PB-370: Introduce upgrade mechanism for Page Builder content

omiroshnichenko · omiroshnichenko · commit 4d7c025ff361 · 2020-02-12T11:42:50.000-06:00
- skip elements that does not have padding
- add more cases to test
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Document.php b/app/code/Magento/PageBuilder/Model/Dom/Document.php
@@ -209,18 +209,13 @@ public function getMetadata($key = null)
      */
     public function stripHtmlWrapperTags(): string
     {
-        $result = '';
         preg_match('/<body>(.*)<\/body>/s', $this->saveHTML(), $matches);
-
-        if (isset($matches[1])) {
-            $result = preg_replace_callback(
-                '/=\"(%7B%7B[^"]*%7D%7D)\"/m',
-                function ($matches) {
-                    return urldecode($matches[0]);
-                },
-                $matches[1]
-            );
-        }
-        return $result;
+        return preg_replace_callback(
+            '/=\"(%7B%7B[^"]*%7D%7D)\"/m',
+            function ($matches) {
+                return urldecode($matches[0]);
+            },
+            $matches[1]
+        );
     }
 }
diff --git a/app/code/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPadding.php b/app/code/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPadding.php
@@ -44,12 +44,15 @@ public function convert($value)
             $style = $row->getAttribute("style");
             preg_match("/padding:(.*?);/", $style, $results);
             $padding = isset($results[1]) ? trim($results[1]) : '';
+            if (!$padding) {
+                continue;
+            }
             // remove padding from main row element
             $row->removeStyle("padding");
             // add padding to inner row element
             $innerDiv = $row->querySelector(".row-full-width-inner");
             $innerDiv->addStyle("padding", $padding);
         }
-        return $fullWidthRows->count() > 0 ? ($document->stripHtmlWrapperTags() ?: $value) : $value;
+        return $fullWidthRows->count() > 0 ? $document->stripHtmlWrapperTags(): $value;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPaddingTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPaddingTest.php

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,15 @@ public function convert($value)`
`44`	`44`	`$style = $row->getAttribute("style");`
`45`	`45`	`preg_match("/padding:(.*?);/", $style, $results);`
`46`	`46`	`$padding = isset($results[1]) ? trim($results[1]) : '';`
	`47`	`+ if (!$padding) {`
	`48`	`+ continue;`
	`49`	`+ }`
`47`	`50`	`// remove padding from main row element`
`48`	`51`	`$row->removeStyle("padding");`
`49`	`52`	`// add padding to inner row element`
`50`	`53`	`$innerDiv = $row->querySelector(".row-full-width-inner");`
`51`	`54`	`$innerDiv->addStyle("padding", $padding);`
`52`	`55`	`}`
`53`		`- return $fullWidthRows->count() > 0 ? ($document->stripHtmlWrapperTags() ?: $value) : $value;`
	`56`	`+ return $fullWidthRows->count() > 0 ? $document->stripHtmlWrapperTags(): $value;`
`54`	`57`	`}`
`55`	`58`	`}`