Skip to content

Commit ad26215

Browse files
Merge branch '8.5' into 9.6
2 parents aa6e858 + ea476db commit ad26215

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
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.2" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.64" installed="3.64.0" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.65" installed="3.65.0" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
66
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.15" location="./tools/php-scoper" copy="true"/>
77
<phar name="composer" version="^2.8" installed="2.8.3" location="./tools/composer" copy="true"/>

src/Framework/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ public function expectOutputString(string $expectedString): void
599599
}
600600

601601
/**
602-
* @psalm-param class-string<\Throwable> $exception
602+
* @psalm-param class-string<Throwable> $exception
603603
*/
604604
public function expectException(string $exception): void
605605
{

tools/php-cs-fixer

12.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)