MSI: Update Magento 2 core to support MSI

Author: RomaKis

app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php

@@ -58,6 +58,7 @@ class DeleteButton implements ButtonProviderInterface
     /**
      * @param RequestInterface $request
      * @param UrlInterface $urlBuilder
+     * @param Escaper $escaper
      * @param string $confirmationMessage
      * @param string $idFieldName
      * @param string $deleteRoutePath
@@ -87,7 +88,7 @@ public function __construct(
     public function getButtonData()
     {
         $data = [];
-        $fieldId = $this->request->getParam($this->idFieldName);
+        $fieldId = $this->escaper->escapeJs($this->escaper->escapeHtml($this->request->getParam($this->idFieldName)));
         if (null !== $fieldId) {
             $url = $this->urlBuilder->getUrl($this->deleteRoutePath);
             $escapedMessage = $this->escaper->escapeJs($this->escaper->escapeHtml($this->confirmationMessage));

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -536,7 +536,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory
-     * @deprecated
+     * @deprecated this variable isn't used anymore.
      */
     protected $_stockResItemFac;
 

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php

@@ -81,15 +81,13 @@ public function execute()
         $entityName = $this->getRequest()->getParam('filename');
 
         if (preg_match('/^\w+$/', $entityName) == 0) {
-            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-            $this->messageManager->addErrorMessage(__('Incorrect file name.'));
+            $this->messageManager->addErrorMessage(__('Incorrect entity name.'));
 
             return $this->getResultRedirect();
         }
         try {
             $fileContents = $this->sampleFileProvider->getFileContents($entityName);
         } catch (NoSuchEntityException $e) {
-            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $this->messageManager->addError(__('There is no sample file for this entity.'));
 
             return $this->getResultRedirect();

app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php

@@ -85,8 +85,8 @@ public function getFileContents(string $entityName): string
      */
     private function getPath(string $entityName): string
     {
-        $directoryRead = $this->getDirectoryRead($entityName);
         $moduleName = $this->getModuleName($entityName);
+        $directoryRead = $this->getDirectoryRead($entityName);
         $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
         $fileAbsolutePath = $moduleDir . '/Files/Sample/' . $entityName . '.csv';
 

dev/tests/api-functional/phpunit_soap.xml.dist

@@ -21,9 +21,6 @@
             <!-- <exclude>testsuite/Magento/GraphQl</exclude> -->
             <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
         </testsuite>
-        <testsuite name="msi">
-            <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
-        </testsuite>
     </testsuites>
 
     <!-- PHP INI settings and constants definition -->