Add PHP 8.5 support

Author: gmazzap

.github/workflows/docker/docker-compose.yml

@@ -66,4 +66,15 @@ services:
         environment:
           *db-environment
         volumes:
-          *wp-volume
+          *wp-volume
+    php85:
+      container_name: wonolog-php-85
+      build:
+        context: .
+        dockerfile: ./php85/Dockerfile
+      depends_on:
+        - db
+      environment:
+        *db-environment
+      volumes:
+        *wp-volume

.github/workflows/docker/php85/Dockerfile

@@ -0,0 +1,15 @@
+FROM wordpress:cli-php8.5
+
+USER root
+
+RUN set -eux; apk update && apk add git
+
+COPY install-composer.sh /usr/bin/install-composer.sh
+RUN chmod +x /usr/bin/install-composer.sh && /usr/bin/install-composer.sh && mv composer.phar /usr/local/bin/composer
+
+COPY wait-for.sh /usr/bin/wait-for.sh
+RUN chmod +x /usr/bin/wait-for.sh
+
+RUN git config --global --add safe.directory /var/www/html
+
+WORKDIR /var/www/html

.github/workflows/php-integration-tests.yml

@@ -22,7 +22,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-service: [ '81', '82', '83', '84' ]
+                php-service: [ '81', '82', '83', '84', '85' ]
                 dependency-versions: [ 'lowest', 'highest' ]
         steps:
             -   name: Checkout

.github/workflows/php-static-analysis.yml

@@ -32,7 +32,7 @@ jobs:
         if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run lint only')) }}
         strategy:
             matrix:
-                php-version: ["8.1", "8.2", "8.3", "8.4"]
+                php-version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
                 dependency-versions: ['highest', 'lowest']
         with:
             PHP_VERSION: ${{ matrix.php-version }}
@@ -48,7 +48,7 @@ jobs:
         uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@support_dependency_versions_in_static_analysis
         strategy:
             matrix:
-                php-version: ["8.1", "8.2", "8.3", "8.4"]
+                php-version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
                 dependency-versions: ["lowest", "highest"]
         with:
             PHP_VERSION: ${{ matrix.php-version }}

.github/workflows/php-unit-tests.yml

@@ -22,7 +22,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+                php-versions: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
                 dependency-versions: ['highest', 'lowest']
 
         steps:
@@ -33,7 +33,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-versions }}
-                  ini-values: zend.assertions=1, error_reporting=${{ ((matrix.php-versions == '8.4') && 'E_ALL') || 'E_ALL & ~E_DEPRECATED' }}, display_errors=On
+                  ini-values: zend.assertions=1, error_reporting=${{ ((matrix.php-versions == '8.4' || matrix.php-versions == '8.5') && 'E_ALL') || 'E_ALL & ~E_DEPRECATED' }}, display_errors=On
                   coverage: none
 
             - name: Install Composer dependencies

composer.json

@@ -38,13 +38,13 @@
         }
     ],
     "require": {
-        "php": ">=8.1 < 8.5",
+        "php": ">=8.1 <= 8.5",
         "psr/log": "^2.0||^3.0",
         "wecodemore/wordpress-early-hook": "^1.3.0",
         "monolog/monolog": "^2.0||^3.0"
     },
     "require-dev": {
-        "antecedent/patchwork": "^2.2.1",
+        "antecedent/patchwork": "^2.2.3",
         "hamcrest/hamcrest-php": "^2.1.1",
         "brain/monkey": "^2.6.2",
         "mockery/mockery": "^1.6.12",