Add php 8.4 support (#209)

* feat: upgrade PHP version to 8.4

* fix: update install-php-extensions URL to version 2.7.34 in Dockerfiles

* feat: add Docker Build Check workflow for automated image builds

* fix: update base image version to unit:1.34.2-php8.4 in Dockerfile

* feat: enhance Docker Build Check workflow with Composer installation and diagnostics

* fix: ensure safe.directory is set for www-data user in Dockerfile

* feat: add Composer public key downloads to Dockerfile for improved security

* fix: update COMPOSER_HOME path and set user for Docker commands in build check workflow

* refactor: remove installation and testing steps for development Dockerfile in build check workflow

Author: ihor-sviziev

.github/workflows/docker-build-check.yaml

@@ -0,0 +1,73 @@
+name: "Docker Build Check"
+
+on:
+  push:
+    branches: [ main, master ]
+    paths:
+      - 'docker/**'
+      - '.github/workflows/docker-build-check.yaml'
+  pull_request:
+    branches: [ main, master ]
+    paths:
+      - 'docker/**'
+      - '.github/workflows/docker-build-check.yaml'
+  workflow_dispatch:  # Allows manual triggering
+
+permissions:
+  contents: read
+
+jobs:
+  build-check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dockerfile: 
+          - docker/php/Dockerfile
+          - docker/php/package.Dockerfile
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Build Docker image (no push)
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ matrix.dockerfile == 'docker/php/Dockerfile' && './docker/php' || '.' }}
+          file: ${{ matrix.dockerfile }}
+          push: false
+          platforms: linux/amd64
+          tags: satisfy-test:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          load: true
+
+      - name: Run basic Composer diagnostics
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:/var/www/html \
+            -w /var/www/html \
+            -e COMPOSER_HOME=/var/www/.composer \
+            -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
+            --user www-data \
+            satisfy-test:${{ github.sha }} \
+            composer diagnose
+
+      - name: Check platform requirements
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:/var/www/html \
+            -w /var/www/html \
+            -e COMPOSER_HOME=/var/www/.composer \
+            -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
+            --user www-data \
+            satisfy-test:${{ github.sha }} \
+            composer check-platform-reqs

.github/workflows/docker-image.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.4"
           extensions: mbstring
           coverage: none
 

.github/workflows/phpunit.yaml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
 
     name: PHP ${{ matrix.php }}
 

composer.json

@@ -45,7 +45,7 @@
         "symfony/twig-bundle": "6.4.*",
         "symfony/validator": "6.4.*",
         "symfony/yaml": "6.4.*",
-        "laminas/laminas-diactoros": "^2.3",
+        "laminas/laminas-diactoros": "^3.6",
         "symfony/monolog-bundle": "^3.8",
         "symfony/dependency-injection": "6.4.*",
         "symfony/event-dispatcher": "6.4.*",

composer.lock

@@ -1,10 +1,10 @@
-FROM unit:1.32.0-php8.2
+FROM unit:1.34.2-php8.4
 
 RUN apt update && \
     apt install -qy wget curl git zip unzip && \
     apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/download/2.2.5/install-php-extensions /usr/local/bin/
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/download/2.7.34/install-php-extensions /usr/local/bin/
 RUN install-php-extensions @composer zip
 
 RUN chown -R www-data:www-data /var/www
@@ -14,6 +14,8 @@ COPY php.ini /usr/local/etc/php/conf.d/satisfy.ini
 USER www-data
 RUN mkdir -p ~/.ssh && chmod 0700 ~/.ssh && ssh-keyscan -H github.com >> ~/.ssh/known_hosts && \
     mkdir -p ~/.composer && chown www-data:www-data ~/.composer && \
+    wget -O ~/.composer/keys.dev.pub https://composer.github.io/snapshots.pub && \
+    wget -O ~/.composer/keys.tags.pub https://composer.github.io/releases.pub && \
     git config --global --add safe.directory /var/www/html
 
 USER root

docker/php/Dockerfile

@@ -1,21 +1,23 @@
-FROM unit:1.32.0-php8.2
+FROM unit:1.34.2-php8.4
 
 RUN apt update && \
     apt install -qy wget curl git zip unzip && \
     apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/download/2.2.5/install-php-extensions /usr/local/bin/
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/download/2.7.34/install-php-extensions /usr/local/bin/
 RUN install-php-extensions @composer zip
 
 COPY docker/php/unit.json /docker-entrypoint.d/config.json
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/satisfy.ini
-RUN chown -R www-data:www-data /var/www
+RUN chown -R www-data:www-data /var/www && \
+    git config --global --add safe.directory /var/www/html
 
 USER www-data
 RUN mkdir -p ~/.ssh && chmod 0700 ~/.ssh && ssh-keyscan -H github.com >> ~/.ssh/known_hosts && \
     mkdir -p ~/.composer && \
     wget -O ~/.composer/keys.dev.pub https://composer.github.io/snapshots.pub && \
-    wget -O ~/.composer/keys.tags.pub https://composer.github.io/releases.pub
+    wget -O ~/.composer/keys.tags.pub https://composer.github.io/releases.pub && \
+    git config --global --add safe.directory /var/www/html
 VOLUME /var/www/.composer
 
 ENV APP_PATH=/var/www/html