Use :- as ini interpolation fallback separator

Author: iluuu1994

Zend/tests/bug70748.phpt

@@ -15,6 +15,6 @@ var_dump(parse_ini_file($ini_file));
 unlink(__DIR__ . "/bug70748.ini");
 ?>
 --EXPECTF--
-Warning: syntax error, unexpected end of file, expecting '}' in %sbug70748.ini on line %d
+Warning: syntax error, unexpected end of file, expecting TC_FALLBACK or '}' in %s on line %d
  in %sbug70748.php on line %d
 bool(false)

Zend/zend_ini_parser.y

@@ -342,6 +342,7 @@ static void normalize_value(zval *zv)
 %token TC_DOLLAR_CURLY
 %token TC_VARNAME
 %token TC_QUOTED_STRING
+%token TC_FALLBACK
 %token BOOL_TRUE
 %token BOOL_FALSE
 %token NULL_NULL
@@ -445,7 +446,7 @@ expr:
 
 cfg_var_ref:
 		TC_DOLLAR_CURLY TC_VARNAME '}'				{ zend_ini_get_var(&$$, &$2, NULL); zend_string_free(Z_STR($2)); }
-	|	TC_DOLLAR_CURLY TC_VARNAME '!' fallback '}'	{ zend_ini_get_var(&$$, &$2, &$4); zend_string_free(Z_STR($2)); zend_string_free(Z_STR($4)); }
+	|	TC_DOLLAR_CURLY TC_VARNAME TC_FALLBACK fallback '}'	{ zend_ini_get_var(&$$, &$2, &$4); zend_string_free(Z_STR($2)); zend_string_free(Z_STR($4)); }
 ;
 
 

Zend/zend_ini_scanner.l

@@ -359,7 +359,9 @@ NEWLINE	("\r"|"\n"|"\r\n")
 TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
 CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
-LABEL [^=\n\r\t;&|^$~(){}!"\[]+
+LABEL_CHAR [^=\n\r\t;&|^$~(){}!"\[\]\x00]
+/* FIXME: Is this missing a \0? */
+LABEL ({LABEL_CHAR}+)
 TOKENS [:,.\[\]"'()&|^+-/*=%$!~<>?@{}]
 OPERATORS [&|^~()!]
 DOLLAR_CURLY "${"
@@ -423,7 +425,56 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	return TC_DOLLAR_CURLY;
 }
 
-<ST_VARNAME>{LABEL} { /* Variable name */
+<ST_VARNAME>":-" { /* End Variable name, fallback start */
+fallback_lexing:
+	yy_pop_state();
+	yy_push_state(ST_VAR_FALLBACK);
+	return TC_FALLBACK;
+}
+
+<ST_VARNAME>{LABEL_CHAR} { /* Variable name */
+	if (YYCURSOR[0] == ':' && YYCURSOR[1] == '-') {
+		YYCURSOR++;
+		goto fallback_lexing;
+	}
+
+	while (YYCURSOR < YYLIMIT) {
+		switch (*YYCURSOR++) {
+			case '=':
+			case '\n':
+			case '\r':
+			case '\t':
+			case ';':
+			case '&':
+			case '|':
+			case '^':
+			case '$':
+			case '~':
+			case '(':
+			case ')':
+			case '{':
+			case '}':
+			case '!':
+			case '"':
+			case '[':
+			case ']':
+				break;
+			/* ':' is only allowed if it isn't followed by '-'. */
+			case ':':
+				if (YYCURSOR[0] == '-') {
+					break;
+				} else {
+					continue;
+				}
+			default:
+				continue;
+		}
+
+		YYCURSOR--;
+		yyleng = YYCURSOR - SCNG(yy_text);
+		break;
+	}
+
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -433,12 +484,6 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
 
-<ST_VARNAME>"!" { /* End Variable name, fallback start */
-	yy_pop_state();
-	yy_push_state(ST_VAR_FALLBACK);
-	return '!';
-}
-
 <ST_VARNAME,ST_VAR_FALLBACK>"}" { /* Variable/fallback end */
 	yy_pop_state();
 	return '}';

ext/standard/tests/general_functions/parse_ini_basic.data

@@ -76,13 +76,13 @@ novalue_option4[]=
 ["Quoted strings and variables in sections"]
 
 [${basicval}]
-[${undefinedval!foo}]
+[${undefinedval:-foo}]
 [${basicval}/foo]
 [foo/${basicval}]
 [foo/${basicval}/foo]
 
 ["${basicqval}"]
-["${undefinedval!foo}"]
+["${undefinedval:-foo}"]
 ["${basicqval}/foo"]
 ["foo/${basicqval}"]
 ["foo/${basicqval}/foo"]
@@ -145,20 +145,22 @@ dollar_test = "\${test}"
 unescaped ="\n\r\t"
 
 [variable-fallback]
-defined1 = "Hello, ${basicval!world}!"
-defined2 = ${basicval!123}
-falsy = ${falsyval!hi}
-undefined = "Hello, ${undefined_var!world}!"
-empty = ${emptyval!foo}
-spaces = ${undefined_var!hi there}
-exclamation = ${hi_is_this_undefined!"no, this is fallback!"}
-nested = ${undefined_var!${also_undefined!${undefined_too!hello}}}
-hostname = localhost:${undefined_var!8080}
-outer_quotes = "foo:${undefined_var!bar}"
-number_value = ${undefined_var!12345}
-true_value = ${undefined_var!true}
-false_value = ${undefined_var!false}
-null_value = ${undefined_var!null}
-empty1 = ${undefined_var!}
+defined1 = "Hello, ${basicval:-world}!"
+defined2 = ${basicval:-123}
+falsy = ${falsyval:-hi}
+undefined = "Hello, ${undefined_var:-world}!"
+empty = ${emptyval:-foo}
+spaces = ${undefined_var:-hi there}
+exclamation = ${hi_is_this_undefined:-"no, this is fallback!"}
+nested = ${undefined_var:-${also_undefined:-${undefined_too:-hello}}}
+hostname = localhost:${undefined_var:-8080}
+outer_quotes = "foo:${undefined_var:-bar}"
+number_value = ${undefined_var:-12345}
+true_value = ${undefined_var:-true}
+false_value = ${undefined_var:-false}
+null_value = ${undefined_var:-null}
+empty1 = ${undefined_var:-}
 empty2 = ${undefined}
-constant = ${undefined!TEST_CONSTANT}
+constant = ${undefined:-TEST_CONSTANT}
+INI:WITH:COLON = ${INI:WITH:COLON:-}
+NONEXISTENT:INI:WITH:COLON = ${NONEXISTENT:INI:WITH:COLON:-fallback}

ext/standard/tests/general_functions/parse_ini_basic.phpt

@@ -5,6 +5,8 @@ basicval=FUBAR_VARIABLE
 basicqval=FUBAR_QUOTES_VARIABLE
 falsyval=false
 emptyval=
+--INI--
+INI:WITH:COLON=ini_with_colon
 --FILE--
 <?php
 
@@ -301,7 +303,7 @@ array(29) {
     string(6) "\n\r\t"
   }
   ["variable-fallback"]=>
-  array(17) {
+  array(19) {
     ["defined1"]=>
     string(22) "Hello, FUBAR_VARIABLE!"
     ["defined2"]=>
@@ -336,6 +338,10 @@ array(29) {
     string(0) ""
     ["constant"]=>
     string(21) "this_is_test_constant"
+    ["INI:WITH:COLON"]=>
+    string(14) "ini_with_colon"
+    ["NONEXISTENT:INI:WITH:COLON"]=>
+    string(8) "fallback"
   }
 }
 Done.

ext/standard/tests/general_functions/parse_ini_string_error.phpt

@@ -11,10 +11,10 @@ Warning: syntax error, unexpected end of file, expecting TC_DOLLAR_CURLY or TC_Q
  in %s on line %d
 bool(false)
 
-Warning: syntax error, unexpected end of file, expecting TC_VARNAME in Unknown on line 1
+Warning: syntax error, unexpected end of file, expecting TC_FALLBACK or '}' in Unknown on line 1
  in %s on line %d
 bool(false)
 
-Warning: syntax error, unexpected end of file, expecting '}' in Unknown on line 1
+Warning: syntax error, unexpected end of file, expecting TC_FALLBACK or '}' in Unknown on line 1
  in %s on line %d
 bool(false)