Merge pull request #1099 from lcobucci/5.5.x-merge-up-into-6.0.x_GUZD…

…5lxe Merge release 5.5.0 into 6.0.x
lcobucci · Jan 28, 2025 · c62bb83 · c62bb83
2 parents 1b7c00a + a835af5
commit c62bb83
Show file tree

Hide file tree

Showing 17 changed files with 590 additions and 551 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -11,3 +11,5 @@
 /README.md                                export-ignore
 /Makefile                                 export-ignore
 /.roave-backward-compatibility-check.json export-ignore
+/.readthedocs.yaml                        export-ignore
+/renovate.json                            export-ignore
diff --git a/.github/workflows/backwards-compatibility.yml b/.github/workflows/backwards-compatibility.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           php-version: "8.2"
           ini-values: memory_limit=-1
@@ -29,7 +29,7 @@ jobs:
         run: echo "composer_cache_dir=$(composer global config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+        uses: "actions/cache@v4.2.0"
         with:
           path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
           key: "php-8.2-bc-break-check-${{ hashFiles('.github/workflows/backwards-compatibility.yml') }}"

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -24,35 +24,17 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "PhpBench"
         run: "make phpbench"
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -24,35 +24,17 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Coding Standard"
         run: "make phpcs PHPCS_FLAGS='-q --report=checkstyle | cs2pr'"
diff --git a/.github/workflows/composer-json-lint.yml b/.github/workflows/composer-json-lint.yml
@@ -24,35 +24,17 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, composer-normalize, composer-require-checker, composer-unused
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Validate composer.json"
         run: "composer validate --strict"

diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -24,38 +24,20 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "xdebug"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Infection"
         run: "make infection PHPUNIT_FLAGS=--coverage-clover=coverage.xml INFECTION_FLAGS=--logger-github"
 
       - name: "Upload Code Coverage"
-        uses: "codecov/codecov-action@v5.0.7"
+        uses: "codecov/codecov-action@v5.3.1"
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -16,7 +16,6 @@ jobs:
           - "lowest"
           - "highest"
           - "locked"
-          - "development"
         php-version:
           - "8.2"
           - "8.3"
@@ -29,39 +28,17 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
-
-      - name: "Install development dependencies"
-        if: ${{ matrix.dependencies == 'development' }}
-        run: "composer config minimum-stability dev && composer update --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Tests"
         run: "make phpunit"
@@ -76,7 +53,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
@@ -85,27 +62,18 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress --ignore-platform-req=php"
+          dependency-versions: "${{ matrix.dependencies }}"
+          composer-options: " --ignore-platform-req=php"
 
       - name: "Tests"
         run: "make phpunit"
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -24,35 +24,17 @@ jobs:
         uses: "actions/checkout@v4.2.2"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.31.1"
+        uses: "shivammathur/setup-php@2.32.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "composer_cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache dependencies"
-        uses: "actions/cache@v4.1.2"
+      - name: "Install dependencies"
+        uses: "ramsey/composer-install@3.0.0"
         with:
-          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress"
-
-      - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress"
-
-      - name: "Install locked dependencies"
-        if: ${{ matrix.dependencies == 'locked' }}
-        run: "composer install --no-interaction --no-progress"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "PHPStan"
         run: "make phpstan"