Integrate PHPStan

.gitattributes

@@ -1,11 +1,13 @@
 * text=auto
 
-/example export-ignore
-/tests export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
-/phpunit.xml.dist export-ignore
 /CHANGELOG.md export-ignore
+/example export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
 /README.md export-ignore
+/stubs export-ignore
+/tests export-ignore

.travis.yml

@@ -37,8 +37,10 @@ install:
   - if [[ $setup = 'basic' && "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
   - if [[ $setup = 'lowest' && "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
   - if [[ "$TRAVIS_PHP_VERSION" = "nightly" ]]; then travis_retry composer install --prefer-dist --no-interaction --ignore-platform-reqs; fi
+  - if [[ "$TRAVIS_PHP_VERSION" = "7.4" ]]; then travis_retry composer requrie --dev phpstan/phpstan:1.1.2; fi
 
 script:
+  - if [[ "$TRAVIS_PHP_VERSION" = "7.4" ]]; then vendor/bin/phpstan analyse; fi
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover
 
 after_success:

phpstan.neon.dist

@@ -0,0 +1,6 @@
+parameters:
+    level: max
+    paths:
+        - src/
+    scanFiles:
+        - stubs/CssSelector.stub

src/Css/Processor.php

@@ -35,7 +35,7 @@ public function getCssFromStyleTags($html)
     {
         $css = '';
         $matches = array();
-        $htmlNoComments = preg_replace('|<!--.*?-->|s', '', $html);
+        $htmlNoComments = (string) preg_replace('|<!--.*?-->|s', '', $html);
         preg_match_all('|<style(?:\s.*)?>(.*)</style>|isU', $htmlNoComments, $matches);
 
         if (!empty($matches[1])) {
@@ -55,15 +55,16 @@ public function getCssFromStyleTags($html)
     private function doCleanup($css)
     {
         // remove charset
-        $css = preg_replace('/@charset "[^"]++";/', '', $css);
+        $css = (string) preg_replace('/@charset "[^"]++";/', '', $css);
         // remove media queries
-        $css = preg_replace('/@media [^{]*+{([^{}]++|{[^{}]*+})*+}/', '', $css);
+        $css = (string) preg_replace('/@media [^{]*+{([^{}]++|{[^{}]*+})*+}/', '', $css);
 
         $css = str_replace(array("\r", "\n"), '', $css);
         $css = str_replace(array("\t"), ' ', $css);
         $css = str_replace('"', '\'', $css);
-        $css = preg_replace('|/\*.*?\*/|', '', $css);
-        $css = preg_replace('/\s\s++/', ' ', $css);
+        $css = (string) preg_replace('|/\*.*?\*/|', '', $css);
+        $css = (string) preg_replace('/\s\s++/', ' ', $css);
+
         $css = trim($css);
 
         return $css;

src/Css/Property/Processor.php

@@ -50,8 +50,8 @@ private function cleanup($string)
         $string = str_replace(array("\r", "\n"), '', $string);
         $string = str_replace(array("\t"), ' ', $string);
         $string = str_replace('"', '\'', $string);
-        $string = preg_replace('|/\*.*?\*/|', '', $string);
-        $string = preg_replace('/\s\s+/', ' ', $string);
+        $string = (string) preg_replace('|/\*.*?\*/|', '', $string);
+        $string = (string) preg_replace('/\s\s+/', ' ', $string);
 
         $string = trim($string);
         $string = rtrim($string, ';');

src/Css/Property/Property.php

@@ -17,7 +17,7 @@ final class Property
     private $value;
 
     /**
-     * @var Specificity
+     * @var Specificity|null
      */
     private $originalSpecificity;
 
@@ -57,7 +57,7 @@ public function getValue()
     /**
      * Get originalSpecificity
      *
-     * @return Specificity
+     * @return Specificity|null
      */
     public function getOriginalSpecificity()
     {

src/Css/Rule/Processor.php

@@ -31,8 +31,8 @@ private function cleanup($string)
         $string = str_replace(array("\r", "\n"), '', $string);
         $string = str_replace(array("\t"), ' ', $string);
         $string = str_replace('"', '\'', $string);
-        $string = preg_replace('|/\*.*?\*/|', '', $string);
-        $string = preg_replace('/\s\s+/', ' ', $string);
+        $string = (string) preg_replace('|/\*.*?\*/|', '', $string);
+        $string = (string) preg_replace('/\s\s+/', ' ', $string);
 
         $string = trim($string);
         $string = rtrim($string, '}');
@@ -116,9 +116,9 @@ public function calculateSpecificityBasedOnASelector($selector)
                       )";
 
         return new Specificity(
-            preg_match_all("/{$idSelectorsPattern}/ix", $selector, $matches),
-            preg_match_all("/{$classAttributesPseudoClassesSelectorsPattern}/ix", $selector, $matches),
-            preg_match_all("/{$typePseudoElementsSelectorPattern}/ix", $selector, $matches)
+            preg_match_all("/{$idSelectorsPattern}/ix", $selector, $matches) ?: 0,
+            preg_match_all("/{$classAttributesPseudoClassesSelectorsPattern}/ix", $selector, $matches) ?: 0,
+            preg_match_all("/{$typePseudoElementsSelectorPattern}/ix", $selector, $matches) ?: 0
         );
     }
 

src/CssToInlineStyles.php

@@ -11,6 +11,7 @@
 
 class CssToInlineStyles
 {
+    /** @var CssSelectorConverter */
     private $cssConverter;
 
     public function __construct()
@@ -130,12 +131,15 @@ protected function getHtmlFromDocument(\DOMDocument $document)
         // retrieve the document element
         // we do it this way to preserve the utf-8 encoding
         $htmlElement = $document->documentElement;
-        $html = $document->saveHTML($htmlElement);
+        $html = $document->saveHTML($htmlElement) ?: '';
         $html = trim($html);
+        if ($htmlElement === null) {
+            return $html;
+        }
 
         // retrieve the doctype
         $document->removeChild($htmlElement);
-        $doctype = $document->saveHTML();
+        $doctype = $document->saveHTML() ?: '';
         $doctype = trim($doctype);
 
         // if it is the html5 doctype convert it to lowercase
@@ -158,6 +162,7 @@ protected function inline(\DOMDocument $document, array $rules)
             return $document;
         }
 
+        /** @var \SplObjectStorage<\DOMElement, Css\Property\Property[]> $propertyStorage */
         $propertyStorage = new \SplObjectStorage();
 
         $xPath = new \DOMXPath($document);
@@ -222,8 +227,10 @@ private function calculatePropertiesToBeApplied(array $properties, array $cssPro
 
                 //overrule if current property is important and existing is not, else check specificity
                 $overrule = !$existingProperty->isImportant() && $property->isImportant();
-                if (!$overrule) {
-                    $overrule = $existingProperty->getOriginalSpecificity()->compareTo($property->getOriginalSpecificity()) <= 0;
+                $originalSpecificity = $existingProperty->getOriginalSpecificity();
+                $specificity = $property->getOriginalSpecificity();
+                if (!$overrule && $originalSpecificity !== null && $specificity !== null) {
+                    $overrule = $originalSpecificity->compareTo($specificity) <= 0;
                 }
 
                 if ($overrule) {

stubs/CssSelector.stub

@@ -0,0 +1,34 @@
+<?php
+
+namespace Symfony\Component\CssSelector;
+
+class CssSelector
+{
+    /** @var bool */
+    private static $html = true;
+
+    /**
+     * @param mixed  $cssExpr The CSS expression
+     * @param string $prefix  An optional prefix for the XPath expression
+     *
+     * @return string
+     */
+    public static function toXPath($cssExpr, $prefix = 'descendant-or-self::')
+    {
+        $converter = new CssSelectorConverter(self::$html);
+
+        return $converter->toXPath($cssExpr, $prefix);
+    }
+
+    /** @return void */
+    public static function enableHtmlExtension()
+    {
+        self::$html = true;
+    }
+
+    /** @return void */
+    public static function disableHtmlExtension()
+    {
+        self::$html = false;
+    }
+}