Merge branch 'master' of https://git.php.net/repository/php-src

Conflicts:
	ext/mysqli/mysqli_api.c

Author: laruence

Zend/tests/bug54013.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #54013 (ReflectionParam for duplicate parameter contains garbage)
+Bug #54013 (ReflectionParam for duplicate parameter contains garbage) (PHP7)
 --FILE--
 <?php
 
@@ -21,11 +21,4 @@ var_dump($params[0], $params[1]);
 
 ?>
 --EXPECTF--
-object(ReflectionParameter)#%d (1) {
-  ["name"]=>
-  string(8) "aaaaaaaa"
-}
-object(ReflectionParameter)#%d (1) {
-  ["name"]=>
-  string(8) "aaaaaaaa"
-}
+Fatal error: Redefinition of parameter aaaaaaaa in %sbug54013.php on line 5

Zend/tests/bug64515.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
+Bug #64515 (Memoryleak when using the same variablename 2times in function declaration) (PHP7)
 --FILE--
 <?php
 function foo($unused = null, $unused = null, $arg = array()) {
@@ -8,5 +8,5 @@ function foo($unused = null, $unused = null, $arg = array()) {
 foo();
 echo "okey";
 ?>
---EXPECT--
-okey
+--EXPECTF--
+Fatal error: Redefinition of parameter unused in %sbug64515.php on line 2

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
 

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;

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

ext/mysqli/mysqli_api.c

@@ -1688,6 +1688,10 @@ static int mysqli_options_get_option_zval_type(int option)
 {
 	switch (option) {
 #ifdef MYSQLI_USE_MYSQLND
+#if PHP_MAJOR_VERSION >= 6
+		/* 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:
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION

main/php_version.h

@@ -1,6 +1,6 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
-#define PHP_MAJOR_VERSION 7 
+#define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"

tests/lang/func_get_arg.001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-func_get_arg test
+func_get_arg test (PHP7)
 --FILE--
 <?php
 
@@ -12,4 +12,4 @@ foo(2);
 echo "\n";
 ?>
 --EXPECT--
-2
+5

tests/lang/func_get_args.004.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Pass same variable by ref and by value. 
+Pass same variable by ref and by value (PHP7).
 --FILE--
 <?php
 function valRef($x, &$y) {
@@ -42,7 +42,7 @@ array(2) {
 }
 array(2) {
   [0]=>
-  string(10) "original.a"
+  string(9) "changed.x"
   [1]=>
   string(9) "changed.y"
 }
@@ -62,6 +62,6 @@ array(2) {
   [0]=>
   string(9) "changed.x"
   [1]=>
-  string(10) "original.b"
+  string(9) "changed.y"
 }
-string(9) "changed.x"
+string(9) "changed.x"