Merge pull request #29 from magento-cia/2.4.4-develop-2.4-develop-sync-122021

dvoskoboinikov · web-flow · commit 8a0944c16712 · 2021-12-23T14:29:43.000-06:00
Sync of 2.4.4-develop with 2.4-develop
diff --git a/app/code/Magento/BundleSampleData/composer.json b/app/code/Magento/BundleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-sample-data": "*",
diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog-rule": "*",
         "magento/module-store": "*",
diff --git a/app/code/Magento/CatalogSampleData/composer.json b/app/code/Magento/CatalogSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-eav": "*",
diff --git a/app/code/Magento/CmsSampleData/Setup/Installer.php b/app/code/Magento/CmsSampleData/Setup/Installer.php
@@ -60,7 +60,6 @@ public function install()
         $this->block->install(
             [
                 'Magento_CmsSampleData::fixtures/blocks/categories_static_blocks.csv',
-                'Magento_CmsSampleData::fixtures/blocks/categories_static_blocks_giftcard.csv',
                 'Magento_CmsSampleData::fixtures/blocks/pages_static_blocks.csv',
             ]
         );
diff --git a/app/code/Magento/CmsSampleData/composer.json b/app/code/Magento/CmsSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
         "magento/module-theme-sample-data": "*",
diff --git a/app/code/Magento/CmsSampleData/etc/module.xml b/app/code/Magento/CmsSampleData/etc/module.xml
@@ -14,7 +14,6 @@
             <module name="Magento_BundleSampleData"/>
             <module name="Magento_ConfigurableSampleData"/>
             <module name="Magento_GroupedProductSampleData"/>
-            <module name="Magento_GiftCardSampleData"/>
             <module name="Magento_ThemeSampleData"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/CmsSampleData/fixtures/blocks/categories_static_blocks_giftcard.csv b/app/code/Magento/CmsSampleData/fixtures/blocks/categories_static_blocks_giftcard.csv
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-configurable-product": "*",
         "magento/module-product-links-sample-data": "*",
diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/DownloadableSampleData/composer.json b/app/code/Magento/DownloadableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-downloadable": "*",
diff --git a/app/code/Magento/GroupedProductSampleData/composer.json b/app/code/Magento/GroupedProductSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-product-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-grouped-product": "*",
diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-msrp-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-msrp": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-offline-shipping-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-offline-shipping": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/ProductLinksSampleData/composer.json b/app/code/Magento/ProductLinksSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-product-links-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog": "*"
     },
diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-review-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-review": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog-rule-sample-data": "*",
         "magento/module-sales-rule": "*",
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-sales": "*",
         "magento/module-configurable-sample-data": "*",
diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-swatches-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-eav": "*",
         "magento/module-catalog": "*"
diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-tax-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-tax": "*",
         "magento/module-directory": "*"
diff --git a/app/code/Magento/ThemeSampleData/composer.json b/app/code/Magento/ThemeSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-theme-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-theme": "*",
         "magento/module-store": "*"
diff --git a/app/code/Magento/WidgetSampleData/Setup/Installer.php b/app/code/Magento/WidgetSampleData/Setup/Installer.php
@@ -28,8 +28,7 @@ public function install()
     {
         $this->cmsBlock->install(
             [
-                'Magento_WidgetSampleData::fixtures/cmsblock.csv',
-                'Magento_WidgetSampleData::fixtures/cmsblock_giftcard.csv'
+                'Magento_WidgetSampleData::fixtures/cmsblock.csv'
             ]
         );
     }
diff --git a/app/code/Magento/WidgetSampleData/composer.json b/app/code/Magento/WidgetSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-widget-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-widget": "*",
         "magento/module-theme": "*",
diff --git a/app/code/Magento/WidgetSampleData/etc/module.xml b/app/code/Magento/WidgetSampleData/etc/module.xml
@@ -12,6 +12,7 @@
             <module name="Magento_SampleData"/>
             <module name="Magento_CatalogSampleData"/>
             <module name="Magento_ConfigurableSampleData"/>
+            <module name="Magento_CmsSampleData"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/WidgetSampleData/fixtures/cmsblock_giftcard.csv b/app/code/Magento/WidgetSampleData/fixtures/cmsblock_giftcard.csv
diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-wishlist-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-wishlist": "*",
         "magento/module-customer": "*",

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public function install()`
`60`	`60`	`$this->block->install(`
`61`	`61`	`[`
`62`	`62`	`'Magento_CmsSampleData::fixtures/blocks/categories_static_blocks.csv',`
`63`		`- 'Magento_CmsSampleData::fixtures/blocks/categories_static_blocks_giftcard.csv',`
`64`	`63`	`'Magento_CmsSampleData::fixtures/blocks/pages_static_blocks.csv',`
`65`	`64`	`]`
`66`	`65`	`);`