From c6eb263ebc39af93e1a7ca17cb028677eb1f6415 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 10 Oct 2026 01:57:57 +0800
Subject: [PATCH] chore: normalize Actions cache keys

---
 .github/workflows/reusable-coveralls.yml         |  6 +++---
 .github/workflows/reusable-phpunit-test.yml      |  7 +++----
 .../reusable-serviceless-phpunit-test.yml        |  6 +++---
 .github/workflows/test-coding-standards.yml      |  6 +++---
 .github/workflows/test-phpstan.yml               | 10 ++++++----
 .github/workflows/test-psalm.yml                 | 10 ++++++----
 .github/workflows/test-random-execution.yml      |  5 +++--
 .github/workflows/test-rector.yml                | 16 +++++++++-------
 .github/workflows/test-structarmed.yml           | 16 +++++++++-------
 9 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index cf9c02b22e11..ffd482fdf6f0 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -46,10 +46,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
+          key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            ${{ github.job }}-php-${{ inputs.php-version }}-
-            ${{ github.job }}-
+            composer-php-${{ inputs.php-version }}-
+            composer-
 
       - name: Cache PHPUnit's static analysis cache
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index b216a71493bb..e21c3a65b671 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -195,11 +195,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
+          key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-
-            ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
-            ${{ inputs.job-id || github.job }}-
+            composer-php-${{ inputs.php-version }}-
+            composer-
 
       - name: Cache PHPUnit's static analysis cache
         if: ${{ inputs.enable-artifact-upload }}
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index 8420d2b8c978..590c064cf022 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -92,10 +92,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
+          key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
-            ${{ inputs.job-id || github.job }}-
+            composer-php-${{ inputs.php-version }}-
+            composer-
 
       - name: Cache PHPUnit's static analysis cache
         if: ${{ inputs.enable-artifact-upload }}
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index b02059733b13..16e0d5d745f6 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -52,10 +52,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.php-version }}-
-            ${{ runner.os }}-
+            composer-php-${{ matrix.php-version }}-
+            composer-
 
       - name: Install dependencies
         run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index cc246f871808..22813782d756 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -69,8 +69,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: composer-php-8.2-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-php-8.2-
+            composer-
 
       - name: Create PHPStan result cache directory
         run: mkdir -p build/phpstan
@@ -79,8 +81,8 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: build/phpstan
-          key: ${{ runner.os }}-phpstan-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-phpstan-
+          key: phpstan-${{ hashFiles('**/*.php', '**/*.neon', 'composer.json') }}
+          restore-keys: phpstan-
 
       - name: Install dependencies
         run: composer update --ansi --no-interaction
diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml
index 3f385ce858fb..27aa0712f0c1 100644
--- a/.github/workflows/test-psalm.yml
+++ b/.github/workflows/test-psalm.yml
@@ -57,8 +57,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-php-${{ matrix.php-version }}-
+            composer-
 
       - name: Create Psalm cache directory
         run: mkdir -p build/psalm
@@ -67,8 +69,8 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: build/psalm
-          key: ${{ runner.os }}-psalm-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-psalm-
+          key: psalm-${{ hashFiles('**/*.php', 'psalm*.xml', 'composer.json') }}
+          restore-keys: psalm-
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/test-random-execution.yml b/.github/workflows/test-random-execution.yml
index e90de6bb031d..932c17b683d7 100644
--- a/.github/workflows/test-random-execution.yml
+++ b/.github/workflows/test-random-execution.yml
@@ -189,9 +189,10 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: PHP_${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
+          key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            PHP_${{ matrix.php-version }}-
+            composer-php-${{ matrix.php-version }}-
+            composer-
 
       - name: Install project dependencies
         run: |
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 2fa9b74c0e02..215670734064 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -75,20 +75,22 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
+          key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-php-${{ matrix.php-version }}-
+            composer-
 
       - name: Rector Cache
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: /tmp/rector
-          key: ${{ runner.os }}-rector-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-rector-
+          key: rector-${{ hashFiles('**/*.php', 'composer.json') }}
+          restore-keys: rector-
 
       - run: mkdir -p /tmp/rector
 
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
+
       - name: Run static analysis
         run: vendor/bin/rector process --dry-run --no-progress-bar
diff --git a/.github/workflows/test-structarmed.yml b/.github/workflows/test-structarmed.yml
index 62a2dbc7d1cb..0deee13a46b0 100644
--- a/.github/workflows/test-structarmed.yml
+++ b/.github/workflows/test-structarmed.yml
@@ -72,20 +72,22 @@ jobs:
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer update --ansi --no-interaction
+          key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-php-${{ matrix.php-version }}-
+            composer-
 
       - name: Structarmed Cache
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: /tmp/structarmed
-          key: ${{ runner.os }}-structarmed-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-structarmed-
+          key: structarmed-${{ hashFiles('**/*.php', 'composer.json') }}
+          restore-keys: structarmed-
 
       - run: mkdir -p /tmp/structarmed
 
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
       - name: Run static analysis
         run: vendor/bin/structarmed analyze