Merge pull request #656 from magento-fearless-kiwis/MAGETWO-62013

Oleksii Korshenko · web-flow · commit 8c0ceedf9522 · 2016-12-08T13:07:20.000-06:00
[Fiwi] Fix of Backward incompatible changes - 2.1.3
diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php
@@ -12,12 +12,20 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Backend config accessor.
  */
 class Config implements ConfigInterface
 {
+    /**
+     * @var \Magento\Framework\App\Config\ScopePool
+     *
+     * @deprecated
+     */
+    protected $_scopePool;
+
     /**
      * @var \Magento\Framework\App\Config
      */
@@ -29,12 +37,17 @@ class Config implements ConfigInterface
     private $data;
 
     /**
-     * @param \Magento\Framework\App\Config $appConfig
-     * @return void
+     * @param \Magento\Framework\App\Config\ScopePool $scopePool
+     * @param \Magento\Framework\App\Config|null $appConfig
      */
-    public function __construct(\Magento\Framework\App\Config $appConfig)
-    {
-        $this->appConfig = $appConfig;
+    public function __construct(
+        \Magento\Framework\App\Config\ScopePool $scopePool,
+        \Magento\Framework\App\Config $appConfig = null
+    ) {
+        $this->_scopePool = $scopePool;
+        $this->appConfig = $appConfig ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Config::class
+        );
     }
 
     /**
diff --git a/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php b/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()
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCommentCreationInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Interface CreditmemoCommentCreationInterface
- *
- * @api
  */
 interface CreditmemoCommentCreationInterface extends ExtensibleDataInterface, CommentInterface
 {
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCreationArgumentsInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Interface CreditmemoCreationArgumentsInterface
- *
- * @api
  */
 interface CreditmemoCreationArgumentsInterface
 {
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemCreationInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface CreditmemoItemCreationInterface
- * @api
  */
 interface CreditmemoItemCreationInterface extends LineItemInterface, ExtensibleDataInterface
 {
diff --git a/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php b/app/code/Magento/Sales/Api/Exception/CouldNotRefundExceptionInterface.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Api\Exception;
 
 /**
- * @api
+ * Interface CouldNotRefundExceptionInterface
  */
 interface CouldNotRefundExceptionInterface
 {
diff --git a/app/code/Magento/Sales/Api/RefundInvoiceInterface.php b/app/code/Magento/Sales/Api/RefundInvoiceInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Interface RefundInvoiceInterface
- *
- * @api
  */
 interface RefundInvoiceInterface
 {
diff --git a/app/code/Magento/Sales/Api/RefundOrderInterface.php b/app/code/Magento/Sales/Api/RefundOrderInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Interface RefundOrderInterface
- *
- * @api
  */
 interface RefundOrderInterface
 {
diff --git a/app/code/Magento/Sales/Model/InvoiceOrder.php b/app/code/Magento/Sales/Model/InvoiceOrder.php
@@ -12,13 +12,16 @@
 use Magento\Sales\Api\InvoiceOrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\Config as OrderConfig;
+use Magento\Sales\Model\Order\Invoice\InvoiceValidatorInterface;
 use Magento\Sales\Model\Order\Invoice\NotifierInterface;
 use Magento\Sales\Model\Order\InvoiceDocumentFactory;
 use Magento\Sales\Model\Order\InvoiceRepository;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
+use Magento\Sales\Model\Order\OrderValidatorInterface;
 use Magento\Sales\Model\Order\PaymentAdapterInterface;
 use Magento\Sales\Model\Order\Validation\InvoiceOrderInterface as InvoiceOrderValidator;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class InvoiceOrder
@@ -81,26 +84,31 @@ class InvoiceOrder implements InvoiceOrderInterface
      * @param ResourceConnection $resourceConnection
      * @param OrderRepositoryInterface $orderRepository
      * @param InvoiceDocumentFactory $invoiceDocumentFactory
+     * @param InvoiceValidatorInterface $invoiceValidator
+     * @param OrderValidatorInterface $orderValidator
      * @param PaymentAdapterInterface $paymentAdapter
      * @param OrderStateResolverInterface $orderStateResolver
      * @param OrderConfig $config
      * @param InvoiceRepository $invoiceRepository
-     * @param InvoiceOrderValidator $invoiceOrderValidator
      * @param NotifierInterface $notifierInterface
      * @param LoggerInterface $logger
+     * @param InvoiceOrderValidator|null $invoiceOrderValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         OrderRepositoryInterface $orderRepository,
         InvoiceDocumentFactory $invoiceDocumentFactory,
+        InvoiceValidatorInterface $invoiceValidator,
+        OrderValidatorInterface $orderValidator,
         PaymentAdapterInterface $paymentAdapter,
         OrderStateResolverInterface $orderStateResolver,
         OrderConfig $config,
         InvoiceRepository $invoiceRepository,
-        InvoiceOrderValidator $invoiceOrderValidator,
         NotifierInterface $notifierInterface,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        InvoiceOrderValidator $invoiceOrderValidator = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->orderRepository = $orderRepository;
@@ -109,9 +117,11 @@ public function __construct(
         $this->orderStateResolver = $orderStateResolver;
         $this->config = $config;
         $this->invoiceRepository = $invoiceRepository;
-        $this->invoiceOrderValidator = $invoiceOrderValidator;
         $this->notifierInterface = $notifierInterface;
         $this->logger = $logger;
+        $this->invoiceOrderValidator = $invoiceOrderValidator ?: ObjectManager::getInstance()->get(
+            InvoiceOrderValidator::class
+        );
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Notifier.php
@@ -7,8 +7,6 @@
 
 /**
  * CreditMemo notifier.
- *
- * @api
  */
 class Notifier implements \Magento\Sales\Model\Order\Creditmemo\NotifierInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php b/app/code/Magento/Sales/Model/Order/Creditmemo/NotifierInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Interface for CreditMemo notifier.
- *
- * @api
  */
 interface NotifierInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
@@ -7,8 +7,6 @@
 
 /**
  * Class CreditmemoDocumentFactory
- *
- * @api
  */
 class CreditmemoDocumentFactory
 {
diff --git a/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php b/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Interface RefundAdapterInterface
- *
- * @api
  */
 interface RefundAdapterInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrderInterface.php
@@ -13,8 +13,6 @@
 
 /**
  * Interface InvoiceOrderInterface
- *
- * @api
  */
 interface InvoiceOrderInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoiceInterface.php
@@ -12,8 +12,6 @@
 
 /**
  * Interface RefundInvoiceInterface
- *
- * @api
  */
 interface RefundInvoiceInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/RefundOrderInterface.php
@@ -11,8 +11,6 @@
 
 /**
  * Interface RefundOrderInterface
- *
- * @api
  */
 interface RefundOrderInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php b/app/code/Magento/Sales/Model/Order/Validation/ShipOrderInterface.php
@@ -10,8 +10,6 @@
 
 /**
  * Interface ShipOrderInterface
- *
- * @api
  */
 interface ShipOrderInterface
 {
diff --git a/app/code/Magento/Sales/Model/ShipOrder.php b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -11,11 +11,14 @@
 use Magento\Sales\Api\ShipOrderInterface;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
+use Magento\Sales\Model\Order\OrderValidatorInterface;
 use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Shipment\NotifierInterface;
+use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface;
 use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
 use Magento\Sales\Model\Order\Validation\ShipOrderInterface as ShipOrderValidator;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class ShipOrder
@@ -77,37 +80,44 @@ class ShipOrder implements ShipOrderInterface
      * @param ResourceConnection $resourceConnection
      * @param OrderRepositoryInterface $orderRepository
      * @param ShipmentDocumentFactory $shipmentDocumentFactory
+     * @param ShipmentValidatorInterface $shipmentValidator
+     * @param OrderValidatorInterface $orderValidator
      * @param OrderStateResolverInterface $orderStateResolver
      * @param OrderConfig $config
      * @param ShipmentRepositoryInterface $shipmentRepository
-     * @param ShipOrderValidator $shipOrderValidator
      * @param NotifierInterface $notifierInterface
      * @param OrderRegistrarInterface $orderRegistrar
      * @param LoggerInterface $logger
+     * @param ShipOrderValidator|null $shipOrderValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         OrderRepositoryInterface $orderRepository,
         ShipmentDocumentFactory $shipmentDocumentFactory,
+        ShipmentValidatorInterface $shipmentValidator,
+        OrderValidatorInterface $orderValidator,
         OrderStateResolverInterface $orderStateResolver,
         OrderConfig $config,
         ShipmentRepositoryInterface $shipmentRepository,
-        ShipOrderValidator $shipOrderValidator,
         NotifierInterface $notifierInterface,
         OrderRegistrarInterface $orderRegistrar,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        ShipOrderValidator $shipOrderValidator = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->orderRepository = $orderRepository;
         $this->shipmentDocumentFactory = $shipmentDocumentFactory;
         $this->orderStateResolver = $orderStateResolver;
         $this->config = $config;
         $this->shipmentRepository = $shipmentRepository;
-        $this->shipOrderValidator = $shipOrderValidator;
         $this->notifierInterface = $notifierInterface;
         $this->logger = $logger;
         $this->orderRegistrar = $orderRegistrar;
+        $this->shipOrderValidator = $shipOrderValidator ?: ObjectManager::getInstance()->get(
+            ShipOrderValidator::class
+        );
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Validator.php b/app/code/Magento/Sales/Model/Validator.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Validator
@@ -29,14 +30,16 @@ class Validator
      * Validator constructor.
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ValidatorResultInterfaceFactory $validatorResult
+     * @param ValidatorResultInterfaceFactory|null $validatorResult
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ValidatorResultInterfaceFactory $validatorResult
+        ValidatorResultInterfaceFactory $validatorResult = null
     ) {
         $this->objectManager = $objectManager;
-        $this->validatorResultFactory = $validatorResult;
+        $this->validatorResultFactory = $validatorResult ?: ObjectManager::getInstance()->get(
+            ValidatorResultInterfaceFactory::class
+        );
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/ValidatorResultInterface.php b/app/code/Magento/Sales/Model/ValidatorResultInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface ValidatorResultInterface
- * @api
  */
 interface ValidatorResultInterface
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php b/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
+            ]
         );
     }
 
diff --git a/app/code/Magento/Store/Model/Config/Processor/Placeholder.php b/app/code/Magento/Store/Model/Config/Processor/Placeholder.php
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Processor/PlaceholderTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Processor/PlaceholderTest.php
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php b/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php
diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Interface CreditmemoCommentCreationInterface`
`12`		`- *`
`13`		`- * @api`
`14`	`12`	`*/`
`15`	`13`	`interface CreditmemoCommentCreationInterface extends ExtensibleDataInterface, CommentInterface`
`16`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Interface CreditmemoCreationArgumentsInterface`
`10`		`- *`
`11`		`- * @api`
`12`	`10`	`*/`
`13`	`11`	`interface CreditmemoCreationArgumentsInterface`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Interface CreditmemoItemCreationInterface`
`12`		`- * @api`
`13`	`12`	`*/`
`14`	`13`	`interface CreditmemoItemCreationInterface extends LineItemInterface, ExtensibleDataInterface`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Magento\Sales\Api\Exception;`
`7`	`7`
`8`	`8`	`/**`
`9`		`- * @api`
	`9`	`+ * Interface CouldNotRefundExceptionInterface`
`10`	`10`	`*/`
`11`	`11`	`interface CouldNotRefundExceptionInterface`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Interface RefundInvoiceInterface`
`10`		`- *`
`11`		`- * @api`
`12`	`10`	`*/`
`13`	`11`	`interface RefundInvoiceInterface`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Interface RefundOrderInterface`
`10`		`- *`
`11`		`- * @api`
`12`	`10`	`*/`
`13`	`11`	`interface RefundOrderInterface`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* CreditMemo notifier.`
`10`		`- *`
`11`		`- * @api`
`12`	`10`	`*/`
`13`	`11`	`class Notifier implements \Magento\Sales\Model\Order\Creditmemo\NotifierInterface`
`14`	`12`	`{`