From a48297dfc1144931e18073a87ed83ea337e3d37a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 23 Feb 2019 00:03:14 +0000
Subject: Add php8 to travis and fix php7.4

- Use clang-format on the code
- Improve portability wrt. php8
- Fix php7.4 compatibility. See https://dustri.org/b/fixing-snuffleupagus-sloppy-comparison-on-array_keys-for-php74.html for a detailed writeup---
 src/sp_disabled_functions.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/sp_disabled_functions.c')

diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index bb22f71..0f42f8f 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -371,11 +371,8 @@ static void should_disable(zend_execute_data* execute_data,
     }
 
     if (config_node->r_value || config_node->value) {
-      if (check_is_builtin_name(config_node) &&
-          !config_node->var &&
-          !config_node->key &&
-          !config_node->r_key &&
-          !config_node->param &&
+      if (check_is_builtin_name(config_node) && !config_node->var &&
+          !config_node->key && !config_node->r_key && !config_node->param &&
           !config_node->r_param) {
         if (false == is_param_matching(execute_data, config_node, builtin_param,
                                        &arg_name, builtin_param_name,
-- 
cgit v1.3