Skip to content

Commit b43d6ff

Browse files
Merge branch '5.4' into 6.0
* 5.4: Fix CS in README files Fix markdown [HttpKernel] Fixes tests for PHP7.4+ fix test [HttpKernel] Throw when HttpKernel is created and the env is empty [FrameworkBundle] Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead [Filesystem] fix readlink for Windows
2 parents fb21447 + 3337a5b commit b43d6ff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ConstraintTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait ConstraintTrait
2020
{
2121
use Legacy\ConstraintTraitForV7;
2222
}
23-
} elseif (\PHP_VERSION < 70100 || !$r->getMethod('evaluate')->hasReturnType()) {
23+
} elseif (!$r->getMethod('evaluate')->hasReturnType()) {
2424
trait ConstraintTrait
2525
{
2626
use Legacy\ConstraintTraitForV8;

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ especially user deprecation notices management.
77
Resources
88
---------
99

10-
* [Documentation](https://symfony.com/doc/current/components/phpunit_bridge.html)
11-
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
12-
* [Report issues](https://github.com/symfony/symfony/issues) and
13-
[send Pull Requests](https://github.com/symfony/symfony/pulls)
14-
in the [main Symfony repository](https://github.com/symfony/symfony)
10+
* [Documentation](https://symfony.com/doc/current/components/phpunit_bridge.html)
11+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
12+
* [Report issues](https://github.com/symfony/symfony/issues) and
13+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
14+
in the [main Symfony repository](https://github.com/symfony/symfony)

0 commit comments

Comments
 (0)