Skip to content

Commit c0895c6

Browse files
sebastianbergmannsebastianbergmann
committed
Update tools
1 parent 891aaf6 commit c0895c6

File tree

11 files changed

+130
-27
lines changed

11 files changed

+130
-27
lines changed

‎tools/.phpstan/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"require-dev": {
33
"phpstan/phpstan": "^2.1.8",
44
"phpstan/extension-installer": "^1.4.3",
5-
"phpstan/phpstan-strict-rules": "^2.0.3",
5+
"phpstan/phpstan-strict-rules": "^2.0.4",
66
"tomasvotruba/type-coverage": "^2.0.2",
77
"ergebnis/phpstan-rules": "^2.8.0"
88
},

‎tools/.phpstan/composer.lock

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

‎tools/.phpstan/vendor/composer/installed.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,17 +278,17 @@
278278
},
279279
{
280280
"name": "phpstan/phpstan-strict-rules",
281-
"version": "2.0.3",
282-
"version_normalized": "2.0.3.0",
281+
"version": "2.0.4",
282+
"version_normalized": "2.0.4.0",
283283
"source": {
284284
"type": "git",
285285
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
286-
"reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba"
286+
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
287287
},
288288
"dist": {
289289
"type": "zip",
290-
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/8b88b5f818bfa301e0c99154ab622dace071c3ba",
291-
"reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba",
290+
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
291+
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
292292
"shasum": ""
293293
},
294294
"require": {
@@ -301,7 +301,7 @@
301301
"phpstan/phpstan-phpunit": "^2.0",
302302
"phpunit/phpunit": "^9.6"
303303
},
304-
"time": "2025-01-21T10:52:14+00:00",
304+
"time": "2025-03-18T11:42:40+00:00",
305305
"type": "phpstan-extension",
306306
"extra": {
307307
"phpstan": {
@@ -323,7 +323,7 @@
323323
"description": "Extra strict and opinionated rules for PHPStan",
324324
"support": {
325325
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
326-
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.3"
326+
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.4"
327327
},
328328
"install-path": "../phpstan/phpstan-strict-rules"
329329
},

‎tools/.phpstan/vendor/composer/installed.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => 'ff662814b51b466b32c93fe10e75bcb7145ef305',
6+
'reference' => '891aaf679d681f542dda1cab300acb25e1097720',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => 'ff662814b51b466b32c93fe10e75bcb7145ef305',
16+
'reference' => '891aaf679d681f542dda1cab300acb25e1097720',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -56,9 +56,9 @@
5656
'dev_requirement' => true,
5757
),
5858
'phpstan/phpstan-strict-rules' => array(
59-
'pretty_version' => '2.0.3',
60-
'version' => '2.0.3.0',
61-
'reference' => '8b88b5f818bfa301e0c99154ab622dace071c3ba',
59+
'pretty_version' => '2.0.4',
60+
'version' => '2.0.4.0',
61+
'reference' => '3e139cbe67fafa3588e1dbe27ca50f31fdb6236a',
6262
'type' => 'phpstan-extension',
6363
'install_path' => __DIR__ . '/../phpstan/phpstan-strict-rules',
6464
'aliases' => array(),

‎tools/.phpstan/vendor/phpstan/extension-installer/src/GeneratedConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class GeneratedConfig
3535
0 => 'rules.neon',
3636
),
3737
),
38-
'version' => '2.0.3',
38+
'version' => '2.0.4',
3939
'phpstanVersionConstraint' => '>=2.0.4.0-dev, <3.0.0.0-dev',
4040
),
4141
'tomasvotruba/type-coverage' =>

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MIT License
22

33
Copyright (c) 2016 Ondřej Mirtes
4+
Copyright (c) 2025 PHPStan s.r.o.
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[PHPStan](https://phpstan.org/) focuses on finding bugs in your code. But in PHP there's a lot of leeway in how stuff can be written. This repository contains additional rules that revolve around strictly and strongly typed code with no loose casting for those who want additional safety in extremely defensive programming:
88

99
* Require booleans in `if`, `elseif`, ternary operator, after `!`, and on both sides of `&&` and `||`.
10+
* Require booleans in `while` and `do while` loop conditions.
1011
* Require numeric operands or arrays in `+` and numeric operands in `-`/`*`/`/`/`**`/`%`.
1112
* Require numeric operand in `$var++`, `$var--`, `++$var`and `--$var`.
1213
* These functions contain a `$strict` parameter for better type safety, it must be set to `true`:
@@ -64,6 +65,7 @@ parameters:
6465
strictRules:
6566
disallowedLooseComparison: false
6667
booleansInConditions: false
68+
booleansInLoopConditions: false
6769
uselessCast: false
6870
requireParentConstructorCall: false
6971
disallowedBacktick: false

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ parameters:
1515
allRules: true
1616
disallowedLooseComparison: %strictRules.allRules%
1717
booleansInConditions: %strictRules.allRules%
18+
booleansInLoopConditions: [%strictRules.allRules%, %featureToggles.bleedingEdge%]
1819
uselessCast: %strictRules.allRules%
1920
requireParentConstructorCall: %strictRules.allRules%
2021
disallowedBacktick: %strictRules.allRules%
@@ -37,6 +38,7 @@ parametersSchema:
3738
allRules: anyOf(bool(), arrayOf(bool())),
3839
disallowedLooseComparison: anyOf(bool(), arrayOf(bool())),
3940
booleansInConditions: anyOf(bool(), arrayOf(bool()))
41+
booleansInLoopConditions: anyOf(bool(), arrayOf(bool()))
4042
uselessCast: anyOf(bool(), arrayOf(bool()))
4143
requireParentConstructorCall: anyOf(bool(), arrayOf(bool()))
4244
disallowedBacktick: anyOf(bool(), arrayOf(bool()))
@@ -64,12 +66,16 @@ conditionalTags:
6466
phpstan.rules.rule: %strictRules.booleansInConditions%
6567
PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule:
6668
phpstan.rules.rule: %strictRules.booleansInConditions%
69+
PHPStan\Rules\BooleansInConditions\BooleanInDoWhileConditionRule:
70+
phpstan.rules.rule: %strictRules.booleansInLoopConditions%
6771
PHPStan\Rules\BooleansInConditions\BooleanInElseIfConditionRule:
6872
phpstan.rules.rule: %strictRules.booleansInConditions%
6973
PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule:
7074
phpstan.rules.rule: %strictRules.booleansInConditions%
7175
PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule:
7276
phpstan.rules.rule: %strictRules.booleansInConditions%
77+
PHPStan\Rules\BooleansInConditions\BooleanInWhileConditionRule:
78+
phpstan.rules.rule: %strictRules.booleansInLoopConditions%
7379
PHPStan\Rules\Cast\UselessCastRule:
7480
phpstan.rules.rule: %strictRules.uselessCast%
7581
PHPStan\Rules\Classes\RequireParentConstructCallRule:
@@ -163,6 +169,9 @@ services:
163169
-
164170
class: PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule
165171

172+
-
173+
class: PHPStan\Rules\BooleansInConditions\BooleanInDoWhileConditionRule
174+
166175
-
167176
class: PHPStan\Rules\BooleansInConditions\BooleanInElseIfConditionRule
168177

@@ -172,6 +181,9 @@ services:
172181
-
173182
class: PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule
174183

184+
-
185+
class: PHPStan\Rules\BooleansInConditions\BooleanInWhileConditionRule
186+
175187
-
176188
class: PHPStan\Rules\Cast\UselessCastRule
177189
arguments:

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/src/Rules/BooleansInConditions/BooleanInDoWhileConditionRule.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Rules\BooleansInConditions;
4+
5+
use PhpParser\Node;
6+
use PHPStan\Analyser\Scope;
7+
use PHPStan\Rules\Rule;
8+
use PHPStan\Rules\RuleErrorBuilder;
9+
use PHPStan\Type\VerbosityLevel;
10+
use function sprintf;
11+
12+
/**
13+
* @implements Rule<Node\Stmt\Do_>
14+
*/
15+
class BooleanInDoWhileConditionRule implements Rule
16+
{
17+
18+
private BooleanRuleHelper $helper;
19+
20+
public function __construct(BooleanRuleHelper $helper)
21+
{
22+
$this->helper = $helper;
23+
}
24+
25+
public function getNodeType(): string
26+
{
27+
return Node\Stmt\Do_::class;
28+
}
29+
30+
public function processNode(Node $node, Scope $scope): array
31+
{
32+
if ($this->helper->passesAsBoolean($scope, $node->cond)) {
33+
return [];
34+
}
35+
36+
$conditionExpressionType = $scope->getType($node->cond);
37+
38+
return [
39+
RuleErrorBuilder::message(sprintf(
40+
'Only booleans are allowed in a do-while condition, %s given.',
41+
$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
42+
))->identifier('doWhile.condNotBoolean')->build(),
43+
];
44+
}
45+
46+
}

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/src/Rules/BooleansInConditions/BooleanInWhileConditionRule.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Rules\BooleansInConditions;
4+
5+
use PhpParser\Node;
6+
use PHPStan\Analyser\Scope;
7+
use PHPStan\Rules\Rule;
8+
use PHPStan\Rules\RuleErrorBuilder;
9+
use PHPStan\Type\VerbosityLevel;
10+
use function sprintf;
11+
12+
/**
13+
* @implements Rule<Node\Stmt\While_>
14+
*/
15+
class BooleanInWhileConditionRule implements Rule
16+
{
17+
18+
private BooleanRuleHelper $helper;
19+
20+
public function __construct(BooleanRuleHelper $helper)
21+
{
22+
$this->helper = $helper;
23+
}
24+
25+
public function getNodeType(): string
26+
{
27+
return Node\Stmt\While_::class;
28+
}
29+
30+
public function processNode(Node $node, Scope $scope): array
31+
{
32+
if ($this->helper->passesAsBoolean($scope, $node->cond)) {
33+
return [];
34+
}
35+
36+
$conditionExpressionType = $scope->getType($node->cond);
37+
38+
return [
39+
RuleErrorBuilder::message(sprintf(
40+
'Only booleans are allowed in a while condition, %s given.',
41+
$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
42+
))->identifier('while.condNotBoolean')->build(),
43+
];
44+
}
45+
46+
}

0 commit comments

Comments
 (0)