chore(agent): update description and wrapper names

Author: hahuja2

agent/fw_cakephp.c

@@ -129,15 +129,11 @@ NR_PHP_WRAPPER(nr_cakephp_name_the_wt_pre20) {
 NR_PHP_WRAPPER_END
 
 /*
- * For CakePHP 2.0 and on, we do things a little differently as the params
- * array doesn't exist in the component any more. Instead we hook the
- * Controller's invokeAction method. This gets the request as a parameter
- * and we get the action from the params array in that object. The
- * controller object ($this) has a name, and that name is used (along
- * with the word "Controller" appended which is what the CakePHP code does).
- *
- * CakePHP 2.x is end-of-life and in maintenance mode (critical bugfixes only).
- * As such, functionality added in PHP 7.1+ is not well supported.
+ *  For CakePHP 4.0 and on, we retrieve the current controller object
+ *  and are able to extract the controller name from that. We then
+ *  retrieve the request object from the controller and are able to
+ *  extract the action name from that. We then concatenate the two
+ *  strings to form the transaction name.
  *
  * txn naming scheme:
  * In this case, `nr_txn_set_path` is called after `NR_PHP_WRAPPER_CALL` with
@@ -147,7 +143,7 @@ NR_PHP_WRAPPER_END
  * default way of calling the wrapped function in func_end.
  *
  */
-NR_PHP_WRAPPER(nr_cakephp_name_the_wt_2) {
+NR_PHP_WRAPPER(nr_cakephp_name_the_wt_4) {
   zval* this_var = 0;
   zval* czval = 0;
   char* controller = 0;
@@ -269,24 +265,21 @@ NR_PHP_WRAPPER(nr_cakephp_problem_1) {
 NR_PHP_WRAPPER_END
 
 /*
- * CakePHP 2.0+
+ * CakePHP 4.0+
  *
  * If the action or controller is not found during the dispatch process, the
  * appropriate Exception will be created and thrown. We wrap the CakeException
  * constructor instead of the Exception handler, since CakePHP allows for the
  * handler to be completely replaced.
  *
- *  CakePHP 2.x is end-of-life and in maintenance mode (critical bugfixes only).
- * As such, functionality added in PHP 7.1+ is not well supported.
- *
  * txn naming scheme:
  * In this case, `nr_txn_set_path` is called before `NR_PHP_WRAPPER_CALL` with
  * `NR_NOT_OK_TO_OVERWRITE` and as this corresponds to calling the wrapped
  * function in func_begin it needs to be explicitly set as a before_callback to
  * ensure OAPI compatibility. This entails that the first wrapped call gets to
  * name the txn.
  */
-NR_PHP_WRAPPER(nr_cakephp_problem_2) {
+NR_PHP_WRAPPER(nr_cakephp_problem_4) {
   const char* name = "Exception";
 
   (void)wraprec;
@@ -312,20 +305,20 @@ void nr_cakephp_enable_1(TSRMLS_D) {
 }
 
 /*
- * Enable CakePHP 2.0+
+ * Enable CakePHP 4.0+
  */
-void nr_cakephp_enable_2(TSRMLS_D) {
+void nr_cakephp_enable(TSRMLS_D) {
   nr_php_wrap_user_function(
       NR_PSTR("Cake\\Controller\\Controller::invokeAction"),
       nr_cakephp_name_the_wt_2 TSRMLS_CC);
 #if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO \
     && !defined OVERWRITE_ZEND_EXECUTE_DATA
   nr_php_wrap_user_function_before_after_clean(
       NR_PSTR("Cake\\Core\\Exception\\CakeException::__construct"),
-      nr_cakephp_problem_2, NULL, NULL);
+      nr_cakephp_problem_4, NULL, NULL);
 #else
   nr_php_wrap_user_function(
       NR_PSTR("Cake\\Core\\Exception\\CakeException::__construct"),
-      nr_cakephp_problem_2 TSRMLS_CC);
+      nr_cakephp_problem_4 TSRMLS_CC);
 #endif
 }

agent/fw_hooks.h

@@ -12,8 +12,7 @@
  */
 #include "php_execute.h"
 
-extern void nr_cakephp_enable_1(TSRMLS_D);
-extern void nr_cakephp_enable_2(TSRMLS_D);
+extern void nr_cakephp_enable(TSRMLS_D);
 extern nr_framework_classification_t nr_cakephp_special_1(
     const char* filename TSRMLS_DC);
 extern nr_framework_classification_t nr_cakephp_special_2(

agent/php_execute.c

@@ -332,7 +332,7 @@ typedef struct _nr_framework_table_t {
 // clang-format: off
 static const nr_framework_table_t all_frameworks[] = {
     {"CakePHP", "cakephp", NR_PSTR("cakephp/src/core/functions.php"), 0,
-     nr_cakephp_enable_2, NR_FW_CAKEPHP},
+     nr_cakephp_enable, NR_FW_CAKEPHP},
 
     /*
      * Watch out: frameworks or CMS' build on top of CodeIgniter might not get
@@ -515,8 +515,6 @@ static nr_library_table_t libraries[] = {
      * with other frameworks or even without a framework at all.
      */
     {"Laminas_Http", NR_PSTR("laminas-http/src/client.php"), nr_laminas_http_enable},
-
-    {"CakePHP3", NR_PSTR("cakephp/src/core/functions.php"), NULL},
 };
 // clang-format: on