Merge pull request #100 from scoutapp/remicollet-issue-98

call json_encode using call_user_func on PHP 7
scoutapp · Dec 24, 2021 · 6b558f6 · 6b558f6
2 parents 2d1c843 + 43aef15
commit 6b558f6
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.5.1 - 2021-12-24
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#100](https://github.com/scoutapp/scout-apm-php-ext/pull/100) Fix json_encode usage where ext-json is shared or does not exist - thanks @remicollet
+
 ## 1.5.0 - 2021-12-23
 
 ### Added

diff --git a/package.xml b/package.xml
@@ -25,19 +25,19 @@
     </lead>
 
     <!-- Current Release -->
-    <date>2021-12-23</date>
-    <time>09:00:00</time>
+    <date>2021-12-24</date>
+    <time>14:00:00</time>
     <version>
-        <release>1.5.0</release>
-        <api>1.5.0</api>
+        <release>1.5.1</release>
+        <api>1.5.1</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="https://opensource.org/licenses/MIT">MIT</license>
     <notes>
-        - file_get_contents and curl_exec now record HTTP methods (#96)
+        - Fix json_encode usage where ext-json is shared or does not exist - thanks @remicollet (#100)
     </notes>
     <!-- End Current Release -->
 
@@ -114,6 +114,22 @@
     <zendextsrcrelease />
 
     <changelog>
+        <release>
+            <date>2021-12-23</date>
+            <time>09:00:00</time>
+            <version>
+                <release>1.5.0</release>
+                <api>1.5.0</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="https://opensource.org/licenses/MIT">MIT</license>
+            <notes>
+                - file_get_contents and curl_exec now record HTTP methods (#96)
+            </notes>
+        </release>
         <release>
             <date>2021-10-29</date>
             <time>09:00:00</time>

diff --git a/scout_utils.c b/scout_utils.c
@@ -89,11 +89,24 @@ void safely_copy_argument_zval_as_scalar(zval *original_to_copy, zval *destinati
             if (strcasecmp("stream-context", zend_rsrc_list_get_rsrc_type(Z_RES_P(original_to_copy))) == 0) {
                 php_stream_context *stream_context = zend_fetch_resource_ex(original_to_copy, NULL, php_le_stream_context());
                 if (stream_context != NULL) {
+#if PHP_VERSION_ID < 80000
+                    /* ext/json can be shared */
+                    zval args[1], jsonenc;
+
+                    ZVAL_STRINGL(&jsonenc, "json_encode", sizeof("json_encode")-1);
+                    args[0] = stream_context->options;
+                    if (FAILURE == call_user_function(EG(function_table), NULL, &jsonenc, destination, 1, args)) {
+                        ZVAL_NULL(destination);
+                    }
+                    zval_ptr_dtor(&jsonenc);
+#else
+                    /* ext/json is always there */
                     smart_str json_encode_string_buffer = {0};
                     php_json_encode(&json_encode_string_buffer, &stream_context->options, 0);
                     smart_str_0(&json_encode_string_buffer);
                     ZVAL_STR_COPY(destination, json_encode_string_buffer.s);
                     smart_str_free(&json_encode_string_buffer);
+#endif
                     return;
                 }
             }

diff --git a/tests/019-url-method-capture-fgc.phpt b/tests/019-url-method-capture-fgc.phpt
@@ -2,6 +2,7 @@
 Both URL and Method can be captured using file_get_contents
 --SKIPIF--
 <?php if (!extension_loaded("scoutapm")) die("skip scoutapm extension required."); ?>
+<?php if (!extension_loaded("json")) die("skip json extension required."); ?>
 --FILE--
 <?php
 

diff --git a/zend_scoutapm.h b/zend_scoutapm.h
@@ -21,7 +21,7 @@
 #include "scout_execute_ex.h"
 
 #define PHP_SCOUTAPM_NAME "scoutapm"
-#define PHP_SCOUTAPM_VERSION "1.5.0"
+#define PHP_SCOUTAPM_VERSION "1.5.1"
 
 /* Extreme amounts of debugging, set to 1 to enable it and `make clean && make` (tests will fail...) */
 #define SCOUT_APM_EXT_DEBUGGING 0