diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f35ea04a77..1cd3a2c44a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -77,7 +77,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - php-version: "8.2" + php-version: "8.5" - name: "Validate Composer" run: "composer validate" diff --git a/compiler/box/composer.json b/compiler/box/composer.json index 4ea8c3e23c..2f109f2a49 100644 --- a/compiler/box/composer.json +++ b/compiler/box/composer.json @@ -1,7 +1,8 @@ { "require": { "humbug/box": "^4.6", - "cweagans/composer-patches": "^1.7" + "cweagans/composer-patches": "^1.7", + "jetbrains/phpstorm-stubs": "dev-master as v2024.x-dev" }, "config": { "platform": { diff --git a/compiler/box/composer.lock b/compiler/box/composer.lock index d063eb539d..65cb6d4bd7 100644 --- a/compiler/box/composer.lock +++ b/compiler/box/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fb82d3fddd187abc2f321b38688fb441", + "content-hash": "8c72337081ddf7ca83d3b63b69ea241f", "packages": [ { "name": "amphp/amp", @@ -1528,24 +1528,25 @@ }, { "name": "jetbrains/phpstorm-stubs", - "version": "v2024.3", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "0e82bdfe850c71857ee4ee3501ed82a9fc5d043c" + "url": "https://github.com/JetBrains/phpstorm-stubs", + "reference": "ef45e9e2a0a3c69c13ed59184d42f99a16240313" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/0e82bdfe850c71857ee4ee3501ed82a9fc5d043c", - "reference": "0e82bdfe850c71857ee4ee3501ed82a9fc5d043c", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/ef45e9e2a0a3c69c13ed59184d42f99a16240313", + "reference": "ef45e9e2a0a3c69c13ed59184d42f99a16240313", "shasum": "" }, "require-dev": { - "friendsofphp/php-cs-fixer": "v3.64.0", - "nikic/php-parser": "v5.3.1", - "phpdocumentor/reflection-docblock": "5.6.0", - "phpunit/phpunit": "11.4.3" + "friendsofphp/php-cs-fixer": "^v3.86", + "nikic/php-parser": "^v5.6", + "phpdocumentor/reflection-docblock": "^5.6", + "phpunit/phpunit": "^12.3" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -1568,10 +1569,7 @@ "stubs", "type" ], - "support": { - "source": "https://github.com/JetBrains/phpstorm-stubs/tree/v2024.3" - }, - "time": "2024-12-14T08:03:12+00:00" + "time": "2026-01-08T09:22:58+00:00" }, { "name": "justinrainbow/json-schema", @@ -4199,9 +4197,18 @@ } ], "packages-dev": [], - "aliases": [], + "aliases": [ + { + "package": "jetbrains/phpstorm-stubs", + "version": "9999999-dev", + "alias": "v2024.x-dev", + "alias_normalized": "2024.9999999.9999999.9999999-dev" + } + ], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "jetbrains/phpstorm-stubs": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {}, diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php index ead7b24c5c..f187cb4eed 100644 --- a/src/Analyser/MutatingScope.php +++ b/src/Analyser/MutatingScope.php @@ -142,6 +142,7 @@ use function array_key_exists; use function array_key_first; use function array_keys; +use function array_last; use function array_map; use function array_merge; use function array_pop; diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php index 2de4fc44dc..bb1412dd7e 100644 --- a/src/Analyser/NodeScopeResolver.php +++ b/src/Analyser/NodeScopeResolver.php @@ -207,6 +207,7 @@ use function array_key_exists; use function array_key_last; use function array_keys; +use function array_last; use function array_map; use function array_merge; use function array_pop; diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php index b24465befa..377da82a68 100644 --- a/src/Analyser/TypeSpecifier.php +++ b/src/Analyser/TypeSpecifier.php @@ -75,6 +75,7 @@ use PHPStan\Type\TypeTraverser; use PHPStan\Type\UnionType; use function array_key_exists; +use function array_last; use function array_map; use function array_merge; use function array_reverse; diff --git a/src/Fixable/PhpPrinter.php b/src/Fixable/PhpPrinter.php index 5bee2a187c..6a3a9999aa 100644 --- a/src/Fixable/PhpPrinter.php +++ b/src/Fixable/PhpPrinter.php @@ -5,6 +5,7 @@ use Override; use PhpParser\Node; use PhpParser\PrettyPrinter\Standard; +use function array_last; use function count; use function rtrim; diff --git a/src/Parser/LastConditionVisitor.php b/src/Parser/LastConditionVisitor.php index 9338df9b60..6197c14137 100644 --- a/src/Parser/LastConditionVisitor.php +++ b/src/Parser/LastConditionVisitor.php @@ -6,6 +6,7 @@ use PhpParser\Node; use PhpParser\NodeVisitorAbstract; use PHPStan\DependencyInjection\AutowiredService; +use function array_last; use function count; #[AutowiredService] diff --git a/src/Parser/TryCatchTypeVisitor.php b/src/Parser/TryCatchTypeVisitor.php index c6323c09c1..ba76956ed1 100644 --- a/src/Parser/TryCatchTypeVisitor.php +++ b/src/Parser/TryCatchTypeVisitor.php @@ -6,6 +6,7 @@ use PhpParser\Node; use PhpParser\NodeVisitorAbstract; use PHPStan\DependencyInjection\AutowiredService; +use function array_last; use function array_pop; use function array_reverse; use function count; diff --git a/src/Parser/VariadicMethodsVisitor.php b/src/Parser/VariadicMethodsVisitor.php index 945c929a8f..b69b961426 100644 --- a/src/Parser/VariadicMethodsVisitor.php +++ b/src/Parser/VariadicMethodsVisitor.php @@ -10,6 +10,7 @@ use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ParametersAcceptor; use function array_key_exists; +use function array_last; use function array_pop; use function in_array; use function sprintf; diff --git a/src/Reflection/AttributeReflectionFactory.php b/src/Reflection/AttributeReflectionFactory.php index dbecc921c6..a8f5063031 100644 --- a/src/Reflection/AttributeReflectionFactory.php +++ b/src/Reflection/AttributeReflectionFactory.php @@ -10,6 +10,7 @@ use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider; use PHPStan\Type\TypeCombinator; use function array_key_exists; +use function array_last; use function count; use function is_int; diff --git a/src/Reflection/GenericParametersAcceptorResolver.php b/src/Reflection/GenericParametersAcceptorResolver.php index 26c84f3852..27d8cfc11c 100644 --- a/src/Reflection/GenericParametersAcceptorResolver.php +++ b/src/Reflection/GenericParametersAcceptorResolver.php @@ -13,6 +13,7 @@ use PHPStan\Type\Type; use PHPStan\Type\TypeCombinator; use function array_key_exists; +use function array_last; use function array_map; use function array_merge; use function count; diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php index 16daa428a9..c181318975 100644 --- a/src/Reflection/ParametersAcceptorSelector.php +++ b/src/Reflection/ParametersAcceptorSelector.php @@ -46,6 +46,7 @@ use function array_is_list; use function array_key_exists; use function array_key_last; +use function array_last; use function array_map; use function array_merge; use function array_slice; diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php index aa261580a8..4dc7d90428 100644 --- a/src/Rules/FunctionCallParametersCheck.php +++ b/src/Rules/FunctionCallParametersCheck.php @@ -29,6 +29,7 @@ use PHPStan\Type\VerbosityLevel; use function array_fill; use function array_key_exists; +use function array_last; use function count; use function implode; use function in_array; diff --git a/src/Rules/Whitespace/FileWhitespaceRule.php b/src/Rules/Whitespace/FileWhitespaceRule.php index c718256ea3..f160e9372e 100644 --- a/src/Rules/Whitespace/FileWhitespaceRule.php +++ b/src/Rules/Whitespace/FileWhitespaceRule.php @@ -13,6 +13,7 @@ use PHPStan\Node\FileNode; use PHPStan\Rules\Rule; use PHPStan\Rules\RuleErrorBuilder; +use function array_last; use function count; /** diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php index 01465018a9..69bd087330 100644 --- a/src/Type/FileTypeMapper.php +++ b/src/Type/FileTypeMapper.php @@ -27,6 +27,7 @@ use PHPStan\Type\Generic\TemplateTypeVarianceMap; use function array_key_exists; use function array_keys; +use function array_last; use function array_map; use function array_merge; use function array_pop;