feat: upgrade to PHP 8.5 ORC1

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

.gitlab/generate-common.php

@@ -13,7 +13,7 @@
     "8.2" => "20220829",
     "8.3" => "20230831",
     "8.4" => "20240924",
-    "8.5" => "20240925",
+    "8.5" => "20250925",
 ];
 
 $all_minor_major_targets = array_keys($php_versions_to_abi);

appsec/tests/integration/src/docker/php/build_dev_php.sh

@@ -37,7 +37,7 @@ function download_php {
   if [[ $version_id -lt 50400 ]]; then
     download_url="http://museum.php.net/php5/php-${version}.tar.gz"
   elif [[ $version_id -ge 80500 ]]; then
-    download_url="https://downloads.php.net/~edorian/php-8.5.0beta3.tar.gz"
+    download_url="https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz"
   else
     download_url="https://www.php.net/distributions/php-${version}.tar.gz"
   fi

dockerfiles/ci/alpine_compile_extension/docker-compose.yml

@@ -141,8 +141,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: 8.5.0
-        phpTarGzUrl: https://downloads.php.net/~edorian/php-8.5.0beta3.tar.gz
-        phpSha256Hash: "ff3f5a8c73c4b84883ef0e3870543c078d324c46ccef2eb85c66cb88124e7a55"
-        phpApi: 20240925
+        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
+        phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
+        phpApi: 20250925
     volumes:
       - ../../:/app

dockerfiles/ci/bookworm/docker-compose.yml

@@ -22,8 +22,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.5"
-        phpTarGzUrl: https://downloads.php.net/~edorian/php-8.5.0beta3.tar.gz
-        phpSha256Hash: "ff3f5a8c73c4b84883ef0e3870543c078d324c46ccef2eb85c66cb88124e7a55"
+        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
+        phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
 
   php-8.4:
     image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION

dockerfiles/ci/buster/docker-compose.yml

@@ -16,9 +16,9 @@ services:
       dockerfile: php-8.5/Dockerfile
       x-bake: *bake
       args:
-        phpVersion: "8.5.0beta1"
-        phpTarGzUrl: https://downloads.php.net/~edorian/php-8.5.0beta1.tar.gz
-        phpSha256Hash: "d28f6de0744fa733db898ddcdeaa784a5e87ec1b4b4822e83529d9a76229ea61"
+        phpVersion: "8.5"
+        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
+        phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
 
   php-8.4:
     image: datadog/dd-trace-ci:php-8.4_buster

dockerfiles/ci/centos/7/docker-compose.yml

@@ -128,6 +128,6 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.5"
-        phpTarGzUrl: https://downloads.php.net/~edorian/php-8.5.0beta3.tar.gz
-        phpSha256Hash: "ff3f5a8c73c4b84883ef0e3870543c078d324c46ccef2eb85c66cb88124e7a55"
+        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
+        phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
     image: 'datadog/dd-trace-ci:php-8.5_centos-7'

dockerfiles/ci/windows/docker-compose.yml

@@ -85,10 +85,10 @@ services:
         - windows/amd64
       context: .
       args:
-        phpVersion: "8.5.0beta1"
+        phpVersion: "8.5.0"
         vsVersion: "vs17"
-        phpTarGzUrl: https://downloads.php.net/~edorian/php-8.5.0beta1.tar.gz
-        phpSha256Hash: "d28f6de0744fa733db898ddcdeaa784a5e87ec1b4b4822e83529d9a76229ea61"
+        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC1.tar.gz
+        phpSha256Hash: "0ea5059a387117fe6ed9a72cdc20945dbff6acc072df936e97d35a9cb26420e0"
 
   php-8.4:
     image: datadog/dd-trace-ci:php-8.4_windows

libdatadog

@@ -1,10 +1,5 @@
 --TEST--
 Suppress function call via suppressCall()
---SKIPIF--
-<?php
-if (!version_compare(PHP_VERSION, '8.5.0', '>='))
-    die('skip: temporary disable on PHP 8.5+');
-?>
 --FILE--
 <?php
 function foo() {

tests/ext/sandbox/install_hook/suppress_call.phpt

@@ -68,7 +68,7 @@ for architecture in "${architectures[@]}"; do
     # Products
     ########################
 
-    php_apis=(20151012 20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924 20240925)
+    php_apis=(20151012 20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924 20250925)
     for php_api in "${php_apis[@]}"; do
         ########################
         # Trace