Merge pull request #725 from magento-nord/develop

[NORD] Sample Data Bug Fixes

Author: Korshenko, Olexii(okorshenko)

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

@@ -1803,7 +1803,7 @@ protected function _saveMediaGallery(array $mediaGalleryData)
                         'value' => $insertValue['value'],
                     ];
                     $valueToProductId[$insertValue['value']] = $productId;
-                    $imageNames = $insertValue['value'];
+                    $imageNames[] = $insertValue['value'];
                     $multiInsertData[] = $valueArr;
                     $insertedGalleryImgs[] = $insertValue['value'];
                 }

app/code/Magento/SampleData/Model/BlackHole.php

@@ -15,24 +15,4 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\SampleData\Model\BlackHoleFactory" type="\Magento\Framework\Mail\TransportInterfaceFactory">
-        <arguments>
-            <argument name="instanceName" xsi:type="string">Magento\SampleData\Model\BlackHole</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="blackHoleTransportBuilder" type="Magento\Framework\Mail\Template\TransportBuilder">
-        <arguments>
-            <argument name="mailTransportFactory" xsi:type="object" >Magento\SampleData\Model\BlackHoleFactory</argument>
-        </arguments>
-    </virtualType>
-    <virtualType  name="sampleDataAccountManagement" type="Magento\Customer\Model\AccountManagement">
-        <arguments>
-            <argument name="transportBuilder" xsi:type="object">blackHoleTransportBuilder</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\SampleData\Module\Customer\Setup\Customer">
-        <arguments>
-            <argument name="accountManagement" xsi:type="object">sampleDataAccountManagement</argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/SampleData/etc/di.xml

@@ -7,16 +7,34 @@
 
 class Executor
 {
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Setup\SampleData\State $state
+     * @param State $state
+     * @param \Magento\Framework\App\State $appState
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Setup\SampleData\State $state
+        \Magento\Framework\Setup\SampleData\State $state,
+        \Magento\Framework\App\State $appState
     ) {
         $this->logger = $logger;
         $this->state = $state;
+        $this->appState = $appState;
     }
 
     /**
@@ -29,7 +47,7 @@ public function __construct(
     public function exec(InstallerInterface $installer)
     {
         try {
-            $installer->install();
+            $this->appState->emulateAreaCode('setup', [$installer, 'install']);
             $this->state->setInstalled();
         } catch (\Exception $e) {
             $this->state->setError();