Merge pull request #6 from codenamephp/dependabot/docker/docker/application/webdevops/php-dev-8.2

Bump webdevops/php-dev from 8.1 to 8.2 in /docker/application

Author: bastianschwarz

.github/workflows/ci.yml

@@ -19,4 +19,4 @@ jobs:
   ci:
     uses: codenamephp/workflows.php/.github/workflows/ci.yml@main
     with:
-      php-versions: '["8.1"]'
+      php-versions: '["8.1","8.2"]'

.idea/php.xml

@@ -33,6 +33,7 @@
     "sort-packages": true
   },
   "scripts": {
+    "phive-update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit -m 'Updated phive dependencies'",
     "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",
@@ -48,6 +49,7 @@
     ]
   },
   "scripts-descriptions": {
+    "phive-update": "Runs a phive update and commits all tools and the phive.xml so PHPStorm won't run code formatting on the phars",
     "phpunit": "Runs phpunit tests",
     "psalm": "Runs psalm static analysis",
     "composer-unused": "Checks for unused composer packages",

composer.json

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   application:
-    user: "${UID}:${GID}" #don't run as root by default to prevent permission conflicts
+    user: "${UID:-1000}:${GID:-1000}" #don't run as root by default to prevent permission conflicts
     build:
       context: docker/application
       args:
@@ -12,6 +12,7 @@ services:
       - ./:/app
       - $HOME/.phive:/home/application/.phive
       - $HOME/.ssh:/home/application/.ssh
+      - $HOME/.gitconfig:/home/application/.gitconfig
       - ${SSH_AUTH_SOCK:-/ssh-agent}:/ssh-agent # Forward local machine SSH key to docker
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro

docker-compose.yml

@@ -1,4 +1,4 @@
-FROM webdevops/php-dev:8.1
+FROM webdevops/php-dev:8.2
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 

docker/application/Dockerfile

@@ -15,9 +15,9 @@
   ~   limitations under the License.
   -->
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.0.1" installed="9.5.21" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^4.0" installed="4.25.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer-unused" version="^0.8" installed="0.8.2" location="./tools/composer-unused" copy="true"/>
-  <phar name="composer-require-checker" version="^4.0" installed="4.1.0" location="./tools/composer-require-checker" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.13" location="./tools/infection" copy="true"/>
+  <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.2.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.4.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
 </phive>