Support PHPStan 2.0 (#267)

phpstan/phpstan#11816 Close #265
spaze · Nov 11, 2024 · 7c3c422 · 7c3c422
2 parents ed12b33 + 55e4124
commit 7c3c422
Show file tree

Hide file tree

Showing 63 changed files with 165 additions and 289 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -27,10 +25,6 @@ jobs:
           - composer phpcs
           - composer phpstan
         exclude:
-          - php-version: "7.2"
-            run: composer lint
-          - php-version: "7.3"
-            run: composer lint
           - php-version: "7.4"
             run: composer lint
           - php-version: "8.0"
@@ -40,10 +34,6 @@ jobs:
           - php-version: "8.2"
             run: composer lint
         include:
-          - php-version: "7.2"
-            run: composer lint-7.x
-          - php-version: "7.3"
-            run: composer lint-7.x
           - php-version: "7.4"
             run: composer lint-7.x
           - php-version: "8.0"
@@ -115,8 +105,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
 		}
 	},
 	"require": {
-		"php": "^7.2 || ^8.0",
-		"phpstan/phpstan": "^1.12.6"
+		"php": "^7.4 || ^8.0",
+		"phpstan/phpstan": "^2.0"
 	},
 	"require-dev": {
 		"nette/neon": "^3.2",
 		"nikic/php-parser": "^4.13 || ^5.0",
 		"phpunit/phpunit": "^8.5 || ^10.1 || ^11.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"php-parallel-lint/php-console-highlighter": "^1.0",
-		"phpstan/phpstan-deprecation-rules": "^1.2",
+		"phpstan/phpstan-deprecation-rules": "^2.0",
 		"spaze/coding-standard": "^1.7"
 	},
 	"autoload": {

diff --git a/src/Allowed/Allowed.php b/src/Allowed/Allowed.php
@@ -34,17 +34,13 @@
 class Allowed
 {
 
-	/** @var Formatter */
-	private $formatter;
+	private Formatter $formatter;
 
-	/** @var Normalizer */
-	private $normalizer;
+	private Normalizer $normalizer;
 
-	/** @var AllowedPath */
-	private $allowedPath;
+	private AllowedPath $allowedPath;
 
-	/** @var TypeStringResolver */
-	private $typeStringResolver;
+	private TypeStringResolver $typeStringResolver;
 
 
 	public function __construct(
@@ -62,7 +58,7 @@ public function __construct(
 
 	/**
 	 * @param Scope $scope
-	 * @param array<int, Arg>|null $args
+	 * @param array<Arg>|null $args
 	 * @param DisallowedWithParams $disallowed
 	 * @return bool
 	 */
@@ -116,7 +112,7 @@ private function callMatches(Scope $scope, string $call): bool
 
 	/**
 	 * @param Scope $scope
-	 * @param array<int, Arg>|null $args
+	 * @param array<Arg>|null $args
 	 * @param array<int|string, Param> $allowConfig
 	 * @param bool $paramsRequired
 	 * @return bool
@@ -152,7 +148,7 @@ private function hasAllowedParams(Scope $scope, ?array $args, array $allowConfig
 
 	/**
 	 * @param Scope $scope
-	 * @param array<int, Arg>|null $args
+	 * @param array<Arg>|null $args
 	 * @param DisallowedWithParams $disallowed
 	 * @return bool
 	 */
@@ -169,7 +165,7 @@ private function hasAllowedParamsInAllowed(Scope $scope, ?array $args, Disallowe
 
 
 	/**
-	 * @param array<int, Arg> $args
+	 * @param array<Arg> $args
 	 * @param Scope $scope
 	 * @param Param $param
 	 * @return Type|null

diff --git a/src/Allowed/AllowedConfig.php b/src/Allowed/AllowedConfig.php
@@ -9,28 +9,28 @@ class AllowedConfig
 {
 
 	/** @var list<string> */
-	private $allowIn;
+	private array $allowIn;
 
 	/** @var list<string> */
-	private $allowExceptIn;
+	private array $allowExceptIn;
 
 	/** @var list<string> */
-	private $allowInCalls;
+	private array $allowInCalls;
 
 	/** @var list<string> */
-	private $allowExceptInCalls;
+	private array $allowExceptInCalls;
 
 	/** @var array<int|string, Param> */
-	private $allowParamsInAllowed;
+	private array $allowParamsInAllowed;
 
 	/** @var array<int|string, Param> */
-	private $allowParamsAnywhere;
+	private array $allowParamsAnywhere;
 
 	/** @var array<int|string, Param> */
-	private $allowExceptParamsInAllowed;
+	private array $allowExceptParamsInAllowed;
 
 	/** @var array<int|string, Param> */
-	private $allowExceptParams;
+	private array $allowExceptParams;
 
 
 	/**

diff --git a/src/Allowed/AllowedPath.php b/src/Allowed/AllowedPath.php
@@ -10,8 +10,7 @@
 class AllowedPath
 {
 
-	/** @var FilePath */
-	private $filePath;
+	private FilePath $filePath;
 
 
 	public function __construct(FilePath $filePath)

diff --git a/src/Calls/EchoCalls.php b/src/Calls/EchoCalls.php
@@ -22,11 +22,10 @@
 class EchoCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/EmptyCalls.php b/src/Calls/EmptyCalls.php
@@ -22,11 +22,10 @@
 class EmptyCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/EvalCalls.php b/src/Calls/EvalCalls.php
@@ -22,11 +22,10 @@
 class EvalCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/ExitDieCalls.php b/src/Calls/ExitDieCalls.php
@@ -22,11 +22,10 @@
 class ExitDieCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/FunctionCalls.php b/src/Calls/FunctionCalls.php
@@ -25,14 +25,12 @@
 class FunctionCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
+	private ReflectionProvider $reflectionProvider;
 
 
 	/**

diff --git a/src/Calls/MethodCalls.php b/src/Calls/MethodCalls.php
@@ -24,11 +24,10 @@
 class MethodCalls implements Rule
 {
 
-	/** @var DisallowedMethodRuleErrors */
-	private $disallowedMethodRuleErrors;
+	private DisallowedMethodRuleErrors $disallowedMethodRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/NewCalls.php b/src/Calls/NewCalls.php
@@ -26,11 +26,10 @@ class NewCalls implements Rule
 {
 	private const CONSTRUCT = '::__construct';
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/PrintCalls.php b/src/Calls/PrintCalls.php
@@ -22,11 +22,10 @@
 class PrintCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/ShellExecCalls.php b/src/Calls/ShellExecCalls.php
@@ -26,11 +26,10 @@
 class ShellExecCalls implements Rule
 {
 
-	/** @var DisallowedCallsRuleErrors */
-	private $disallowedCallsRuleErrors;
+	private DisallowedCallsRuleErrors $disallowedCallsRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/Calls/StaticCalls.php b/src/Calls/StaticCalls.php
@@ -24,11 +24,10 @@
 class StaticCalls implements Rule
 {
 
-	/** @var DisallowedMethodRuleErrors */
-	private $disallowedMethodRuleErrors;
+	private DisallowedMethodRuleErrors $disallowedMethodRuleErrors;
 
 	/** @var list<DisallowedCall> */
-	private $disallowedCalls;
+	private array $disallowedCalls;
 
 
 	/**

diff --git a/src/ControlStructures/BreakControlStructure.php b/src/ControlStructures/BreakControlStructure.php
@@ -22,11 +22,10 @@
 class BreakControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**

diff --git a/src/ControlStructures/ContinueControlStructure.php b/src/ControlStructures/ContinueControlStructure.php
@@ -22,11 +22,10 @@
 class ContinueControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**

diff --git a/src/ControlStructures/DeclareControlStructure.php b/src/ControlStructures/DeclareControlStructure.php
@@ -22,11 +22,10 @@
 class DeclareControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**

diff --git a/src/ControlStructures/DoWhileControlStructure.php b/src/ControlStructures/DoWhileControlStructure.php
@@ -22,11 +22,10 @@
 class DoWhileControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**

diff --git a/src/ControlStructures/ElseControlStructure.php b/src/ControlStructures/ElseControlStructure.php
@@ -22,11 +22,10 @@
 class ElseControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**

diff --git a/src/ControlStructures/ElseIfControlStructure.php b/src/ControlStructures/ElseIfControlStructure.php
@@ -23,11 +23,10 @@
 class ElseIfControlStructure implements Rule
 {
 
-	/** @var DisallowedControlStructureRuleErrors */
-	private $disallowedControlStructureRuleErrors;
+	private DisallowedControlStructureRuleErrors $disallowedControlStructureRuleErrors;
 
 	/** @var list<DisallowedControlStructure> */
-	private $disallowedControlStructures;
+	private array $disallowedControlStructures;
 
 
 	/**