PHP 8.5 support. Closes #127 #129

Author: halaxa

Makefile

@@ -6,14 +6,15 @@ COVERAGE_PHP := 7.4 3.1.1
 PHP_8_3 := 8.3 3.3.2
 
 define PHP_VERSIONS
-"7.2 3.1.1"\
-"7.3 3.1.1"\
-"7.4 3.1.1"\
-"8.0 3.1.1"\
-"8.1 3.1.1"\
-"8.2 3.2.0"\
-"8.3 3.3.2"\
-"8.4 3.4.0beta1"
+"7.2 3.1.5"\
+"7.3 3.1.5"\
+"7.4 3.1.5"\
+"8.0 3.4.7"\
+"8.1 3.4.7"\
+"8.2 3.4.7"\
+"8.3 3.4.7"\
+"8.4 3.4.7"\
+"8.5"
 endef
 
 define DOCKER_RUN

build/build-image.sh

@@ -32,12 +32,14 @@ printf "
         libtool \
         make \
         bash \
-        linux-headers \
-    && wget http://pear.php.net/go-pear.phar && php go-pear.phar \
-    && pecl install xdebug-$XDEBUG_VERSION \
-        && docker-php-ext-enable xdebug \
-        && docker-php-ext-enable opcache \
-    && wget https://getcomposer.org/download/2.8.1/composer.phar -O /usr/local/bin/composer \
+        linux-headers
+    RUN if [ ! -z \"$XDEBUG_VERSION\" ]; then \
+        wget http://pear.php.net/go-pear.phar && php go-pear.phar \
+        && pecl install xdebug-$XDEBUG_VERSION \
+        && docker-php-ext-enable xdebug; \
+      fi
+    RUN php -i | grep -q opcache || docker-php-ext-enable opcache
+    RUN wget https://getcomposer.org/download/2.9.2/composer.phar -O /usr/local/bin/composer \
         && chmod +x /usr/local/bin/composer
 " | docker build --quiet --tag "$CONTAINER_NAME" - > /dev/null
 

build/composer-update.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
 set -x
-composer --quiet update
+composer --quiet update || composer update

composer.json

@@ -21,7 +21,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.2 - 8.4"
+        "php": "7.2 - 8.5"
     },
     "require-dev": {
         "ext-json": "*",