Skip to content

Commit e82b97e

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.5
* 11.5: Fix CS/WS issues Update tools
2 parents 776fc64 + 361e40d commit e82b97e

13 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎.phive/phars.xml‎

Lines changed: 2 additions & 2 deletions
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.4" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.94" installed="3.94.2" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.94" installed="3.95.1" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.19" location="./tools/php-scoper" copy="true"/>
6-
<phar name="composer" version="^2.8" installed="2.9.5" location="./tools/composer" copy="true"/>
6+
<phar name="composer" version="^2.8" installed="2.10.0-RC1" location="./tools/composer" copy="true"/>
77
</phive>

‎src/Framework/Constraint/Constraint.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,10 @@ protected function valueToTypeStringFragment(mixed $value): string
287287
}
288288

289289
return match ($type) {
290-
'array', 'integer' => 'an ' . $type . ' ',
290+
'array', 'integer' => 'an ' . $type . ' ',
291291
'boolean', 'closed resource', 'float', 'resource', 'string' => 'a ' . $type . ' ',
292-
'null' => 'null ',
293-
default => 'a value of ' . $type . ' ',
292+
'null' => 'null ',
293+
default => 'a value of ' . $type . ' ',
294294
};
295295
}
296296
}

‎tests/_files/DataProviderDependencyVoidTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public static function provider(): iterable
2020
return [
2121
[0, 0],
2222
[1, 'b' => 1],
23-
['a' => 2, 'b' => 2],
24-
['b' => 3, 'a' => 3],
23+
['a' => 2, 'b' => 2],
24+
['b' => 3, 'a' => 3],
2525
];
2626
}
2727

‎tests/unit/Framework/Assert/assertEqualsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public static function notEqualValues(): array
194194
[[], [0 => 1]],
195195
[[0 => 1], []],
196196
[[0 => null], []],
197-
[[0 => 1, 1 => 2], [0 => 1, 1 => 3]],
197+
[[0 => 1, 1 => 2], [0 => 1, 1 => 3]],
198198
[['a', 'b' => [1, 2]], ['a', 'b' => [2, 1]]],
199199
// objects
200200
[new SampleClass(4, 8, 15), new SampleClass(16, 23, 42)],

‎tests/unit/Framework/Assert/assertSameTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public static function sameValues(): array
6868
[-INF, -INF],
6969
// arrays
7070
[[], []],
71-
[[0 => 1], [0 => 1]],
72-
[[0 => null], [0 => null]],
71+
[[0 => 1], [0 => 1]],
72+
[[0 => null], [0 => null]],
7373
[['a', 'b' => [1, 2]], ['a', 'b' => [1, 2]]],
7474
// objects
7575
[$object, $object],

‎tools/.phpstan/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"phpstan/phpstan": "^2.1.46",
3+
"phpstan/phpstan": "^2.1.47",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.10",
66
"tomasvotruba/type-coverage": "^2.1.0",

‎tools/.phpstan/composer.lock‎

Lines changed: 5 additions & 5 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@
223223
},
224224
{
225225
"name": "phpstan/phpstan",
226-
"version": "2.1.46",
227-
"version_normalized": "2.1.46.0",
226+
"version": "2.1.47",
227+
"version_normalized": "2.1.47.0",
228228
"dist": {
229229
"type": "zip",
230-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
231-
"reference": "a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
230+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/79015445d8bd79e62b29140f12e5bfced1dcca65",
231+
"reference": "79015445d8bd79e62b29140f12e5bfced1dcca65",
232232
"shasum": ""
233233
},
234234
"require": {
@@ -237,7 +237,7 @@
237237
"conflict": {
238238
"phpstan/phpstan-shim": "*"
239239
},
240-
"time": "2026-04-01T09:25:14+00:00",
240+
"time": "2026-04-13T15:49:08+00:00",
241241
"bin": [
242242
"phpstan",
243243
"phpstan.phar"

‎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.5.x-dev',
55
'version' => '12.5.9999999.9999999-dev',
6-
'reference' => '202aa013f50748c0da4c080cb5e0174655d2e0b1',
6+
'reference' => '776fc641ae2e493a5be059088d1e3f6b117e1d5b',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.5.x-dev',
1515
'version' => '12.5.9999999.9999999-dev',
16-
'reference' => '202aa013f50748c0da4c080cb5e0174655d2e0b1',
16+
'reference' => '776fc641ae2e493a5be059088d1e3f6b117e1d5b',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -47,9 +47,9 @@
4747
'dev_requirement' => true,
4848
),
4949
'phpstan/phpstan' => array(
50-
'pretty_version' => '2.1.46',
51-
'version' => '2.1.46.0',
52-
'reference' => 'a193923fc2d6325ef4e741cf3af8c3e8f54dbf25',
50+
'pretty_version' => '2.1.47',
51+
'version' => '2.1.47.0',
52+
'reference' => '79015445d8bd79e62b29140f12e5bfced1dcca65',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),

‎tools/.phpstan/vendor/phpstan/phpstan/phpstan.phar‎

89.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)