add PHP 8.5 support

.github/workflows/qa.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     name: PHP ${{ matrix.php }}
 

Dockerfile.php85

@@ -0,0 +1,16 @@
+FROM php:8.5-cli
+
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    git \
+    unzip \
+    sudo \
+    && docker-php-ext-install pdo pdo_mysql pdo_pgsql mysqli pgsql \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+WORKDIR /usr/src/app
+
+# Suppress deprecation warnings for nette/tester compatibility with PHP 8.5
+RUN echo "error_reporting = E_ALL & ~E_DEPRECATED" > /usr/local/etc/php/conf.d/php85-compat.ini

docker-compose.yaml

@@ -48,6 +48,12 @@ services:
     <<: *php-service-base
     image: thecodingmachine/php:8.4-v4-cli
 
+  php85:
+    <<: *php-service-base
+    build:
+      context: .
+      dockerfile: Dockerfile.php85
+
   postgres:
     image: postgres:9.6
     environment:

tests/matrix/dbal/dibi-5.0.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80000"
-PHP_VERSION_MAX="80499"
+PHP_VERSION_MAX="80599"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~5.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:dev-master"
 DBAL="dibi"

tests/matrix/dbal/doctrine-4.0-php-8.5.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80500"
+PHP_VERSION_MAX="80599"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^4.3.4"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:dev-master"
+DBAL="doctrine"

tests/matrix/dbal/nextras-5.0-php-8.1-to-8.4.sh → tests/matrix/dbal/nextras-5.0-php-8.1-to-8.5.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80100"
-PHP_VERSION_MAX="80499"
+PHP_VERSION_MAX="80599"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~5.0.1"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:dev-master"
 DBAL="nextras"

tests/matrix/symfony-bundle/symfony-7.0-php-8.5.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80500"
+PHP_VERSION_MAX="80599"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^3.10.2"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle:~2.6"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/cache:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/cache-contracts:~3.4.2"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:^7.3.6"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/error-handler:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/var-exporter:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:^7.2.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:dev-master"
+DBAL='doctrine'

tests/run-integration.sh

@@ -97,7 +97,7 @@ tester_run_integration_group()
 
 	"$PROJECT_DIR/vendor/bin/tester" \
 		-C \
-		-o console \
+		-o console: \
 		"$PROJECT_DIR/tests/cases/integration/$INTEGRATION_GROUP"
 }