Skip to content

Commit a3f2d71

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.8
2 parents b328325 + e0e262a commit a3f2d71

141 files changed

Lines changed: 231 additions & 292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/reusable-coveralls.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4747
with:
4848
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
49-
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
49+
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
5050
restore-keys: |
51-
${{ github.job }}-php-${{ inputs.php-version }}-
52-
${{ github.job }}-
51+
composer-php-${{ inputs.php-version }}-
52+
composer-
5353
5454
- name: Cache PHPUnit's static analysis cache
5555
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0

‎.github/workflows/reusable-phpunit-test.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,10 @@ jobs:
233233
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
234234
with:
235235
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
236-
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
236+
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
237237
restore-keys: |
238-
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-
239-
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
240-
${{ inputs.job-id || github.job }}-
238+
composer-php-${{ inputs.php-version }}-
239+
composer-
241240
242241
- name: Cache PHPUnit's static analysis cache
243242
if: ${{ inputs.enable-artifact-upload }}

‎.github/workflows/reusable-serviceless-phpunit-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ jobs:
9292
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
9393
with:
9494
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
95-
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
95+
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
9696
restore-keys: |
97-
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
98-
${{ inputs.job-id || github.job }}-
97+
composer-php-${{ inputs.php-version }}-
98+
composer-
9999
100100
- name: Cache PHPUnit's static analysis cache
101101
if: ${{ inputs.enable-artifact-upload }}

‎.github/workflows/test-coding-standards.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5353
with:
5454
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
55-
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
55+
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
5656
restore-keys: |
57-
${{ runner.os }}-${{ matrix.php-version }}-
58-
${{ runner.os }}-
57+
composer-php-${{ matrix.php-version }}-
58+
composer-
5959
6060
- name: Install dependencies
6161
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}

‎.github/workflows/test-phpstan.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ jobs:
6969
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7070
with:
7171
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
72-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
73-
restore-keys: ${{ runner.os }}-composer-
72+
key: composer-php-8.2-${{ hashFiles('**/composer.json') }}
73+
restore-keys: |
74+
composer-php-8.2-
75+
composer-
7476
7577
- name: Create PHPStan result cache directory
7678
run: mkdir -p build/phpstan
@@ -79,8 +81,8 @@ jobs:
7981
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8082
with:
8183
path: build/phpstan
82-
key: ${{ runner.os }}-phpstan-${{ github.sha }}
83-
restore-keys: ${{ runner.os }}-phpstan-
84+
key: phpstan-${{ hashFiles('**/*.php', '**/*.neon', 'composer.json') }}
85+
restore-keys: phpstan-
8486

8587
- name: Install dependencies
8688
run: composer update --ansi --no-interaction

‎.github/workflows/test-psalm.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ jobs:
5757
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5858
with:
5959
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
60-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
61-
restore-keys: ${{ runner.os }}-composer-
60+
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
61+
restore-keys: |
62+
composer-php-${{ matrix.php-version }}-
63+
composer-
6264
6365
- name: Create Psalm cache directory
6466
run: mkdir -p build/psalm
@@ -67,8 +69,8 @@ jobs:
6769
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
6870
with:
6971
path: build/psalm
70-
key: ${{ runner.os }}-psalm-${{ github.sha }}
71-
restore-keys: ${{ runner.os }}-psalm-
72+
key: psalm-${{ hashFiles('**/*.php', 'psalm*.xml', 'composer.json') }}
73+
restore-keys: psalm-
7274

7375
- name: Install dependencies
7476
run: |

‎.github/workflows/test-random-execution.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,10 @@ jobs:
189189
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
190190
with:
191191
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
192-
key: PHP_${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
192+
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
193193
restore-keys: |
194-
PHP_${{ matrix.php-version }}-
194+
composer-php-${{ matrix.php-version }}-
195+
composer-
195196
196197
- name: Install project dependencies
197198
run: |

‎.github/workflows/test-rector.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,22 @@ jobs:
7575
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7676
with:
7777
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
78-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
79-
restore-keys: ${{ runner.os }}-composer-
80-
81-
- name: Install dependencies
82-
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
78+
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
79+
restore-keys: |
80+
composer-php-${{ matrix.php-version }}-
81+
composer-
8382
8483
- name: Rector Cache
8584
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8685
with:
8786
path: /tmp/rector
88-
key: ${{ runner.os }}-rector-${{ github.run_id }}
89-
restore-keys: ${{ runner.os }}-rector-
87+
key: rector-${{ hashFiles('**/*.php', 'composer.json') }}
88+
restore-keys: rector-
9089

9190
- run: mkdir -p /tmp/rector
9291

92+
- name: Install dependencies
93+
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
94+
9395
- name: Run static analysis
9496
run: vendor/bin/rector process --dry-run --no-progress-bar

‎.github/workflows/test-structarmed.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,22 @@ jobs:
7272
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7373
with:
7474
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
75-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
76-
restore-keys: ${{ runner.os }}-composer-
77-
78-
- name: Install dependencies
79-
run: composer update --ansi --no-interaction
75+
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
76+
restore-keys: |
77+
composer-php-${{ matrix.php-version }}-
78+
composer-
8079
8180
- name: Structarmed Cache
8281
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8382
with:
8483
path: /tmp/structarmed
85-
key: ${{ runner.os }}-structarmed-${{ github.run_id }}
86-
restore-keys: ${{ runner.os }}-structarmed-
84+
key: structarmed-${{ hashFiles('**/*.php', 'composer.json') }}
85+
restore-keys: structarmed-
8786

8887
- run: mkdir -p /tmp/structarmed
8988

89+
- name: Install dependencies
90+
run: composer update --ansi --no-interaction
91+
9092
- name: Run static analysis
9193
run: vendor/bin/structarmed analyze

‎system/Autoloader/Autoloader.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060
* // register the autoloader
6161
* $loader->register();
6262
* ```
63-
*
64-
* @see \CodeIgniter\Autoloader\AutoloaderTest
6563
*/
6664
class Autoloader
6765
{

0 commit comments

Comments
 (0)