Skip to content

Commit e9a0544

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 ab51bdb + 1ee26c4 commit e9a0544

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Tests/OptionsResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ public function testDeeplyNestedUnionTypesException(string $type, $invalidValue,
20252025
$this->resolver->resolve(['option' => $invalidValue]);
20262026
}
20272027

2028-
public function provideValidDeeplyNestedUnionTypes(): array
2028+
public static function provideValidDeeplyNestedUnionTypes(): array
20292029
{
20302030
$resource = fopen('php://memory', 'r');
20312031
$object = new \stdClass();
@@ -2101,7 +2101,7 @@ public function provideValidDeeplyNestedUnionTypes(): array
21012101
];
21022102
}
21032103

2104-
public function provideInvalidDeeplyNestedUnionTypes(): array
2104+
public static function provideInvalidDeeplyNestedUnionTypes(): array
21052105
{
21062106
$resource = fopen('php://memory', 'r');
21072107
$object = new \stdClass();

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
>
@@ -18,7 +19,7 @@
1819
</testsuite>
1920
</testsuites>
2021

21-
<coverage>
22+
<source ignoreSuppressionOfDeprecations="true">
2223
<include>
2324
<directory>./</directory>
2425
</include>
@@ -27,5 +28,9 @@
2728
<directory>./Tests</directory>
2829
<directory>./vendor</directory>
2930
</exclude>
30-
</coverage>
31+
</source>
32+
33+
<extensions>
34+
<bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension" />
35+
</extensions>
3136
</phpunit>

0 commit comments

Comments
 (0)