Skip to content

Commit 8e87a83

Browse files
Merge pull request #19 from codenamephp/dependabot/docker/docker/application/webdevops/php-dev-8.3
Bump webdevops/php-dev from 8.2 to 8.3 in /docker/application
2 parents 9b0e8bc + ac34575 commit 8e87a83

15 files changed

Lines changed: 4894 additions & 1964 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ on:
1717

1818
jobs:
1919
ci:
20-
uses: codenamephp/workflows.php/.github/workflows/ci.yml@main
20+
uses: codenamephp/workflows.php/.github/workflows/ci.yml@1
2121
with:
22-
php-versions: '["8.0", "8.1", "8.2"]'
22+
php-versions: '["8.0", "8.1", "8.2", "8.3"]'

.github/workflows/prepare-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ on:
77

88
jobs:
99
calculate_next_version:
10-
uses: codenamephp/workflows.common/.github/workflows/calculate-next-version.yml@main
10+
uses: codenamephp/workflows.common/.github/workflows/calculate-next-version.yml@1
1111
draft_release:
1212
needs: calculate_next_version
13-
uses: codenamephp/workflows.common/.github/workflows/draft-release.yml@main
13+
uses: codenamephp/workflows.common/.github/workflows/draft-release.yml@1
1414
with:
1515
version: ${{ needs.calculate_next_version.outputs.version }}
1616
update_changelog:
17-
uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@main
17+
uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@1
1818
needs: calculate_next_version
1919
with:
2020
ref: ${{github.ref_name}}
2121
future-release: ${{ needs.calculate_next_version.outputs.version }}
22-
release-branch: 'release'
22+
release-branch: 'release'

.github/workflows/update-changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ on:
77

88
jobs:
99
update_changelog:
10-
uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@main
10+
uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@1
1111
with:
12-
ref: ${{github.ref_name}}
12+
ref: ${{github.ref_name}}

.idea/php.xml

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

.idea/phpunit.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/platform.di.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/ci_all.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"phpunit": "XDEBUG_MODE=coverage tools/phpunit.phar -c test/phpunit.dist.xml test/",
4242
"psalm": "XDEBUG_MODE=off tools/psalm --threads=10 --long-progress",
4343
"composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
44-
"composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
45-
"infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
44+
"composer-require-checker": "php -r 'exit((int) !(PHP_VERSION_ID >= 80400));' && XDEBUG_MODE=off tools/composer-require-checker --no-interaction || echo 'Skipping composer-require-checker because it needs PHP8.2 or higher'",
45+
"infection": "php -r 'exit((int) !(PHP_VERSION_ID >= 80100));' && XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations || echo 'Skipping infection because it needs PHP8.1 or higher'",
4646
"phive:update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit tools/* -m 'Updated phive dependencies'",
4747
"ci-all": [
4848
"composer validate",

docker/application/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
FROM webdevops/php-dev:8.2
1+
FROM webdevops/php-dev:8.3
22

33
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
44

5-
RUN wget -O phive.phar "https://phar.io/releases/phive.phar" && \
6-
wget -O phive.phar.asc "https://phar.io/releases/phive.phar.asc" && \
7-
gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x6AF725270AB81E04D79442549D8A98B29B2D5D79 && \
8-
gpg --verify phive.phar.asc phive.phar && \
9-
rm phive.phar.asc && \
10-
chmod +x phive.phar && \
11-
mv phive.phar /usr/local/bin/phive && \
12-
mkdir "/home/$APPLICATION_USER/.phive"
5+
COPY --from=phario/phive:0.15.2 /usr/local/bin/phive /usr/local/bin/phive
6+
RUN mkdir "/home/$APPLICATION_USER/.phive"
137

148
# configure services
159
RUN set -x \

phive.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
~
1717
-->
1818
<phive xmlns="https://phar.io/phive">
19-
<phar name="phpunit" version="^9.0.1" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
20-
<phar name="psalm" version="^5.0" installed="5.1.0" location="./tools/psalm" copy="true"/>
21-
<phar name="composer-unused" version="^0.8" installed="0.8.5" location="./tools/composer-unused" copy="true"/>
22-
<phar name="composer-require-checker" version="^4.0" installed="4.3.0" location="./tools/composer-require-checker" copy="true"/>
23-
<phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
19+
<phar name="phpunit" version="^9.0.1" installed="9.6.15" location="./tools/phpunit.phar" copy="true"/>
20+
<phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
21+
<phar name="composer-unused" version="^0.8" installed="0.8.11" location="./tools/composer-unused" copy="true"/>
22+
<phar name="composer-require-checker" version="^4.0" installed="4.8.0" location="./tools/composer-require-checker" copy="true"/>
23+
<phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection" copy="true"/>
2424
</phive>

0 commit comments

Comments
 (0)