MAGETWO-69019: #8607: Interface constructor if present will break Mag…

…ento compilation #9524
magento · May 15, 2017 · 0a8ee90 · 0a8ee90
2 parents 847d23f + 89d43e8
commit 0a8ee90
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
@@ -25,9 +25,11 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
         /**
          * Skip native PHP types, classes without constructor
          */
-        if (!$class->getFileName() || false == $class->hasMethod(
-            '__construct'
-        ) || !$inherited && $class->getConstructor()->class != $class->getName()
+        if ($class->isInterface() ||
+            !$class->getFileName() ||
+            false == $class->hasMethod('__construct') ||
+            !$inherited &&
+            $class->getConstructor()->class != $class->getName()
         ) {
             return $output;
         }

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
@@ -86,6 +86,20 @@ public function testGetConstructorArgumentsClassWithoutOwnConstructorInheritedFa
         $this->assertEquals([], $actualResult);
     }
 
+    public function testGetConstructorArgumentsWhenInputTypeIsInterfaceWithParam()
+    {
+        $class = new \ReflectionClass('InterfaceTypeWithConstructorMethodAndParams');
+        $actualResult = $this->_model->getConstructorArguments($class);
+        $this->assertEquals([], $actualResult);
+    }
+
+    public function testGetConstructorArgumentsWhenInputTypeIsInterfaceWithoutParam()
+    {
+        $class = new \ReflectionClass('InterfaceTypeWithConstructorMethodWithoutParams');
+        $actualResult = $this->_model->getConstructorArguments($class);
+        $this->assertEquals([], $actualResult);
+    }
+
     public function testGetConstructorArgumentsClassWithoutOwnConstructorInheritedTrue()
     {
         $expectedResult = [

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
@@ -223,3 +223,21 @@ public function __construct(\stdClass $stdClassObject, \ClassExtendsDefaultPhpTy
         $this->argumentTwo = $secondClass;
     }
 }
+
+interface InterfaceTypeWithConstructorMethodAndParams
+{
+    /**
+     * We do not expect that this is valid case. There is no need to declare interface with method __construct
+     *
+     * @param $paramOne
+     * @param $paramTwo
+     */
+    public function __construct($paramOne, $paramTwo);
+}
+interface InterfaceTypeWithConstructorMethodWithoutParams
+{
+    /**
+     * We do not expect that this is valid case. There is no need to declare interface with method __construct
+     */
+    public function __construct();
+}