Skip to content

Commit c86980e

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '12.3'
* 12.3: Update tools
2 parents 0acd833 + dd82178 commit c86980e

File tree

11 files changed

+40
-40
lines changed

11 files changed

+40
-40
lines changed

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.80" installed="3.88.0" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.80" installed="3.88.2" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.17" location="./tools/php-scoper" copy="true"/>
66
<phar name="composer" version="^2.8" installed="2.8.12" location="./tools/composer" copy="true"/>
77
</phive>

‎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.29",
44
"phpstan/extension-installer": "^1.4.3",
5-
"phpstan/phpstan-strict-rules": "^2.0.6",
5+
"phpstan/phpstan-strict-rules": "^2.0.7",
66
"tomasvotruba/type-coverage": "^2.0.2",
77
"ergebnis/phpstan-rules": "^2.12.0"
88
},

‎tools/.phpstan/composer.lock‎

Lines changed: 8 additions & 8 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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,30 +282,30 @@
282282
},
283283
{
284284
"name": "phpstan/phpstan-strict-rules",
285-
"version": "2.0.6",
286-
"version_normalized": "2.0.6.0",
285+
"version": "2.0.7",
286+
"version_normalized": "2.0.7.0",
287287
"source": {
288288
"type": "git",
289289
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
290-
"reference": "f9f77efa9de31992a832ff77ea52eb42d675b094"
290+
"reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538"
291291
},
292292
"dist": {
293293
"type": "zip",
294-
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f9f77efa9de31992a832ff77ea52eb42d675b094",
295-
"reference": "f9f77efa9de31992a832ff77ea52eb42d675b094",
294+
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/d6211c46213d4181054b3d77b10a5c5cb0d59538",
295+
"reference": "d6211c46213d4181054b3d77b10a5c5cb0d59538",
296296
"shasum": ""
297297
},
298298
"require": {
299299
"php": "^7.4 || ^8.0",
300-
"phpstan/phpstan": "^2.0.4"
300+
"phpstan/phpstan": "^2.1.29"
301301
},
302302
"require-dev": {
303303
"php-parallel-lint/php-parallel-lint": "^1.2",
304304
"phpstan/phpstan-deprecation-rules": "^2.0",
305305
"phpstan/phpstan-phpunit": "^2.0",
306306
"phpunit/phpunit": "^9.6"
307307
},
308-
"time": "2025-07-21T12:19:29+00:00",
308+
"time": "2025-09-26T11:19:08+00:00",
309309
"type": "phpstan-extension",
310310
"extra": {
311311
"phpstan": {
@@ -327,7 +327,7 @@
327327
"description": "Extra strict and opinionated rules for PHPStan",
328328
"support": {
329329
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
330-
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.6"
330+
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.7"
331331
},
332332
"install-path": "../phpstan/phpstan-strict-rules"
333333
},

‎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' => '12.3.x-dev',
55
'version' => '12.3.9999999.9999999-dev',
6-
'reference' => '4d49069cb5c3519111fcb5efb9d9a8eea678e961',
6+
'reference' => '0ceb6027b55de23bd742d6081b46d3b7036bc2f0',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.3.x-dev',
1515
'version' => '12.3.9999999.9999999-dev',
16-
'reference' => '4d49069cb5c3519111fcb5efb9d9a8eea678e961',
16+
'reference' => '0ceb6027b55de23bd742d6081b46d3b7036bc2f0',
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.6',
60-
'version' => '2.0.6.0',
61-
'reference' => 'f9f77efa9de31992a832ff77ea52eb42d675b094',
59+
'pretty_version' => '2.0.7',
60+
'version' => '2.0.7.0',
61+
'reference' => 'd6211c46213d4181054b3d77b10a5c5cb0d59538',
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class GeneratedConfig
1212
public const EXTENSIONS = array (
1313
'ergebnis/phpstan-rules' =>
1414
array (
15-
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
1616
'relative_install_path' => '../../../ergebnis/phpstan-rules',
1717
'extra' =>
1818
array (
@@ -26,7 +26,7 @@ final class GeneratedConfig
2626
),
2727
'phpstan/phpstan-strict-rules' =>
2828
array (
29-
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
3030
'relative_install_path' => '../../phpstan-strict-rules',
3131
'extra' =>
3232
array (
@@ -35,12 +35,12 @@ final class GeneratedConfig
3535
0 => 'rules.neon',
3636
),
3737
),
38-
'version' => '2.0.6',
39-
'phpstanVersionConstraint' => '>=2.0.4.0-dev, <3.0.0.0-dev',
38+
'version' => '2.0.7',
39+
'phpstanVersionConstraint' => '>=2.1.29.0-dev, <3.0.0.0-dev',
4040
),
4141
'tomasvotruba/type-coverage' =>
4242
array (
43-
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
4444
'relative_install_path' => '../../../tomasvotruba/type-coverage',
4545
'extra' =>
4646
array (
@@ -58,7 +58,7 @@ final class GeneratedConfig
5858
);
5959

6060
/** @var string|null */
61-
public const PHPSTAN_VERSION_CONSTRAINT = '>=2.1.8.0-dev, <3.0.0.0-dev';
61+
public const PHPSTAN_VERSION_CONSTRAINT = '>=2.1.29.0-dev, <3.0.0.0-dev';
6262

6363
private function __construct()
6464
{

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
| `numericOperandsInArithmeticOperators` | Require numeric operand in `+$var`, `-$var`, `$var++`, `$var--`, `++$var` and `--$var`. |
1414
| `numericOperandsInArithmeticOperators` | Require numeric operand in `$var++`, `$var--`, `++$var`and `--$var`. |
1515
| `strictFunctionCalls` | These functions contain a `$strict` parameter for better type safety, it must be set to `true`:<br>* `in_array` (3rd parameter)<br>* `array_search` (3rd parameter)<br>* `array_keys` (3rd parameter; only if the 2nd parameter `$search_value` is provided)<br>* `base64_decode` (2nd parameter). |
16-
| `overwriteVariablesWithLoop` | Variables assigned in `while` loop condition and `for` loop initial assignment cannot be used after the loop. |
17-
| `overwriteVariablesWithLoop` | Variables set in foreach that's always looped thanks to non-empty arrays cannot be used after the loop. |
16+
| `overwriteVariablesWithLoop` | * Disallow overwriting variables with `foreach` key and value variables.<br>* Disallow overwriting variables with `for` loop initial assignment. |
1817
| `switchConditionsMatchingType` | Types in `switch` condition and `case` value must match. PHP compares them loosely by default and that can lead to unexpected results. |
1918
| `dynamicCallOnStaticMethod` | Check that statically declared methods are called statically. |
2019
| `disallowedEmpty` | Disallow `empty()` - it's a very loose comparison (see [manual](https://php.net/empty)), it's recommended to use more strict one. |
2120
| `disallowedShortTernary` | Disallow short ternary operator (`?:`) - implies weak comparison, it's recommended to use null coalesce operator (`??`) or ternary operator with strict condition. |
2221
| `noVariableVariables` | Disallow variable variables (`$$foo`, `$this->$method()` etc.). |
23-
| `overwriteVariablesWithLoop` | Disallow overwriting variables with foreach key and value variables. |
2422
| `checkAlwaysTrueInstanceof`, `checkAlwaysTrueCheckTypeFunctionCall`, `checkAlwaysTrueStrictComparison` | Always true `instanceof`, type-checking `is_*` functions and strict comparisons `===`/`!==`. These checks can be turned off by setting `checkAlwaysTrueInstanceof`, `checkAlwaysTrueCheckTypeFunctionCall` and `checkAlwaysTrueStrictComparison` to false. |
2523
| | Correct case for referenced and called function names. |
2624
| `matchingInheritedMethodNames` | Correct case for inherited and implemented method names. |

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
],
88
"require": {
99
"php": "^7.4 || ^8.0",
10-
"phpstan/phpstan": "^2.0.4"
10+
"phpstan/phpstan": "^2.1.29"
1111
},
1212
"require-dev": {
1313
"php-parallel-lint/php-parallel-lint": "^1.2",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ parameters:
1111
reportStaticMethodSignatures: true
1212
reportMaybesInPropertyPhpDocTypes: true
1313
reportWrongPhpDocTypeInVarTag: true
14+
checkStrictPrintfPlaceholderTypes: true
1415
strictRules:
1516
allRules: true
1617
disallowedLooseComparison: %strictRules.allRules%

‎tools/.phpstan/vendor/phpstan/phpstan-strict-rules/src/Rules/Classes/RequireParentConstructCallRule.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,26 +104,27 @@ private function callsParentConstruct(Node $parserNode): bool
104104
*/
105105
private function getParentConstructorClass($classReflection)
106106
{
107-
while ($classReflection->getParentClass() !== false) {
108-
$constructor = $classReflection->getParentClass()->hasMethod('__construct') ? $classReflection->getParentClass()->getMethod('__construct') : null;
109-
$constructorWithClassName = $classReflection->getParentClass()->hasMethod($classReflection->getParentClass()->getName()) ? $classReflection->getParentClass()->getMethod($classReflection->getParentClass()->getName()) : null;
107+
$parentClass = $classReflection->getParentClass();
108+
while ($parentClass !== false) {
109+
$constructor = $parentClass->hasMethod('__construct') ? $parentClass->getMethod('__construct') : null;
110+
$constructorWithClassName = $parentClass->hasMethod($parentClass->getName()) ? $parentClass->getMethod($parentClass->getName()) : null;
110111
if (
111112
(
112113
$constructor !== null
113-
&& $constructor->getDeclaringClass()->getName() === $classReflection->getParentClass()->getName()
114+
&& $constructor->getDeclaringClass()->getName() === $parentClass->getName()
114115
&& !$constructor->isAbstract()
115116
&& !$constructor->isPrivate()
116117
&& !$constructor->isDeprecated()
117118
) || (
118119
$constructorWithClassName !== null
119-
&& $constructorWithClassName->getDeclaringClass()->getName() === $classReflection->getParentClass()->getName()
120+
&& $constructorWithClassName->getDeclaringClass()->getName() === $parentClass->getName()
120121
&& !$constructorWithClassName->isAbstract()
121122
)
122123
) {
123-
return $classReflection->getParentClass();
124+
return $parentClass;
124125
}
125126

126-
$classReflection = $classReflection->getParentClass();
127+
$parentClass = $parentClass->getParentClass();
127128
}
128129

129130
return false;

0 commit comments

Comments
 (0)