Reworked mediaquery extraction once again (preserving the order in which they are accessed)

Author: JanDC

src/Css/Rule/Processor.php

@@ -22,20 +22,20 @@ public function splitIntoSeparateMediaQueries($rulesString)
 
         $indexedRules = [];
 
-        $first = true;
         foreach ($queryParts as $part) {
-            if ($first) {
-                $first = false;
-                $indexedRules[''] = (array)explode('}', $part);
+            if (strpos($part,' ') !== 0) {
+                $indexedRules[][''] = (array)explode('}', $part);
                 continue;
             }
 
-            $mediaQueryString = "@media" . substr($part, 0, strpos($part, '{'));
+            $mediaQueryString = "@media".substr($part, 0, strpos($part, '{'));
             $mediaQueryRules = substr($part, strpos($part, '{') + 1);
             $mediaQueryRules = substr($mediaQueryRules, 0, -1);
-            $indexedRules[$mediaQueryString] = (array)explode('}', $mediaQueryRules);
+
+            $indexedRules[][$mediaQueryString] = (array)explode('}', $mediaQueryRules)  ;
         }
 
+
         return $indexedRules;
     }
 
@@ -147,11 +147,9 @@ public function calculateSpecificityBasedOnASelector($selector)
     public function convertArrayToObjects(array $mediaQueryRules, array $objects = array())
     {
 
-        foreach ($mediaQueryRules as $media => $rules) {
-            $order = 1;
-            foreach ($rules as $rule) {
-                $objects = array_merge($objects, $this->convertToObjects($media, $rule, $order));
-                $order++;
+        foreach ($mediaQueryRules as $order => $ruleSet) {
+            foreach (reset($ruleSet) as $rule) {
+                $objects = array_merge($objects, $this->convertToObjects(key($ruleSet), $rule, $order));
             }
         }
 

src/CssStore.php

@@ -3,6 +3,7 @@
 namespace PageSpecificCss;
 
 use PageSpecificCss\Css\Property\Property;
+use PageSpecificCss\Css\Rule\Rule;
 
 class CssStore
 {
@@ -11,7 +12,8 @@ class CssStore
 
     public function addCssStyles($cssRules)
     {
-        $this->styles = array_merge_recursive($this->styles, $cssRules);
+        $this->styles = array_merge($this->styles, $cssRules);
+
         return $this;
     }
 
@@ -32,9 +34,23 @@ public function dumpStyles($path)
 
     public function compileStyles()
     {
-        return join('', array_map(function ($properties, $key) {
-            return $this->parseMediaToString($key, $properties);
-        }, $this->styles, array_keys($this->styles)));
+
+        // Structure rules in order, by media query
+        $styles = $this->prepareStylesForProcessing();
+
+
+        return join(
+            '',
+            array_map(
+                function ($styleGroup) {
+                    $media = key($styleGroup);
+                    $rules = reset($styleGroup);
+
+                    return $this->parseMediaToString($media, $rules);
+                },
+                $styles
+            )
+        );
     }
 
     /**
@@ -46,35 +62,69 @@ public function compileStyles()
      */
     private function parseMediaToString($media, array $rules)
     {
+
         if ($media == '') {
             return
-                join('', array_map(function ($properties, $selector) {
-                        return $this->parsePropertiesToString($selector, $properties);
-                    }, $rules, array_keys($rules))
+                join(
+                    '',
+                    array_map(
+                        function ($rule) {
+                            /** @var Rule $rule */
+                            return $this->parsePropertiesToString($rule->getSelector(), $rule->getProperties());
+                        },
+                        $rules
+                    )
                 );
 
         }
 
-        return "$media { " . join('', array_map(function ($properties, $selector) {
-                    return $this->parsePropertiesToString($selector, $properties);
-                }, $rules, array_keys($rules))
-            ) . "}";
+        return "$media { ".join(
+                '',
+                array_map(
+                    function ($rule, $selector) {
+                        /** @var Rule $rule */
+                        return $this->parsePropertiesToString($rule->getSelector(), $rule->getProperties());
+                    },
+                    $rules
+                )
+            )."}";
 
 
     }
 
     /**
      *
-     * @return string
+     * @param $selector
+     * @param array $properties
      *
+     * @return string
      */
     private function parsePropertiesToString($selector, array $properties)
     {
-        return "$selector { " .
-            join('', array_map(function (Property $property) {
-                    return $property->getName() . ': ' . $property->getValue() . ';';
-                }, $properties)
-            ) .
+        return "$selector { ".
+            join(
+                '',
+                array_map(
+                    function (Property $property) {
+                        return $property->getName().': '.$property->getValue().';';
+                    },
+                    $properties
+                )
+            ).
             "}";
     }
+
+    private function prepareStylesForProcessing()
+    {
+        // Group styles by order and media
+        $groupedStyles = [];
+
+        /** @var Rule $style */
+        foreach ($this->styles as $style) {
+            $groupedStyles[$style->getOrder()][$style->getMedia()][] = $style;
+        }
+
+
+        return $groupedStyles;
+    }
 }

src/PageSpecificCss.php

@@ -102,7 +102,6 @@ public function extractCss($html)
 
         $xPath = new \DOMXPath($document);
 
-        usort($this->rules, [RuleProcessor::class, 'sortOnSpecificity']);
 
         $applicable_rules = array_filter($this->rules, function (Rule $rule) use ($xPath) {
             try {
@@ -121,29 +120,8 @@ public function extractCss($html)
             return true;
         });
 
-        $applicable_rules = $this->groupRulesBySelector($applicable_rules);
-        return $applicable_rules;
-    }
-
-    /**
-     * @param Rule[] $applicable_rules
-     *
-     * @return  array
-     */
-    private function groupRulesBySelector($applicable_rules)
-    {
-        $grouped = [];
-
-        foreach ($applicable_rules as $applicable_rule) {
-            /** @var Rule $applicable_rule */
-            if (isset($grouped[$applicable_rule->getMedia()][$applicable_rule->getSelector()])) {
-                $grouped[$applicable_rule->getMedia()][$applicable_rule->getSelector()] = array_merge($grouped[$applicable_rule->getMedia()][$applicable_rule->getSelector()], $applicable_rule->getProperties());
-            } else {
-                $grouped[$applicable_rule->getMedia()][$applicable_rule->getSelector()] = $applicable_rule->getProperties();
-            }
-        }
 
-        return $grouped;
+        return $applicable_rules;
     }
 
     public function addHtmlToStore($rawHtml)