Bump version to 7.0.0-dev

diff --git a/Zend/zend.h b/Zend/zend.h
index c071acd87dbb39b8d9047c71ab290feee57b4e34..0718edba125cfe782ee18d320a0f537f5ef0fcd0 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.7.0-dev"
+#define ZEND_VERSION "2.8.0-dev"
 
 #define ZEND_ENGINE_2
 

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 38ac9f8947e73ee35f48492c1b5e71a22779d1b1..e210839870735a0ac0ef2a9e1a8d207bfa60846b 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -28,7 +28,7 @@
 /* The first number is the engine version and the rest is the date.
  * This way engine 2/3 API no. is always greater than engine 1 API no..
  */
-#define ZEND_EXTENSION_API_NO  220131227
+#define ZEND_EXTENSION_API_NO  220140815
 
 typedef struct _zend_extension_version_info {
        int zend_extension_api_no;

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 283b069f488e159784149146ecb24462fcc6ed81..0cd9ca4d16354634f3f4d909f009405cb82fad6f 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -33,7 +33,7 @@
 #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
 #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
 
-#define ZEND_MODULE_API_NO 20131227
+#define ZEND_MODULE_API_NO 20140815
 #ifdef ZTS
 #define USING_ZTS 1
 #else

diff --git a/configure.in b/configure.in
index 8781cbc45954635a60c2812519f886f240b1e6c9..d07b7192cbd1d30c700b4cdfe2c9bc1b914294f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -117,8 +117,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #undef PTHREADS
 ])
 
-PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=7
+PHP_MAJOR_VERSION=7
+PHP_MINOR_VERSION=0
 PHP_RELEASE_VERSION=0
 PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 19f12417feb3393f0cc61cfcf55fa8e299d1dd97..b5a68c2b93f4e6952c319be8cf4f912ece58299a 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1689,7 +1689,8 @@ static int mysqli_options_get_option_zval_type(int option)
        switch (option) {
 #ifdef MYSQLI_USE_MYSQLND
 #if PHP_MAJOR_VERSION >= 6
-               case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:
+               /* PHP-7 doesn't supprt unicode yet ??? */
+               /*case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:*/
 #endif
                case MYSQLND_OPT_NET_CMD_BUFFER_SIZE:
                case MYSQLND_OPT_NET_READ_BUFFER_SIZE:

diff --git a/main/php_version.h b/main/php_version.h
index 87c2e4ac4d8f7a6c15826f0256c2ac7e984d1d0a..d48ab241411eb5358927ef8de358f3dcae593689 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,8 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
-#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 7
+#define PHP_MAJOR_VERSION 7
+#define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.7.0-dev"
-#define PHP_VERSION_ID 50700
+#define PHP_VERSION "7.0.0-dev"
+#define PHP_VERSION_ID 70000