Merge branch 'main' into v3

# Conflicts:
#	.github/workflows/tests.yml
#	layers/fpm-dev/Dockerfile
#	php-80/Dockerfile
#	php-81/Dockerfile
#	php-82/Dockerfile
#	php-83/Dockerfile
#	php-84/Dockerfile
#	src/opcache.ini
#	src/php-85.ini
#	src/php.ini

Author: mnapoli

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
                     - x86
                     - arm
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v6
 
             -   name: Get the version
                 id: get_version

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
     push:
-        branches: [ 'main', 'v3' ]
+        branches: [ 'main', '2.x', 'v3' ]
     pull_request:
         branches: [ '*' ]
 

tests/test_4_function_invocation.php

@@ -27,6 +27,8 @@ function post(string $url, array $params)
 
 $body = ['Hello' => 'From Bref!'];
 
+waitForPort('127.0.0.1', 8080);
+
 try {
     $response = post('http://127.0.0.1:8080/2015-03-31/functions/function/invocations', $body);
     $response = json_decode($response, true, 512, JSON_THROW_ON_ERROR);

tests/test_5_fpm_invocation.php

@@ -25,6 +25,8 @@ function post(string $url, string $body)
 
 $body = file_get_contents(__DIR__ . '/test_5_event.json');
 
+waitForPort('127.0.0.1', 8080);
+
 try {
     $response = post('http://127.0.0.1:8080/2015-03-31/functions/function/invocations', $body);
     $response = json_decode($response, true, 512, JSON_THROW_ON_ERROR);

tests/test_6_console_invocation.php

@@ -27,6 +27,8 @@ function post(string $url, string $param)
 
 $body = '"From Bref"';
 
+waitForPort('127.0.0.1', 8080);
+
 try {
     $response = post('http://127.0.0.1:8080/2015-03-31/functions/function/invocations', $body);
     $response = json_decode($response, true, 512, JSON_THROW_ON_ERROR);

tests/test_7_custom_ini_scan_dir.php

@@ -27,6 +27,8 @@ function post(string $url, string $params)
 
 $body = 'list_extensions';
 
+waitForPort('127.0.0.1', 8080);
+
 try {
     $response = post('http://127.0.0.1:8080/2015-03-31/functions/function/invocations', $body);
     $response = json_decode($response, true, 512, JSON_THROW_ON_ERROR);

tests/utils.php

@@ -25,3 +25,22 @@ function success(string $message): void
     }
     exit(1);
 }
+
+/**
+ * Wait for a port to be available (useful for QEMU-emulated containers that start slowly).
+ */
+function waitForPort(string $host, int $port, int $timeoutSeconds = 5): void
+{
+    $start = time();
+    while (true) {
+        $socket = @fsockopen($host, $port, $errno, $errstr, 1);
+        if ($socket !== false) {
+            fclose($socket);
+            return;
+        }
+        if (time() - $start >= $timeoutSeconds) {
+            error("Timeout waiting for $host:$port to be available");
+        }
+        usleep(100000); // 100ms
+    }
+}