Skip to content

Commit 4f9acaf

Browse files
bwoebibwoebi
committed
Fixes
Signed-off-by: Bob Weinand <[email protected]>
1 parent bd68f12 commit 4f9acaf

File tree

14 files changed

+62
-46
lines changed

14 files changed

+62
-46
lines changed

‎ext/compatibility.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,13 @@ static zend_always_inline zend_fcall_info dd_fcall_info(int argc, zval *args, zv
6969
.params = args,
7070
.retval = rv,
7171
.size = sizeof(zend_fcall_info),
72+
#if PHP_VERSION_ID < 70100
73+
.symbol_table = NULL,
74+
#endif
7275
#if PHP_VERSION_ID >= 80000
7376
.named_params = NULL,
77+
#else
78+
.no_separation = 1,
7479
#endif
7580
};
7681
}

‎src/DDTrace/Integrations/Laravel/LaravelIntegration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static function (SpanData $span, $args) {
249249
$span->name = self::isLumen($rootSpan) ? 'lumen.view' : 'laravel.view';
250250
$span->meta[Tag::COMPONENT] = $span->name === 'laravel.view'
251251
? self::NAME
252-
: self::NAME;
252+
: LumenIntegration::NAME;
253253
$span->type = Type::WEB_SERVLET;
254254
$span->service = self::getServiceName();
255255
if (isset($args[0]) && \is_string($args[0])) {

‎zend_abstract_interface/exceptions/tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(exceptions exceptions.cc)
22

3-
target_link_libraries(exceptions PUBLIC catch2_main Tea::Tea Zai::Exceptions)
3+
target_link_libraries(exceptions PUBLIC catch2_main Tea::Tea Zai::Exceptions Zai::Sandbox)
44

55
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/stubs
66
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

‎zend_abstract_interface/exceptions/tests/exceptions.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
extern "C" {
2-
#include <zai_string/tests/symbols.h>
32
#include "exceptions/exceptions.h"
43
}
54

5+
#include <sandbox/tests/zai_tests_common.hpp>
66
#include "tea/testing/catch2.hpp"
77
#include <cstring>
88

‎zend_abstract_interface/hook/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ target_include_directories(
66

77
target_compile_features(zai_hook PUBLIC c_std_99)
88

9-
target_link_libraries(zai_hook PUBLIC Tea::Php)
9+
target_link_libraries(zai_hook PUBLIC Tea::Php Zai::String)
1010
if(PhpConfig_VERNUM GREATER_EQUAL "80000")
1111
target_link_libraries(zai_hook PUBLIC Zai::JitUtils)
1212
endif()

‎zend_abstract_interface/hook/hook.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,8 @@ zai_hook_continued zai_hook_continue(zend_execute_data *ex, zai_hook_memory_t *m
10121012
}
10131013

10141014
if (check_scope) {
1015-
if (!(hook->resolved_scope->ce_flags & ZEND_ACC_TRAIT) && !instanceof_function(zend_get_called_scope(ex), hook->resolved_scope)) {
1015+
// explicitly check for resolved_scope, as that might be NULL due to Closure scope rebinding
1016+
if (hook->resolved_scope && !(hook->resolved_scope->ce_flags & ZEND_ACC_TRAIT) && !instanceof_function(zend_get_called_scope(ex), hook->resolved_scope)) {
10161017
continue;
10171018
}
10181019
}

‎zend_abstract_interface/hook/tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ add_executable(hooks
33
internal/request.cc
44
)
55

6-
target_link_libraries(hooks PUBLIC catch2_main Tea::Tea Zai::Hook)
6+
target_link_libraries(hooks PUBLIC catch2_main Tea::Tea Zai::Sandbox Zai::Hook)
77
if(PhpConfig_VERNUM GREATER_EQUAL "80000")
88
target_link_libraries(hooks PUBLIC Zai::JitUtils)
99
endif()

‎zend_abstract_interface/hook/tests/internal/request.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ HOOK_TEST_CASE("continue", { /* no static */ }, {
8989
}, {
9090
zval result;
9191

92-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
92+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
9393

9494
CHECK(zai_hook_test_begin_check == 1);
9595
CHECK(zai_hook_test_end_check == 1);
@@ -115,7 +115,7 @@ HOOK_TEST_CASE("stop", { /* no static */ }, {
115115
}, {
116116
zval result;
117117

118-
CHECK(!zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
118+
CHECK(!zai_test_call_global_with_0_params(zai_hook_test_target, &result));
119119

120120
CHECK(zai_hook_test_begin_check == 1);
121121
CHECK(zai_hook_test_end_check == 1);
@@ -149,7 +149,7 @@ HOOK_TEST_CASE("multiple continue", { /* no static */ }, {
149149
}, {
150150
zval result;
151151

152-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
152+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
153153

154154
CHECK(zai_hook_test_begin_check == 2);
155155
CHECK(zai_hook_test_end_check == 2);
@@ -183,7 +183,7 @@ HOOK_TEST_CASE("multiple stop", { /* no static */ }, {
183183
}, {
184184
zval result;
185185

186-
CHECK(!zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
186+
CHECK(!zai_test_call_global_with_0_params(zai_hook_test_target, &result));
187187

188188
CHECK(zai_hook_test_begin_check == 1);
189189
CHECK(zai_hook_test_end_check == 1);
@@ -217,7 +217,7 @@ HOOK_TEST_CASE("continue with static", {
217217
}, {
218218
zval result;
219219

220-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
220+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
221221

222222
CHECK(zai_hook_test_begin_check == 2);
223223
CHECK(zai_hook_test_end_check == 2);
@@ -251,7 +251,7 @@ HOOK_TEST_CASE("stop with static", {
251251
}, {
252252
zval result;
253253

254-
CHECK(!zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
254+
CHECK(!zai_test_call_global_with_0_params(zai_hook_test_target, &result));
255255

256256
CHECK(zai_hook_test_begin_check == 1);
257257
CHECK(zai_hook_test_end_check == 1);
@@ -288,7 +288,7 @@ HOOK_TEST_CASE("resolved removal", {
288288

289289
zval result;
290290

291-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
291+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
292292

293293
CHECK(zai_hook_test_begin_check == 0);
294294
CHECK(zai_hook_test_end_check == 0);
@@ -366,7 +366,7 @@ HOOK_TEST_CASE("hook add during begin", {
366366
}, {
367367
zval result;
368368

369-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
369+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
370370

371371
CHECK(zai_hook_test_begin_check == 3);
372372
CHECK(zai_hook_test_end_check == 3);

‎zend_abstract_interface/hook/tests/internal/static.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ HOOK_TEST_CASE("continue", {
8282
}, {
8383
zval result;
8484

85-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
85+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
8686

8787
CHECK(zai_hook_test_begin_check == 1);
8888
CHECK(zai_hook_test_end_check == 1);
@@ -108,7 +108,7 @@ HOOK_TEST_CASE("stop", {
108108
}, {
109109
zval result;
110110

111-
CHECK(!zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
111+
CHECK(!zai_test_call_global_with_0_params(zai_hook_test_target, &result));
112112

113113
CHECK(zai_hook_test_begin_check == 1);
114114
CHECK(zai_hook_test_end_check == 1);
@@ -142,7 +142,7 @@ HOOK_TEST_CASE("multiple continue", {
142142
}, {
143143
zval result;
144144

145-
CHECK(zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
145+
CHECK(zai_test_call_global_with_0_params(zai_hook_test_target, &result));
146146

147147
CHECK(zai_hook_test_begin_check == 2);
148148
CHECK(zai_hook_test_end_check == 2);
@@ -176,7 +176,7 @@ HOOK_TEST_CASE("multiple stop", {
176176
}, {
177177
zval result;
178178

179-
CHECK(!zai_test_call_global_with_0_params(&zai_hook_test_target, &result));
179+
CHECK(!zai_test_call_global_with_0_params(zai_hook_test_target, &result));
180180

181181
CHECK(zai_hook_test_begin_check == 1);
182182
CHECK(zai_hook_test_end_check == 1);

‎zend_abstract_interface/hook/tests/internal/zai_tests_internal.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#define HAVE_HOOK_TESTS_INTERNAL_HPP
33

44
#include <tea/testing/catch2.hpp>
5+
#include <sandbox/tests/zai_tests_common.hpp>
56

67
extern "C" {
78
#include <hook/hook.h>
8-
#include <zai_string/tests/symbols.h>
99

1010
static void (*zend_execute_internal_function)(zend_execute_data *ex, zval *rv);
1111

0 commit comments

Comments
 (0)