Skip to content

Commit 433f70d

Browse files
authored
Merge branch 'develop' into perf/optimize-forge-foreignkeys
2 parents d86c9f3 + fa140b5 commit 433f70d

69 files changed

Lines changed: 529 additions & 575 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.

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ structarmed.php export-ignore
2626
phpmetrics.json export-ignore
2727
phpstan-baseline.php export-ignore
2828
phpstan-bootstrap.php export-ignore
29-
phpstan.neon.dist export-ignore
29+
phpstan.dist.neon export-ignore
3030
phpunit.dist.xml export-ignore
3131
psalm-baseline.xml export-ignore
3232
psalm.xml export-ignore

.github/workflows/reusable-coveralls.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4444
4545
- name: Cache dependencies
46-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
46+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4747
with:
4848
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
4949
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -52,7 +52,7 @@ jobs:
5252
${{ github.job }}-
5353
5454
- name: Cache PHPUnit's static analysis cache
55-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
55+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5656
with:
5757
path: build/.phpunit.cache/code-coverage
5858
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}${{ inputs.mysql-version || '' }}" >> $GITHUB_OUTPUT
193193
194194
- name: Cache dependencies
195-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
195+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
196196
with:
197197
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
198198
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
@@ -203,7 +203,7 @@ jobs:
203203
204204
- name: Cache PHPUnit's static analysis cache
205205
if: ${{ inputs.enable-artifact-upload }}
206-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
206+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
207207
with:
208208
path: build/.phpunit.cache/code-coverage
209209
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_OUTPUT
9090
9191
- name: Cache Composer dependencies
92-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
92+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
9393
with:
9494
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
9595
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -99,7 +99,7 @@ jobs:
9999
100100
- name: Cache PHPUnit's static analysis cache
101101
if: ${{ inputs.enable-artifact-upload }}
102-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
102+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
103103
with:
104104
path: build/.phpunit.cache/code-coverage
105105
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5050

5151
- name: Cache dependencies
52-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
52+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5353
with:
5454
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
5555
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/test-phpstan.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- 'tests/**.php'
1414
- 'utils/**.php'
1515
- composer.json
16-
- phpstan.neon.dist
16+
- phpstan.dist.neon
1717
- phpstan-baseline.php
1818
- '.github/workflows/test-phpstan.yml'
1919

@@ -27,7 +27,7 @@ on:
2727
- 'tests/**.php'
2828
- 'utils/**.php'
2929
- composer.json
30-
- phpstan.neon.dist
30+
- phpstan.dist.neon
3131
- phpstan-baseline.php
3232
- '.github/workflows/test-phpstan.yml'
3333

@@ -66,7 +66,7 @@ jobs:
6666
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6767

6868
- name: Cache dependencies
69-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
69+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7070
with:
7171
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
7272
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -76,7 +76,7 @@ jobs:
7676
run: mkdir -p build/phpstan
7777

7878
- name: Cache PHPStan result cache directory
79-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
79+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8080
with:
8181
path: build/phpstan
8282
key: ${{ runner.os }}-phpstan-${{ github.sha }}

.github/workflows/test-psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5555

5656
- name: Cache composer dependencies
57-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
57+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5858
with:
5959
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
6060
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
@@ -64,7 +64,7 @@ jobs:
6464
run: mkdir -p build/psalm
6565

6666
- name: Cache Psalm results
67-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
67+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
6868
with:
6969
path: build/psalm
7070
key: ${{ runner.os }}-psalm-${{ github.sha }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
187187

188188
- name: Cache composer dependencies
189-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
189+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
190190
with:
191191
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
192192
key: PHP_${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}

.github/workflows/test-rector.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
7373

7474
- name: Cache dependencies
75-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
75+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7676
with:
7777
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
7878
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -82,7 +82,7 @@ jobs:
8282
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
8383

8484
- name: Rector Cache
85-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
85+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8686
with:
8787
path: /tmp/rector
8888
key: ${{ runner.os }}-rector-${{ github.run_id }}

.github/workflows/test-structarmed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6969

7070
- name: Cache dependencies
71-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
71+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7272
with:
7373
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
7474
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -78,7 +78,7 @@ jobs:
7878
run: composer update --ansi --no-interaction
7979

8080
- name: Structarmed Cache
81-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
81+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8282
with:
8383
path: /tmp/structarmed
8484
key: ${{ runner.os }}-structarmed-${{ github.run_id }}

0 commit comments

Comments
 (0)