Skip to content

Commit 86d305f

Browse files
Merge branch '7.4' into 8.0
* 7.4: run PhpUnitBridge tests with PHPUnit 11.5 Add global lower bounds to deps on the CI Replace backtick operator, deprecated in PHP 8.5, with shell_exec() fix tests fall back to legacy options handling if configured named arguments do not match [DependencyInjection] Add test case to ensure XML parse exception message includes filename and position [Serializer] Fix normalizing objects with accessors having the same name as a property [DependencyInjection] Fix optimizing ClassExistenceResource [SecurityBundle] Prevent accessing the tracked token storage when collecting data
2 parents 83ad03c + 60ddafb commit 86d305f

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

Tests/DeprecationErrorHandler/DeprecationGroupTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111

1212
namespace Symfony\Bridge\PhpUnit\Tests\DeprecationErrorHandler;
1313

14+
use PHPUnit\Framework\Attributes\RequiresPhpunit;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\DeprecationGroup;
1617

18+
#[RequiresPhpunit('<10')]
1719
final class DeprecationGroupTest extends TestCase
1820
{
1921
public function testItGroupsByMessage()

Tests/DeprecationErrorHandler/DeprecationNoticeTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111

1212
namespace Symfony\Bridge\PhpUnit\Tests\DeprecationErrorHandler;
1313

14+
use PHPUnit\Framework\Attributes\RequiresPhpunit;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\DeprecationNotice;
1617

18+
#[RequiresPhpunit('<10')]
1719
final class DeprecationNoticeTest extends TestCase
1820
{
1921
public function testItGroupsByCaller()

Tests/DeprecationErrorHandler/DeprecationTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
namespace Symfony\Bridge\PhpUnit\Tests\DeprecationErrorHandler;
1313

1414
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\RequiresPhpunit;
1516
use PHPUnit\Framework\TestCase;
1617
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
1718
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;
1819
use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV7;
1920

21+
#[RequiresPhpunit('<10')]
2022
class DeprecationTest extends TestCase
2123
{
2224
private static $vendorDir;

bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
}
191191

192192
$info = [];
193-
foreach (explode("\n", `$COMPOSER info --no-ansi -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
193+
foreach (explode("\n", shell_exec("$COMPOSER info --no-ansi -a -n phpunit/phpunit \"$PHPUNIT_VERSION.*\"")) as $line) {
194194
$line = rtrim($line);
195195

196196
if (!$info && preg_match('/^versions +: /', $line)) {

0 commit comments

Comments
 (0)