Merge branch 'MAGETWO-57975' into MPI-PR-Bugfixes

Author: YevSent

app/etc/di.xml

@@ -674,6 +674,7 @@
     <type name="Magento\Framework\Code\Generator">
         <arguments>
             <argument name="generatedEntities" xsi:type="array">
+                <item name="extensionInterfaceFactory" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator</item>
                 <item name="factory" xsi:type="string">\Magento\Framework\ObjectManager\Code\Generator\Factory</item>
                 <item name="proxy" xsi:type="string">\Magento\Framework\ObjectManager\Code\Generator\Proxy</item>
                 <item name="interceptor" xsi:type="string">\Magento\Framework\Interception\Code\Generator\Interceptor</item>

dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php

@@ -5,12 +5,17 @@
  */
 namespace Magento\Framework\Code;
 
+use Magento\Framework\Code\Generator;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Code\Generator as DIGenerator;
+use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
+use Magento\TestFramework\Helper\Bootstrap;
 
 require_once __DIR__ . '/GeneratorTest/SourceClassWithNamespace.php';
 require_once __DIR__ . '/GeneratorTest/ParentClassWithNamespace.php';
+require_once __DIR__ . '/GeneratorTest/SourceClassWithNamespaceExtension.php';
+
 /**
  * @magentoAppIsolation enabled
  */
@@ -51,6 +56,8 @@ protected function setUp()
             [
                 'ioObject' => $this->_ioObject,
                 'generatedEntities' => [
+                    ExtensionAttributesInterfaceFactoryGenerator::ENTITY_TYPE =>
+                        ExtensionAttributesInterfaceFactoryGenerator::class,
                     DIGenerator\Factory::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
                     DIGenerator\Proxy::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
                     InterceptionGenerator\Interceptor::ENTITY_TYPE =>
@@ -148,4 +155,34 @@ public function testGenerateClassInterceptorWithNamespace()
             $this->assertEquals($expectedContent, $content);
         }
     }
+
+    /**
+     * Generates a new file with ExtensionInterfaceFactory class and compares with the sample from the
+     * SourceClassWithNamespaceExtensionInterfaceFactory.php.sample file.
+     */
+    public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespace()
+    {
+        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
+        $this->varDirectory->create(
+            $this->varDirectory->getAbsolutePath('generation') . '/Magento/Framework/Code/GeneratorTest/'
+        );
+
+        $generatorResult = $this->_generator->generateClass($factoryClassName);
+
+        $factory = Bootstrap::getObjectManager()->create($factoryClassName);
+        $object = $factory->create();
+
+        $this->assertEquals($generatorResult, Generator::GENERATION_SUCCESS);
+        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE . 'Extension', $object);
+
+        $content = $this->_clearDocBlock(
+            file_get_contents(
+                $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory')
+            )
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespaceExtension.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Code\GeneratorTest;
+
+/**
+ * Source class for ExtensionInterfaceFactory generator.
+ */
+class SourceClassWithNamespaceExtension extends ParentClassWithNamespace
+{
+}

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample

@@ -0,0 +1,48 @@
+<?php
+namespace Magento\Framework\Code\GeneratorTest;
+
+/**
+ * Factory class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+class SourceClassWithNamespaceExtensionInterfaceFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * ExtensionInterfaceFactory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = '\\Magento\\Framework\\Code\\GeneratorTest\\SourceClassWithNamespaceExtension')
+    {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension
+     */
+    public function create(array $data = array())
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}

lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Api\Code\Generator;
+
+use Magento\Framework\ObjectManager\Code\Generator\Factory;
+use Magento\Framework\Code\Generator\DefinedClasses;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Code\Generator\CodeGeneratorInterface;
+
+class ExtensionAttributesInterfaceFactoryGenerator extends Factory
+{
+    /**
+     * {@inheritdoc}
+     */
+    const ENTITY_TYPE = 'extensionInterfaceFactory';
+
+    /**
+     * @var string
+     */
+    private static $suffix = 'InterfaceFactory';
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param string|null $sourceClassName
+     * @param string|null $resultClassName
+     * @param Io $ioObject
+     * @param CodeGeneratorInterface $classGenerator
+     * @param DefinedClasses $definedClasses
+     */
+    public function __construct(
+        $sourceClassName = null,
+        $resultClassName = null,
+        Io $ioObject = null,
+        CodeGeneratorInterface $classGenerator = null,
+        DefinedClasses $definedClasses = null
+    ) {
+        $sourceClassName .= 'Extension';
+        parent::__construct(
+            $sourceClassName,
+            $resultClassName,
+            $ioObject,
+            $classGenerator,
+            $definedClasses
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _validateData()
+    {
+        $result = true;
+        $sourceClassName = $this->getSourceClassName();
+        $resultClassName = $this->_getResultClassName();
+
+        if ($resultClassName !== $sourceClassName . self::$suffix) {
+            $this->_addError(
+                'Invalid Factory class name [' . $resultClassName . ']. Use ' . $sourceClassName . self::$suffix
+            );
+            $result = false;
+        }
+
+        return $result;
+    }
+}