Merge pull request #19 from codenamephp/dependabot/docker/docker/appl…

…ication/webdevops/php-dev-8.3 Bump webdevops/php-dev from 8.2 to 8.3 in /docker/application
codenamephp · Jan 6, 2024 · 8e87a83 · 8e87a83
2 parents 9b0e8bc + ac34575
commit 8e87a83
Show file tree

Hide file tree

Showing 15 changed files with 4,894 additions and 1,964 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,6 @@ on:
 
 jobs:
   ci:
-    uses: codenamephp/workflows.php/.github/workflows/ci.yml@main
+    uses: codenamephp/workflows.php/.github/workflows/ci.yml@1
     with:
-      php-versions: '["8.0", "8.1", "8.2"]'
+      php-versions: '["8.0", "8.1", "8.2", "8.3"]'
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -7,16 +7,16 @@ on:
 
 jobs:
   calculate_next_version:
-    uses: codenamephp/workflows.common/.github/workflows/calculate-next-version.yml@main
+    uses: codenamephp/workflows.common/.github/workflows/calculate-next-version.yml@1
   draft_release:
     needs: calculate_next_version
-    uses: codenamephp/workflows.common/.github/workflows/draft-release.yml@main
+    uses: codenamephp/workflows.common/.github/workflows/draft-release.yml@1
     with:
       version: ${{ needs.calculate_next_version.outputs.version }}
   update_changelog:
-    uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@main
+    uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@1
     needs: calculate_next_version
     with:
       ref: ${{github.ref_name}}
       future-release: ${{ needs.calculate_next_version.outputs.version }}
-      release-branch: 'release'
+      release-branch: 'release'
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -7,6 +7,6 @@ on:
 
 jobs:
   update_changelog:
-    uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@main
+    uses: codenamephp/workflows.common/.github/workflows/update-changelog.yml@1
     with:
-      ref: ${{github.ref_name}}
+      ref: ${{github.ref_name}}
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/.idea/platform.di.iml b/.idea/platform.di.iml
diff --git a/.idea/runConfigurations/ci_all.xml b/.idea/runConfigurations/ci_all.xml
diff --git a/composer.json b/composer.json
@@ -41,8 +41,8 @@
     "phpunit": "XDEBUG_MODE=coverage tools/phpunit.phar -c test/phpunit.dist.xml test/",
     "psalm": "XDEBUG_MODE=off tools/psalm --threads=10 --long-progress",
     "composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
-    "composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
-    "infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
+    "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'",
+    "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'",
     "phive:update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit tools/* -m 'Updated phive dependencies'",
     "ci-all": [
       "composer validate",

diff --git a/docker/application/Dockerfile b/docker/application/Dockerfile
@@ -1,15 +1,9 @@
-FROM webdevops/php-dev:8.2
+FROM webdevops/php-dev:8.3
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
-RUN wget -O phive.phar "https://phar.io/releases/phive.phar" && \
-    wget -O phive.phar.asc "https://phar.io/releases/phive.phar.asc" && \
-    gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x6AF725270AB81E04D79442549D8A98B29B2D5D79 && \
-    gpg --verify phive.phar.asc phive.phar && \
-    rm phive.phar.asc && \
-    chmod +x phive.phar && \
-    mv phive.phar /usr/local/bin/phive && \
-    mkdir "/home/$APPLICATION_USER/.phive"
+COPY --from=phario/phive:0.15.2 /usr/local/bin/phive /usr/local/bin/phive
+RUN mkdir "/home/$APPLICATION_USER/.phive"
 
 # configure services
 RUN set -x \

diff --git a/phive.xml b/phive.xml
@@ -16,9 +16,9 @@
   ~
   -->
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.0.1" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.1.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer-unused" version="^0.8" installed="0.8.5" location="./tools/composer-unused" copy="true"/>
-  <phar name="composer-require-checker" version="^4.0" installed="4.3.0" location="./tools/composer-require-checker" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
+  <phar name="phpunit" version="^9.0.1" installed="9.6.15" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
+  <phar name="composer-unused" version="^0.8" installed="0.8.11" location="./tools/composer-unused" copy="true"/>
+  <phar name="composer-require-checker" version="^4.0" installed="4.8.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection" copy="true"/>
 </phive>
diff --git a/tools/composer-require-checker b/tools/composer-require-checker
diff --git a/tools/composer-unused b/tools/composer-unused
diff --git a/tools/infection b/tools/infection