Skip to content

Commit bc8b9ae

Browse files
Misterio77derickr
Misterio77
authored and
derickr
committed
Add fallback value syntax for ini variables
1 parent 0b0cec5 commit bc8b9ae

File tree

5 files changed

+104
-9
lines changed

5 files changed

+104
-9
lines changed

‎Zend/zend_ini_parser.y

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static void zend_ini_get_constant(zval *result, zval *name)
170170
/* }}} */
171171

172172
/* {{{ zend_ini_get_var() */
173-
static void zend_ini_get_var(zval *result, zval *name)
173+
static void zend_ini_get_var(zval *result, zval *name, zval *fallback)
174174
{
175175
zval *curval;
176176
char *envvar;
@@ -182,9 +182,13 @@ static void zend_ini_get_var(zval *result, zval *name)
182182
} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name))) != NULL ||
183183
(envvar = getenv(Z_STRVAL_P(name))) != NULL) {
184184
ZVAL_NEW_STR(result, zend_string_init(envvar, strlen(envvar), ZEND_SYSTEM_INI));
185+
/* ..or if not defined, try fallback value */
186+
} else if (fallback) {
187+
ZVAL_NEW_STR(result, zend_string_init(Z_STRVAL_P(fallback), strlen(Z_STRVAL_P(fallback)), ZEND_SYSTEM_INI));
185188
} else {
186189
zend_ini_init_string(result);
187190
}
191+
188192
}
189193
/* }}} */
190194

@@ -440,7 +444,14 @@ expr:
440444
;
441445
442446
cfg_var_ref:
443-
TC_DOLLAR_CURLY TC_VARNAME '}' { zend_ini_get_var(&$$, &$2); zend_string_free(Z_STR($2)); }
447+
TC_DOLLAR_CURLY TC_VARNAME '}' { zend_ini_get_var(&$$, &$2, NULL); zend_string_free(Z_STR($2)); }
448+
| TC_DOLLAR_CURLY TC_VARNAME '!' fallback '}' { zend_ini_get_var(&$$, &$2, &$4); zend_string_free(Z_STR($2)); zend_string_free(Z_STR($4)); }
449+
;
450+
451+
452+
fallback:
453+
var_string_list { $$ = $1; }
454+
| %empty { zend_ini_init_string(&$$); }
444455
;
445456
446457
constant_literal:

‎Zend/zend_ini_scanner.l

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ RAW_VALUE_CHARS [^\n\r;\000]
370370
371371
LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
372372
VALUE_CHARS ([^$= \t\n\r;&|^~()!"'\000]|{LITERAL_DOLLAR})
373+
FALLBACK_CHARS ([^$\n\r;"'!}\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
373374
SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
374375
375376
<!*> := yyleng = YYCURSOR - SCNG(yy_text);
@@ -417,7 +418,7 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
417418
return ']';
418419
}
419420

420-
<ST_DOUBLE_QUOTES,ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{DOLLAR_CURLY} { /* Variable start */
421+
<ST_DOUBLE_QUOTES,ST_SECTION_VALUE,ST_VALUE,ST_OFFSET,ST_VAR_FALLBACK>{DOLLAR_CURLY} { /* Variable start */
421422
yy_push_state(ST_VARNAME);
422423
return TC_DOLLAR_CURLY;
423424
}
@@ -432,7 +433,13 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
432433
RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
433434
}
434435

435-
<ST_VARNAME>"}" { /* Variable end */
436+
<ST_VARNAME>"!" { /* End Variable name, fallback start */
437+
yy_pop_state();
438+
yy_push_state(ST_VAR_FALLBACK);
439+
return '!';
440+
}
441+
442+
<ST_VARNAME,ST_VAR_FALLBACK>"}" { /* Variable/fallback end */
436443
yy_pop_state();
437444
return '}';
438445
}
@@ -522,11 +529,11 @@ end_raw_value_chars:
522529
return END_OF_LINE;
523530
}
524531

525-
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{CONSTANT} { /* Get constant option value */
532+
<ST_SECTION_VALUE,ST_VALUE,ST_VAR_FALLBACK,ST_OFFSET>{CONSTANT} { /* Get constant option value */
526533
RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
527534
}
528535

529-
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{NUMBER} { /* Get number option value as string */
536+
<ST_SECTION_VALUE,ST_VALUE,ST_VAR_FALLBACK,ST_OFFSET>{NUMBER} { /* Get number option value as string */
530537
RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
531538
}
532539

@@ -548,11 +555,15 @@ end_raw_value_chars:
548555
RETURN_TOKEN(TC_STRING, yytext, yyleng);
549556
}
550557

558+
<ST_VAR_FALLBACK>{FALLBACK_CHARS}+ { /* Same as above, but excluding '}' */
559+
RETURN_TOKEN(TC_STRING, yytext, yyleng);
560+
}
561+
551562
<ST_SECTION_VALUE,ST_OFFSET>{SECTION_VALUE_CHARS}+ { /* Get rest as section/offset value */
552563
RETURN_TOKEN(TC_STRING, yytext, yyleng);
553564
}
554565

555-
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{TABS_AND_SPACES}*["] { /* Double quoted '"' string start */
566+
<ST_SECTION_VALUE,ST_VALUE,ST_VAR_FALLBACK,ST_OFFSET>{TABS_AND_SPACES}*["] { /* Double quoted '"' string start */
556567
yy_push_state(ST_DOUBLE_QUOTES);
557568
return '"';
558569
}
@@ -603,7 +614,7 @@ end_raw_value_chars:
603614
return TC_QUOTED_STRING;
604615
}
605616

606-
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{WHITESPACE} {
617+
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET,ST_VAR_FALLBACK>{WHITESPACE} {
607618
RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
608619
}
609620

‎ext/standard/tests/general_functions/parse_ini_basic.data

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,13 @@ novalue_option4[]=
7676
["Quoted strings and variables in sections"]
7777

7878
[${basicval}]
79+
[${undefinedval!foo}]
7980
[${basicval}/foo]
8081
[foo/${basicval}]
8182
[foo/${basicval}/foo]
8283

8384
["${basicqval}"]
85+
["${undefinedval!foo}"]
8486
["${basicqval}/foo"]
8587
["foo/${basicqval}"]
8688
["foo/${basicqval}/foo"]
@@ -141,3 +143,22 @@ double_quoted_multiline = "Lorem \"ipsum\"""
141143
dolor"
142144
dollar_test = "\${test}"
143145
unescaped ="\n\r\t"
146+
147+
[variable-fallback]
148+
defined1 = "Hello, ${basicval!world}!"
149+
defined2 = ${basicval!123}
150+
falsy = ${falsyval!hi}
151+
undefined = "Hello, ${undefined_var!world}!"
152+
empty = ${emptyval!foo}
153+
spaces = ${undefined_var!hi there}
154+
exclamation = ${hi_is_this_undefined!"no, this is fallback!"}
155+
nested = ${undefined_var!${also_undefined!${undefined_too!hello}}}
156+
hostname = localhost:${undefined_var!8080}
157+
outer_quotes = "foo:${undefined_var!bar}"
158+
number_value = ${undefined_var!12345}
159+
true_value = ${undefined_var!true}
160+
false_value = ${undefined_var!false}
161+
null_value = ${undefined_var!null}
162+
empty1 = ${undefined_var!}
163+
empty2 = ${undefined}
164+
constant = ${undefined!TEST_CONSTANT}

‎ext/standard/tests/general_functions/parse_ini_basic.phpt

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ parse_ini_file() tests
33
--ENV--
44
basicval=FUBAR_VARIABLE
55
basicqval=FUBAR_QUOTES_VARIABLE
6+
falsyval=false
7+
emptyval=
68
--FILE--
79
<?php
810

@@ -15,7 +17,7 @@ var_dump(parse_ini_file($ini_file, 1));
1517
echo "Done.\n";
1618
?>
1719
--EXPECT--
18-
array(27) {
20+
array(29) {
1921
["basic"]=>
2022
array(15) {
2123
["basicval"]=>
@@ -179,6 +181,9 @@ array(27) {
179181
["FUBAR_VARIABLE"]=>
180182
array(0) {
181183
}
184+
["foo"]=>
185+
array(0) {
186+
}
182187
["FUBAR_VARIABLE/foo"]=>
183188
array(0) {
184189
}
@@ -295,5 +300,42 @@ array(27) {
295300
["unescaped"]=>
296301
string(6) "\n\r\t"
297302
}
303+
["variable-fallback"]=>
304+
array(17) {
305+
["defined1"]=>
306+
string(22) "Hello, FUBAR_VARIABLE!"
307+
["defined2"]=>
308+
string(14) "FUBAR_VARIABLE"
309+
["falsy"]=>
310+
string(5) "false"
311+
["undefined"]=>
312+
string(13) "Hello, world!"
313+
["empty"]=>
314+
string(3) "foo"
315+
["spaces"]=>
316+
string(8) "hi there"
317+
["exclamation"]=>
318+
string(21) "no, this is fallback!"
319+
["nested"]=>
320+
string(5) "hello"
321+
["hostname"]=>
322+
string(14) "localhost:8080"
323+
["outer_quotes"]=>
324+
string(7) "foo:bar"
325+
["number_value"]=>
326+
string(5) "12345"
327+
["true_value"]=>
328+
string(1) "1"
329+
["false_value"]=>
330+
string(0) ""
331+
["null_value"]=>
332+
string(0) ""
333+
["empty1"]=>
334+
string(0) ""
335+
["empty2"]=>
336+
string(0) ""
337+
["constant"]=>
338+
string(21) "this_is_test_constant"
339+
}
298340
}
299341
Done.

‎ext/standard/tests/general_functions/parse_ini_string_error.phpt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,18 @@ Ini parsing errors should not result in memory leaks
33
--FILE--
44
<?php
55
var_dump(parse_ini_string('a="b'));
6+
var_dump(parse_ini_string('a=${b'));
7+
var_dump(parse_ini_string('a=${b!a'));
68
?>
79
--EXPECTF--
810
Warning: syntax error, unexpected end of file, expecting TC_DOLLAR_CURLY or TC_QUOTED_STRING or '"' in Unknown on line 1
911
in %s on line %d
1012
bool(false)
13+
14+
Warning: syntax error, unexpected end of file, expecting TC_VARNAME in Unknown on line 1
15+
in %s on line %d
16+
bool(false)
17+
18+
Warning: syntax error, unexpected end of file, expecting '}' in Unknown on line 1
19+
in %s on line %d
20+
bool(false)

0 commit comments

Comments
 (0)