Skip to content

Commit c983906

Browse files
lavarouZNeumann
authored andcommitted
fix ZEND_8_4_X_API_NO value (#992)
`ZEND_MODULE_API_NO` for PHP 8.4 is actually `20240924`.
1 parent 8883671 commit c983906

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

agent/config.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ if test "$PHP_NEWRELIC" = "yes"; then
239239
dnl Define $(PHP_CONFIG) so we can call it when building tests.
240240
PHP_SUBST(PHP_CONFIG)
241241

242+
dnl Make sure we include the source directory in the include search path.
243+
PHP_ADD_INCLUDE([$abs_srcdir], [1])
244+
242245
dnl Include the Makefile.frag, which we use to handle build time
243246
dnl dependencies.
244247
PHP_ADD_MAKEFILE_FRAGMENT

agent/newrelic-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ fi
338338
# (8.0, 8.1, 8.2, 8.3, 8.4)
339339
# for x64 and aarch64
340340
if [ ${arch} = x64 ] || [ ${arch} = aarch64 ]; then
341-
for pmv in "20200930" "20210902" "20220829" "20230831" "20240925"; do
341+
for pmv in "20200930" "20210902" "20220829" "20230831" "20240924"; do
342342
check_file "${ilibdir}/agent/${arch}/newrelic-${pmv}.so"
343343
done
344344
fi
@@ -1240,7 +1240,7 @@ does not exist. This particular instance of PHP will be skipped.
12401240
8.1.*) pi_modver="20210902" ;;
12411241
8.2.*) pi_modver="20220829" ;;
12421242
8.3.*) pi_modver="20230831" ;;
1243-
8.4.*) pi_modver="20240925" ;;
1243+
8.4.*) pi_modver="20240924" ;;
12441244
esac
12451245
log "${pdir}: pi_modver=${pi_modver}"
12461246

agent/php_includes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#define ZEND_8_1_X_API_NO 20210902
5555
#define ZEND_8_2_X_API_NO 20220829
5656
#define ZEND_8_3_X_API_NO 20230831
57-
#define ZEND_8_4_X_API_NO 20240925
57+
#define ZEND_8_4_X_API_NO 20240924
5858

5959
#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP8+ */
6060
#include "Zend/zend_observer.h"

agent/tests/test_agent.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ static void test_function_debug_name(TSRMLS_D) {
142142
func = nr_php_zval_to_function(closure TSRMLS_CC);
143143
name = nr_php_function_debug_name(func);
144144

145+
#if ZEND_MODULE_API_NO < ZEND_8_4_X_API_NO
145146
tlib_pass_if_str_equal("closure", "{closure} declared at -:1", name);
147+
#else
148+
tlib_pass_if_str_equal("closure", "{closure:-:1} declared at -:1", name);
149+
#endif
146150

147151
nr_php_zval_free(&closure);
148152
nr_free(name);

make/release.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ release-$1-zts: Makefile agent | releases/$$(RELEASE_OS)/agent/$$(RELEASE_ARCH)/
163163

164164
endef
165165

166-
$(eval $(call RELEASE_AGENT_TARGET,8.4,20240925))
166+
$(eval $(call RELEASE_AGENT_TARGET,8.4,20240924))
167167
$(eval $(call RELEASE_AGENT_TARGET,8.3,20230831))
168168
$(eval $(call RELEASE_AGENT_TARGET,8.2,20220829))
169169
$(eval $(call RELEASE_AGENT_TARGET,8.1,20210902))

0 commit comments

Comments
 (0)