Comment and reorder the parser hack

Still need to fix parse error message generation

Author: Girgias

Zend/tests/type_declarations/intersection_types/invalid_types/invalid_nullable_type.phpt

@@ -7,4 +7,4 @@ function foo(): ?Countable&Iterator {}
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected token "&", expecting "{" in %s on line %d
+Parse error: syntax error, unexpected token "&'", expecting "{" in %s on line %d

Zend/zend_language_parser.y

@@ -231,8 +231,11 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token T_COALESCE        "'??'"
 %token T_POW             "'**'"
 %token T_POW_EQUAL       "'**='"
-%token T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG "'&'"
-%token T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG     "'&''"
+/* We need to split the & token in two because otherwise Bison somehow lands
+ * in a shift/reduce conflict for parameter intersection types */
+%token T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG     "'&'"
+// TODO Fix parse error message
+%token T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG "'&''"
 %token T_BAD_CHARACTER   "invalid character"
 
 /* Token used to force a parse error from the lexer */

ext/tokenizer/tokenizer_data.c

@@ -167,8 +167,8 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
 	REGISTER_LONG_CONSTANT("T_COALESCE", T_COALESCE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_POW", T_POW, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_POW_EQUAL", T_POW_EQUAL, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG", T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG", T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG", T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_BAD_CHARACTER", T_BAD_CHARACTER, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
 }
@@ -319,8 +319,8 @@ char *get_token_type_name(int token_type)
 		case T_COALESCE: return "T_COALESCE";
 		case T_POW: return "T_POW";
 		case T_POW_EQUAL: return "T_POW_EQUAL";
-		case T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG";
 		case T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG";
+		case T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG";
 		case T_BAD_CHARACTER: return "T_BAD_CHARACTER";
 
 	}