#558: Content Types Output Style Attribute Removal

bluemwhitew · bluemwhitew · commit c6383f6f4365 · 2020-09-15T10:43:51.000+01:00
- Code Review Feedback/Amends (Thanks, @BarnyShergold)
diff --git a/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php
@@ -42,7 +42,7 @@ public function __construct(DOMDocument $domDocument)
      */
     private function generateDataAttribute(): string
     {
-        return strtoupper(uniqid());
+        return \strtoupper(\uniqid());
     }
 
     /**
@@ -68,11 +68,11 @@ private function generateInternalStyles(array $styleMap): string
      */
     public function convert($value): string
     {
-        libxml_use_internal_errors(true);
+        \libxml_use_internal_errors(true);
         $document = new DOMDocument();
         $document->loadHTML($value);
         $xpath = new DOMXPath($document);
-        libxml_clear_errors();
+        \libxml_clear_errors();
 
         $body = $document->documentElement->lastChild;
         $nodes = $xpath->query(self::XPATH_SELECTOR); // Query for Inline Styles
@@ -98,7 +98,7 @@ public function convert($value): string
         $body->appendChild($style);
 
         // @todo: Refactor
-        preg_match(
+        \preg_match(
             '/<html><body>(.+)<\/body><\/html>$/si',
             $document->saveHTML(),
             $matches
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php
@@ -40,7 +40,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
         $convertPageBuilderStripStyles = $this->objectManager->create(PageBuilderStripStyles::class);
         $result = $convertPageBuilderStripStyles->convert($htmlString);
 
-        libxml_use_internal_errors(true);
+        \libxml_use_internal_errors(true);
 
         $docBefore = new DOMDocument();
         $docBefore->loadHTML($htmlString);
@@ -50,7 +50,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
         $docAfter->loadHTML($result);
         $xpathAfter = new DOMXPath($docAfter);
 
-        libxml_clear_errors();
+        \libxml_clear_errors();
 
         $getInternalStyles = false;
         $nodesBefore = $xpathBefore->query(PageBuilderStripStyles::XPATH_SELECTOR);
@@ -67,10 +67,10 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
         }
 
         // Assert Inline Styles Were Removed
-        $this->assertEquals(0, count($xpathAfter->query(PageBuilderStripStyles::XPATH_SELECTOR)));
+        $this->assertEquals(0, \count($xpathAfter->query(PageBuilderStripStyles::XPATH_SELECTOR)));
 
         // Assert Expected Internal Styles
-        $this->assertEquals($expectedStyleTags, count($xpathAfter->query('//style')));
+        $this->assertEquals($expectedStyleTags, \count($xpathAfter->query('//style')));
 
         // Assert Converted Styles
         if ($getInternalStyles) {
@@ -170,6 +170,7 @@ public function conversionData(): array
         ];
         // phpcs:enable Generic.Files.LineLength.TooLong
     }
+
     /**
      * @return array
      */
