Merge pull request #263 from darkwebdesign/issue-240-7.0

raymondschouten · web-flow · commit 26c5853603e5 · 2024-05-31T08:16:58.000+02:00
#240: Update Add-on Pack for Symfony 7.0
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'Rector'
@@ -36,7 +36,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'PHPStan'
@@ -51,7 +51,7 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: 'Composer Install'
         uses: 'ramsey/composer-install@v3'
       - name: 'PHP CS Fixer'
@@ -62,10 +62,7 @@ jobs:
     runs-on: 'ubuntu-24.04'
     strategy:
       matrix:
-        include:
-          - php: '8.1'
-          - php: '8.2'
-          - php: '8.3'
+        php: ['8.2', '8.3']
       fail-fast: false
     steps:
       - name: 'Checkout'
diff --git a/.github/workflows/subtree-split.yaml b/.github/workflows/subtree-split.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: 'ubuntu-24.04'
     steps:
       - name: 'SSH Agent'
-        uses: webfactory/ssh-agent@v0.9.0
+        uses: 'webfactory/ssh-agent@v0.9.0'
         with:
           ssh-private-key: |
             ${{ secrets.DEPLOY_KEY_SYMFONY_ADDON_CONSTRAINTS }}
diff --git a/README.md b/README.md
@@ -4,14 +4,14 @@
 [![Total Downloads](https://poser.pugx.org/darkwebdesign/symfony-addon-pack/downloads?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-pack)
 [![License](https://poser.pugx.org/darkwebdesign/symfony-addon-pack/license?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-pack)
 
-[![Build Status](https://github.com/darkwebdesign/symfony-addon-pack/actions/workflows/build.yaml/badge.svg?branch=6.4)](https://github.com/darkwebdesign/symfony-addon-pack/actions/workflows/build.yaml)
-[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-pack/branch/6.4/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-pack)
-[![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.4-93C74B.svg)](https://symfony.com/)
+[![Build Status](https://github.com/darkwebdesign/symfony-addon-pack/actions/workflows/build.yaml/badge.svg?branch=7.0)](https://github.com/darkwebdesign/symfony-addon-pack/actions/workflows/build.yaml)
+[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-pack/branch/7.0/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-pack)
+[![PHP Version](https://img.shields.io/badge/php-8.2%2B-777BB3.svg)](https://php.net/)
+[![Symfony Version](https://img.shields.io/badge/symfony-7.0-93C74B.svg)](https://symfony.com/)
 
 Symfony Add-on Pack is a collection of extra Symfony components that you can use in your Symfony applications.
 
-Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.4).
+Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/7.0).
 
 ## Features
 
diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
     ],
     "require": {
         "ext-json": "*",
-        "php": "^8.1",
-        "symfony/event-dispatcher": "6.4.*",
-        "symfony/form": "6.4.*",
-        "symfony/options-resolver": "6.4.*",
-        "symfony/validator": "6.4.*"
+        "php": "^8.2",
+        "symfony/event-dispatcher": "7.0.*",
+        "symfony/form": "7.0.*",
+        "symfony/options-resolver": "7.0.*",
+        "symfony/validator": "7.0.*"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
diff --git a/rector.php b/rector.php
@@ -4,7 +4,6 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\Symfony\Set\SymfonySetList;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -16,8 +15,7 @@
         __DIR__ . '/symfony-addon-transformers/tests',
     ])
     ->withSets([
-        LevelSetList::UP_TO_PHP_81,
-        SymfonySetList::SYMFONY_64,
+        LevelSetList::UP_TO_PHP_82,
     ])
     ->withImportNames(
         importShortClasses: false,
diff --git a/symfony-addon-constraints/.github/workflows/build.yaml b/symfony-addon-constraints/.github/workflows/build.yaml
@@ -17,9 +17,9 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: 'composer install --no-progress --prefer-dist --optimize-autoloader'
       - name: 'Rector'
         run: 'vendor/bin/rector process --dry-run --no-progress-bar --ansi'
 
@@ -32,9 +32,9 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: 'composer install --no-progress --prefer-dist --optimize-autoloader'
       - name: 'PHPStan'
         run: 'vendor/bin/phpstan analyze --no-progress --ansi'
 
@@ -47,9 +47,9 @@ jobs:
       - name: 'Setup PHP'
         uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: 'composer install --no-progress --prefer-dist --optimize-autoloader'
       - name: 'PHP CS Fixer'
         run: 'vendor/bin/php-cs-fixer fix --diff --dry-run --show-progress=none --ansi'
 
@@ -58,10 +58,7 @@ jobs:
     runs-on: 'ubuntu-24.04'
     strategy:
       matrix:
-        include:
-          - php: '8.1'
-          - php: '8.2'
-          - php: '8.3'
+        php: ['8.2', '8.3']
       fail-fast: false
     steps:
       - name: 'Checkout'
@@ -70,8 +67,8 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: "${{ matrix.php }}"
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+      - name: 'Install dependencies'
+        run: 'composer install --no-progress --prefer-dist --optimize-autoloader'
       - name: 'PHPUnit'
         run: 'XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-clover phpunit-coverage.xml'
       - name: 'Code Climate'
diff --git a/symfony-addon-constraints/README.md b/symfony-addon-constraints/README.md
@@ -4,15 +4,15 @@
 [![Total Downloads](https://poser.pugx.org/darkwebdesign/symfony-addon-constraints/downloads?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-constraints)
 [![License](https://poser.pugx.org/darkwebdesign/symfony-addon-constraints/license?format=flat)](https://packagist.org/packages/darkwebdesign/symfony-addon-constraints)
 
-[![Build Status](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml/badge.svg?branch=6.4)](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml)
-[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints/branch/6.4/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints)
-[![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.4-93C74B.svg)](https://symfony.com/)
+[![Build Status](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml/badge.svg?branch=7.0)](https://github.com/darkwebdesign/symfony-addon-constraints/actions/workflows/build.yaml)
+[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints/branch/7.0/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-constraints)
+[![PHP Version](https://img.shields.io/badge/php-8.2%2B-777BB3.svg)](https://php.net/)
+[![Symfony Version](https://img.shields.io/badge/symfony-7.0-93C74B.svg)](https://symfony.com/)
 
 Symfony Add-on Constraints is a collection of extra Symfony validation constraints that you can use in your Symfony
 applications.
 
-Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/6.4).
+Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/7.0).
 
 ## Features
 
diff --git a/symfony-addon-constraints/composer.json b/symfony-addon-constraints/composer.json
@@ -10,8 +10,8 @@
     ],
     "require": {
         "ext-json": "*",
-        "php": "^8.1",
-        "symfony/validator": "6.4.*"
+        "php": "^8.2",
+        "symfony/validator": "7.0.*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.58",
diff --git a/symfony-addon-constraints/rector.php b/symfony-addon-constraints/rector.php
@@ -4,16 +4,14 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\Symfony\Set\SymfonySetList;
 
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
     ->withSets([
-        LevelSetList::UP_TO_PHP_81,
-        SymfonySetList::SYMFONY_64,
+        LevelSetList::UP_TO_PHP_82,
     ])
     ->withImportNames(
         importShortClasses: false,
diff --git a/symfony-addon-form-types/.github/workflows/build.yaml b/symfony-addon-form-types/.github/workflows/build.yaml
@@ -17,15 +17,11 @@ jobs:
       - name: 'Setup PHP'
         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.4.x-dev --dev --no-install'
-          php_version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: |
+          composer require --dev --no-install darkwebdesign/symfony-addon-transformers:7.0.x-dev
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: 'Rector'
         run: 'vendor/bin/rector process --dry-run --no-progress-bar --ansi'
 
@@ -38,15 +34,11 @@ jobs:
       - name: 'Setup PHP'
         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.4.x-dev --dev --no-install'
-          php_version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: |
+          composer require --dev --no-install darkwebdesign/symfony-addon-transformers:7.0.x-dev
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: 'PHPStan'
         run: 'vendor/bin/phpstan analyze --no-progress --ansi'
 
@@ -59,15 +51,11 @@ jobs:
       - name: 'Setup PHP'
         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.4.x-dev --dev --no-install'
-          php_version: '8.1'
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+          php-version: '8.2'
+      - name: 'Install dependencies'
+        run: |
+          composer require --dev --no-install darkwebdesign/symfony-addon-transformers:7.0.x-dev
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: 'PHP CS Fixer'
         run: 'vendor/bin/php-cs-fixer fix --diff --dry-run --show-progress=none --ansi'
 
@@ -76,10 +64,7 @@ jobs:
     runs-on: 'ubuntu-24.04'
     strategy:
       matrix:
-        include:
-          - php: '8.1'
-          - php: '8.2'
-          - php: '8.3'
+        php: ['8.2', '8.3']
       fail-fast: false
     steps:
       - name: 'Checkout'
@@ -88,14 +73,10 @@ 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.4.x-dev --dev --no-install'
-          php_version: "${{ matrix.php }}"
-      - name: 'Composer Install'
-        uses: 'ramsey/composer-install@v3'
+      - name: 'Install dependencies'
+        run: |
+          composer require --dev --no-install darkwebdesign/symfony-addon-transformers:7.0.x-dev
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: 'PHPUnit'
         run: 'XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-clover phpunit-coverage.xml'
       - name: 'Code Climate'
diff --git a/symfony-addon-form-types/README.md b/symfony-addon-form-types/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.4)](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.4/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.4-93C74B.svg)](https://symfony.com/)
+[![Build Status](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml/badge.svg?branch=7.0)](https://github.com/darkwebdesign/symfony-addon-form-types/actions/workflows/build.yaml)
+[![Coverage Status](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types/branch/7.0/graph/badge.svg)](https://codecov.io/gh/darkwebdesign/symfony-addon-form-types)
+[![PHP Version](https://img.shields.io/badge/php-8.2%2B-777BB3.svg)](https://php.net/)
+[![Symfony Version](https://img.shields.io/badge/symfony-7.0-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.4).
+Learn more about it in its [documentation](https://darkwebdesign.github.io/symfony-addon-pack/docs/7.0).
 
 ## Features
 
diff --git a/symfony-addon-form-types/composer.json b/symfony-addon-form-types/composer.json
@@ -9,13 +9,13 @@
         {"name": "Raymond Schouten"}
     ],
     "require": {
-        "php": "^8.1",
-        "symfony/event-dispatcher": "6.4.*",
-        "symfony/form": "6.4.*",
-        "symfony/options-resolver": "6.4.*"
+        "php": "^8.2",
+        "symfony/event-dispatcher": "7.0.*",
+        "symfony/form": "7.0.*",
+        "symfony/options-resolver": "7.0.*"
     },
     "require-dev": {
-        "darkwebdesign/symfony-addon-transformers": "6.4.*",
+        "darkwebdesign/symfony-addon-transformers": "7.0.*",
         "doctrine/orm": "^2.7",
         "friendsofphp/php-cs-fixer": "^3.58",
         "phpstan/extension-installer": "^1.3",
diff --git a/symfony-addon-form-types/rector.php b/symfony-addon-form-types/rector.php
@@ -4,16 +4,14 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\Symfony\Set\SymfonySetList;
 
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
     ->withSets([
-        LevelSetList::UP_TO_PHP_81,
-        SymfonySetList::SYMFONY_64,
+        LevelSetList::UP_TO_PHP_82,
     ])
     ->withImportNames(
         importShortClasses: false,
diff --git a/symfony-addon-form-types/tests/BirthdayTypeTest.php b/symfony-addon-form-types/tests/BirthdayTypeTest.php
@@ -34,7 +34,7 @@ class BirthdayTypeTest extends TypeTestCase
 {
     public function test(): void
     {
-        $form = $this->factory->create(BirthdayType::class);
+        $form = $this->factory->create(BirthdayType::class, options: ['widget' => 'choice']);
 
         $choices = $form->get('year')->getConfig()->getOption('choices');
 
diff --git a/symfony-addon-transformers/.github/workflows/build.yaml b/symfony-addon-transformers/.github/workflows/build.yaml
diff --git a/symfony-addon-transformers/README.md b/symfony-addon-transformers/README.md
diff --git a/symfony-addon-transformers/composer.json b/symfony-addon-transformers/composer.json
diff --git a/symfony-addon-transformers/rector.php b/symfony-addon-transformers/rector.php
