Merge from 558_1_content-type-style-attribute-removal

bluemwhitew · bluemwhitew · commit 60343e51bf62 · 2020-09-21T15:50:39.000+01:00
diff --git a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php
@@ -37,7 +37,7 @@ public function __construct(UpgradeContentHelper $helper)
      * @return void
      * @throws FieldDataConversionException
      */
-    public function apply()
+    public function apply(): void
     {
         $this->helper->upgrade([
             PageBuilderStripStyles::class

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(UpgradeContentHelper $helper)`
`37`	`37`	`* @return void`
`38`	`38`	`* @throws FieldDataConversionException`
`39`	`39`	`*/`
`40`		`- public function apply()`
	`40`	`+ public function apply(): void`
`41`	`41`	`{`
`42`	`42`	`$this->helper->upgrade([`
`43`	`43`	`PageBuilderStripStyles::class`