MAGETWO-65521: Remove unserialize in \Magento\Framework\DB\Adapter\Pdo\Mysql

- making logger optional

Author: Igor Melnikov

lib/internal/Magento/Framework/DB/Adapter/Pdo/MysqlFactory.php

@@ -36,8 +36,8 @@ public function __construct(
      * Create instance of Mysql adapter
      *
      * @param string $className
-     * @param LoggerInterface $logger
      * @param array $config
+     * @param LoggerInterface|null $logger
      * @param SelectFactory|null $selectFactory
      * @return Mysql
      * @throws \InvalidArgumentException
@@ -54,12 +54,12 @@ public function create(
         $arguments = [
             'config' => $config
         ];
-        if ($selectFactory) {
-            $arguments['selectFactory'] = $selectFactory;
-        }
         if ($logger) {
             $arguments['logger'] = $logger;
         }
+        if ($selectFactory) {
+            $arguments['selectFactory'] = $selectFactory;
+        }
         return $this->objectManager->create(
             $className,
             $arguments

lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlFactoryTest.php

@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\DB\Test\Unit\Adapter\Pdo;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\DB\LoggerInterface;
+use Magento\Framework\DB\SelectFactory;
+use Magento\Framework\DB\Adapter\Pdo\MysqlFactory;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+
+class MysqlFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SelectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectFactoryMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var MysqlFactory
+     */
+    private $mysqlFactory;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->objectManagerMock = $this->getMock(ObjectManagerInterface::class);
+        $this->mysqlFactory = $objectManager->getObject(
+            MysqlFactory::class,
+            [
+                'objectManager' => $this->objectManagerMock
+            ]
+        );
+    }
+
+    /**
+     * @param array $config
+     * @param LoggerInterface|null $logger
+     * @param SelectFactory|null $selectFactory
+     * @param array $arguments
+     * @dataProvider createDataProvider
+     */
+    public function testCreate(
+        array $config,
+        LoggerInterface $logger = null,
+        SelectFactory $selectFactory = null,
+        array $arguments
+    ) {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(
+                Mysql::class,
+                $arguments
+            );
+        $this->mysqlFactory->create(
+            Mysql::class,
+            $config,
+            $logger,
+            $selectFactory
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function createDataProvider()
+    {
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->selectFactoryMock = $this->getMock(SelectFactory::class, [], [], '', false);
+        return [
+            [
+                ['foo' => 'bar'],
+                $this->loggerMock,
+                $this->selectFactoryMock,
+                [
+                    'config' => ['foo' => 'bar'],
+                    'logger' => $this->loggerMock,
+                    'selectFactory' => $this->selectFactoryMock
+                ]
+            ],
+            [
+                ['foo' => 'bar'],
+                $this->loggerMock,
+                null,
+                [
+                    'config' => ['foo' => 'bar'],
+                    'logger' => $this->loggerMock
+                ]
+            ],
+            [
+                ['foo' => 'bar'],
+                null,
+                $this->selectFactoryMock,
+                [
+                    'config' => ['foo' => 'bar'],
+                    'selectFactory' => $this->selectFactoryMock
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid class, stdClass must extend Magento\Framework\DB\Adapter\Pdo\Mysql.
+     */
+    public function testCreateInvalidClass()
+    {
+        $this->mysqlFactory->create(
+            \stdClass::class,
+            []
+        );
+    }
+}

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Type/Db/ConnectionFactoryTest.php

@@ -6,7 +6,7 @@
 namespace Magento\Framework\connectionFactory\Test\Unit\ResourceconnectionFactory\Type\Db;
 
 use Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface;
-use Magento\Framework\connectionFactory\ResourceconnectionFactory\Type\Db\ConnectionFactory;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactory;
 use Magento\Framework\ObjectManagerInterface;
 
 class ConnectionFactoryTest extends \PHPUnit_Framework_TestCase