Skip to content

Commit 09f28ad

Browse files
committed
Update dev tools
1 parent 2f3c7d8 commit 09f28ad

File tree

8 files changed

+205
-176
lines changed

8 files changed

+205
-176
lines changed

.dev-tools/composer.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
"type": "project",
33
"require": {
44
"php": "^8.4",
5-
"ergebnis/composer-normalize": "^2.47",
6-
"infection/infection": "^0.31.0",
5+
"ergebnis/composer-normalize": "^2.48.2",
6+
"infection/infection": "^0.31.2",
77
"kubawerlos/composer-smaller-lock": "^1.1.0",
88
"kubawerlos/php-cs-fixer-config": "^5.3",
99
"mi-schi/phpmd-extension": "^4.3",
1010
"phpmd/phpmd": "^2.15",
1111
"phpstan/extension-installer": "^1.4.3",
12-
"phpstan/phpstan": "^2.1.20",
12+
"phpstan/phpstan": "^2.1.23",
1313
"phpstan/phpstan-phpunit": "^2.0.7",
1414
"phpstan/phpstan-strict-rules": "^2.0.6",
1515
"shipmonk/composer-dependency-analyser": "^1.8.3",
16-
"shipmonk/dead-code-detector": "^0.13.0",
17-
"shipmonk/phpstan-rules": "^4.1.5",
18-
"squizlabs/php_codesniffer": "^3.13.2",
16+
"shipmonk/dead-code-detector": "^0.13.3",
17+
"shipmonk/phpstan-rules": "^4.2.1",
18+
"squizlabs/php_codesniffer": "^3.13.4",
1919
"tomasvotruba/type-coverage": "^2.0.2",
20-
"vimeo/psalm": "^6.13.0"
20+
"vimeo/psalm": "^6.13.1"
2121
},
2222
"autoload": {
2323
"psr-4": {
@@ -32,7 +32,8 @@
3232
"infection/extension-installer": false,
3333
"kubawerlos/composer-smaller-lock": true,
3434
"phpstan/extension-installer": true
35-
}
35+
},
36+
"bump-after-update": true
3637
},
3738
"scripts": {
3839
"analyse": [

.dev-tools/composer.lock

Lines changed: 182 additions & 167 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Analyzer/Analysis/ConstructorAnalysis.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,11 @@ private function getPropertyIndex(int $index, int $openBrace): ?int
158158
}
159159

160160
$propertyIndex = $this->tokens->getPrevMeaningfulToken($assignmentIndex);
161+
\assert(\is_int($propertyIndex));
162+
161163
if (!$this->tokens[$propertyIndex]->isGivenKind(\T_STRING)) {
162164
return null;
163165
}
164-
\assert(\is_int($propertyIndex));
165166

166167
$objectOperatorIndex = $this->tokens->getPrevMeaningfulToken($propertyIndex);
167168
\assert(\is_int($objectOperatorIndex));

src/Fixer/EmptyFunctionBodyFixer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
7272
$tokens->ensureWhitespaceAtIndex($openBraceIndex + 1, 0, '');
7373

7474
$beforeOpenBraceIndex = $tokens->getPrevNonWhitespace($openBraceIndex);
75+
\assert(\is_int($beforeOpenBraceIndex));
76+
7577
if (!$tokens[$beforeOpenBraceIndex]->isGivenKind([\T_COMMENT, \T_DOC_COMMENT])) {
7678
$tokens->ensureWhitespaceAtIndex($openBraceIndex - 1, 1, ' ');
7779
}

src/Fixer/PhpdocVarAnnotationToAssertFixer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ private static function getTypesToExclude(string $content): array
115115
private static function getVariableIndex(Tokens $tokens, int $docCommentIndex): ?int
116116
{
117117
$prevIndex = $tokens->getPrevMeaningfulToken($docCommentIndex);
118+
\assert(\is_int($prevIndex));
119+
118120
if (!$tokens[$prevIndex]->equalsAny([';', '{', '}', [\T_OPEN_TAG]])) {
119121
return null;
120122
}
@@ -252,6 +254,7 @@ private static function canBePlacedAfterExpression(Tokens $tokens, int $expressi
252254

253255
if ($tokens[$afterExpressionIndex]->isGivenKind(\T_NS_SEPARATOR)) {
254256
$afterExpressionIndex = $tokens->getNextMeaningfulToken($afterExpressionIndex);
257+
\assert(\is_int($afterExpressionIndex));
255258
}
256259

257260
return !$tokens[$afterExpressionIndex]->equals([\T_STRING, 'assert'], false);

src/Fixer/PromotedConstructorPropertyFixer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ private function promoteProperties(Tokens $tokens, int $classIndex, ConstructorA
161161
}
162162

163163
$assignedPropertyIndex = $tokens->getPrevTokenOfKind($constructorPromotableAssignments[$constructorParameterName], [[\T_STRING]]);
164+
\assert(\is_int($assignedPropertyIndex));
165+
164166
$oldParameterName = $tokens[$constructorParameterIndex]->getContent();
165167
$newParameterName = '$' . $tokens[$assignedPropertyIndex]->getContent();
166168
if ($oldParameterName !== $newParameterName && \in_array($newParameterName, $constructorParameterNames, true)) {

src/Fixer/StringableInterfaceFixer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ private static function doesHaveToStringMethod(Tokens $tokens, int $classStartIn
140140
}
141141

142142
$functionNameIndex = $tokens->getNextMeaningfulToken($index);
143+
\assert(\is_int($functionNameIndex));
143144

144145
if ($tokens[$functionNameIndex]->equals([\T_STRING, '__toString'], false)) {
145146
return true;

src/Fixer/TrimKeyFixer.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,15 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
7474
$newInnerContent = Preg::replace('/\\s{2,}/', ' ', $innerContent);
7575

7676
$prevIndex = $tokens->getPrevMeaningfulToken($indexToFix);
77+
\assert(\is_int($prevIndex));
78+
7779
if (!$tokens[$prevIndex]->equals('.')) {
7880
$newInnerContent = \ltrim($newInnerContent);
7981
}
8082

8183
$nextIndex = $tokens->getNextMeaningfulToken($indexToFix);
84+
\assert(\is_int($nextIndex));
85+
8286
if (!$tokens[$nextIndex]->equals('.')) {
8387
$newInnerContent = \rtrim($newInnerContent);
8488
}

0 commit comments

Comments
 (0)