static var overriding closure binding should error

Author: iluuu1994

Zend/tests/static_variables_closure_bind.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Static variable can't override bound closure variables
+--FILE--
+<?php
+
+$a = null;
+
+function () use (&$a) {
+    static $a;
+};
+
+?>
+--EXPECTF--
+Fatal error: Duplicate declaration of static variable $a in %s on line %d

Zend/zend_compile.c

@@ -4876,25 +4876,22 @@ static void zend_compile_static_var(zend_ast *ast) /* {{{ */
 		zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as static variable");
 	}
 
+	if (!CG(active_op_array)->static_variables) {
+		if (CG(active_op_array)->scope) {
+			CG(active_op_array)->scope->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
+		}
+		CG(active_op_array)->static_variables = zend_new_array(8);
+	}
+
+	if (zend_hash_exists(CG(active_op_array)->static_variables, var_name)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Duplicate declaration of static variable $%s", ZSTR_VAL(var_name));
+	}
+
 	if (!value_ast) {
 		zend_compile_static_var_common(var_name, &EG(uninitialized_zval), ZEND_BIND_REF);
 	} else {
 		zend_op *opline;
 
-		if (!CG(active_op_array)->static_variables) {
-			if (CG(active_op_array)->scope) {
-				CG(active_op_array)->scope->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
-			}
-			CG(active_op_array)->static_variables = zend_new_array(8);
-		}
-
-		if (zend_string_equals_literal(var_name, "this")) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as static variable");
-		}
-		if (zend_hash_exists(CG(active_op_array)->static_variables, var_name)) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Duplicate declaration of static variable $%s", ZSTR_VAL(var_name));
-		}
-
 		zval *placeholder_ptr = zend_hash_update(CG(active_op_array)->static_variables, var_name, &EG(uninitialized_zval));
 		Z_TYPE_EXTRA_P(placeholder_ptr) |= IS_TYPE_UNINITIALIZED;
 		uint32_t placeholder_offset = (uint32_t)((char*)placeholder_ptr - (char*)CG(active_op_array)->static_variables->arData);