MAGETWO-62013: Fix class constructors in a backward compatible way - 2.1.3

Author: Oleksii Korshenko

app/code/Magento/Backend/Test/Unit/App/ConfigTest.php

@@ -34,7 +34,10 @@ protected function setUp()
             '',
             false
         );
-        $this->model = new \Magento\Backend\App\Config($this->appConfig);
+        $this->model = new \Magento\Backend\App\Config(
+            $this->getMock(\Magento\Framework\App\Config\ScopePool::class, [], [], '', false, false),
+            $this->appConfig
+        );
     }
 
     public function testGetValue()

app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php

@@ -23,6 +23,7 @@
 use Magento\Sales\Model\ValidatorResultInterface;
 use Magento\Sales\Model\InvoiceOrder;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class InvoiceOrderTest
@@ -119,6 +120,8 @@ class InvoiceOrderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $objectManager = new ObjectManager($this);
+
         $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -184,17 +187,20 @@ protected function setUp()
             ->setMethods(['hasMessages', 'getMessages', 'addMessage'])
             ->getMock();
 
-        $this->invoiceOrder = new InvoiceOrder(
-            $this->resourceConnectionMock,
-            $this->orderRepositoryMock,
-            $this->invoiceDocumentFactoryMock,
-            $this->paymentAdapterMock,
-            $this->orderStateResolverMock,
-            $this->configMock,
-            $this->invoiceRepositoryMock,
-            $this->invoiceOrderValidatorMock,
-            $this->notifierInterfaceMock,
-            $this->loggerMock
+        $this->invoiceOrder = $objectManager->getObject(
+            InvoiceOrder::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock,
+                'orderRepository' => $this->orderRepositoryMock,
+                'invoiceDocumentFactory' => $this->invoiceDocumentFactoryMock,
+                'paymentAdapter' => $this->paymentAdapterMock,
+                'orderStateResolver' => $this->orderStateResolverMock,
+                'config' => $this->configMock,
+                'invoiceRepository' => $this->invoiceRepositoryMock,
+                'invoiceOrderValidator' => $this->invoiceOrderValidatorMock,
+                'notifierInterface' => $this->notifierInterfaceMock,
+                'logger' => $this->loggerMock
+            ]
         );
     }
 

app/code/Magento/Store/Test/Unit/Model/Config/Processor/PlaceholderTest.php

@@ -36,7 +36,12 @@ protected function setUp()
             ['key2' => 'value2-processed']
         );
 
-        $this->model = new \Magento\Store\Model\Config\Processor\Placeholder($this->configPlaceholderMock);
+        $this->model = new \Magento\Store\Model\Config\Processor\Placeholder(
+            $this->getMock(\Magento\Framework\App\RequestInterface::class),
+            [],
+            null,
+            $this->configPlaceholderMock
+        );
     }
 
     public function testProcess()