Merge branch 'MAGETWO-87551' of github.com:magento-trigger/magento2ce into MAGETWO-87551

Author: rganin

app/etc/di.xml

@@ -43,6 +43,8 @@
     <preference for="Magento\Framework\Api\Search\DocumentInterface" type="Magento\Framework\Api\Search\Document" />
     <preference for="Magento\Framework\Api\Search\AggregationInterface" type="Magento\Framework\Search\Response\Aggregation" />
     <preference for="Magento\Framework\App\RequestSafetyInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="\Magento\Framework\Setup\SchemaSetupInterface" type="\Magento\Setup\Module\Setup" />
+    <preference for="\Magento\Framework\Setup\ModuleDataSetupInterface" type="\Magento\Setup\Module\DataSetup" />
     <type name="Magento\Store\Model\Store">
         <arguments>
             <argument name="currencyInstalled" xsi:type="string">system/currency/installed</argument>

setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php

@@ -161,7 +161,8 @@ public function __construct(
     private function getPatchApplier()
     {
         if (!$this->patchApplier) {
-            $this->patchApplier = $this->objectManager->get(PatchApplier::class);
+            $this->patchApplier = $this
+                ->objectManager->get(PatchApplier::class);
         }
 
         return $this->patchApplier;

setup/src/Magento/Setup/Model/Patch/PatchApplier.php

@@ -91,8 +91,8 @@ public function __construct(
         PatchHistory $patchHistory,
         PatchFactory $patchFactory,
         ObjectManagerInterface $objectManager,
-        \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup = null,
-        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup = null
+        \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
     ) {
         $this->patchRegistryFactory = $patchRegistryFactory;
         $this->dataPatchReader = $dataPatchReader;