define dedicated nrframework_t for Yii2

Yii 1.x and Yii 2.x are detected as two distinct frameworks and therefore
need their own values in nrframework_t enum. This helps with tracking
framework usage through supportability metrics. This approach obsoletes
the need to store framework_version.

Author: lavarou

agent/fw_yii.c

@@ -37,7 +37,7 @@ NR_PHP_WRAPPER(nr_yii1_runWithParams_wrapper) {
   (void)wraprec;
   NR_UNUSED_SPECIALFN;
 
-  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK_VERSION(NR_FW_YII, 1);
+  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK(NR_FW_YII1);
 
   this_var = nr_php_scope_get(NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
   if (NULL == this_var) {
@@ -89,7 +89,6 @@ NR_PHP_WRAPPER_END
  * Enable Yii1 instrumentation.
  */
 void nr_yii1_enable(TSRMLS_D) {
-  NRPRG(framework_version) = 1;
 #if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO \
     && !defined OVERWRITE_ZEND_EXECUTE_DATA
   nr_php_wrap_user_function_before_after_clean(
@@ -119,7 +118,7 @@ NR_PHP_WRAPPER(nr_yii2_runWithParams_wrapper) {
   (void)wraprec;
   NR_UNUSED_SPECIALFN;
 
-  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK_VERSION(NR_FW_YII, 2);
+  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK(NR_FW_YII2);
 
   this_var = nr_php_scope_get(NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
   if (NULL == this_var) {
@@ -161,7 +160,7 @@ NR_PHP_WRAPPER(nr_yii2_error_handler_wrapper) {
   NR_UNUSED_SPECIALFN;
   (void)wraprec;
 
-  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK_VERSION(NR_FW_YII, 2);
+  NR_PHP_WRAPPER_REQUIRE_FRAMEWORK(NR_FW_YII2);
 
   exception = nr_php_arg_get(1, NR_EXECUTE_ORIG_ARGS TSRMLS_CC);
   if (NULL == exception || !nr_php_is_zval_valid_object(exception)) {
@@ -189,7 +188,6 @@ NR_PHP_WRAPPER_END
  * Enable Yii2 instrumentation.
  */
 void nr_yii2_enable(TSRMLS_D) {
-  NRPRG(framework_version) = 2;
 #if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO \
     && !defined OVERWRITE_ZEND_EXECUTE_DATA
   nr_php_wrap_user_function_before_after_clean(

agent/php_execute.c

@@ -416,9 +416,9 @@ static const nr_framework_table_t all_frameworks[] = {
     {"WordPress", "wordpress", NR_PSTR("wp-config.php"), 0, nr_wordpress_enable,
      NR_FW_WORDPRESS},
 
-    {"Yii", "yii", NR_PSTR("framework/yii.php"), 0, nr_yii1_enable, NR_FW_YII},
-    {"Yii", "yii", NR_PSTR("framework/yiilite.php"), 0, nr_yii1_enable, NR_FW_YII},
-    {"Yii2", "yii2", NR_PSTR("yii2/baseyii.php"), 0, nr_yii2_enable, NR_FW_YII},
+    {"Yii", "yii", NR_PSTR("framework/yii.php"), 0, nr_yii1_enable, NR_FW_YII1},
+    {"Yii", "yii", NR_PSTR("framework/yiilite.php"), 0, nr_yii1_enable, NR_FW_YII1},
+    {"Yii2", "yii2", NR_PSTR("yii2/baseyii.php"), 0, nr_yii2_enable, NR_FW_YII2},
 
     /* See above: Laminas, the successor to Zend, which shares much
        of the instrumentation implementation with Zend */

agent/php_newrelic.h

@@ -167,7 +167,8 @@ typedef enum {
   NR_FW_SYMFONY2,
   NR_FW_SYMFONY4,
   NR_FW_WORDPRESS,
-  NR_FW_YII,
+  NR_FW_YII1,
+  NR_FW_YII2,
   NR_FW_ZEND,
   NR_FW_ZEND2,
   NR_FW_LAMINAS3,