MAGETWO-31931: Implement ExtensionInterface Code Generator

- Fixed builds

Author: Alexander Paliarush

dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/ExtensionGeneratorTest.php

@@ -85,7 +85,7 @@ public function testValidateException()
         $this->assertTrue(
             in_array(
                 'Invalid extension name [\Magento\Catalog\Api\Data\ProductInterface].'
-                    . ' Use \Magento\Catalog\Api\Data\ProductExtension',
+                . ' Use \Magento\Catalog\Api\Data\ProductExtension',
                 $model->getErrors()
             ),
             'Expected validation error message is missing.'
@@ -96,6 +96,7 @@ public function testValidateException()
      * Check if generated code matches provided expected result.
      *
      * @param string $expectedResult
+     * @return void
      */
     protected function validateGeneratedCode($expectedResult)
     {

dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/ExtensionInterfaceGeneratorTest.php

@@ -66,7 +66,7 @@ public function testValidateException()
         $this->assertTrue(
             in_array(
                 'Invalid extension interface name [\Magento\Catalog\Api\Data\ProductInterface].'
-                    . ' Use \Magento\Catalog\Api\Data\ProductExtensionInterface',
+                . ' Use \Magento\Catalog\Api\Data\ProductExtensionInterface',
                 $model->getErrors()
             ),
             'Expected validation error message is missing.'

dev/tests/unit/testsuite/Magento/Framework/Code/_files/app/code/Magento/SomeModule/Model/SevenInterface.php

@@ -3,6 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
+
 namespace Magento\SomeModule\Model;
 
 use Magento\SomeModule\Model\Two\Test as TestTwo;

lib/internal/Magento/Framework/Code/Generator/InterfaceGenerator.php

@@ -21,56 +21,74 @@ public function generate()
                 return $output;
             }
         }
-
         $output = '';
         if (!$this->getName()) {
             return $output;
         }
 
-        if (null !== ($namespace = $this->getNamespaceName())) {
-            $output .= 'namespace ' . $namespace . ';' . self::LINE_FEED . self::LINE_FEED;
-        }
-
-        $uses = $this->getUses();
-        if (!empty($uses)) {
-            foreach ($uses as $use) {
-                $output .= 'use ' . $use . ';' . self::LINE_FEED;
-            }
-            $output .= self::LINE_FEED;
-        }
-
+        $output .= $this->generateDirectives();
         if (null !== ($docBlock = $this->getDocBlock())) {
             $docBlock->setIndentation('');
             $output .= $docBlock->generate();
         }
-
         $output .= 'interface ' . $this->getName();
-
         if (!empty($this->extendedClass)) {
             $output .= ' extends ' . $this->extendedClass;
         }
 
-        $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED;
+        $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED
+            . $this->generateMethods() . self::LINE_FEED . '}' . self::LINE_FEED;
+
+        return $output;
+    }
+
+    /**
+     * Instantiate interface method generator object.
+     *
+     * @return \Magento\Framework\Code\Generator\InterfaceMethodGenerator
+     */
+    protected function createMethodGenerator()
+    {
+        return new \Magento\Framework\Code\Generator\InterfaceMethodGenerator();
+    }
 
+    /**
+     * Generate methods.
+     *
+     * @return string
+     */
+    protected function generateMethods()
+    {
+        $output = '';
         $methods = $this->getMethods();
         if (!empty($methods)) {
             foreach ($methods as $method) {
                 $output .= $method->generate() . self::LINE_FEED;
             }
         }
-
-        $output .= self::LINE_FEED . '}' . self::LINE_FEED;
-
         return $output;
     }
 
     /**
-     * Instantiate interface method generator object.
+     * Generate directives.
      *
-     * @return \Magento\Framework\Code\Generator\InterfaceMethodGenerator
+     * @return string
      */
-    protected function createMethodGenerator()
+    protected function generateDirectives()
     {
-        return new \Magento\Framework\Code\Generator\InterfaceMethodGenerator();
+        $output = '';
+        $namespace = $this->getNamespaceName();
+        if (null !== $namespace) {
+            $output .= 'namespace ' . $namespace . ';' . self::LINE_FEED . self::LINE_FEED;
+        }
+
+        $uses = $this->getUses();
+        if (!empty($uses)) {
+            foreach ($uses as $use) {
+                $output .= 'use ' . $use . ';' . self::LINE_FEED;
+            }
+            $output .= self::LINE_FEED;
+        }
+        return $output;
     }
 }

lib/internal/Magento/Framework/Code/Generator/InterfaceMethodGenerator.php

@@ -15,22 +15,7 @@ class InterfaceMethodGenerator extends \Zend\Code\Generator\MethodGenerator
      */
     public function generate()
     {
-        if ($this->getVisibility() != self::VISIBILITY_PUBLIC) {
-            throw new \LogicException(
-                "Interface method visibility can only be 'public'. Method name: '{$this->getName()}'"
-            );
-        }
-        if ($this->isFinal()) {
-            throw new \LogicException(
-                "Interface method cannot be marked as 'final'. Method name: '{$this->getName()}'"
-            );
-        }
-        if ($this->isAbstract()) {
-            throw new \LogicException(
-                "'abstract' modifier cannot be used for interface method. Method name: '{$this->getName()}'"
-            );
-        }
-
+        $this->validateMethodModifiers();
         $output = '';
         if (!$this->getName()) {
             return $output;
@@ -61,4 +46,29 @@ public function generate()
 
         return $output;
     }
+
+    /**
+     * Ensure that used method modifiers are allowed for interface methods.
+     *
+     * @throws \LogicException
+     * @return void
+     */
+    protected function validateMethodModifiers()
+    {
+        if ($this->getVisibility() != self::VISIBILITY_PUBLIC) {
+            throw new \LogicException(
+                "Interface method visibility can only be 'public'. Method name: '{$this->getName()}'"
+            );
+        }
+        if ($this->isFinal()) {
+            throw new \LogicException(
+                "Interface method cannot be marked as 'final'. Method name: '{$this->getName()}'"
+            );
+        }
+        if ($this->isAbstract()) {
+            throw new \LogicException(
+                "'abstract' modifier cannot be used for interface method. Method name: '{$this->getName()}'"
+            );
+        }
+    }
 }