Merge pull request phpredis#1026 from yatsukhnenko/develop

yatsukhnenko · web-flow · commit 2559f7298048 · 2016-11-18T19:33:11.000+02:00
TravisCI: clang + refactoring
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,20 @@ php:
   - 7.0
   - 7.1
   - nightly
+env: CC=gcc
 matrix:
+  include:
+    - env: CC=clang
+      php: 7.0
+    - env: CC=clang
+      php: 7.1
+    - env: CC=clang
+      php: nightly
   allow_failures:
     - php: nightly
+addons:
+  apt:
+    packages: clang
 before_install: phpize
 install: ./configure CFLAGS=-Wall --prefix=/usr && sudo make install
 before_script:
diff --git a/cluster_library.c b/cluster_library.c
@@ -2242,15 +2242,10 @@ PHP_REDIS_API void cluster_mset_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster
 
     // Set our return if it's the last call
     if(mctx->last) {
-#if (PHP_MAJOR_VERSION < 7)
-        zend_bool bval = Z_LVAL_P(mctx->z_multi);
-#else
-        zend_bool bval = (Z_TYPE_P(mctx->z_multi) == IS_TRUE);
-#endif
         if(CLUSTER_IS_ATOMIC(c)) {
-            ZVAL_BOOL(return_value, bval);
+            ZVAL_BOOL(return_value, zval_is_true(mctx->z_multi));
         } else {
-            add_next_index_bool(&c->multi_resp, bval);
+            add_next_index_bool(&c->multi_resp, zval_is_true(mctx->z_multi));
         }
         efree(mctx->z_multi);
     }
diff --git a/redis_array.c b/redis_array.c
@@ -25,7 +25,6 @@
 #include "ext/standard/info.h"
 #include "php_ini.h"
 #include "php_redis.h"
-#include "redis_array.h"
 #include <zend_exceptions.h>
 
 #include "library.h"
@@ -255,29 +254,17 @@ PHP_METHOD(RedisArray, __construct)
 
 		/* extract index option. */
         if ((zpData = zend_hash_str_find(hOpts, "index", sizeof("index") - 1)) != NULL) {
-#if (PHP_MAJOR_VERSION < 7)
-            b_index = (Z_TYPE_P(zpData) == IS_BOOL && Z_LVAL_P(zpData));
-#else
-            b_index = (Z_TYPE_P(zpData) == IS_TRUE);
-#endif
+            b_index = zval_is_true(zpData);
 		}
 
 		/* extract autorehash option. */
         if ((zpData = zend_hash_str_find(hOpts, "autorehash", sizeof("autorehash") - 1)) != NULL) {
-#if (PHP_MAJOR_VERSION < 7)
-            b_autorehash = (Z_TYPE_P(zpData) == IS_BOOL && Z_LVAL_P(zpData));
-#else
-            b_autorehash = (Z_TYPE_P(zpData) == IS_TRUE);
-#endif
+            b_autorehash = zval_is_true(zpData);
 		}
 
 		/* pconnect */
         if ((zpData = zend_hash_str_find(hOpts, "pconnect", sizeof("pconnect") - 1)) != NULL) {
-#if (PHP_MAJOR_VERSION < 7)
-            b_pconnect = (Z_TYPE_P(zpData) == IS_BOOL && Z_LVAL_P(zpData));
-#else
-            b_pconnect = (Z_TYPE_P(zpData) == IS_TRUE);
-#endif
+            b_pconnect = zval_is_true(zpData);
 		}
 
 		/* extract retry_interval option. */
@@ -293,11 +280,7 @@ PHP_METHOD(RedisArray, __construct)
 
 		/* extract lazy connect option. */
         if ((zpData = zend_hash_str_find(hOpts, "lazy_connect", sizeof("lazy_connect") - 1)) != NULL) {
-#if (PHP_MAJOR_VERSION < 7)
-            b_lazy_connect = (Z_TYPE_P(zpData) == IS_BOOL && Z_LVAL_P(zpData));
-#else
-            b_lazy_connect = (Z_TYPE_P(zpData) == IS_TRUE);
-#endif
+            b_lazy_connect = zval_is_true(zpData);
 		}
 		
 		/* extract connect_timeout option */		
diff --git a/redis_commands.c b/redis_commands.c
@@ -2439,11 +2439,7 @@ int redis_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     // ALPHA
     if (((z_ele = zend_hash_str_find(ht_opts, "alpha", sizeof("alpha") - 1)) != NULL ||
          (z_ele = zend_hash_str_find(ht_opts, "ALPHA", sizeof("ALPHA") - 1)) != NULL) &&
-#if (PHP_MAJOR_VERSION < 7)
-         (Z_TYPE_P(z_ele) == IS_BOOL && Z_LVAL_P(z_ele))
-#else
-         (Z_TYPE_P(z_ele) == IS_TRUE)
-#endif
+         zval_is_true(z_ele)
     ) {
         add_next_index_stringl(&z_argv, "ALPHA", sizeof("ALPHA") - 1);
     }
