Merge branch 'MAGETWO-35920-interceptor-trait' into develop

Author: otoolec

lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php

@@ -155,13 +155,13 @@ protected function _generateCode()
         $typeName = $this->getSourceClassName();
         $reflection = new \ReflectionClass($typeName);
 
+        $interfaces = [];
         if ($reflection->isInterface()) {
-            $this->_classGenerator->setImplementedInterfaces([$typeName]);
+            $interfaces[] = $typeName;
         } else {
             $this->_classGenerator->setExtendedClass($typeName);
         }
         $this->_classGenerator->addTrait('\Magento\Framework\Interception\Interceptor');
-        $interfaces = $this->_classGenerator->getImplementedInterfaces();
         $interfaces[] = '\Magento\Framework\Interception\InterceptorInterface';
         $this->_classGenerator->setImplementedInterfaces($interfaces);
         return parent::_generateCode();

lib/internal/Magento/Framework/Interception/Test/Unit/Chain/ChainTest.php

@@ -33,13 +33,13 @@ public function testInvokeNextBeforePlugin()
         $type = 'type';
         $method = 'method';
 
-        $subjectMock = $this->getMock('SubjectClass', ['___callParent']);
+        $subjectMock = $this->getMock('Magento\Framework\Interception\InterceptorInterface');
         $pluginMock = $this->getMock('PluginClass', ['beforeMethod']);
 
         $pluginMock->expects($this->once())
             ->method('beforeMethod')
             ->with($subjectMock, 1, 2)
-            ->will($this->returnValue('beforeMethodResult'));
+            ->will($this->returnValue(['beforeMethodResult']));
 
         $this->_pluginListMock->expects($this->once())
             ->method('getNext')
@@ -57,7 +57,7 @@ public function testInvokeNextBeforePlugin()
 
         $subjectMock->expects($this->once())
             ->method('___callParent')
-            ->with('method', 'beforeMethodResult')
+            ->with('method', ['beforeMethodResult'])
             ->will($this->returnValue('subjectMethodResult'));
 
         $this->assertEquals('subjectMethodResult', $this->_model->invokeNext($type, $method, $subjectMock, [1, 2]));
@@ -71,7 +71,7 @@ public function testInvokeNextAroundPlugin()
         $type = 'type';
         $method = 'method';
 
-        $subjectMock = $this->getMock('SubjectClass');
+        $subjectMock = $this->getMock('Magento\Framework\Interception\InterceptorInterface');
         $pluginMock = $this->getMock('PluginClass', ['aroundMethod']);
 
         $pluginMock->expects($this->once())
@@ -102,7 +102,7 @@ public function testInvokeNextAfterPlugin()
         $type = 'type';
         $method = 'method';
 
-        $subjectMock = $this->getMock('SubjectClass', ['___callParent']);
+        $subjectMock = $this->getMock('Magento\Framework\Interception\InterceptorInterface');
         $pluginMock = $this->getMock('PluginClass', ['afterMethod']);
 
         $pluginMock->expects($this->once())

lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php

@@ -11,12 +11,12 @@
 class InterceptorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $ioObjectMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $classGeneratorMock;
 
@@ -46,13 +46,13 @@ public function testGetDefaultResultClassName()
         );
 
         $this->classGeneratorMock->expects($this->once())->method('setName')
-            ->will($this->returnValue($this->classGeneratorMock));
+            ->willReturnSelf();
         $this->classGeneratorMock->expects($this->once())->method('addProperties')
-            ->will($this->returnValue($this->classGeneratorMock));
+            ->willReturnSelf();
         $this->classGeneratorMock->expects($this->once())->method('addMethods')
-            ->will($this->returnValue($this->classGeneratorMock));
+            ->willReturnSelf();
         $this->classGeneratorMock->expects($this->once())->method('setClassDocBlock')
-            ->will($this->returnValue($this->classGeneratorMock));
+            ->willReturnSelf();
         $this->classGeneratorMock->expects($this->once())->method('generate')
             ->will($this->returnValue('source code example'));
         $model->expects($this->once())->method('_validateData')->will($this->returnValue(true));