Merge remote-tracking branch 'publication/2.3.1-rc' into 2.3

pdohogne-magento · pdohogne-magento · commit 62f8492eae03 · 2019-03-26T09:32:48.000-05:00
diff --git a/app/code/Magento/BundleSampleData/composer.json b/app/code/Magento/BundleSampleData/composer.json
@@ -21,5 +21,5 @@
             "Magento\\BundleSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\CatalogRuleSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/CatalogSampleData/composer.json b/app/code/Magento/CatalogSampleData/composer.json
@@ -18,5 +18,5 @@
             "Magento\\CatalogSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/CmsSampleData/composer.json b/app/code/Magento/CmsSampleData/composer.json
@@ -21,5 +21,5 @@
             "Magento\\CmsSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -20,5 +20,5 @@
             "Magento\\ConfigurableSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json
@@ -18,5 +18,5 @@
             "Magento\\CustomerSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php b/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php
@@ -24,6 +24,35 @@ class Converter extends \Magento\CatalogSampleData\Model\Product\Converter
      */
     private $filesystem;
 
+    public function __construct(
+        \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory,
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
+        \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory $fileContentFactory = null,
+        Filesystem $filesystem = null
+    ) {
+        parent::__construct(
+            $categoryTreeFactory,
+            $categoryResourceTreeFactory,
+            $eavConfig,
+            $categoryCollectionFactory,
+            $attributeCollectionFactory,
+            $attrOptionCollectionFactory,
+            $productCollectionFactory
+        );
+        $this->fileContentFactory = $fileContentFactory ?: ObjectManager::getInstance()->get(
+            \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
+        );
+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(
+            Filesystem::class
+        );
+    }
+
+
     /**
      * Get downloadable data from array
      *
@@ -159,11 +188,6 @@ public function getSamplesInfo()
      */
     private function getFileContent()
     {
-        if (!$this->fileContentFactory) {
-            $this->fileContentFactory = ObjectManager::getInstance()->create(
-                \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
-            );
-        }
         return $this->fileContentFactory->create();
     }
 
@@ -173,11 +197,6 @@ private function getFileContent()
      */
     private function getFilesystem()
     {
-        if (!$this->filesystem) {
-            $this->filesystem = ObjectManager::getInstance()->create(
-                Filesystem::class
-            );
-        }
         return $this->filesystem;
     }
 }
diff --git a/app/code/Magento/DownloadableSampleData/composer.json b/app/code/Magento/DownloadableSampleData/composer.json
@@ -22,5 +22,5 @@
             "Magento\\DownloadableSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/GroupedProductSampleData/composer.json b/app/code/Magento/GroupedProductSampleData/composer.json
@@ -21,5 +21,5 @@
             "Magento\\GroupedProductSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\MsrpSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php b/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php
@@ -8,6 +8,7 @@
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 use Magento\Framework\App\ObjectManager;
 use Magento\Config\App\Config\Type\System as SystemConfig;
+use Magento\OfflineShipping\Model\Carrier\Tablerate as CarrierTablerate;
 
 /**
  * Class Tablerate
@@ -128,7 +129,7 @@ public function install(array $fixtures)
                             'dest_country_id' => $data['country'],
                             'dest_region_id' => $regionId,
                             'dest_zip' => $data['zip'],
-                            'condition_name' => 'package_value',
+                            'condition_name' => 'package_value_with_discount',
                             'condition_value' => $data['order_subtotal'],
                             'price' => $data['price'],
                             'cost' => 0,
@@ -146,7 +147,9 @@ public function install(array $fixtures)
         }
 
         $this->configWriter->save('carriers/tablerate/active', 1);
-        $this->configWriter->save('carriers/tablerate/condition_name', 'package_value');
+        $this->configWriter->save(
+            'carriers/tablerate/condition_name', 'package_value_with_discount'
+        );
         $this->cacheTypeList->cleanType('config');
         $this->systemConfig->clean();
     }
diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json
@@ -20,5 +20,5 @@
             "Magento\\OfflineShippingSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/ProductLinksSampleData/composer.json b/app/code/Magento/ProductLinksSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\ProductLinksSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\ReviewSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json
@@ -21,5 +21,5 @@
             "Magento\\SalesRuleSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -20,5 +20,5 @@
             "Magento\\SalesSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json
@@ -20,5 +20,5 @@
             "Magento\\SwatchesSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\TaxSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/ThemeSampleData/composer.json b/app/code/Magento/ThemeSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\ThemeSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/WidgetSampleData/Model/CmsBlock.php b/app/code/Magento/WidgetSampleData/Model/CmsBlock.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
+use \Magento\Framework\App\State;
 
 /**
  * Launches setup of sample data for Widget module
@@ -53,6 +54,11 @@ class CmsBlock
      */
     private $serializer;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param \Magento\Widget\Model\Widget\InstanceFactory $widgetFactory
@@ -61,6 +67,7 @@ class CmsBlock
      * @param \Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory
      * @param Json|null $serializer
+     * @param State|null $appState
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
@@ -69,7 +76,8 @@ public function __construct(
         \Magento\Cms\Model\BlockFactory $cmsBlockFactory,
         \Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory,
-        Json $serializer = null
+        Json $serializer = null,
+        State $appState = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -79,6 +87,7 @@ public function __construct(
         $this->appCollectionFactory = $appCollectionFactory;
         $this->categoryFactory = $categoryFactory;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
+        $this->appState = $appState ?: \Magento\Framework\App\ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -163,7 +172,10 @@ public function install(array $fixtures)
                     ->setStoreIds([\Magento\Store\Model\Store::DEFAULT_STORE_ID])
                     ->setWidgetParameters(['block_id' => $block->getId()])
                     ->setPageGroups([$pageGroup]);
-                $widgetInstance->save();
+                $this->appState->emulateAreaCode(
+                    'frontend',
+                    [$widgetInstance, 'save']
+                );
             }
         }
     }
diff --git a/app/code/Magento/WidgetSampleData/composer.json b/app/code/Magento/WidgetSampleData/composer.json
@@ -21,5 +21,5 @@
             "Magento\\WidgetSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json
@@ -19,5 +19,5 @@
             "Magento\\WishlistSampleData\\": ""
         }
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }
diff --git a/pub/media/composer.json b/pub/media/composer.json
@@ -10,5 +10,5 @@
             ]
         ]
     },
-    "version": "100.3.0"
+    "version": "100.3.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@`
`21`	`21`	`"Magento\\BundleSampleData\\": ""`
`22`	`22`	`}`
`23`	`23`	`},`
`24`		`- "version": "100.3.0"`
	`24`	`+ "version": "100.3.1"`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`"Magento\\CatalogRuleSampleData\\": ""`
`20`	`20`	`}`
`21`	`21`	`},`
`22`		`- "version": "100.3.0"`
	`22`	`+ "version": "100.3.1"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`"Magento\\CatalogSampleData\\": ""`
`19`	`19`	`}`
`20`	`20`	`},`
`21`		`- "version": "100.3.0"`
	`21`	`+ "version": "100.3.1"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`"Magento\\ConfigurableSampleData\\": ""`
`21`	`21`	`}`
`22`	`22`	`},`
`23`		`- "version": "100.3.0"`
	`23`	`+ "version": "100.3.1"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`"Magento\\DownloadableSampleData\\": ""`
`23`	`23`	`}`
`24`	`24`	`},`
`25`		`- "version": "100.3.0"`
	`25`	`+ "version": "100.3.1"`
`26`	`26`	`}`