fix guzzle

Author: ZNeumann

agent/lib_guzzle4.c

@@ -436,22 +436,33 @@ const zend_function_entry nr_guzzle4_subscriber_functions[]
  * Purpose : Registers an event subscriber for a newly instantiated
  *           GuzzleHttp\Client object.
  */
+
+#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
+void nr_guzzle4_client_construct(NR_EXECUTE_PROTO) {
+#else
 NR_PHP_WRAPPER_START(nr_guzzle4_client_construct) {
+#endif
   zval* emitter = NULL;
   zval* retval = NULL;
   zval* subscriber = NULL;
   zval* this_var = nr_php_scope_get(NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
 
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
   (void)wraprec;
+#endif
   NR_UNUSED_SPECIALFN;
 
   /* This is how we distinguish Guzzle 4/5 from other versions. */
   if (0 == nr_guzzle_does_zval_implement_has_emitter(this_var TSRMLS_CC)) {
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
     NR_PHP_WRAPPER_CALL;
+#endif
     goto end;
   }
 
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
   NR_PHP_WRAPPER_CALL;
+#endif
 
   /*
    * We can't have newrelic\Guzzle4\Subscriber implement
@@ -503,7 +514,9 @@ NR_PHP_WRAPPER_START(nr_guzzle4_client_construct) {
   nr_php_zval_free(&emitter);
   nr_php_zval_free(&subscriber);
 }
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
 NR_PHP_WRAPPER_END
+#endif
 
 void nr_guzzle4_enable(TSRMLS_D) {
   if (0 == NRINI(guzzle_enabled)) {

agent/lib_guzzle4.h

@@ -26,6 +26,10 @@ extern void nr_guzzle4_rshutdown(TSRMLS_D);
 /*
  * Purpose : Client::__construct() wrapper for Guzzle 4.
  */
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
 extern NR_PHP_WRAPPER_PROTOTYPE(nr_guzzle4_client_construct);
+#else
+extern void nr_guzzle4_client_construct(NR_EXECUTE_PROTO);
+#endif
 
 #endif /* LIB_GUZZLE4_HDR */

agent/lib_guzzle6.c

@@ -342,7 +342,11 @@ const zend_function_entry nr_guzzle6_requesthandler_functions[]
 
 /* }}} */
 
+#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
+void nr_guzzle6_client_construct(NR_EXECUTE_PROTO) {
+#else
 NR_PHP_WRAPPER_START(nr_guzzle6_client_construct) {
+#endif
   zval* config;
   zend_class_entry* guzzle_client_ce;
   zval* handler_stack;
@@ -357,16 +361,22 @@ NR_PHP_WRAPPER_START(nr_guzzle6_client_construct) {
     nr_free(version);
   }
 
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
   (void)wraprec;
+#endif
   NR_UNUSED_SPECIALFN;
 
   /* This is how we distinguish Guzzle 4/5. */
   if (nr_guzzle_does_zval_implement_has_emitter(this_var TSRMLS_CC)) {
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
     NR_PHP_WRAPPER_CALL;
+#endif
     goto end;
   }
 
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
   NR_PHP_WRAPPER_CALL;
+#endif
 
   /*
    * Get our middleware callable (which is just a string), and make sure it's
@@ -413,7 +423,9 @@ NR_PHP_WRAPPER_START(nr_guzzle6_client_construct) {
   nr_php_zval_free(&middleware);
   nr_php_scope_release(&this_var);
 }
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
 NR_PHP_WRAPPER_END
+#endif
 
 void nr_guzzle6_enable(TSRMLS_D) {
   int retval;

agent/lib_guzzle6.h

@@ -20,6 +20,10 @@ extern void nr_guzzle6_minit(TSRMLS_D);
 /*
  * Purpose : Client::__construct() wrapper for Guzzle 6.
  */
+#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
 extern NR_PHP_WRAPPER_PROTOTYPE(nr_guzzle6_client_construct);
+#else
+extern void nr_guzzle6_client_construct(NR_EXECUTE_PROTO);
+#endif
 
 #endif /* LIB_GUZZLE4_HDR */

agent/php_wrapper.h

@@ -277,7 +277,7 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
     const nrtxn_t* txn = NRPRG(txn);                        \
     const nrtime_t txn_start_time = nr_txn_start_time(txn); \
     if (NRPRG(in_wrapper)) {      \
-      printf("AAHHHHHHHHHHH\n");  \
+      printf("AAHHHHHHHHHHH %s\n", #name);  \
     }                             \
     NRPRG(in_wrapper) = true;                               \
                                                             \
@@ -384,10 +384,7 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
   }
 #else
 #define NR_PHP_WRAPPER_DELEGATE(name)                                \
-  if (!was_executed) {                                               \
-    ((name)(execute_data)); \
-    was_executed = 1;                                                \
-  }
+  ((name)(execute_data, func_return_value));
 #endif
 
 static inline bool is_instrumentation_set_and_not_equal(