Merge pull request #27 from magento-trigger/AC-1977

xmav · web-flow · commit 6c02e3b14ca9 · 2021-12-18T02:12:45.000-06:00
[Platform Health] PHP 8.1 Updates
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/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/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/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

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`	`);`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public function install()`
`28`	`28`	`{`
`29`	`29`	`$this->cmsBlock->install(`
`30`	`30`	`[`
`31`		`- 'Magento_WidgetSampleData::fixtures/cmsblock.csv',`
`32`		`- 'Magento_WidgetSampleData::fixtures/cmsblock_giftcard.csv'`
	`31`	`+ 'Magento_WidgetSampleData::fixtures/cmsblock.csv'`
`33`	`32`	`]`
`34`	`33`	`);`
`35`	`34`	`}`