Skip to content

Commit a96c61d

Browse files
Merge branch '12.5'
* 12.5: Update ChangeLog Update dependencies Update tools Fix cs Allow Throwable in expectExceptionObject Skipped tests alone no longer lead to a yellow background for the test result summary
2 parents 33d931d + 59a9424 commit a96c61d

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.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.3" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.80" installed="3.88.2" location="./tools/php-cs-fixer" copy="true"/>
5-
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.17" location="./tools/php-scoper" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.80" installed="3.89.0" location="./tools/php-cs-fixer" copy="true"/>
5+
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.18" location="./tools/php-scoper" copy="true"/>
66
<phar name="composer" version="^2.8" installed="2.8.12" location="./tools/composer" copy="true"/>
77
</phive>

composer.lock

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

src/Framework/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ final protected function expectExceptionMessageMatches(string $regularExpression
10821082
* Information for expected exception class, expected exception message, and
10831083
* expected exception code are retrieved from a given Exception object.
10841084
*/
1085-
final protected function expectExceptionObject(\Exception $exception): void
1085+
final protected function expectExceptionObject(Throwable $exception): void
10861086
{
10871087
$this->expectException($exception::class);
10881088
$this->expectExceptionMessage($exception->getMessage());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php return array(
22
'root' => array(
33
'name' => '__root__',
4-
'pretty_version' => '12.4.x-dev',
5-
'version' => '12.4.9999999.9999999-dev',
6-
'reference' => '347dd0d17010ce5232ebe355c89aced2e992b0d1',
4+
'pretty_version' => '12.5.x-dev',
5+
'version' => '12.5.9999999.9999999-dev',
6+
'reference' => '5e5ff7c9977b5d1d9c7c31147187f1b5ecb9d661',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
1010
'dev' => true,
1111
),
1212
'versions' => array(
1313
'__root__' => array(
14-
'pretty_version' => '12.4.x-dev',
15-
'version' => '12.4.9999999.9999999-dev',
16-
'reference' => '347dd0d17010ce5232ebe355c89aced2e992b0d1',
14+
'pretty_version' => '12.5.x-dev',
15+
'version' => '12.5.9999999.9999999-dev',
16+
'reference' => '5e5ff7c9977b5d1d9c7c31147187f1b5ecb9d661',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),

tools/php-cs-fixer

6.01 KB
Binary file not shown.

tools/php-scoper

890 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)