Added support for PHP 8.4 (#130) (#132)

elastic · Nov 25, 2024 · c137dd4 · c137dd4
1 parent 0e8d560
commit c137dd4
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         { "name": "Sergey Kleyman" }
     ],
     "require": {
-        "php": "8.0.*||8.1.*||8.2.*||8.3.*",
+        "php": "8.1.*||8.2.*||8.3.*||8.4.*",
         "open-telemetry/exporter-otlp": "1.0.4",
         "open-telemetry/opentelemetry-auto-curl": "0.0.2",
         "open-telemetry/opentelemetry-auto-http-async": "1.0.1",

diff --git a/elastic-otel-php.properties b/elastic-otel-php.properties
@@ -1,4 +1,4 @@
 version=0.2.0
-supported_php_versions=(81 82 83)
+supported_php_versions=(81 82 83 84)
 php_headers_version=2.0
 logger_features_enum_values=ALL=0,MODULE=1,REQUEST=2,TRANSPORT=3,BOOTSTRAP=4,HOOKS=5,INSTRUMENTATION=6,OTEL=7
diff --git a/prod/native/building/conan/profiles/linux-arm64-release b/prod/native/building/conan/profiles/linux-arm64-release
@@ -17,3 +17,4 @@ CC=/opt/gcc-14.2.0/bin/gcc
 CXX=/opt/gcc-14.2.0/bin/g++
 LDFLAGS+=-static-libgcc
 LDFLAGS+=-static-libstdc++
+CC_FOR_BUILD=/opt/gcc-14.2.0/bin/gcc
diff --git a/prod/native/building/conan/profiles/linux-x86-64-release b/prod/native/building/conan/profiles/linux-x86-64-release
@@ -17,3 +17,4 @@ CC=/opt/gcc-14.2.0/bin/gcc
 CXX=/opt/gcc-14.2.0/bin/g++
 LDFLAGS+=-static-libgcc
 LDFLAGS+=-static-libstdc++
+CC_FOR_BUILD=/opt/gcc-14.2.0/bin/gcc
diff --git a/prod/native/building/conan/profiles/linuxmusl-arm64-release b/prod/native/building/conan/profiles/linuxmusl-arm64-release
@@ -17,3 +17,4 @@ CC=/opt/gcc-14.2.0/bin/gcc
 CXX=/opt/gcc-14.2.0/bin/g++
 LDFLAGS+=-static-libgcc
 LDFLAGS+=-static-libstdc++
+CC_FOR_BUILD=/opt/gcc-14.2.0/bin/gcc
diff --git a/prod/native/building/conan/profiles/linuxmusl-x86-64-release b/prod/native/building/conan/profiles/linuxmusl-x86-64-release
@@ -17,3 +17,4 @@ CC=/opt/gcc-14.2.0/bin/gcc
 CXX=/opt/gcc-14.2.0/bin/g++
 LDFLAGS+=-static-libgcc
 LDFLAGS+=-static-libstdc++
+CC_FOR_BUILD=/opt/gcc-14.2.0/bin/gcc
diff --git a/prod/native/building/dependencies/php-headers/conandata.yml b/prod/native/building/dependencies/php-headers/conandata.yml
@@ -17,6 +17,6 @@ sources:
       contentsRoot: "php-{}"
   "84":
     linux:
-      version: "8.4.0RC2"
-      url: "https://github.com/php/php-src/archive/refs/tags/php-{}.tar.gz"
-      contentsRoot: "php-src-php-{}"
+      version: "8.4.1"
+      url: "https://www.php.net/distributions/php-{}.tar.gz"
+      contentsRoot: "php-{}"
diff --git a/prod/native/building/dependencies/php-headers/conanfile.py b/prod/native/building/dependencies/php-headers/conanfile.py
@@ -33,8 +33,8 @@ def requirements(self):
             self.requires("libxml2/2.9.9")
             self.requires("sqlite3/3.46.1")
 
-    # def build_requirements(self):
-    #     self.tool_requires("bison/3.8.2")
+    def build_requirements(self):
+        self.tool_requires("bison/3.8.2")
 
     def init(self):
         self.source_temp_dir = "php-src"

diff --git a/prod/native/conanfile.txt b/prod/native/conanfile.txt
@@ -7,6 +7,7 @@ gtest/1.15.0
 php-headers-81/2.0
 php-headers-82/2.0
 php-headers-83/2.0
+php-headers-84/2.0
 
 [layout]
 cmake_layout

diff --git a/prod/native/extension/phpt/tests/includes/tests_util.inc b/prod/native/extension/phpt/tests/includes/tests_util.inc
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL);
 
 function elasticApmOnAssertFailure(string $condDesc, string $expr, $actual, $expected)
 {

diff --git a/prod/native/loader/code/phpdetection.cpp b/prod/native/loader/code/phpdetection.cpp
@@ -79,7 +79,7 @@ std::tuple<std::string_view, int, int, bool> getZendModuleApiVersion(std::string
 
     // zendEngineVersion, phpVersion, zendModuleApiVersion, isVersionSupported
     constexpr std::array<std::tuple<std::string_view, int, int, bool>, knownVersionsCount> knownPhpVersions{{
-        {"4.4"sv, 84, 20240924, false}, // PHP 8.4
+        {"4.4"sv, 84, 20240924, true},  // PHP 8.4
         {"4.3"sv, 83, 20230831, true},  // PHP 8.3
         {"4.2"sv, 82, 20220829, true},  // PHP 8.2
         {"4.1"sv, 81, 20210902, true},  // PHP 8.1