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

- restoring constructors to keep backward incompatibility

Author: cpartica

app/code/Magento/Backend/App/Config.php

@@ -12,12 +12,18 @@
 
 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
+     */
+    protected $_scopePool;
+
     /**
      * @var \Magento\Framework\App\Config
      */
@@ -29,12 +35,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
+        );
     }
 
     /**

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,30 @@ 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)
      */
     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 +116,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
+        );
     }
 
     /**

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,43 @@ 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)
      */
     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
+        );
     }
 
     /**

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
+        );
     }
 
     /**

app/code/Magento/Store/Model/Config/Processor/Placeholder.php

@@ -9,25 +9,51 @@
 
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
 use Magento\Store\Model\Config\Placeholder as ConfigPlaceholder;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Placeholder configuration values processor. Replace placeholders in configuration with config values
  * @package Magento\Store\Model\Config\Processor
  */
 class Placeholder implements PostProcessorInterface
 {
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $request;
+
+    /**
+     * @var string[]
+     */
+    protected $urlPaths;
+
+    /**
+     * @var string
+     */
+    protected $urlPlaceholder;
+
     /**
      * @var ConfigPlaceholder
      */
     private $configPlaceholder;
 
     /**
      * Placeholder constructor.
-     * @param ConfigPlaceholder $configPlaceholder
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param string[] $urlPaths
+     * @param string $urlPlaceholder
+     * @param ConfigPlaceholder|null $configPlaceholder
      */
-    public function __construct(ConfigPlaceholder $configPlaceholder)
-    {
-        $this->configPlaceholder = $configPlaceholder;
+    public function __construct(
+        \Magento\Framework\App\RequestInterface $request,
+        $urlPaths,
+        $urlPlaceholder,
+        ConfigPlaceholder $configPlaceholder = null
+    ) {
+        $this->request = $request;
+        $this->urlPaths = $urlPaths;
+        $this->urlPlaceholder = $urlPlaceholder;
+        $this->configPlaceholder = $configPlaceholder ?: ObjectManager::getInstance()->get(ConfigPlaceholder::class);
     }
 
     /**

lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php

@@ -6,6 +6,9 @@
  */
 namespace Magento\Framework\App\Cache;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Cache\Tag\Resolver;
+
 /**
  * Automatic cache cleaner plugin
  */
@@ -37,18 +40,18 @@ class FlushCacheByTags
      * @param Type\FrontendPool $cachePool
      * @param StateInterface $cacheState
      * @param array $cacheList
-     * @param Tag\Resolver $tagResolver
+     * @param Tag\Resolver|null $tagResolver
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\FrontendPool $cachePool,
         \Magento\Framework\App\Cache\StateInterface $cacheState,
         array $cacheList,
-        \Magento\Framework\App\Cache\Tag\Resolver $tagResolver
+        \Magento\Framework\App\Cache\Tag\Resolver $tagResolver = null
     ) {
         $this->cachePool = $cachePool;
         $this->cacheState = $cacheState;
         $this->cacheList = $cacheList;
-        $this->tagResolver = $tagResolver;
+        $this->tagResolver = $tagResolver ?: ObjectManager::getInstance()->get(Resolver::class);
     }
 
     /**

lib/internal/Magento/Framework/App/Config.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\ConfigTypeInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Config
@@ -41,16 +42,16 @@ class Config implements ScopeConfigInterface
      * Config constructor.
      *
      * @param ScopePool $scopePool
-     * @param ScopeCodeResolver $scopeCodeResolver
+     * @param ScopeCodeResolver|null $scopeCodeResolver
      * @param array $types
      */
     public function __construct(
         ScopePool $scopePool,
-        ScopeCodeResolver $scopeCodeResolver,
+        ScopeCodeResolver $scopeCodeResolver = null,
         array $types = []
     ) {
         $this->_scopePool = $scopePool;
-        $this->scopeCodeResolver = $scopeCodeResolver;
+        $this->scopeCodeResolver = $scopeCodeResolver ?: ObjectManager::getInstance()->get(ScopeCodeResolver::class);
         $this->types = $types;
     }