Merge branch 'master' into jsond

Author: bukka

NEWS

@@ -65,6 +65,7 @@
   . Fixed possible read after end of buffer and use after free. (Dmitry)
 
 - Opcache:
+  . Fixed bug (try block removed while combined with xdebug). (Laruence)
   . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
     + Opcache). (Laruence)
 
@@ -93,6 +94,10 @@
     breaks the RecursiveIterator). (Paul Garvin)
   . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
 
+- Sqlite3:
+  . Fix bug #68260 (SQLite3Result::fetchArray declares wrong 
+    required_num_args). (Julien)
+
 - Standard:
   . Removed call_user_method() and call_user_method_array() functions. (Kalle)
   . Fix user session handlers (See rfc:session.user.return-value). (Sara)

README.GIT-RULES

@@ -114,9 +114,9 @@ If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
 bug report when developers are browsing CVS via LXR or Bonsai.
 
-Example::
+Example:
 
-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
+Fixed bug #14016 (pgsql notice handler double free crash bug.)
 
 When you change the NEWS file for a bug fix, then please keep the bugs
 sorted in decreasing order under the fixed version.

README.PARAMETER_PARSING_API

@@ -90,7 +90,7 @@ Note on 64bit compatibility
 ---------------------------
 Please note that since version 7 PHP uses zend_long as integer type and 
 zend_string with size_t as length, so make sure you pass zend_longs to "l" 
-and size_t to strings length (i.e. for "s" you need to pass char * and int), 
+and size_t to strings length (i.e. for "s" you need to pass char * and size_t), 
 not the other way round!
 
 Both mistakes might cause memory corruptions and segfaults:

Zend/tests/access_modifiers_003.phpt

@@ -10,4 +10,4 @@ final final class test {
 echo "Done\n";
 ?>
 --EXPECTF--	
-Parse error: %s error,%sexpecting %s in %s on line %d
+Fatal error: Multiple final modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_013.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Prevent abstract and final in the same class declaration
+--FILE--
+<?php
+
+final abstract class C {
+	private function priv() { }
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use the final modifier on an abstract class in %s on line %d

Zend/tests/bug68775.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #68775: yield in a function argument crashes or loops indefinitely
+--FILE--
+<?php
+
+function a($x) {
+    var_dump($x);
+}
+
+function gen() {
+     a(yield);
+}
+
+$g = gen();
+$g->send(1);
+
+?>
+--EXPECT--
+int(1)

Zend/tests/compound_assign_with_numeric_strings.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Error cases of compound shift assignment on strings
+--FILE--
+<?php
+
+$n = "65";
+$n <<= $n;
+var_dump($n);
+
+$n = "-1";
+$n <<= $n;
+var_dump($n);
+
+$n = "65";
+$n >>= $n;
+var_dump($n);
+
+$n = "-1";
+$n >>= $n;
+var_dump($n);
+
+$n = "0";
+$n %= $n;
+var_dump($n);
+
+$n = "-1";
+$n %= $n;
+var_dump($n);
+--EXPECTF--
+int(0)
+
+Warning: Bit shift by negative number in %s on line %d
+bool(false)
+int(0)
+
+Warning: Bit shift by negative number in %s on line %d
+bool(false)
+
+Warning: Division by zero in %s on line %d
+bool(false)
+int(0)

Zend/tests/foreach_reference.phpt

@@ -0,0 +1,50 @@
+--TEST--
+foreach with reference
+--FILE--
+<?php
+
+$array = ['a', 'b', 'c', 'd'];
+
+foreach ($array as &$a) {
+}
+
+var_dump($array);
+
+var_dump(array_values($array));
+var_dump($a);
+
+var_dump(array_reverse($array));
+
+?>
+--EXPECTF--
+array(4) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "c"
+  [3]=>
+  &string(1) "d"
+}
+array(4) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "c"
+  [3]=>
+  &string(1) "d"
+}
+string(1) "d"
+array(4) {
+  [0]=>
+  &string(1) "d"
+  [1]=>
+  string(1) "c"
+  [2]=>
+  string(1) "b"
+  [3]=>
+  string(1) "a"
+}

Zend/tests/list_empty_error.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Empty list() assignments are not allowed
+--FILE--
+<?php
+
+list(,,,,,,,,,,) = [];
+
+?>
+--EXPECTF--
+Fatal error: Cannot use empty list in %s on line %d

Zend/tests/traits/bug55524.phpt

@@ -12,4 +12,4 @@ trait Foo extends Base {
 echo 'DONE';
 ?>
 --EXPECTF--
-Fatal error: A trait (Foo) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error in %s on line %d
+Parse error: syntax error, unexpected 'extends' (T_EXTENDS), expecting '{' in %s on line %d

Zend/tests/traits/bugs/interfaces.phpt

@@ -16,4 +16,4 @@ trait THello implements MyInterface {
 
 ?>
 --EXPECTF--	
-Fatal error: Cannot use 'MyInterface' as interface on 'THello' since it is a Trait in %s on line %d
+Parse error: syntax error, unexpected 'implements' (T_IMPLEMENTS), expecting '{' in %s on line %d

Zend/zend_compile.c

@@ -540,6 +540,22 @@ void zend_do_free(znode *op1) /* {{{ */
 }
 /* }}} */
 
+uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
+{
+	uint32_t new_flags = flags | new_flag;
+	if ((flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) && (new_flag & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Multiple abstract modifiers are not allowed");
+	}
+	if ((flags & ZEND_ACC_FINAL) && (new_flag & ZEND_ACC_FINAL)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Multiple final modifiers are not allowed");
+	}
+	if ((new_flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) && (new_flags & ZEND_ACC_FINAL)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Cannot use the final modifier on an abstract class");
+	}
+	return new_flags;
+}
+/* }}} */
+
 uint32_t zend_add_member_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
 {
 	uint32_t new_flags = flags | new_flag;
@@ -2175,10 +2191,7 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n
 {
 	zend_ast_list *list = zend_ast_get_list(ast);
 	uint32_t i;
-
-	if (list->children == 1 && !list->child[0]) {
-		zend_error_noreturn(E_COMPILE_ERROR, "Cannot use empty list");
-	}
+	zend_bool has_elems = 0;
 
 	for (i = 0; i < list->children; ++i) {
 		zend_ast *var_ast = list->child[i];
@@ -2187,6 +2200,7 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n
 		if (var_ast == NULL) {
 			continue;
 		}
+		has_elems = 1;
 
 		dim_node.op_type = IS_CONST;
 		ZVAL_LONG(&dim_node.u.constant, i);
@@ -2198,6 +2212,11 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n
 		zend_emit_op(&fetch_result, ZEND_FETCH_LIST, expr_node, &dim_node);
 		zend_emit_assign_znode(var_ast, &fetch_result);
 	}
+
+	if (!has_elems) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Cannot use empty list");
+	}
+
 	*result = *expr_node;
 }
 /* }}} */
@@ -4441,12 +4460,6 @@ void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */
 
 		zend_op *opline;
 
-		/* Traits can not implement interfaces */
-		if (ZEND_CE_IS_TRAIT(CG(active_class_entry))) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as interface on '%s' "
-				"since it is a Trait", name->val, CG(active_class_entry)->name->val);
-		}
-
 		if (!zend_is_const_default_class_ref(class_ast)) {
 			zend_error_noreturn(E_COMPILE_ERROR,
 				"Cannot use '%s' as interface name as it is reserved", name->val);
@@ -4520,12 +4533,6 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */
 	}
 
 	if (extends_ast) {
-		if (ZEND_CE_IS_TRAIT(ce)) {
-			zend_error_noreturn(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. "
-				"Traits can only be composed from other traits with the 'use' keyword. Error",
-				name->val);
-		}
-
 		if (!zend_is_const_default_class_ref(extends_ast)) {
 			zend_string *extends_name = zend_ast_get_str(extends_ast);
 			zend_error_noreturn(E_COMPILE_ERROR,

Zend/zend_compile.h

@@ -632,6 +632,7 @@ ZEND_API binary_op_type get_binary_op(int opcode);
 void zend_stop_lexing(void);
 void zend_emit_final_return(zval *zv);
 zend_ast *zend_ast_append_str(zend_ast *left, zend_ast *right);
+uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag);
 uint32_t zend_add_member_modifier(uint32_t flags, uint32_t new_flag);
 zend_ast *zend_ast_append_doc_comment(zend_ast *list);
 void zend_handle_encoding_declaration(zend_ast *ast);

Zend/zend_generators.c

@@ -303,8 +303,8 @@ ZEND_API void zend_generator_resume(zend_generator *generator) /* {{{ */
 		zend_execute_data *original_execute_data = EG(current_execute_data);
 		zend_class_entry *original_scope = EG(scope);
 		zend_vm_stack original_stack = EG(vm_stack);
-
 		original_stack->top = EG(vm_stack_top);
+
 		/* Set executor globals */
 		EG(current_execute_data) = generator->execute_data;
 		EG(scope) = generator->execute_data->func->common.scope;
@@ -314,8 +314,7 @@ ZEND_API void zend_generator_resume(zend_generator *generator) /* {{{ */
 
 		/* We want the backtrace to look as if the generator function was
 		 * called from whatever method we are current running (e.g. next()).
-		 * So we have to link generator call frame with caller call frames */
-
+		 * So we have to link generator call frame with caller call frame. */
 		generator->execute_data->prev_execute_data = original_execute_data;
 
 		/* Resume execution */
@@ -329,6 +328,7 @@ ZEND_API void zend_generator_resume(zend_generator *generator) /* {{{ */
 		}
 
 		/* Restore executor globals */
+		generator->stack->top = EG(vm_stack_top);
 		EG(current_execute_data) = original_execute_data;
 		EG(scope) = original_scope;
 		EG(vm_stack_top) = original_stack->top;