Update build tools

.gitignore

@@ -1,9 +1,9 @@
 .php-cs-fixer.cache
 .php-cs-fixer.php
-.phpunit.result.cache
 coverage
 composer.lock
 phpunit.xml
+/.phpunit.cache/
 /build/
 /vendor/
 !/vendor-bin/tools/composer.lock

composer.json

@@ -44,7 +44,7 @@
         "symfony/options-resolver": "^5.4 || ^6.2",
         "symfony/property-access": "^5.4 || ^6.2",
         "symfony/translation": "^5.4 || ^6.2",
-        "symfony/validator": "^5.4 || ^6.2"
+        "symfony/validator": "^5.4.22 || ^6.2.8"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.5",

phpunit.xml.dist

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
   <php>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
   </php>
@@ -13,7 +9,9 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-  </listeners>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

src/Bridge/Symfony/Resources/config/form.php

@@ -53,6 +53,5 @@
             ->tag('form.type_extension', [
                 'extended-type' => FileType::class,
             ])
-
     ;
 };

src/Bridge/Symfony/Resources/config/form_doctrine.php

@@ -19,6 +19,5 @@
             ->args([
                 service('doctrine'),
             ])
-
     ;
 };

src/Bridge/Symfony/Resources/config/validator.php

@@ -20,6 +20,5 @@
 
         ->set(BatchTimeAfterValidator::class)
             ->tag('validator.constraint_validator', [])
-
     ;
 };

tests/Type/BaseTypeTest.php → tests/Type/BaseTypeTestCase.php

@@ -14,12 +14,13 @@
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
-abstract class BaseTypeTest extends TypeTestCase
+abstract class BaseTypeTestCase extends TypeTestCase
 {
     public function testPassDisabledAsOption(): void
     {
@@ -209,5 +210,8 @@ protected function createBuilder(array $parentOptions = [], array $childOptions
         ;
     }
 
+    /**
+     * @return class-string<FormTypeInterface<mixed>>
+     */
     abstract protected function getTestedType(): string;
 }

tests/Type/BatchTimeTypeTest.php

@@ -14,7 +14,7 @@
 use Nucleos\Form\Type\BatchTimeType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 
-final class BatchTimeTypeTest extends BaseTypeTest
+final class BatchTimeTypeTest extends BaseTypeTestCase
 {
     public function testGetParent(): void
     {

tests/Type/DACHCountryTypeTest.php

@@ -15,7 +15,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-final class DACHCountryTypeTest extends BaseTypeTest
+final class DACHCountryTypeTest extends BaseTypeTestCase
 {
     public function testCountriesAreSelectable(): void
     {

tests/Type/DateOutputTypeTest.php

@@ -13,7 +13,7 @@
 
 use Nucleos\Form\Type\DateOutputType;
 
-final class DateOutputTypeTest extends BaseTypeTest
+final class DateOutputTypeTest extends BaseTypeTestCase
 {
     public function testSubmitNull($expected = null, $norm = null, $view = ''): void
     {

tests/Type/DoctrineDiscriminatorTypeTest.php

@@ -24,7 +24,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormTypeInterface;
 
-final class DoctrineDiscriminatorTypeTest extends BaseTypeTest
+final class DoctrineDiscriminatorTypeTest extends BaseTypeTestCase
 {
     /**
      * @var ManagerRegistry&MockObject

tests/Type/GenderTypeTest.php

@@ -15,7 +15,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-final class GenderTypeTest extends BaseTypeTest
+final class GenderTypeTest extends BaseTypeTestCase
 {
     public function testGendersAreSelectable(): void
     {

tests/Type/JsonTypeTest.php

@@ -13,7 +13,7 @@
 
 use Nucleos\Form\Type\JsonType;
 
-final class JsonTypeTest extends BaseTypeTest
+final class JsonTypeTest extends BaseTypeTestCase
 {
     public function testSubmitNull($expected = [], $norm = null, $view = ''): void
     {

tests/Type/NumberOutputTypeTest.php

@@ -13,7 +13,7 @@
 
 use Nucleos\Form\Type\NumberOutputType;
 
-final class NumberOutputTypeTest extends BaseTypeTest
+final class NumberOutputTypeTest extends BaseTypeTestCase
 {
     public function testSubmitNull($expected = null, $norm = null, $view = ''): void
     {

tests/Type/OutputTypeTest.php

@@ -13,7 +13,7 @@
 
 use Nucleos\Form\Type\OutputType;
 
-final class OutputTypeTest extends BaseTypeTest
+final class OutputTypeTest extends BaseTypeTestCase
 {
     public function testSubmitNull($expected = null, $norm = null, $view = ''): void
     {

tests/Type/TimePickerTypeTest.php

@@ -13,7 +13,7 @@
 
 use Nucleos\Form\Type\TimePickerType;
 
-final class TimePickerTypeTest extends BaseTypeTest
+final class TimePickerTypeTest extends BaseTypeTestCase
 {
     public function testSubmitNull($expected = null, $norm = null, $view = ''): void
     {

tests/Validator/Constraints/BatchTimeAfterValidatorTest.php

@@ -59,7 +59,7 @@ public function testValidateInvalidFirstField(): void
         $end->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getEnd'])
+            ->addMethods(['getEnd'])
             ->getMock()
         ;
         $object->method('getEnd')->willReturn($end);
@@ -82,7 +82,7 @@ public function testValidateInvalidSecondField(): void
         $begin->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin'])
+            ->addMethods(['getBegin'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -105,7 +105,7 @@ public function testValidateInvalidFirstValue(): void
         $begin->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -129,7 +129,7 @@ public function testValidateInvalidSecondValue(): void
         $end->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn('test');
@@ -151,7 +151,7 @@ public function testValidateEmptyFirstValue(): void
         $end->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn(null);
@@ -182,7 +182,7 @@ public function testValidateEmptySecondValue(): void
         $begin->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -216,7 +216,7 @@ public function testValidateDatesInvalid(): void
         $end->setTime(new DateTime('2015-01-01 10:00'));
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -250,7 +250,7 @@ public function testValidateDatesValid(): void
         $end->setTime(new DateTime('2015-02-01 10:00'));
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -277,7 +277,7 @@ public function testValidateEqualDate(): void
         $end->setTime(new DateTime('2015-01-01 10:00'));
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -298,7 +298,7 @@ public function testValidateEqualDate(): void
     public function testValidateNotRequired(): void
     {
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn(null);
@@ -323,7 +323,7 @@ public function testValidateNotRequiredWithEmptyFirst(): void
         $end->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn(null);
@@ -355,7 +355,7 @@ public function testValidateNotRequiredWithEmptySecond(): void
         $begin->setTime(new DateTime());
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -389,7 +389,7 @@ public function testValidateEmptyFirstValueDate(): void
         $end->setTime(new DateTime('2015-02-01 10:00'));
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);
@@ -422,7 +422,7 @@ public function testValidateEmptySecondValueDate(): void
         $end = new BatchTime();
 
         $object = $this->getMockBuilder('stdClass')
-            ->setMethods(['getBegin', 'getEnd'])
+            ->addMethods(['getBegin', 'getEnd'])
             ->getMock()
         ;
         $object->method('getBegin')->willReturn($begin);