Merge branch '6.2' of github.com:darkwebdesign/symfony-addon-pack

Author: raymondschouten

.github/workflows/build.yaml

@@ -18,6 +18,12 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: '8.1'
+      - name: 'Fix dependencies'
+        uses: 'php-actions/composer@v6'
+        with:
+          command: 'require'
+          args: 'darkwebdesign/symfony-addon-transformers:6.2.x-dev --dev --no-install'
+          php_version: '8.1'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'Rector'
@@ -33,6 +39,12 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: '8.1'
+      - name: 'Fix dependencies'
+        uses: 'php-actions/composer@v6'
+        with:
+          command: 'require'
+          args: 'darkwebdesign/symfony-addon-transformers:6.2.x-dev --dev --no-install'
+          php_version: '8.1'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'PHPStan'
@@ -48,6 +60,12 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: '8.1'
+      - name: 'Fix dependencies'
+        uses: 'php-actions/composer@v6'
+        with:
+          command: 'require'
+          args: 'darkwebdesign/symfony-addon-transformers:6.2.x-dev --dev --no-install'
+          php_version: '8.1'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'PHP CS Fixer'
@@ -70,6 +88,12 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: "${{ matrix.php }}"
+      - name: 'Fix dependencies'
+        uses: 'php-actions/composer@v6'
+        with:
+          command: 'require'
+          args: 'darkwebdesign/symfony-addon-transformers:6.2.x-dev --dev --no-install'
+          php_version: "${{ matrix.php }}"
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'PHPUnit'

README.md

@@ -4,14 +4,14 @@
 [![Total Downloads](https://poser.pugx.org/darkwebdesign/symfony-addon-form-types/downloads?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-form-types)
 [![License](https://poser.pugx.org/darkwebdesign/symfony-addon-form-types/license?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-form-types)
 
-[![Build Status](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml/badge.svg?branch=6.1)](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml)
-[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types/branch/6.1/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types)
+[![Build Status](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml/badge.svg?branch=6.2)](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml)
+[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types/branch/6.2/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types)
 [![PHP Version](https://img.shields.io/badge/php-8.1%2B-777BB3.svg)](https://php.net/)
-[![Symfony Version](https://img.shields.io/badge/symfony-6.1-93C74B.svg)](https://symfony.com/)
+[![Symfony Version](https://img.shields.io/badge/symfony-6.2-93C74B.svg)](https://symfony.com/)
 
 Symfony Add-on Form Types is a collection of extra Symfony form field types that you can use in your Symfony applications.
 
-Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.1).
+Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.2).
 
 ## Features
 

composer.json

@@ -10,20 +10,20 @@
     ],
     "require": {
         "php": "^8.1",
-        "symfony/event-dispatcher": "6.1.*",
-        "symfony/form": "6.1.*",
-        "symfony/options-resolver": "6.1.*"
+        "symfony/event-dispatcher": "6.2.*",
+        "symfony/form": "6.2.*",
+        "symfony/options-resolver": "6.2.*"
     },
     "require-dev": {
-        "darkwebdesign/symfony-addon-transformers": "6.1.*",
+        "darkwebdesign/symfony-addon-transformers": "6.2.*",
         "doctrine/orm": "^2.7",
         "friendsofphp/php-cs-fixer": "^3.58",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.11",
         "phpstan/phpstan-doctrine": "^1.4",
         "phpstan/phpstan-phpunit": "^1.4",
         "phpstan/phpstan-symfony": "^1.4",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "rector/rector": "^1.1"
     },
     "suggest": {

phpunit.xml.dist

@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
+         cacheDirectory=".phpunit.cache"
          colors="true"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
          failOnRisky="true"
-         failOnWarning="true"
-         verbose="true">
+         failOnWarning="true">
 
     <testsuites>
         <testsuite name="DarkWeb Design Symfony Add-on Form Types Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <source restrictDeprecations="true"
+            restrictNotices="true"
+            restrictWarnings="true">
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
 
 </phpunit>

rector.php

@@ -13,7 +13,7 @@
     ])
     ->withSets([
         LevelSetList::UP_TO_PHP_81,
-        SymfonySetList::SYMFONY_61,
+        SymfonySetList::SYMFONY_62,
     ])
     ->withImportNames(
         importShortClasses: false,

tests/BirthdayTypeTest.php

@@ -23,13 +23,13 @@
 namespace DarkWebDesign\SymfonyAddonFormTypes\Tests;
 
 use DarkWebDesign\SymfonyAddonFormTypes\BirthdayType;
+use PHPUnit\Framework\Attributes\CoversClass;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonFormTypes\BirthdayType
- *
  * @internal
  */
+#[CoversClass(BirthdayType::class)]
 class BirthdayTypeTest extends TypeTestCase
 {
     public function test(): void

tests/BooleanToYesNoSubscriberTest.php

@@ -24,21 +24,21 @@
 
 use DarkWebDesign\SymfonyAddonFormTypes\BooleanToYesNoSubscriber;
 use DarkWebDesign\SymfonyAddonFormTypes\BooleanType;
+use DarkWebDesign\SymfonyAddonTransformers\BooleanToValueTransformer;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\UsesClass;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonFormTypes\BooleanToYesNoSubscriber
- *
- * @uses \DarkWebDesign\SymfonyAddonFormTypes\BooleanType
- * @uses \DarkWebDesign\SymfonyAddonTransformers\BooleanToValueTransformer
- *
  * @internal
  */
+#[CoversClass(BooleanToYesNoSubscriber::class)]
+#[UsesClass(BooleanType::class)]
+#[UsesClass(BooleanToValueTransformer::class)]
 class BooleanToYesNoSubscriberTest extends TypeTestCase
 {
-    /**
-     * @dataProvider provider
-     */
+    #[DataProvider('provider')]
     public function test(?bool $value): void
     {
         $form = $this->factory->createBuilder()
@@ -83,7 +83,7 @@ public function testDataNotArray(): void
     /**
      * @return array<string, array{bool|null}>
      */
-    public function provider(): array
+    public static function provider(): array
     {
         return [
             'true' => [true],

tests/BooleanTypeTest.php

@@ -23,20 +23,20 @@
 namespace DarkWebDesign\SymfonyAddonFormTypes\Tests;
 
 use DarkWebDesign\SymfonyAddonFormTypes\BooleanType;
+use DarkWebDesign\SymfonyAddonTransformers\BooleanToValueTransformer;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\UsesClass;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonFormTypes\BooleanType
- *
- * @uses \DarkWebDesign\SymfonyAddonTransformers\BooleanToValueTransformer
- *
  * @internal
  */
+#[CoversClass(BooleanType::class)]
+#[UsesClass(BooleanToValueTransformer::class)]
 class BooleanTypeTest extends TypeTestCase
 {
-    /**
-     * @dataProvider providerValueTrueFalse
-     */
+    #[DataProvider('providerValueTrueFalse')]
     public function test(mixed $valueTrue, mixed $valueFalse): void
     {
         $options = [
@@ -57,9 +57,7 @@ public function test(mixed $valueTrue, mixed $valueFalse): void
         $this->assertFalse($form->getData());
     }
 
-    /**
-     * @dataProvider providerValueTrueFalse
-     */
+    #[DataProvider('providerValueTrueFalse')]
     public function testInvalidValue(mixed $valueTrue, mixed $valueFalse): void
     {
         $options = [
@@ -74,9 +72,7 @@ public function testInvalidValue(mixed $valueTrue, mixed $valueFalse): void
         $this->assertNull($form->getData());
     }
 
-    /**
-     * @dataProvider providerWidget
-     */
+    #[DataProvider('providerWidget')]
     public function testWidget(string $widget, bool $expanded): void
     {
         $options = [
@@ -108,7 +104,7 @@ public function testHumanize(): void
     /**
      * @return array<string, array{mixed, mixed}>
      */
-    public function providerValueTrueFalse(): array
+    public static function providerValueTrueFalse(): array
     {
         return [
             'true/false' => ['true', 'false'],
@@ -123,7 +119,7 @@ public function providerValueTrueFalse(): array
     /**
      * @return array<string, array{string, bool}>
      */
-    public function providerWidget(): array
+    public static function providerWidget(): array
     {
         return [
             'choice' => ['choice', false],

tests/EntityTypeTest.php

@@ -24,24 +24,25 @@
 
 use DarkWebDesign\SymfonyAddonFormTypes\EntityType;
 use DarkWebDesign\SymfonyAddonFormTypes\Tests\Models\City;
+use DarkWebDesign\SymfonyAddonTransformers\EntityToIdentifierTransformer;
 use Doctrine\ORM\EntityManager;
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Persistence\ObjectRepository;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\FormExtensionInterface;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonFormTypes\EntityType
- *
- * @uses \DarkWebDesign\SymfonyAddonTransformers\EntityToIdentifierTransformer
- *
  * @internal
  */
+#[CoversClass(EntityType::class)]
+#[UsesClass(EntityToIdentifierTransformer::class)]
 class EntityTypeTest extends TypeTestCase
 {
     private City $entity;

tests/JsonSchemaSubscriberTest.php

@@ -23,14 +23,14 @@
 namespace DarkWebDesign\SymfonyAddonFormTypes\Tests;
 
 use DarkWebDesign\SymfonyAddonFormTypes\JsonSchemaSubscriber;
+use PHPUnit\Framework\Attributes\CoversClass;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * @covers \DarkWebDesign\SymfonyAddonFormTypes\JsonSchemaSubscriber
- *
  * @internal
  */
+#[CoversClass(JsonSchemaSubscriber::class)]
 class JsonSchemaSubscriberTest extends TypeTestCase
 {
     public function test(): void