Add Support for PHP 8.5

Author: andysnell

.env.dist

@@ -10,3 +10,9 @@ XDEBUG_MODE=debug
 
 # XDebug Configuration (https://xdebug.org/docs/all_settings#XDEBUG_CONFIG)
 XDEBUG_CONFIG="client_host=host.docker.internal start_with_request=trigger idekey=PHPSTORM output_dir=/var/www/build/xdebug"
+
+# Docker image tag for the php image (e.g. 8.4-cli, 8.5-cli)
+PHP_VERSION=8.4-cli
+
+# Controls the Docker build arg toggling Xdebug extension installation
+WITH_XDEBUG=false

.gitattributes

@@ -25,7 +25,7 @@
 /captainhook.json           export-ignore
 /codecov.yml                export-ignore
 /compose.yaml               export-ignore
-/compose.yml               export-ignore
+/compose.yml                export-ignore
 /composer.lock              export-ignore
 /conventional-commits.json  export-ignore
 /docker-compose.yaml        export-ignore

CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.2 [2025-11-13]
+
+### Added
+
+- Add explicit support for PHP 8.5 in composer.json constraints.
+- [Development Docker Image] Add `PHP_VERSION` and `WITH_XDEBUG` environment variables and build args to make Docker image more flexible.
+
+### Changed
+
+- Remove composer.json repository override for 'phoneburner/php-coding-standard' (as it is now available on Packagist)
+- [Development Docker Image] Switch from PECL to PIE for installing PHP extensions.
+- [Development Docker Image] Optional Xdebug extension is no longer installed by default.
+- [Development Docker Image] Install git, fixing Composer root-version warning message.
+
+### Fixed
+
+- Fix whitespace issues in .gitattributes
+
 ## [1.0.1] - 2025-07-30
 
 ### Added

Dockerfile

@@ -3,7 +3,9 @@
 # PHP Build Stages
 ##------------------------------------------------------------------------------
 
-FROM php:8.4-cli AS php
+ARG PHP_VERSION=8.4-cli
+FROM php:${PHP_VERSION} AS php
+ARG WITH_XDEBUG=false
 ARG USER_UID=1000
 ARG USER_GID=1000
 WORKDIR /app
@@ -19,16 +21,18 @@ RUN groupadd --gid $USER_GID dev \
 RUN --mount=type=cache,target=/var/lib/apt,sharing=locked apt-get update && apt-get dist-upgrade --yes
 
 RUN --mount=type=cache,target=/var/lib/apt apt-get install --yes --quiet --no-install-recommends \
+    git \
     libzip-dev \
     unzip \
   && cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-RUN <<-EOF
-  set -eux
-  export MAKEFLAGS="-j $(nproc)"
-  pecl install xdebug
-  docker-php-ext-enable xdebug
-EOF
+COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
+
+RUN if [ "${WITH_XDEBUG}" != "false" ]; then \
+    pie install xdebug/xdebug; \
+else \
+    echo 'Skipping Installation of the Xdebug Extension...'; \
+fi
 
 RUN <<-EOF
   set -eux

composer.json

@@ -52,7 +52,7 @@
     }
   ],
   "require": {
-    "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
     "phoneburner/http-tortilla": "^2.0.0",
     "psr/http-factory": "^1.0",
     "psr/http-message": "^2.0",