php 5.4 suppert

Author: aiwhj

.travis.yml

@@ -16,6 +16,7 @@ addons:
     - clickhouse
 
 php:
+  - 5.4
   - 5.5
   - 5.6
   - 7.0

README.md

@@ -23,7 +23,7 @@ PHP client for [Yandex ClickHouse](https://clickhouse.yandex/)，Based on [Click
 * UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
 
 ## Supported PHP version
-PHP 5.5+
+PHP 5.4+
 
 ## Performance
 ![image](https://github.com/SeasX/SeasClick/raw/master/tests/bench_mark/bench_mark.png)

SeasClick.cpp

@@ -257,7 +257,7 @@ PHP_METHOD(SEASCLICK_RES_NAME, __construct)
         clientMap.insert(std::pair<int, Client*>(key, client));
 
     } catch (const std::exception& e) {
-        zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
+        sc_zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
     }
 
     RETURN_TRUE;
@@ -356,7 +356,7 @@ PHP_METHOD(SEASCLICK_RES_NAME, select)
         );
 
     } catch (const std::exception& e) {
-        zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
+        sc_zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
     }
 }
 /* }}} */
@@ -451,7 +451,7 @@ PHP_METHOD(SEASCLICK_RES_NAME, insert)
         sc_zval_ptr_dtor(&return_should);
 
     } catch (const std::exception& e) {
-        zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
+        sc_zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
     }
     RETURN_TRUE;
 }
@@ -507,7 +507,7 @@ PHP_METHOD(SEASCLICK_RES_NAME, execute)
         client->Execute(sql_s);
 
     } catch (const std::exception& e) {
-        zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
+        sc_zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
     }
     RETURN_TRUE;
 }
@@ -524,7 +524,7 @@ PHP_METHOD(SEASCLICK_RES_NAME, __destruct)
         clientMap.erase(key);
 
     } catch (const std::exception& e) {
-        zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
+        sc_zend_throw_exception(NULL, e.what(), 0 TSRMLS_CC);
     }
     RETURN_TRUE;
 }

php7_wrapper.h

@@ -17,6 +17,13 @@
 */
 // PHP7+
 #if PHP_MAJOR_VERSION < 7
+
+#if PHP_VERSION_ID < 50500
+#define sc_zend_throw_exception(a, b, c) zend_throw_exception(a, (char *)b, c)
+#else
+#define sc_zend_throw_exception zend_throw_exception
+#endif
+
 #define IS_TRUE                               1
 #define SC_MAKE_STD_ZVAL(p)                   MAKE_STD_ZVAL(p)
 #define SC_RETURN_STRINGL(k, l) RETURN_STRINGL(k, l, 1)
@@ -78,7 +85,7 @@ static inline zval *sc_zend_hash_index_find(HashTable *ht, ulong h)
 #define SC_HASHTABLE_FOREACH_START2(ht, k, klen, ktype, entry)\
     zval **tmp = NULL; ulong_t idx;\
     for (zend_hash_internal_pointer_reset(ht); \
-            (ktype = zend_hash_get_current_key_ex(ht, &k, &klen, &idx, 0, NULL)) != HASH_KEY_NON_EXISTENT; \
+            (ktype = zend_hash_get_current_key_ex(ht, &k, &klen, &idx, 0, NULL)) != HASH_KEY_NON_EXISTANT; \
             zend_hash_move_forward(ht)\
         ) { \
     if (zend_hash_get_current_data(ht, (void**)&tmp) == FAILURE) {\
@@ -93,6 +100,8 @@ static inline zval *sc_zend_hash_index_find(HashTable *ht, ulong h)
 
 #else
 // PHP5
+#define sc_zend_throw_exception zend_throw_exception
+
 #define sc_zend_hash_find   zend_hash_str_find
 #define sc_zend_hash_index_find   zend_hash_index_find
 #define SC_MAKE_STD_ZVAL(p)             zval _stack_zval_##p; p = &(_stack_zval_##p)