Improve 8.5 support

Author: cataphract

appsec/run-tests-internal.php

@@ -845,19 +845,19 @@ function write_information()
     $info_params = array();
     settings2array($ini_overwrites, $info_params);
     $info_params = settings2params($info_params);
-    $php_info = `$php $pass_options $info_params $no_file_cache "$info_file"`;
-    define('TESTED_PHP_VERSION', `$php -n -r "echo PHP_VERSION;"`);
+    $php_info = shell_exec("$php $pass_options $info_params $no_file_cache \"$info_file\"");
+    define('TESTED_PHP_VERSION', shell_exec("$php -n -r \"echo PHP_VERSION;\""));
 
     if ($php_cgi && $php != $php_cgi) {
-        $php_info_cgi = `$php_cgi $pass_options $info_params $no_file_cache -q "$info_file"`;
+        $php_info_cgi = shell_exec("$php_cgi $pass_options $info_params $no_file_cache -q \"$info_file\"");
         $php_info_sep = "\n---------------------------------------------------------------------";
         $php_cgi_info = "$php_info_sep\nPHP         : $php_cgi $php_info_cgi$php_info_sep";
     } else {
         $php_cgi_info = '';
     }
 
     if ($phpdbg) {
-        $phpdbg_info = `$phpdbg $pass_options $info_params $no_file_cache -qrr "$info_file"`;
+        $phpdbg_info = shell_exec("$phpdbg $pass_options $info_params $no_file_cache -qrr \"$info_file\"");
         $php_info_sep = "\n---------------------------------------------------------------------";
         $phpdbg_info = "$php_info_sep\nPHP         : $phpdbg $phpdbg_info$php_info_sep";
     } else {
@@ -872,7 +872,7 @@ function write_information()
     // load list of enabled extensions
     save_text($info_file,
         '<?php echo str_replace("Zend OPcache", "opcache", implode(",", get_loaded_extensions())); ?>');
-    $exts_to_test = explode(',', `$php $pass_options $info_params $no_file_cache "$info_file"`);
+    $exts_to_test = explode(',', shell_exec("$php $pass_options $info_params $no_file_cache \"$info_file\""));
     // check for extensions that need special handling and regenerate
     $info_params_ex = array(
         'session' => array('session.auto_start=0'),
@@ -2171,9 +2171,9 @@ function run_test($php, $file, array $env)
         $ext_params = array();
         settings2array($ini_overwrites, $ext_params);
         $ext_params = settings2params($ext_params);
-        $ext_dir = `$php $pass_options $extra_options $ext_params $no_file_cache -d display_errors=0 -r "echo ini_get('extension_dir');"`;
+        $ext_dir = shell_exec("$php $pass_options $extra_options $ext_params $no_file_cache -d display_errors=0 -r \"echo ini_get('extension_dir');\"");
         $extensions = preg_split("/[\n\r]+/", trim($section_text['EXTENSIONS']));
-        $loaded = explode(",", `$php $pass_options $extra_options $ext_params $no_file_cache -d display_errors=0 -r "echo implode(',', get_loaded_extensions());"`);
+        $loaded = explode(",", shell_exec("$php $pass_options $extra_options $ext_params $no_file_cache -d display_errors=0 -r \"echo implode(',', get_loaded_extensions());\""));
         $ext_prefix = IS_WINDOWS ? "php_" : "";
         foreach ($extensions as $req_ext) {
             if (!in_array($req_ext, $loaded)) {
@@ -3403,7 +3403,7 @@ function show_result(
     $tested,
     $tested_file,
     $extra = '',
-    array $temp_filenames = null
+    $temp_filenames = null
 ) {
     global $SHOW_ONLY_GROUPS, $colorize;
 

appsec/tests/extension/module_order_opcache.phpt

@@ -2,10 +2,7 @@
 Verify ddappsec is always in the module registry after ddtrace when opcache is present
 --SKIPIF--
 <?php
-if (!extension_loaded('Zend OPcache')) {
-    die('skip requires opcache');
-}
-if (!version_compare(PHP_VERSION, '8.5.0', '>='))
+if (version_compare(PHP_VERSION, '8.5.0', '>='))
     die('skip: opcache is loaded by default in PHP 8.5+');
 ?>
 --INI--

appsec/tests/extension/module_order_opcache_php85.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Verify ddappsec is always in the module registry after ddtrace when opcache is present
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '8.5.0', '<')) {
+    die('skip: opcache is loaded by default only in PHP 8.5+');
+}
+?>
+--INI--
+extension=ddtrace.so
+--FILE--
+<?php
+foreach (get_loaded_extensions() as &$ext) {
+    if ($ext == 'ddappsec' || $ext == 'ddtrace') {
+        printf("%s\n", $ext);
+    }
+}
+?>
+--EXPECTF--
+ddtrace
+ddappsec

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

@@ -36,8 +36,6 @@ function download_php {
   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/~daniels/php-8.5.0RC3.tar.gz"
   else
     download_url="https://www.php.net/distributions/php-${version}.tar.gz"
   fi
@@ -109,7 +107,7 @@ function get_xdebug_version {
   elif [[ $version_id -lt 80400 ]]; then
     echo '3.3.2'
   elif [[ $version_id -ge 80400 ]]; then
-    echo '3.4.0'
+    echo '3.5.0'
   fi
 }
 
@@ -199,7 +197,6 @@ function build_php {
     --enable-filter
     --enable-intl=shared
     --enable-mbstring=shared
-    --enable-opcache=shared
     "--enable-pdo=$([[ $(uname -o) != Darwin ]] && echo shared)"
     --enable-phar=shared
     --enable-xml
@@ -226,6 +223,10 @@ function build_php {
     options+=(--enable-json) # not shared to make it consistent with php 8
   fi
 
+  if [[ $version_id -lt 85000 ]]; then
+    options+=(--enable-opcache=shared)
+  fi
+
   if [[ $minimal -eq 0 ]]; then
     local mysql_config= mysql_prefix=
     if contains_element nomysqlnd "${variants[@]}"; then