Merge all html snippets before extracting css rules. This prevents duplicate html/body styles being extracted (due to handling duplicate domdocuments)

Author: JanDC

src/Css/Processor.php

@@ -16,8 +16,6 @@ class Processor
      */
     public function getRules($css, $existingRules = [])
     {
-
-
         $css = $this->doCleanup($css);
         $rulesProcessor = new RuleProcessor();
         $rulesByMediaQuery = $rulesProcessor->splitIntoSeparateMediaQueries($css);

src/Css/Rule/Processor.php

@@ -25,26 +25,32 @@ public function splitIntoSeparateMediaQueries($rulesString)
         $mediaQueryMatches = [];
         preg_match_all($mediaQuerySelector, $rulesString, $mediaQueryMatches);
 
-        $remainingRuleset = $rulesString;
+        $remainingRuleSet = $rulesString;
 
         $queryParts = [];
         foreach (reset($mediaQueryMatches) as $mediaQueryMatch) {
-            $tokenisedRules = explode($mediaQueryMatch, $remainingRuleset);
+            $tokenisedRules = explode($mediaQueryMatch, $remainingRuleSet);
+
 
             $queryParts[] = reset($tokenisedRules);
             $queryParts[] = $mediaQueryMatch;
 
             if (count($tokenisedRules) === 2) {
-                $remainingRuleset = end($tokenisedRules);
+                $remainingRuleSet = end($tokenisedRules);
+            } else {
+                $remainingRuleSet = '';
             }
         }
 
+        if (!empty($remainingRuleSet)) {
+            $queryParts[] = $remainingRuleSet;
+        }
 
         $indexedRules = [];
 
         foreach ($queryParts as $part) {
 
-            if (strpos($part, '@media') === FALSE) {
+            if (strpos($part, '@media') === false) {
                 $indexedRules[][''] = (array)explode('}', $part);
                 continue;
             }
@@ -88,7 +94,7 @@ private function cleanup($string)
      * Convert a rule-string into an object
      *
      * @param string $rule
-     * @param int $originalOrder
+     * @param int    $originalOrder
      * @return array
      */
     public function convertToObjects($media, $rule, $originalOrder)

src/PageSpecificCss.php

@@ -2,11 +2,11 @@
 
 namespace PageSpecificCss;
 
+use DOMNodeList;
 use Exception;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\CssSelector\Exception\ExceptionInterface;
 use PageSpecificCss\Css\Processor;
-use PageSpecificCss\Css\Rule\Processor as RuleProcessor;
 use PageSpecificCss\Css\Rule\Rule;
 use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
 
@@ -63,9 +63,7 @@ public function addBaseRules($sourceCss)
 
     public function buildExtractedRuleSet()
     {
-        foreach ($this->htmlStore->getSnippets() as $htmlSnippet) {
-            $this->processHtmlToStore($htmlSnippet);
-        }
+        $this->processHtmlToStore(implode('', $this->htmlStore->getSnippets()));
 
         return $this->cssStore->compileStyles();
     }
@@ -104,14 +102,12 @@ public function extractCss($html)
 
         $xPath = new \DOMXPath($document);
 
+
         $applicable_rules = array_filter(
             $this->rules,
             function (Rule $rule) use ($xPath) {
-                try {
-                    if ($rule->getSelector() === "u-color-orange-base") {
-                        error_log("hola!!!");
-                    }
 
+                try {
                     $expression = $this->cssConverter->toXPath($rule->getSelector());
                 } catch (ExpressionErrorException $expressionErrorException) {
 
@@ -132,6 +128,7 @@ function (Rule $rule) use ($xPath) {
                     return false;
                 }
 
+                /** @var DOMNodeList $elements */
                 $elements = $xPath->query($expression);
 
                 if ($elements === false || $elements->length == 0) {