Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to PHPStan 2 #40

Merged
merged 9 commits into from
Nov 12, 2024
Merged

Update to PHPStan 2 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
312f023
Update to PHPStan 2
SchmidtClaudia Nov 11, 2024
e06408b
Fix PHPStan 2 findings
SchmidtClaudia Nov 11, 2024
55ce5e2
Upgrade Baseline
SchmidtClaudia Nov 11, 2024
f126d9e
Fix overwrite logic as $context->negate makes $context->false return …
Seldaek Nov 12, 2024
19d9a08
Restore 2.x code
Seldaek Nov 12, 2024
3c5eea0
Fix syntax for old php
Seldaek Nov 12, 2024
92438b0
Make changes compatible with phpstan 1 + 2
Seldaek Nov 12, 2024
108a329
Ignore some errors
Seldaek Nov 12, 2024
8f5344f
Restore baseline for phpstan1
Seldaek Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
},
"require-dev": {
"phpunit/phpunit": "^8 || ^9",
"phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-strict-rules": "^1.1"
"phpstan/phpstan": "^1.12 || ^2",
"phpstan/phpstan-strict-rules": "^1 || ^2"
},
"conflict": {
"phpstan/phpstan": "<1.11.10"
Expand Down
72 changes: 52 additions & 20 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ parameters:
path: src/Preg.php

-
message: "#^Creating new PHPStan\\\\Reflection\\\\Native\\\\NativeParameterReflection is not covered by backward compatibility promise\\. The class might change in a minor PHPStan version\\.$#"
message: '#^Creating new PHPStan\\Reflection\\Native\\NativeParameterReflection is not covered by backward compatibility promise\. The class might change in a minor PHPStan version\.$#'
identifier: phpstanApi.constructor
count: 1
path: src/PHPStan/PregReplaceCallbackClosureTypeExtension.php

Expand All @@ -20,102 +21,133 @@ parameters:
count: 2
path: src/Preg.php

-
message: '#^Parameter \#2 \$callback of function preg_replace_callback expects callable\(array\<string\>\)\: string, \(callable\(array\<int\|string, array\{string\|null, int\<\-1, max\>\}\>\)\: string\)\|\(callable\(array\<int\|string, string\|null\>\)\: string\) given\.$#'
identifier: argument.type
count: 2
path: src/Preg.php

-
message: "#^Parameter &\\$matches @param\\-out type of method Composer\\\\Pcre\\\\Preg\\:\\:matchAllWithOffsets\\(\\) expects array\\<int\\|string, list\\<array\\{string\\|null, int\\<\\-1, max\\>\\}\\>\\>, array given\\.$#"
count: 1
path: src/Preg.php

-
message: "#^Parameter &\\$matches @param\\-out type of method Composer\\\\Pcre\\\\Preg\\:\\:matchWithOffsets\\(\\) expects array\\<int\\|string, array\\{string\\|null, int\\<\\-1, max\\>\\}\\>, array\\<int\\|string, string\\|null\\> given\\.$#"
message: '#^Parameter &\$matches @param\-out type of method Composer\\Pcre\\Preg\:\:matchAllWithOffsets\(\) expects array\<int\|string, list\<array\{string\|null, int\<\-1, max\>\}\>\>, array\<mixed\> given\.$#'
identifier: paramOut.type
count: 1
path: src/Preg.php

-
message: '#^Parameter &\$matches @param\-out type of method Composer\\Pcre\\Preg\:\:matchWithOffsets\(\) expects array\<int\|string, array\{string\|null, int\<\-1, max\>\}\>, array\<int\|string, string\|null\> given\.$#'
identifier: paramOut.type
count: 1
path: src/Preg.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/GrepTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/IsMatchAllTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/IsMatchAllWithOffsetsTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/IsMatchTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/IsMatchWithOffsetsTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/MatchAllTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/MatchTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/ReplaceCallbackArrayTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/ReplaceCallbackTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/ReplaceTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/SplitTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/PregTests/SplitWithOffsetsTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/IsMatchTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/MatchAllTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/MatchTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/ReplaceCallbackArrayTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/ReplaceCallbackTest.php

-
message: "#^Regex pattern is invalid\\: No ending matching delimiter '\\}' found$#"
message: '#^Regex pattern is invalid\: No ending matching delimiter ''\}'' found$#'
identifier: regexp.pattern
count: 2
path: tests/RegexTests/ReplaceTest.php
16 changes: 16 additions & 0 deletions src/PHPStan/PregMatchTypeSpecifyingExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,26 @@ public function specifyTypes(MethodReflection $methodReflection, StaticCall $nod
$context = $context->negate();
}

// @phpstan-ignore function.alreadyNarrowedType, function.impossibleType
if (method_exists('PHPStan\Analyser\SpecifiedTypes', 'setRootExpr')) {
// @phpstan-ignore method.notFound
$typeSpecifier = $this->typeSpecifier->create(
$matchesArg->value,
$matchedType,
$context,
// @phpstan-ignore argument.type
$scope
)->setRootExpr($node);

return $overwrite ? $typeSpecifier->setAlwaysOverwriteTypes() : $typeSpecifier;
}

// @phpstan-ignore arguments.count
return $this->typeSpecifier->create(
$matchesArg->value,
$matchedType,
$context,
// @phpstan-ignore argument.type
$overwrite,
$scope,
$node
Expand Down