Skip to content

Commit 924f44f

Browse files
Merge branch '5.4' into 6.0
* 5.4: Fix tests Bump Symfony version to 5.4.7 Update VERSION for 5.4.6 Update CHANGELOG for 5.4.6 Bump Symfony version to 4.4.40 Update VERSION for 4.4.39 Update CONTRIBUTORS for 4.4.39 Update CHANGELOG for 4.4.39
2 parents 81f5e8e + 31977d3 commit 924f44f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/expectdeprecationfail.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $test = realpath(__DIR__.'/FailTests/ExpectDeprecationTraitTestFail.php');
66
passthru('php '.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --colors=never '.$test);
77
?>
88
--EXPECTF--
9-
PHPUnit %s by Sebastian Bergmann and contributors.
9+
PHPUnit %s
1010

1111
%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\ExpectDeprecationTraitTestFail
1212
FF 2 / 2 (100%)

Tests/expectrisky.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $test = realpath(__DIR__.'/FailTests/NoAssertionsTestRisky.php');
88
passthru('php '.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --fail-on-risky --colors=never '.$test);
99
?>
1010
--EXPECTF--
11-
PHPUnit %s by Sebastian Bergmann and contributors.
11+
PHPUnit %s
1212

1313
%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky
1414
R. 2 / 2 (100%)

0 commit comments

Comments
 (0)