Skip to content

Commit 6d916ee

Browse files
Merge branch '7.4' into 8.0
* 7.4: run tests using PHPUnit 11.5 make data provider static [Lock] Fix using fractional TTLs on all platforms [Lock] Fixes an issue with PostgreSQL when using fractional TTLs [Console][Table] Fix unnecessary wrapping [DependencyInjection] Deprecate registering a service without a class when its id is a non-existing FQCN disable detecting modified indexes with DBAL 4.3 [cache] RedisTrait::doFetch should use pipeline instead of mget for Relay\Cluster relax assertions for forward compatibility with Symfony 7.4 [Console][Table] Fix invalid UTF-8 due to text wrapping
2 parents 8c93db7 + c595a69 commit 6d916ee

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Tests/Caster/DoctrineCasterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testCastPersistentCollection()
4040
%A
4141
-backRefFieldName: null
4242
-isDirty: false
43-
-em: $entityManagerClass { …3}
43+
-em: $entityManagerClass { …%d}
4444
-typeClass: Doctrine\ORM\Mapping\ClassMetadata { …}
4545
%A
4646
EODUMP;
@@ -49,7 +49,7 @@ public function testCastPersistentCollection()
4949
$expected = <<<EODUMP
5050
Doctrine\ORM\PersistentCollection {
5151
%A
52-
-em: $entityManagerClass { …3}
52+
-em: $entityManagerClass { …%d}
5353
-backRefFieldName: null
5454
-typeClass: Doctrine\ORM\Mapping\ClassMetadata { …}
5555
%A

Tests/Dumper/CliDumperTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\VarDumper\Tests\Dumper;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1615
use Symfony\Component\VarDumper\Caster\ClassStub;
1716
use Symfony\Component\VarDumper\Caster\CutStub;
1817
use Symfony\Component\VarDumper\Cloner\Data;

phpunit.xml.dist

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnDeprecation="true"
89
failOnRisky="true"
910
failOnWarning="true"
1011
>
@@ -21,7 +22,7 @@
2122
</testsuite>
2223
</testsuites>
2324

24-
<coverage>
25+
<source ignoreSuppressionOfDeprecations="true">
2526
<include>
2627
<directory>./</directory>
2728
</include>
@@ -30,5 +31,9 @@
3031
<directory>./Tests</directory>
3132
<directory>./vendor</directory>
3233
</exclude>
33-
</coverage>
34+
</source>
35+
36+
<extensions>
37+
<bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension" />
38+
</extensions>
3439
</phpunit>

0 commit comments

Comments
 (0)