Updated css extractor to support mediaqueries

Author: JanDC

src/Css/Processor.php

@@ -18,9 +18,9 @@ public function getRules($css, $existingRules = array())
     {
         $css = $this->doCleanup($css);
         $rulesProcessor = new RuleProcessor();
-        $rules = $rulesProcessor->splitIntoSeparateRules($css);
+        $rulesByMediaQuery = $rulesProcessor->splitIntoSeparateMediaQueries($css);
 
-        return $rulesProcessor->convertArrayToObjects($rules, $existingRules);
+        return $rulesProcessor->convertArrayToObjects($rulesByMediaQuery, $existingRules);
     }
 
     /**

src/Css/Rule/Processor.php

@@ -13,11 +13,30 @@ class Processor
      * @param string $rulesString
      * @return array
      */
-    public function splitIntoSeparateRules($rulesString)
+    public function splitIntoSeparateMediaQueries($rulesString)
     {
         $rulesString = $this->cleanup($rulesString);
 
-        return (array)explode('}', $rulesString);
+        // Intelligently break up rules, preserving mediaquery context and such
+        $queryParts = explode('@media', $rulesString);
+
+        $indexedRules = [];
+
+        $first = true;
+        foreach ($queryParts as $part) {
+            if ($first) {
+                $first = false;
+                $indexedRules[''] = (array)explode('}', $part);
+                continue;
+            }
+
+            $mediaQueryString = "@media" . substr($part, 0, strpos($part, '{'));
+            $mediaQueryRules = substr($part, strpos($part, '{') + 1);
+            $mediaQueryRules = substr($mediaQueryRules, 0, -1);
+            $indexedRules[$mediaQueryString] = (array)explode('}', $mediaQueryRules);
+        }
+
+        return $indexedRules;
     }
 
     /**
@@ -33,7 +52,6 @@ private function cleanup($string)
         $string = preg_replace('/\s\s+/', ' ', $string);
 
         $string = trim($string);
-        $string = rtrim($string, '}');
 
         return $string;
     }
@@ -45,27 +63,20 @@ private function cleanup($string)
      * @param int $originalOrder
      * @return array
      */
-    public function convertToObjects($rule, $originalOrder)
+    public function convertToObjects($media, $rule, $originalOrder)
     {
         $rule = $this->cleanup($rule);
 
         $chunks = explode('{', $rule);
 
         $selectorIdentifier = 0;
         $ruleIdentifier = 1;
-        $media = '';
-
-        if (count($chunks) == 3) {
-            $selectorIdentifier++;
-            $ruleIdentifier++;
-            $media = $chunks[0];
-        }
 
         if (!isset($chunks[$ruleIdentifier])) {
-            return array();
+            return [];
         }
         $propertiesProcessor = new PropertyProcessor();
-        $rules = array();
+        $rules = [];
         $selectors = (array)explode(',', trim($chunks[$selectorIdentifier]));
         $properties = $propertiesProcessor->splitIntoSeparateProperties($chunks[$ruleIdentifier]);
 
@@ -133,12 +144,15 @@ public function calculateSpecificityBasedOnASelector($selector)
      * @param array $rules
      * @return Rule[]
      */
-    public function convertArrayToObjects(array $rules, array $objects = array())
+    public function convertArrayToObjects(array $mediaQueryRules, array $objects = array())
     {
-        $order = 1;
-        foreach ($rules as $rule) {
-            $objects = array_merge($objects, $this->convertToObjects($rule, $order));
-            $order++;
+
+        foreach ($mediaQueryRules as $media => $rules) {
+            $order = 1;
+            foreach ($rules as $rule) {
+                $objects = array_merge($objects, $this->convertToObjects($media, $rule, $order));
+                $order++;
+            }
         }
 
         return $objects;