add PHP 8.4 support

JanTvrdik · JanTvrdik · commit 20b522d39282 · 2025-02-06T23:04:34.000+01:00
diff --git a/.github/workflows/qa.yaml b/.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']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     name: PHP ${{ matrix.php }}
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -44,6 +44,10 @@ services:
     <<: *php-service-base
     image: thecodingmachine/php:8.3-v4-cli
 
+  php84:
+    <<: *php-service-base
+    image: thecodingmachine/php:8.4-v4-cli
+
   postgres:
     image: postgres:9.6
     environment:
diff --git a/readme.md b/readme.md
@@ -32,7 +32,7 @@ Development & Running Integration Tests in Docker
     ```
 3. Run tests
     ```bash
-    tests/run-in-docker.sh php81 tests/run-integration.sh
+    tests/run-in-docker.sh php84 tests/run-integration.sh
     ```
 
 License
diff --git a/tests/inc/TestPrinter.php b/tests/inc/TestPrinter.php
@@ -21,7 +21,7 @@ public function __construct()
 	}
 
 
-	protected function output(string $s, string $color = null): void
+	protected function output(string $s, ?string $color = null): void
 	{
 		$this->lines[] = preg_replace('#; \d+\.\d+ s#', '; XX s', $s);
 		$this->out .= "$s\n";
diff --git a/tests/matrix/dbal/dibi-4.0-php-8.1.sh b/tests/matrix/dbal/dibi-4.0-php-8.1.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80100"
-PHP_VERSION_MAX="80399"
+PHP_VERSION_MAX="80499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.2.7"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
 DBAL="dibi"
diff --git a/tests/matrix/dbal/dibi-5.0.sh b/tests/matrix/dbal/dibi-5.0.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80000"
-PHP_VERSION_MAX="80399"
+PHP_VERSION_MAX="80499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~5.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
 DBAL="dibi"
diff --git a/tests/matrix/dbal/doctrine-3.0.sh b/tests/matrix/dbal/doctrine-3.0.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="70300"
-PHP_VERSION_MAX="80399"
+PHP_VERSION_MAX="80499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^3.3.7"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
 DBAL="doctrine"
diff --git a/tests/matrix/dbal/doctrine-4.0.sh b/tests/matrix/dbal/doctrine-4.0.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80100"
-PHP_VERSION_MAX="80399"
+PHP_VERSION_MAX="80499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^4.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
 DBAL="doctrine"
diff --git a/tests/matrix/dbal/nette-3.0-php-8.1-to-php-8.3.sh b/tests/matrix/dbal/nette-3.0-php-8.1-to-php-8.3.sh
diff --git a/tests/matrix/dbal/nextras-5.0-php-8.1-to-8.3.sh b/tests/matrix/dbal/nextras-5.0-php-8.1-to-8.3.sh
diff --git a/tests/matrix/dbal/nextras-5.0-php-8.1-to-8.4.sh b/tests/matrix/dbal/nextras-5.0-php-8.1-to-8.4.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80100"
+PHP_VERSION_MAX="80499"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~5.0.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
+DBAL="nextras"
diff --git a/tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh b/tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh
@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="80200"
-PHP_VERSION_MAX="80399"
+PHP_VERSION_MAX="80499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^3.3.7"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.11"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle:~2.6"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~7.0"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/cache:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/cache-contracts:~3.4.2"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/error-handler:~7.1.3"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/var-exporter:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~7.1"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.4"
 DBAL='doctrine'

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function __construct()`
`21`	`21`	`}`
`22`	`22`
`23`	`23`
`24`		`- protected function output(string $s, string $color = null): void`
	`24`	`+ protected function output(string $s, ?string $color = null): void`
`25`	`25`	`{`
`26`	`26`	`$this->lines[] = preg_replace('#; \d+\.\d+ s#', '; XX s', $s);`
`27`	`27`	`$this->out .= "$s\n";`