Skip to content

Commit e24dffa

Browse files
authored
Config::withMerge (#383)
* tweak: fix deprecation error * build: upgrade dependencies * ci: only keep artifacts for 1 day
1 parent 9651fd0 commit e24dffa

4 files changed

Lines changed: 62 additions & 72 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
with:
3939
name: build-artifact-${{ matrix.php }}
4040
path: /tmp/github-actions
41+
retention-days: 1
4142

4243
phpunit:
4344
runs-on: ubuntu-latest
@@ -173,15 +174,3 @@ jobs:
173174

174175
permissions:
175176
actions: write
176-
177-
steps:
178-
- name: Remove old artifacts for prior workflow runs on this repository
179-
env:
180-
GH_TOKEN: ${{ github.token }}
181-
run: |
182-
gh api "/repos/${{ github.repository }}/actions/artifacts" | jq ".artifacts[] | select(.name | startswith(\"build-artifact\")) | .id" > artifact-id-list.txt
183-
while read id
184-
do
185-
echo -n "Deleting artifact ID $id ... "
186-
gh api --method DELETE /repos/${{ github.repository }}/actions/artifacts/$id && echo "Done"
187-
done <artifact-id-list.txt

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"scripts": {
5353
"phpunit": "vendor/bin/phpunit --configuration phpunit.xml",
5454
"phpunit:coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --configuration phpunit.xml --coverage-text",
55-
"phpstan": "vendor/bin/phpstan analyse --level 6 src",
55+
"phpstan": "vendor/bin/phpstan analyse --level 6 --memory-limit 1G src",
5656
"phpcs": "vendor/bin/phpcs src --standard=phpcs.xml",
5757
"phpmd": "vendor/bin/phpmd src/ text phpmd.xml",
5858
"test": [

composer.lock

Lines changed: 59 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/ExecuteCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ protected function getConfig(bool|string $repoBasePath, ?string $defaultPath):\G
197197
: null;
198198

199199
if($default) {
200-
$config->merge($default);
200+
$config = $config->withMerge($default);
201201
}
202202
return $config;
203203
}

0 commit comments

Comments
 (0)