Merge branch 'main' into tv-named-args

symplify · Aug 22, 2023 · b3f01ba · b3f01ba
2 parents 546c505 + 8e54ff5
commit b3f01ba
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 241 deletions.
diff --git a/config/static-rules.neon b/config/static-rules.neon
@@ -34,7 +34,6 @@ rules:
     - Symplify\PHPStanRules\Rules\NarrowType\NoReturnFalseInNonBoolClassMethodRule
 
     - Symplify\PHPStanRules\Rules\Complexity\ForbiddenArrayMethodCallRule
-    - Symplify\PHPStanRules\Rules\ForbiddenSpreadOperatorRule
     - Symplify\PHPStanRules\Rules\CheckRequiredInterfaceInContractNamespaceRule
     - Symplify\PHPStanRules\Rules\NoEmptyClassRule
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -8,7 +8,7 @@ parameters:
         - packages
         - packages-tests
 
-    reportUnmatchedIgnoredErrors: false
+    # reportUnmatchedIgnoredErrors: false
 
     excludePaths:
         # parallel
@@ -36,9 +36,6 @@ parameters:
         - '#Class Symplify\\PHPStanRules\\(.*?)Rule implements generic interface PHPStan\\Rules\\Rule but does not specify its types\: TNodeType#'
         - '#Method (.*?)::getCollectors\(\) return type with generic interface PHPStan\\Collectors\\Collector does not specify its types\: TNodeType, TValue#'
 
-        # child type
-        - '#Parameter \#1 \$node of method Symplify\\PHPStanRules\\Rules\\ForbiddenSpreadOperatorRule\:\:hasVariadicParam\(\) expects PhpParser\\Node\\Expr\\ArrowFunction\|PhpParser\\Node\\Expr\\Closure\|PhpParser\\Node\\Stmt\\ClassMethod\|PhpParser\\Node\\Stmt\\Function_, PhpParser\\Node\\Expr\\ArrowFunction\|PhpParser\\Node\\Expr\\Closure\|\(PhpParser\\Node\\Expr\\FuncCall&PhpParser\\Node\\FunctionLike\)\|\(PhpParser\\Node\\Expr\\MethodCall&PhpParser\\Node\\FunctionLike\)\|\(PhpParser\\Node\\Expr\\StaticCall&PhpParser\\Node\\FunctionLike\)\|PhpParser\\Node\\Stmt\\ClassMethod\|PhpParser\\Node\\Stmt\\Function_ given#'
-
         # invalid PHPStan type - it alwasy requires 2 types to traverse with callable
         -
             message: '#Callable callable\(PHPStan\\Type\\Type\)\: PHPStan\\Type\\Type invoked with 2 parameters, 1 required#'

diff --git a/src/Rules/ForbiddenSpreadOperatorRule.php b/src/Rules/ForbiddenSpreadOperatorRule.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SkipFirstVariadic.php b/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SkipFirstVariadic.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SkipNoSpreadOperator.php b/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SkipNoSpreadOperator.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperator.php b/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperator.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperatorAsFunctionArg.php b/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperatorAsFunctionArg.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperatorAsMethodArg.php b/tests/Rules/ForbiddenSpreadOperatorRule/Fixture/SpreadOperatorAsMethodArg.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/ForbiddenSpreadOperatorRuleTest.php b/tests/Rules/ForbiddenSpreadOperatorRule/ForbiddenSpreadOperatorRuleTest.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/Source/ClassMethodWithFirstArgumentVariadic.php b/tests/Rules/ForbiddenSpreadOperatorRule/Source/ClassMethodWithFirstArgumentVariadic.php
diff --git a/tests/Rules/ForbiddenSpreadOperatorRule/config/configured_rule.neon b/tests/Rules/ForbiddenSpreadOperatorRule/config/configured_rule.neon