Merge branch '6.0' of github.com:darkwebdesign/symfony-addon-pack into issue-233-6.0

Author: raymondschouten

.github/workflows/build.yaml

@@ -0,0 +1,53 @@
+name: 'Build'
+
+on:
+  push:
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.run_id }}"
+  cancel-in-progress: true
+
+jobs:
+  rector:
+    name: 'Rector'
+    runs-on: 'ubuntu-24.04'
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v4'
+      - name: 'Setup PHP'
+        uses: 'shivammathur/setup-php@v2'
+        with:
+          php-version: '8.3'
+      - name: 'Composer Install'
+        uses: 'ramsey/composer-install@v3'
+      - name: 'Rector'
+        run: 'vendor/bin/rector process --dry-run --no-progress-bar'
+
+  phpunit:
+    name: 'PHPUnit'
+    runs-on: 'ubuntu-24.04'
+    strategy:
+      matrix:
+        include:
+          - php: '8.0'
+          - php: '8.1'
+          - php: '8.2'
+          - php: '8.3'
+      fail-fast: false
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v4'
+      - name: 'Setup PHP'
+        uses: 'shivammathur/setup-php@v2'
+        with:
+          php-version: "${{ matrix.php }}"
+      - name: 'Composer Install'
+        uses: 'ramsey/composer-install@v3'
+      - name: 'PHPUnit'
+        run: 'XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-clover phpunit-coverage.xml'
+      - name: 'Code Climate'
+        uses: 'paambaati/codeclimate-action@v6'
+        with:
+          coverageLocations: 'phpunit-coverage.xml:clover'
+        env:
+          CC_TEST_REPORTER_ID: "${{ secrets.CODECLIMATE_REPORTER_ID }}"

.gitignore

@@ -1,4 +1,4 @@
-/.phpunit.result.cache
-/build/
+/.idea/
+/.phpunit.cache/
 /composer.lock
 /vendor/

.travis.yml

@@ -9,14 +9,16 @@
         {"name": "Raymond Schouten"}
     ],
     "require": {
-        "php": ">=8.0.2",
-        "symfony/form": "6.0.*"
+        "php": "^8.0",
+        "symfony/event-dispatcher": "6.0.*",
+        "symfony/form": "6.0.*",
+        "symfony/options-resolver": "6.0.*"
     },
     "require-dev": {
         "darkwebdesign/symfony-addon-transformers": "6.0.*",
         "doctrine/orm": "^2.7",
-        "phpunit/phpunit": "^8.5",
-        "rector/rector": "^0.18.6"
+        "phpunit/phpunit": "^9.5",
+        "rector/rector": "^1.1"
     },
     "suggest": {
         "darkwebdesign/symfony-addon-pack": "All Symfony add-ons bundled together",

composer.json

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         cacheResultFile=".phpunit.cache/test-results"
          colors="true"
          executionOrder="depends,defects"
          forceCoversAnnotation="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
          verbose="true">
 
     <testsuites>
@@ -16,10 +20,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
 </phpunit>

phpunit.xml.dist

@@ -4,19 +4,18 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\Symfony\Set\SymfonyLevelSetList;
+use Rector\Symfony\Set\SymfonySetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
-    ]);
-
-    $rectorConfig->sets([
+    ])
+    ->withSets([
         LevelSetList::UP_TO_PHP_80,
-        SymfonyLevelSetList::UP_TO_SYMFONY_60,
-    ]);
-
-    $rectorConfig->importNames(true, false);
-    $rectorConfig->importShortClasses(false);
-};
+        SymfonySetList::SYMFONY_60,
+    ])
+    ->withImportNames(
+        importDocBlockNames: false,
+        importShortClasses: false,
+    );

rector.php

@@ -35,12 +35,10 @@
  */
 class BooleanToYesNoSubscriber implements EventSubscriberInterface
 {
-    /** @var string[] */
-    private $fieldNames;
-
-    public function __construct(array $fieldNames)
-    {
-        $this->fieldNames = $fieldNames;
+    public function __construct(
+        /** @var string[] */
+        private array $fieldNames
+    ) {
     }
 
     /**

src/BooleanToYesNoSubscriber.php

@@ -44,7 +44,7 @@ class BooleanType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         if (!class_exists(BooleanToValueTransformer::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the "darkwebdesign/symfony-addon-transformers" package is not installed. Try running "composer require darkwebdesign/symfony-addon-transformers".', __CLASS__));
+            throw new \LogicException(sprintf('You cannot use "%s" as the "darkwebdesign/symfony-addon-transformers" package is not installed. Try running "composer require darkwebdesign/symfony-addon-transformers".', self::class));
         }
 
         $builder->addModelTransformer(new BooleanToValueTransformer($options['value_true'], $options['value_false']));
@@ -55,28 +55,20 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $labelTrueNormalizer = function (Options $options, $value) {
-            return !is_null($value) ? (string) $value : $this->humanize((string) $options['value_true']);
-        };
+        $labelTrueNormalizer = fn(Options $options, $value) =>
+            !is_null($value) ? (string) $value : $this->humanize((string) $options['value_true']);
 
-        $labelFalseNormalizer = function (Options $options, $value) {
-            return !is_null($value) ? (string) $value : $this->humanize((string) $options['value_false']);
-        };
+        $labelFalseNormalizer = fn(Options $options, $value) =>
+            !is_null($value) ? (string) $value : $this->humanize((string) $options['value_false']);
 
-        $choicesNormalizer = function (Options $options) {
-            return [
-                $options['label_true'] => $options['value_true'],
-                $options['label_false'] => $options['value_false'],
-            ];
-        };
+        $choicesNormalizer = fn(Options $options) => [
+            $options['label_true'] => $options['value_true'],
+            $options['label_false'] => $options['value_false'],
+        ];
 
-        $expandedNormalizer = function (Options $options) {
-            return 'choice' !== $options['widget'];
-        };
+        $expandedNormalizer = fn(Options $options) => 'choice' !== $options['widget'];
 
-        $multipleNormalizer = function () {
-            return false;
-        };
+        $multipleNormalizer = fn() => false;
 
         $resolver->setDefaults([
             'label_true' => null,
@@ -109,7 +101,7 @@ public function getParent(): string
     }
 
     /**
-     * Makes a technical name human readable.
+     * Makes a technical name human-readable.
      */
     public function humanize(string $text): string
     {

src/BooleanType.php

@@ -31,9 +31,11 @@
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+// @codeCoverageIgnoreStart
 if (!interface_exists(ManagerRegistry::class)) {
     throw new \LogicException('You cannot use "DarkWebDesign\SymfonyAddonFormTypes\EntityType" as the "doctrine/orm" package is not installed. Try running "composer require doctrine/orm".');
 }
+// @codeCoverageIgnoreEnd
 
 /**
  * Entity form field type.
@@ -44,15 +46,9 @@
  */
 class EntityType extends AbstractType
 {
-    /** @var \Doctrine\Persistence\ManagerRegistry */
-    private $registry;
-
-    /**
-     * @param \Doctrine\Persistence\ManagerRegistry $registry
-     */
-    public function __construct(ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        private ManagerRegistry $registry
+    ) {
     }
 
     /**
@@ -61,7 +57,7 @@ public function __construct(ManagerRegistry $registry)
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         if (!class_exists(EntityToIdentifierTransformer::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the "darkwebdesign/symfony-addon-transformers" package is not installed. Try running "composer require darkwebdesign/symfony-addon-transformers".', __CLASS__));
+            throw new \LogicException(sprintf('You cannot use "%s" as the "darkwebdesign/symfony-addon-transformers" package is not installed. Try running "composer require darkwebdesign/symfony-addon-transformers".', self::class));
         }
 
         $builder->addViewTransformer(new EntityToIdentifierTransformer($options['entity_manager'], $options['class']));
@@ -73,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     public function configureOptions(OptionsResolver $resolver): void
     {
         if (!interface_exists(ObjectManager::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the "doctrine/orm" package is not installed. Try running "composer require doctrine/orm".', __CLASS__));
+            throw new \LogicException(sprintf('You cannot use "%s" as the "doctrine/orm" package is not installed. Try running "composer require doctrine/orm".', self::class));
         }
 
         $registry = $this->registry;
@@ -99,9 +95,7 @@ public function configureOptions(OptionsResolver $resolver): void
             return $entityManager;
         };
 
-        $compoundNormalizer = function () {
-            return false;
-        };
+        $compoundNormalizer = fn() => false;
 
         $resolver->setDefaults([
             'entity_manager' => null,

src/EntityType.php

@@ -35,12 +35,9 @@
  */
 class JsonSchemaSubscriber implements EventSubscriberInterface
 {
-    /** @var string */
-    private $fieldName;
-
-    public function __construct(string $fieldName = 'schema')
-    {
-        $this->fieldName = $fieldName;
+    public function __construct(
+        private string $fieldName = 'schema'
+    ) {
     }
 
     /**