Update test workflows and test matrix (#82)

This moves us closer to the current state of the PHP and Symfony
ecosystem, preparing to upgrade to the upcoming Symfony 7.4/8.0
releases.

Author: mpdude

.github/workflows/dependencies.yml

@@ -7,7 +7,7 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 8.1
+    PHP_VERSION: 8.4
 
 jobs:
     composer-require-checker:
@@ -34,4 +34,4 @@ jobs:
                     composer install --no-interaction --no-scripts --no-progress --no-suggest
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.18.0

.github/workflows/fix-cs-php.yml

@@ -21,7 +21,7 @@ jobs:
                     ref: ${{ github.head_ref }}
 
             -   name: Run PHP-CS-Fixer
-                uses: docker://ghcr.io/php-cs-fixer/php-cs-fixer:3.62.0-php8.3
+                uses: docker://ghcr.io/php-cs-fixer/php-cs-fixer:3.89.2-php8.4
                 with:
                     args: "fix --show-progress=dots"
 

.github/workflows/lock-symfony-version.sh

@@ -8,35 +8,34 @@ on:
 
 jobs:
     PHPUnit:
-
         runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
                 include:
-                    - { php-version: 8.1, symfony-locked-version: none, orm-version: none, dependency-version: prefer-lowest }
-                    - { php-version: 8.1, symfony-locked-version: 6.4.*, orm-version: '^2.18', dependency-version: prefer-stable }
-                    - { php-version: 8.1, symfony-locked-version: 6.4.*, orm-version: none, dependency-version: prefer-stable }
-                    - { php-version: 8.2, symfony-locked-version: none, orm-version: '^2.18', dependency-version: prefer-stable }
-                    - { php-version: 8.3, symfony-locked-version: none, orm-version: none, dependency-version: prefer-stable }
-        name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ORM Version ${{matrix.orm-version }}, ${{ matrix.dependency-version }})
+                    - { php-version: 8.1, symfony-version: '', orm-version: '', dependency-version: prefer-lowest }
+                    - { php-version: 8.3, symfony-version: 6.4.*, orm-version: '^2.20', dependency-version: '' }
+                    - { php-version: 8.3, symfony-version: 6.4.*, orm-version: '^3.0', dependency-version: '' }
+                    - { php-version: 8.4, symfony-version: 7.*, orm-version: '^2.20', dependency-version: '' }
+                    - { php-version: 8.4, symfony-version: 7.*, orm-version: '^3.0', dependency-version: '' }
+        name: PHPUnit (PHP ${{matrix.php-version}}, Symfony version constraint ${{ matrix.symfony-version || 'none' }}, Doctrine ORM version constraint ${{ matrix.orm-version || 'none' }}, ${{ matrix.dependency-version || 'prefer-stable' }})
         steps:
             -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
                   php-version: ${{ matrix.php-version }}
                   coverage: none
-                  tools: composer:v2
+                  tools: composer:v2, flex
             -   uses: actions/cache@v4
                 with:
                     path: vendor
-                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
+                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-version }}-${{ matrix.orm-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
                     restore-keys: |
-                        composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
-            -   run: VERSION=${{ matrix.symfony-locked-version }} .github/workflows/lock-symfony-version.sh
-                if: matrix.symfony-locked-version != 'none'
-            -   run: composer require --no-update --no-interaction --no-scripts --no-progress --ansi doctrine/orm '${{ matrix.orm-version}}'
-                if: matrix.orm-version != 'none'
-            -   run: composer update --${{ matrix.dependency-version }} --no-interaction --no-scripts --no-progress --ansi
+                        composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-version }}-${{ matrix.orm-version }}-${{ matrix.dependency-version }}-
+            -   run: composer require --no-update doctrine/orm '${{ matrix.orm-version }}' --no-interaction --no-scripts --no-progress --ansi
+                if: matrix.orm-version != ''
+            -   run: composer update --no-interaction --no-scripts --no-progress --ansi --${{ matrix.dependency-version }}
+                env:
+                    SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
             -   run: composer show
-            -   run: vendor/bin/phpunit
+            -   run: vendor/bin/phpunit --display-warnings --display-deprecations

.github/workflows/tests.yml

@@ -20,7 +20,7 @@
     },
 
     "require": {
-        "php": "8.1.*|8.2.*|8.3.*",
+        "php": ">= 8.1",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/dbal": "^2.3|^3.0",
         "doctrine/event-manager": "^1.0|^2.0",

composer.json

@@ -241,7 +241,7 @@ private function isTranslationCached(string $locale): bool
      */
     private function cacheTranslation(string $locale): void
     {
-        /** @var $translationsInAllLanguages Selectable */
+        /** @var Selectable $translationsInAllLanguages */
         $translationsInAllLanguages = $this->translationCollection->getValue($this->entity);
         $criteria = $this->createLocaleCriteria($locale);
         $translationsFilteredByLocale = $translationsInAllLanguages->matching($criteria);

src/Doctrine/PersistentTranslatable.php

@@ -78,7 +78,7 @@ final class TranslatableClassMetadata
      *                            their fields.
      */
     private function __construct(
-        private readonly string $class
+        private readonly string $class,
     ) {
     }