Error on multiple default blocks in a switch

morrisonlevi · morrisonlevi · commit b476eca82610 · 2014-09-05T16:07:07.000-06:00
Part of RFC: https://wiki.php.net/rfc/switch.default.multiple
diff --git a/Zend/tests/034.phpt b/Zend/tests/034.phpt
@@ -22,5 +22,5 @@ switch (1) {
 }
 
 ?>
---EXPECT--
-3
+--EXPECTF--
+Fatal error: Switch statements may only contain one default clause in %s on line 13
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5091,6 +5091,11 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) /* {{{ */
 		znode cond_node;
 
 		if (!cond_ast) {
+			if (has_default_case) {
+				CG(zend_lineno) = case_ast->lineno;
+				zend_error_noreturn(E_COMPILE_ERROR,
+					"Switch statements may only contain one default clause");
+			}
 			has_default_case = 1;
 			continue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ switch (1) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`?>`
`25`		`---EXPECT--`
`26`		`-3`
	`25`	`+--EXPECTF--`
	`26`	`+Fatal error: Switch statements may only contain one default clause in %s on line 13`