Merge remote-tracking branch 'tango/MC-35996' into PR-10-14

Author: dhorytskyi

app/code/Magento/Analytics/ReportXml/ConnectionFactory.php

@@ -6,56 +6,65 @@
 
 namespace Magento\Analytics\ReportXml;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 
 /**
  * Creates connection instance for export according to existing one
+ *
  * This connection does not use buffered statement, also this connection is not persistent
  */
 class ConnectionFactory
 {
     /**
-     * @var ResourceConnection
+     * @var ResourceConfigInterface
      */
-    private $resourceConnection;
+    private $resourceConfig;
 
     /**
-     * @var ObjectManagerInterface
+     * @var DeploymentConfig
      */
-    private $objectManager;
+    private $deploymentConfig;
 
     /**
-     * @param ResourceConnection $resourceConnection
-     * @param ObjectManagerInterface $objectManager
+     * @var ConnectionFactoryInterface
+     */
+    private $connectionFactory;
+
+    /**
+     * @param ResourceConfigInterface $resourceConfig
+     * @param DeploymentConfig $deploymentConfig
+     * @param ConnectionFactoryInterface $connectionFactory
      */
     public function __construct(
-        ResourceConnection $resourceConnection,
-        ObjectManagerInterface $objectManager
+        ResourceConfigInterface $resourceConfig,
+        DeploymentConfig $deploymentConfig,
+        ConnectionFactoryInterface $connectionFactory
     ) {
-        $this->resourceConnection = $resourceConnection;
-        $this->objectManager = $objectManager;
+        $this->resourceConfig = $resourceConfig;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->connectionFactory = $connectionFactory;
     }
 
     /**
      * Creates one-time connection for export
      *
-     * @param string $connectionName
+     * @param string $resourceName
      * @return AdapterInterface
      */
-    public function getConnection($connectionName)
+    public function getConnection($resourceName)
     {
-        $connection = $this->resourceConnection->getConnection($connectionName);
-        $connectionClassName = get_class($connection);
-        $configData = $connection->getConfig();
+        $connectionName = $this->resourceConfig->getConnectionName($resourceName);
+        $configData = $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/' . $connectionName
+        );
         $configData['use_buffered_query'] = false;
         unset($configData['persistent']);
-        return $this->objectManager->create(
-            $connectionClassName,
-            [
-                'config' => $configData
-            ]
-        );
+        $connection = $this->connectionFactory->create($configData);
+
+        return $connection;
     }
 }

app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php

@@ -8,40 +8,29 @@
 namespace Magento\Analytics\Test\Unit\ReportXml;
 
 use Magento\Analytics\ReportXml\ConnectionFactory;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ConnectionFactoryTest extends TestCase
 {
     /**
-     * @var ResourceConnection|MockObject
+     * @var ResourceConfigInterface|MockObject
      */
-    private $resourceConnectionMock;
+    private $resourceConfigMock;
 
     /**
-     * @var ObjectManagerInterface|MockObject
+     * @var DeploymentConfig|MockObject
      */
-    private $objectManagerMock;
+    private $deploymentConfigMock;
 
     /**
-     * @var ConnectionFactory|MockObject
+     * @var ConnectionFactoryInterface|MockObject
      */
-    private $connectionNewMock;
-
-    /**
-     * @var AdapterInterface|MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
+    private $connectionFactoryMock;
 
     /**
      * @var ConnectionFactory
@@ -53,47 +42,36 @@ class ConnectionFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-
-        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-
-        $this->connectionMock = $this->createMock(MysqlPdoAdapter::class);
-
-        $this->connectionNewMock = $this->createMock(MysqlPdoAdapter::class);
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-
-        $this->connectionFactory = $this->objectManagerHelper->getObject(
-            ConnectionFactory::class,
-            [
-                'resourceConnection' => $this->resourceConnectionMock,
-                'objectManager' => $this->objectManagerMock,
-            ]
+        $this->resourceConfigMock = $this->createMock(ResourceConfigInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->connectionFactoryMock = $this->createMock(ConnectionFactoryInterface::class);
+
+        $this->connectionFactory = new ConnectionFactory(
+            $this->resourceConfigMock,
+            $this->deploymentConfigMock,
+            $this->connectionFactoryMock
         );
     }
 
     public function testGetConnection()
     {
-        $connectionName = 'read';
-
-        $this->resourceConnectionMock
-            ->expects($this->once())
-            ->method('getConnection')
-            ->with($connectionName)
-            ->willReturn($this->connectionMock);
-
-        $this->connectionMock
-            ->expects($this->once())
-            ->method('getConfig')
-            ->with()
-            ->willReturn(['persistent' => 1]);
-
-        $this->objectManagerMock
-            ->expects($this->once())
+        $resourceName = 'default';
+
+        $this->resourceConfigMock->expects($this->once())
+            ->method('getConnectionName')
+            ->with($resourceName)
+            ->willReturn('default');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('db/connection/default')
+            ->willReturn(['host' => 'localhost', 'port' => 3306, 'persistent' => true]);
+        $connectionMock = $this->createMock(AdapterInterface::class);
+        $this->connectionFactoryMock->expects($this->once())
             ->method('create')
-            ->with(get_class($this->connectionMock), ['config' => ['use_buffered_query' => false]])
-            ->willReturn($this->connectionNewMock);
+            ->with(['host' => 'localhost', 'port' => 3306, 'use_buffered_query' => false])
+            ->willReturn($connectionMock);
 
-        $this->assertSame($this->connectionNewMock, $this->connectionFactory->getConnection($connectionName));
+        $connection = $this->connectionFactory->getConnection($resourceName);
+        $this->assertSame($connectionMock, $connection);
     }
 }

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

@@ -266,4 +266,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Analytics\ReportXml\ConnectionFactory">
+        <arguments>
+            <argument name="connectionFactory" xsi:type="object">Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactory</argument>
+        </arguments>
+    </type>
 </config>