Skip to content

Commit d2328c9

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 ff56a25 + 096c874 commit d2328c9

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Extension/Core/Type/UrlType.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\Form\FormBuilderInterface;
1717
use Symfony\Component\Form\FormInterface;
1818
use Symfony\Component\Form\FormView;
19-
use Symfony\Component\OptionsResolver\Options;
2019
use Symfony\Component\OptionsResolver\OptionsResolver;
2120

2221
class UrlType extends AbstractType

Tests/Extension/Core/EventListener/ResizeFormListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Component\EventDispatcher\EventDispatcher;
1717
use Symfony\Component\Form\AbstractType;
18+
use Symfony\Component\Form\Event\PostSetDataEvent;
1819
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1920
use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
2021
use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener;
2122
use Symfony\Component\Form\Extension\Core\Type\TextType;
2223
use Symfony\Component\Form\FormBuilder;
2324
use Symfony\Component\Form\FormBuilderInterface;
24-
use Symfony\Component\Form\Event\PostSetDataEvent;
2525
use Symfony\Component\Form\FormEvent;
2626
use Symfony\Component\Form\FormFactoryBuilder;
2727
use Symfony\Component\Form\FormFactoryInterface;

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)