test: fix 8.5 tests

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

Author: Leiyks

.gitlab/generate-package.php

@@ -1259,9 +1259,7 @@
   before_script:
 <?php unset_dd_runner_env_vars() ?>
     - |
-     if [[ "$MINOR_MAJOR" == "8.5" ]]; then
-       export XDEBUG_SO_NAME=xdebug-3.4.5.so
-     elif [[ "$MINOR_MAJOR" == "8.4" ]]; then
+     if [[ "$MINOR_MAJOR" == "8.4" ]]; then
        export XDEBUG_SO_NAME=xdebug-3.4.0.so
      elif [[ "$MINOR_MAJOR" == "8.3" ]]; then
        export XDEBUG_SO_NAME=xdebug-3.3.2.so

.gitlab/generate-tracer.php

@@ -652,7 +652,7 @@ function before_script_steps() {
     ["8.2", "3.2.2"],
     ["8.3", "3.3.2"],
     ["8.4", "3.4.0"],
-    ["8.5", "3.4.5"],
+    // ["8.5", "3.4.5"], Xdebug not supported yet on 8.5
 ];
 foreach ($xdebug_test_matrix as [$major_minor, $xdebug]):
 ?>

appsec/tests/extension/module_order_opcache.phpt

@@ -5,6 +5,8 @@ Verify ddappsec is always in the module registry after ddtrace when opcache is p
 if (!extension_loaded('Zend OPcache')) {
     die('skip requires opcache');
 }
+if (!version_compare(PHP_VERSION, '8.5.0', '>='))
+    die('skip: opcache is loaded by default in PHP 8.5+');
 ?>
 --INI--
 extension=ddtrace.so

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

@@ -33,7 +33,14 @@ function download_php {
     return
   fi
 
-  local download_url="https://downloads.php.net/~edorian/php-8.5.0beta3.tar.gz"
+  local download_url
+  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"
+  else
+    download_url="https://www.php.net/distributions/php-${version}.tar.gz"
+  fi
 
   cd "$download_dir"
   curl -L -f -v "$download_url" | tar --strip-components=1 -xzf -

loader/dd_library_loader.c

@@ -16,7 +16,7 @@
 #include "php_dd_library_loader.h"
 
 #define MIN_API_VERSION 320151012
-#define MAX_API_VERSION 420240924
+#define MAX_API_VERSION 420240925
 #define MAX_INI_API_VERSION MAX_API_VERSION + 1
 
 #define PHP_70_VERSION 20151012
@@ -25,7 +25,7 @@
 #define PHP_80_VERSION 20200930
 
 #define MIN_PHP_VERSION "7.0"
-#define MAX_PHP_VERSION "8.4"
+#define MAX_PHP_VERSION "8.5"
 
 extern zend_module_entry dd_library_loader_mod;