Merge pull request #715 from stof/upgrade_phpstan

Upgrade phpstan
scssphp · Aug 15, 2024 · 1c57724 · 1c57724
2 parents 394ed1e + 43bb1e4
commit 1c57724
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 60 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1415,11 +1415,6 @@ parameters:
 			count: 1
 			path: src/Compiler.php
 
-		-
-			message: "#^Parameter \\#1 \\$value of method ScssPhp\\\\ScssPhp\\\\Compiler\\:\\:compileValue\\(\\) expects array\\|ScssPhp\\\\ScssPhp\\\\Node\\\\Number, array\\|string given\\.$#"
-			count: 1
-			path: src/Compiler.php
-
 		-
 			message: "#^Parameter \\#2 \\$baseDir of method ScssPhp\\\\ScssPhp\\\\Compiler\\:\\:resolveImportPath\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
@@ -1625,11 +1620,6 @@ parameters:
 			count: 1
 			path: src/Parser.php
 
-		-
-			message: "#^Method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:func\\(\\) has parameter \\$func with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Parser.php
-
 		-
 			message: "#^Method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:isPlainCssValidElement\\(\\) has parameter \\$parsed with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1675,11 +1665,6 @@ parameters:
 			count: 1
 			path: src/Parser.php
 
-		-
-			message: "#^Method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:unit\\(\\) has parameter \\$unit with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Parser.php
-
 		-
 			message: "#^PHPDoc tag @var for variable \\$nextValue has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1700,6 +1685,16 @@ parameters:
 			count: 1
 			path: src/Parser.php
 
+		-
+			message: "#^Parameter &\\$out @param\\-out type of method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:enclosedExpression\\(\\) expects array\\|ScssPhp\\\\ScssPhp\\\\Node\\\\Number, array\\|hasOffsetValue\\(int, string\\) given\\.$#"
+			count: 2
+			path: src/Parser.php
+
+		-
+			message: "#^Parameter &\\$out @param\\-out type of method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:genericList\\(\\) expects array\\|ScssPhp\\\\ScssPhp\\\\Node\\\\Number, array\\|ScssPhp\\\\ScssPhp\\\\Node\\\\Number\\|null given\\.$#"
+			count: 1
+			path: src/Parser.php
+
 		-
 			message: "#^Right side of && is always true\\.$#"
 			count: 5

diff --git a/phpstan-no-baseline.neon b/phpstan-no-baseline.neon
@@ -38,5 +38,9 @@ parameters:
             message: "#^Method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:[^(]+\\(\\) has parameter \\$out with no value type specified in iterable type array\\.$#"
             path: src/Parser.php
 
+        -
+            message: "#^Method ScssPhp\\\\ScssPhp\\\\Parser\\:\\:[^(]+\\(\\) has @param-out PHPDoc tag for parameter \\$\\w+ with no value type specified in iterable type array\\.$#"
+            path: src/Parser.php
+
 includes:
     - vendor-bin/phpstan/vendor/phpstan/phpstan/conf/bleedingEdge.neon
diff --git a/src/Block/DirectiveBlock.php b/src/Block/DirectiveBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,7 +27,7 @@ class DirectiveBlock extends Block
     public $name;
 
     /**
-     * @var string|array|null
+     * @var array|Number|null
      */
     public $value;
 

diff --git a/src/Block/EachBlock.php b/src/Block/EachBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,7 +27,7 @@ class EachBlock extends Block
     public $vars = [];
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $list;
 

diff --git a/src/Block/ElseifBlock.php b/src/Block/ElseifBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@
 class ElseifBlock extends Block
 {
     /**
-     * @var array
+     * @var array|Number
      */
     public $cond;
 

diff --git a/src/Block/ForBlock.php b/src/Block/ForBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,12 +27,12 @@ class ForBlock extends Block
     public $var;
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $start;
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $end;
 

diff --git a/src/Block/IfBlock.php b/src/Block/IfBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@
 class IfBlock extends Block
 {
     /**
-     * @var array
+     * @var array|Number
      */
     public $cond;
 

diff --git a/src/Block/MediaBlock.php b/src/Block/MediaBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@
 class MediaBlock extends Block
 {
     /**
-     * @var string|array|null
+     * @var string|array|Number|null
      */
     public $value;
 

diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1656,6 +1656,7 @@ protected function compileWith($withCondition)
                 $parser = $this->parserFactory(__METHOD__);
 
                 if ($parser->parseValue($buffer, $reParsedWith)) {
+                    \assert(\is_array($reParsedWith));
                     $withCondition = $reParsedWith;
                 }
             }