Cleanup

Author: tvlooy

src/Css/Property/Processor.php

@@ -40,7 +40,7 @@ public function splitIntoSeparateProperties($propertiesString)
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @return mixed|string
      */
     private function cleanup($string)

src/Css/Property/Property.php

@@ -23,8 +23,8 @@ final class Property
 
     /**
      * Property constructor.
-     * @param                  $name
-     * @param                  $value
+     * @param string           $name
+     * @param string           $value
      * @param Specificity|null $specificity
      */
     public function __construct($name, $value, Specificity $specificity = null)

src/Css/Rule/Processor.php

@@ -13,12 +13,11 @@ class Processor
      * Split a string into seperate rules
      *
      * @param string $rulesString
+     *
      * @return array
      */
     public function splitIntoSeparateMediaQueries($rulesString)
     {
-        //  $rulesString = $this->cleanup($rulesString);
-
         // Intelligently break up rules, preserving mediaquery context and such
 
         $mediaQuerySelector = '/@media[^{]+\{([\s\S]+?\})\s*\}/';
@@ -31,7 +30,6 @@ public function splitIntoSeparateMediaQueries($rulesString)
         foreach (reset($mediaQueryMatches) as $mediaQueryMatch) {
             $tokenisedRules = explode($mediaQueryMatch, $remainingRuleSet);
 
-
             $queryParts[] = reset($tokenisedRules);
             $queryParts[] = $mediaQueryMatch;
 
@@ -49,7 +47,6 @@ public function splitIntoSeparateMediaQueries($rulesString)
         $indexedRules = [];
 
         foreach ($queryParts as $part) {
-
             if (strpos($part, '@media') === false) {
                 $indexedRules[][''] = (array)explode('}', $part);
                 continue;
@@ -93,6 +90,7 @@ private function cleanup($string)
     /**
      * Convert a rule-string into an object
      *
+     * @param string $media
      * @param string $rule
      * @param int    $originalOrder
      * @return array
@@ -175,12 +173,13 @@ public function calculateSpecificityBasedOnASelector($selector)
     }
 
     /**
-     * @param array $rules
+     * @param array $mediaQueryRules
+     * @param array $objects
+     *
      * @return Rule[]
      */
     public function convertArrayToObjects(array $mediaQueryRules, array $objects = array())
     {
-
         foreach ($mediaQueryRules as $order => $ruleSet) {
             foreach (reset($ruleSet) as $rule) {
                 $objects = array_merge($objects, $this->convertToObjects(key($ruleSet), $rule, $order));

src/CssFromHTMLExtractor.php

@@ -13,7 +13,7 @@
 class CssFromHTMLExtractor
 {
 
-    /** @var  CssSelectorConverter */
+    /** @var CssSelectorConverter */
     protected $cssConverter;
 
     /** @var CssStore */
@@ -54,7 +54,7 @@ public function getHtmlStore()
     }
 
     /**
-     * @param $sourceCss
+     * @param string $sourceCss
      */
     public function addBaseRules($sourceCss)
     {
@@ -79,6 +79,7 @@ public function processHtmlToStore($html)
 
     /**
      * @param string $html
+     *
      * @return \DOMDocument
      */
     protected function createDomDocumentFromHtml($html)
@@ -93,7 +94,7 @@ protected function createDomDocumentFromHtml($html)
     }
 
     /**
-     * @param $html
+     * @param string $html
      *
      * @return string
      */
@@ -132,7 +133,7 @@ function (Rule $rule) use ($xPath) {
                 /** @var DOMNodeList $elements */
                 $elements = $xPath->query($expression);
 
-                if ($elements === false || $elements->length == 0) {
+                if ($elements->length === 0) {
                     return false;
                 }
 
@@ -148,4 +149,4 @@ public function addHtmlToStore($rawHtml)
     {
         $this->htmlStore->addHtmlSnippet($rawHtml);
     }
-}
+}

src/CssStore.php

@@ -10,12 +10,13 @@ class CssStore
     /** @var array Property objects, grouped by selector */
     private $styles = [];
 
-    /** @var  string|null */
+    /** @var string|null */
     private $charset;
 
     public function addCssStyles($cssRules)
     {
         $this->styles = array_merge($this->styles, $cssRules);
+
         return $this;
     }
 
@@ -36,11 +37,9 @@ public function dumpStyles($path)
 
     public function compileStyles()
     {
-
         // Structure rules in order, by media query
         $styles = $this->prepareStylesForProcessing();
 
-
         $prefix = is_null($this->charset) ? '' : $this->charset;
 
         return $prefix . join(
@@ -66,7 +65,6 @@ function ($styleGroup) {
      */
     private function parseMediaToString($media, array $rules)
     {
-
         if ($media == '') {
             return
                 join(
@@ -90,13 +88,11 @@ function (Rule $rule) {
                     $rules
                 )
             ) . "}";
-
-
     }
 
     /**
      *
-     * @param $selector
+     * @param string $selector
      * @param array $properties
      *
      * @return string
@@ -126,13 +122,11 @@ private function prepareStylesForProcessing()
             $groupedStyles[$style->getOrder()][$style->getMedia()][] = $style;
         }
 
-
         return $groupedStyles;
     }
 
     public function setCharset($charset)
     {
         $this->charset = $charset;
-
     }
-}
+}

src/Twig/Extension.php

@@ -21,7 +21,7 @@ public function __construct()
     }
 
     /**
-     * @param $sourceCss
+     * @param string $sourceCss
      */
     public function addBaseRules($sourceCss)
     {
@@ -38,6 +38,7 @@ public function getTokenParsers()
     public function addCssToExtract($rawHtml)
     {
         $this->pageSpecificCssService->addHtmlToStore($rawHtml);
+
         return $rawHtml;
     }