MAGETWO-34528: Contribution of Sprint 24 Work to Mainline

- fixing merging issues

Author: mazhalai

app/code/Magento/Webapi/Model/Plugin/Manager.php

@@ -5,12 +5,12 @@
  */
 namespace Magento\Webapi\Model\Plugin;
 
-use Magento\Integration\Model\Integration;
+use Magento\Integration\Model\ConfigBasedIntegrationManager;
 use Magento\Integration\Service\V1\AuthorizationServiceInterface as IntegrationAuthorizationInterface;
 use Magento\Webapi\Model\IntegrationConfig;
 
 /**
- * Plugin for \Magento\Integration\Model\Manager model to manage resource permissions of
+ * Plugin for ConfigBasedIntegrationManager model to manage resource permissions of
  * integration installed from config file
  */
 class Manager
@@ -54,14 +54,14 @@ public function __construct(
     /**
      * Process integration resource permissions after the integration is created
      *
-     * @param \Magento\Integration\Model\Manager $subject
+     * @param ConfigBasedIntegrationManager $subject
      * @param string[] $integrationNames Name of integrations passed as array from the invocation chain
      *
      * @return string[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterProcessIntegrationConfig(
-        \Magento\Integration\Model\Manager $subject,
+        ConfigBasedIntegrationManager $subject,
         $integrationNames
     ) {
         if (empty($integrationNames)) {

app/code/Magento/Webapi/etc/di.xml

@@ -32,7 +32,7 @@
             <argument name="customAttributeMap" xsi:type="object">CustomAttributeMap</argument>
         </arguments>
     </type>
-    <type name="Magento\Integration\Model\Manager">
+    <type name="Magento\Integration\Model\ConfigBasedIntegrationManager">
         <plugin name="webapiSetup" type="Magento\Webapi\Model\Plugin\Manager" />
     </type>
 </config>

dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_TestModuleIntegrationFromConfig" schema_version="0.0.1" active="true">
+    <module name="Magento_TestModuleIntegrationFromConfig" setup_version="0.0.1" active="true">
     </module>
 </config>

dev/tests/unit/testsuite/Magento/Setup/Model/InstallerFactoryTest.php

@@ -70,7 +70,15 @@ public function testCreate()
             [
                 'Magento\Framework\App\DeploymentConfig\Reader',
                 $this->getMock('Magento\Framework\App\DeploymentConfig\Reader', [], [], '', false),
-            ]
+            ],
+            [
+                'Magento\Framework\Model\Resource\Db\TransactionManager',
+                $this->getMock('Magento\Framework\Model\Resource\Db\TransactionManager', [], [], '', false),
+            ],
+            [
+                'Magento\Framework\Model\Resource\Db\ObjectRelationProcessor',
+                $this->getMock('Magento\Framework\Model\Resource\Db\ObjectRelationProcessor', [], [], '', false),
+            ],
         ];
         $serviceLocatorMock = $this->getMockForAbstractClass('Zend\ServiceManager\ServiceLocatorInterface', ['get']);
         $serviceLocatorMock

dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php

@@ -110,9 +110,9 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
     ];
 
     /**
-     * @var \Magento\Framework\App\Resource|\PHPUnit_Framework_MockObject_MockObject
+     * @var Magento\Framework\Model\Resource\Db\Context|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $resourceMock;
+    private $contextMock;
 
     protected function setUp()
     {
@@ -142,7 +142,7 @@ protected function setUp()
         $this->filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
         $this->sampleData = $this->getMock('Magento\Setup\Model\SampleData', [], [], '', false);
         $this->objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
-        $this->resourceMock = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
+        $this->contextMock = $this->getMock('Magento\Framework\Model\Resource\Db\Context', [], [], '', false);
         $this->object = $this->createObject();
     }
 
@@ -178,7 +178,7 @@ private function createObject($connectionFactory = false, $objectManagerProvider
             $this->filesystem,
             $this->sampleData,
             $objectManagerProvider,
-            $this->resourceMock
+            $this->contextMock
         );
     }
 
@@ -204,15 +204,17 @@ public function testInstall()
         $table->expects($this->any())->method('addColumn')->willReturn($table);
         $table->expects($this->any())->method('setComment')->willReturn($table);
         $connection->expects($this->any())->method('newTable')->willReturn($table);
-        $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($connection);
+        $resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
+        $this->contextMock->expects($this->any())->method('getResources')->willReturn($resource);
+        $resource->expects($this->any())->method('getConnection')->will($this->returnValue($connection));
         $dataSetup = $this->getMock('Magento\Setup\Module\DataSetup', [], [], '', false);
         $cacheManager = $this->getMock('Magento\Framework\App\Cache\Manager', [], [], '', false);
         $cacheManager->expects($this->once())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
         $cacheManager->expects($this->once())->method('setEnabled')->willReturn(['foo', 'bar']);
         $this->objectManager->expects($this->any())
             ->method('create')
             ->will($this->returnValueMap([
-                ['Magento\Setup\Module\Setup', ['resource' => $this->resourceMock], $setup],
+                ['Magento\Setup\Module\Setup', ['resource' => $resource], $setup],
                 ['Magento\Setup\Module\DataSetup', [], $dataSetup],
                 ['Magento\Framework\App\Cache\Manager', [], $cacheManager],
             ]));

dev/tests/unit/testsuite/Magento/Webapi/Model/Plugin/ManagerTest.php

@@ -38,7 +38,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $apiSetupPlugin;
 
     /**
-     * @var \Magento\Integration\Model\Manager|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Integration\Model\ConfigBasedIntegrationManager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $subjectMock;
 
@@ -62,7 +62,7 @@ public function setUp()
             ['grantPermissions']
         )->getMock();
 
-        $this->subjectMock = $this->getMock('Magento\Integration\Model\Manager', [], [], '', false);
+        $this->subjectMock = $this->getMock('Magento\Integration\Model\ConfigBasedIntegrationManager', [], [], '', false);
         $this->apiSetupPlugin = new \Magento\Webapi\Model\Plugin\Manager(
             $this->integrationConfigMock,
             $this->integrationAuthorizationServiceMock,

setup/src/Magento/Setup/Model/Installer.php

@@ -32,6 +32,7 @@
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Model\Resource\Db\Context;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -201,9 +202,9 @@ class Installer
     private $objectManagerProvider;
 
     /**
-     * @var Resource
+     * @var Context
      */
-    private $resource;
+    private $context;
 
     /**
      * Constructor
@@ -222,7 +223,7 @@ class Installer
      * @param Filesystem $filesystem
      * @param SampleData $sampleData
      * @param ObjectManagerProvider $objectManagerProvider
-     * @param \Magento\Framework\App\Resource $resource
+     * @param Context $context
      * 
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -241,7 +242,7 @@ public function __construct(
         Filesystem $filesystem,
         SampleData $sampleData,
         ObjectManagerProvider $objectManagerProvider,
-        \Magento\Framework\App\Resource $resource
+        Context $context
     ) {
         $this->filePermissions = $filePermissions;
         $this->deploymentConfigWriter = $deploymentConfigWriter;
@@ -259,7 +260,7 @@ public function __construct(
         $this->installInfo[self::INFO_MESSAGE] = [];
         $this->deploymentConfig = $deploymentConfig;
         $this->objectManagerProvider = $objectManagerProvider;
-        $this->resource = $resource;
+        $this->context = $context;
     }
 
     /**
@@ -598,7 +599,7 @@ public function installSchema()
     {
         $setup = $this->objectManagerProvider->get()->create(
             'Magento\Setup\Module\Setup',
-            ['resource' => $this->resource]
+            ['resource' => $this->context->getResources()]
         );
         $this->setupModuleRegistry($setup);
         $this->log->log('Schema creation/updates:');
@@ -639,7 +640,7 @@ private function handleDBSchemaData($setup, $type)
         $this->assertDeploymentConfigExists();
         $this->assertDbAccessible();
 
-        $resource = new \Magento\Framework\Module\Resource($this->resource);
+        $resource = new \Magento\Framework\Module\Resource($this->context);
         $verType = $type . '-version';
         $installType = $type . '-install';
         $upgradeType = $type . '-upgrade';
@@ -733,7 +734,7 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
     {
         $setup = $this->objectManagerProvider->get()->create(
             'Magento\Setup\Module\Setup',
-            ['resource' => $this->resource]
+            ['resource' => $this->context->getResources()]
         );
         $dbConnection = $setup->getConnection();
 
@@ -779,7 +780,7 @@ public function installAdminUser($data)
         $this->assertDeploymentConfigExists();
         $setup = $this->objectManagerProvider->get()->create(
             'Magento\Setup\Module\Setup',
-            ['resource' => $this->resource]
+            ['resource' => $this->context->getResources()]
         );
         $adminAccount = $this->adminAccountFactory->create($setup, (array)$data);
         $adminAccount->save();

setup/src/Magento/Setup/Model/InstallerFactory.php

@@ -58,7 +58,11 @@ public function create(LoggerInterface $log)
             $this->serviceLocator->get('Magento\Framework\Filesystem'),
             $this->serviceLocator->get('Magento\Setup\Model\SampleData'),
             $this->serviceLocator->get('Magento\Setup\Model\ObjectManagerProvider'),
-            $this->getResource()
+            new \Magento\Framework\Model\Resource\Db\Context(
+                $this->getResource(),
+                $this->serviceLocator->get('Magento\Framework\Model\Resource\Db\TransactionManager'),
+                $this->serviceLocator->get('Magento\Framework\Model\Resource\Db\ObjectRelationProcessor')
+            )
         );
     }