@@ -116,7 +116,7 @@ void nr_php_amqplib_handle_version() {
116
116
117
117
result = zend_eval_string (
118
118
"(function() {"
119
- " $nr_php_amqplib_version = '' ;"
119
+ " $nr_php_amqplib_version = null ;"
120
120
" try {"
121
121
" $nr_php_amqplib_version = PhpAmqpLib\\Package::VERSION;"
122
122
" } catch (Throwable $e) {"
@@ -126,19 +126,23 @@ void nr_php_amqplib_handle_version() {
126
126
& retval_zpd , "Get nr_php_amqplib_version" );
127
127
128
128
/* See if we got a non-empty/non-null string for version. */
129
- if (SUCCESS == result ) {
130
- if (nr_php_is_zval_non_empty_string (& retval_zpd )) {
131
- version = Z_STRVAL (retval_zpd );
132
- }
129
+ if (FAILURE == result ) {
130
+ return ;
133
131
}
134
132
135
- if (NRINI (vulnerability_management_package_detection_enabled )) {
136
- /* Add php package to transaction */
137
- nr_txn_add_php_package (NRPRG (txn ), PHP_PACKAGE_NAME , version );
133
+ if (nr_php_is_zval_valid_string (& retval_zpd )) {
134
+ version = Z_STRVAL (retval_zpd );
138
135
}
139
136
140
- nr_txn_suggest_package_supportability_metric (NRPRG (txn ), PHP_PACKAGE_NAME ,
141
- version );
137
+ if (NULL != version ) {
138
+ if (NRINI (vulnerability_management_package_detection_enabled )) {
139
+ /* Add php package to transaction */
140
+ nr_txn_add_php_package (NRPRG (txn ), PHP_PACKAGE_NAME , version );
141
+ }
142
+
143
+ nr_txn_suggest_package_supportability_metric (NRPRG (txn ), PHP_PACKAGE_NAME ,
144
+ version );
145
+ }
142
146
143
147
zval_dtor (& retval_zpd );
144
148
}
0 commit comments