From bdb19292d9e610c10bd34dec7c93f0a9833a97db Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 15:55:26 +0200 Subject: [PATCH 01/12] Remove assignment of new by reference --- Zend/tests/bug45178.phpt | 29 ------- Zend/zend_compile.c | 10 +-- Zend/zend_compile.h | 3 +- Zend/zend_language_parser.y | 2 - Zend/zend_vm_def.h | 10 --- Zend/zend_vm_execute.h | 40 --------- ext/standard/tests/serialize/bug31402.phpt | 87 ------------------- tests/classes/new_001.phpt | 48 ---------- tests/lang/bug20175.phpt | 56 +----------- tests/lang/bug22231.phpt | 42 --------- tests/lang/bug22510.phpt | 4 +- .../lang/engine_assignExecutionOrder_007.phpt | 46 ---------- 12 files changed, 6 insertions(+), 371 deletions(-) delete mode 100644 Zend/tests/bug45178.phpt delete mode 100644 ext/standard/tests/serialize/bug31402.phpt delete mode 100644 tests/classes/new_001.phpt delete mode 100644 tests/lang/bug22231.phpt delete mode 100644 tests/lang/engine_assignExecutionOrder_007.phpt diff --git a/Zend/tests/bug45178.phpt b/Zend/tests/bug45178.phpt deleted file mode 100644 index 5ce1859948cd9..0000000000000 --- a/Zend/tests/bug45178.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Bug #45178 memory corruption on assignment result of "new" by reference ---FILE-- -error = array($this,$this); - } -} -$a =& new Foo(); - -class Bar { - function __construct() { - $this->_rme2 = $this; - } -} - -$b =& new Bar(); -$b->_rme2 = 0; -var_dump($b); -?> ---EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %sbug45178.php on line 7 - -Deprecated: Assigning the return value of new by reference is deprecated in %sbug45178.php on line 15 -object(Bar)#%d (1) { - ["_rme2"]=> - int(0) -} diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a5a32298d584a..341e30067b9d5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3936,9 +3936,6 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ if (zend_is_call(source_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; - } else if (source_ast->kind == ZEND_AST_NEW) { - zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); - opline->extended_value = ZEND_RETURNS_NEW; } } /* }}} */ @@ -7857,11 +7854,8 @@ void zend_compile_var(znode *result, zend_ast *ast, uint32_t type TSRMLS_DC) /* if (type == BP_VAR_W || type == BP_VAR_REF || type == BP_VAR_RW || type == BP_VAR_UNSET ) { - /* For BC reasons =& new Foo is allowed */ - if (type != BP_VAR_REF || ast->kind != ZEND_AST_NEW) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use temporary expression in write context"); - } + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use temporary expression in write context"); } zend_compile_expr(result, ast TSRMLS_CC); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 89bb2b8457598..0a10ee9573add 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -671,8 +671,7 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); #define ZEND_RETURNS_FUNCTION 1<<0 -#define ZEND_RETURNS_NEW 1<<1 -#define ZEND_RETURNS_VALUE 1<<2 +#define ZEND_RETURNS_VALUE 1<<1 #define ZEND_FAST_RET_TO_CATCH 1 #define ZEND_FAST_RET_TO_FINALLY 2 diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6bfef2219e2e8..2e06bf4c97410 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -746,8 +746,6 @@ expr_without_variable: { $$ = zend_ast_create(ZEND_AST_ASSIGN, $1, $3); } | variable '=' '&' variable { $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); } - | variable '=' '&' new_expr - { $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); } | T_CLONE expr { $$ = zend_ast_create(ZEND_AST_CLONE, $2); } | variable T_PLUS_EQUAL expr { $$ = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1, $3); } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 4bd80bd9d6709..f478571c9c31d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1741,10 +1741,6 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV) HANDLE_EXCEPTION(); } ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ASSIGN); - } else if (OP2_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!OP2_FREE) { - PZVAL_LOCK(value_ptr); - } } variable_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_W); @@ -1764,12 +1760,6 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV) zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC); } - if (OP2_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!OP2_FREE) { - Z_DELREF_P(variable_ptr); - } - } - if (RETURN_VALUE_USED(opline)) { ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 0720356e94abc..e60c853a7e3a3 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -22841,10 +22841,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDL HANDLE_EXCEPTION(); } return ZEND_ASSIGN_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); - } else if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!(free_op2.var != NULL)) { - PZVAL_LOCK(value_ptr); - } } variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); @@ -22864,12 +22860,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDL zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC); } - if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!(free_op2.var != NULL)) { - Z_DELREF_P(variable_ptr); - } - } - if (RETURN_VALUE_USED(opline)) { ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr); } @@ -26240,10 +26230,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLE HANDLE_EXCEPTION(); } return ZEND_ASSIGN_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); - } else if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!0) { - PZVAL_LOCK(value_ptr); - } } variable_ptr = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); @@ -26263,12 +26249,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLE zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC); } - if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!0) { - Z_DELREF_P(variable_ptr); - } - } - if (RETURN_VALUE_USED(opline)) { ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr); } @@ -39809,10 +39789,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLE HANDLE_EXCEPTION(); } return ZEND_ASSIGN_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); - } else if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!(free_op2.var != NULL)) { - PZVAL_LOCK(value_ptr); - } } variable_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); @@ -39832,12 +39808,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLE zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC); } - if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!(free_op2.var != NULL)) { - Z_DELREF_P(variable_ptr); - } - } - if (RETURN_VALUE_USED(opline)) { ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr); } @@ -42952,10 +42922,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER HANDLE_EXCEPTION(); } return ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); - } else if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!0) { - PZVAL_LOCK(value_ptr); - } } variable_ptr = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); @@ -42975,12 +42941,6 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC); } - if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - if (!0) { - Z_DELREF_P(variable_ptr); - } - } - if (RETURN_VALUE_USED(opline)) { ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr); } diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt deleted file mode 100644 index 59cc52f5f4151..0000000000000 --- a/ext/standard/tests/serialize/bug31402.phpt +++ /dev/null @@ -1,87 +0,0 @@ ---TEST-- -Bug #31402 (unserialize() generates references when it should not) ---INI-- -error_reporting=E_ALL&~E_STRICT&~E_DEPRECATED ---FILE-- -i = $i; - } -} - -class TestY { - var $A = array(); - var $B; - - function __construct() { - $this->A[1] = new TestX(1); - $this->A[2] = & new TestX(2); - $this->A[3] = & $this->A[2]; - $this->B = $this->A[1]; - } -} - -$before = new TestY(); -$ser = serialize($before); -$after = unserialize($ser); - -var_dump($before, $after); - -?> -===DONE=== ---EXPECTF-- -object(TestY)#%d (2) { - ["A"]=> - array(3) { - [1]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } - [2]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - [3]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - } - ["B"]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } -} -object(TestY)#%d (2) { - ["A"]=> - array(3) { - [1]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } - [2]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - [3]=> - &object(TestX)#%d (1) { - ["i"]=> - int(2) - } - } - ["B"]=> - object(TestX)#%d (1) { - ["i"]=> - int(1) - } -} -===DONE=== diff --git a/tests/classes/new_001.phpt b/tests/classes/new_001.phpt deleted file mode 100644 index ee7d3529a312c..0000000000000 --- a/tests/classes/new_001.phpt +++ /dev/null @@ -1,48 +0,0 @@ ---TEST-- -Confirm difference between assigning new directly and by reference. ---INI-- -error_reporting=E_ALL | E_DEPRECATED ---FILE-- -id = ++Inc::$counter; - } - } - - $f = new Inc(); - $k =& $f; - echo "\$f initially points to the first object:\n"; - var_dump($f); - - echo "Assigning new object directly to \$k affects \$f:\n"; - $k = new Inc(); - var_dump($f); - - echo "Assigning new object by ref to \$k removes it from \$f's reference set, so \$f is unchanged:\n"; - $k =& new Inc(); - var_dump($f); -?> ---EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line 23 -Compile-time strict error message should precede this. -$f initially points to the first object: -object(Inc)#%d (1) { - ["id"]=> - int(1) -} -Assigning new object directly to $k affects $f: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} -Assigning new object by ref to $k removes it from $f's reference set, so $f is unchanged: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt index 7c6ec780ed7db..e1799f62a80f3 100644 --- a/tests/lang/bug20175.phpt +++ b/tests/lang/bug20175.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #20175 (Static vars can't store ref to new instance) ---SKIPIF-- - --INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED +error_reporting=E_ALL --FILE-- oop_name = 'oop:' . ++$oop_global; - } -} - -class oop_test { - static $oop_value; - - function oop_test() { - echo "oop_test()\n"; - } - - function oop_static() { - echo "oop_static()\n"; - if (!isset(self::$oop_value)) { - self::$oop_value = & new oop_class; - } - echo self::$oop_value->oop_name; - } -} - print foo_static()."\n"; print foo_static()."\n"; print bar_static()."\n"; @@ -132,14 +93,8 @@ wow:1 wow_static() wow:1 "; -$oop_tester = new oop_test; -print $oop_tester->oop_static()."\n"; -print $oop_tester->oop_static()."\n"; -$oop_tester = new oop_test; // repeated. -print $oop_tester->oop_static()."\n"; ?> --EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s.php on line %d %s foo_static() foo_global() @@ -158,12 +113,3 @@ wow_global() wow:1 wow_static() wow:1 -oop_test() -oop_static() -oop_class() -oop:1 -oop_static() -oop:1 -oop_test() -oop_static() -oop:1 diff --git a/tests/lang/bug22231.phpt b/tests/lang/bug22231.phpt deleted file mode 100644 index ede6a371e53a8..0000000000000 --- a/tests/lang/bug22231.phpt +++ /dev/null @@ -1,42 +0,0 @@ ---TEST-- -Bug #22231 (segfault when returning a global variable by reference) ---INI-- -error_reporting=E_ALL | E_DEPRECATED ---FILE-- -fubar); -unset($bar); -$bar = &foo(); -var_dump($bar->fubar); - -$foo = &foo(); -var_dump($foo); -var_dump($foo->fubar); -unset($foo); -$foo = &foo(); -var_dump($foo->fubar); -?> ---EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d -object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" -object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt index fd717147d74a7..c625ea7dddc64 100644 --- a/tests/lang/bug22510.phpt +++ b/tests/lang/bug22510.phpt @@ -76,7 +76,8 @@ function ok3(&$bar) { $bar->run3(); } -$bar = &new bar(); +$foo = new bar(); +$bar =& $foo; ok1($bar); $bar->instance->finalize(); print "done!\n"; @@ -91,7 +92,6 @@ $bar->instance->finalize(); print "I'm alive!\n"; ?> --EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d ok1 bar::run1 foo::method1 diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt deleted file mode 100644 index 56b729ed8842a..0000000000000 --- a/tests/lang/engine_assignExecutionOrder_007.phpt +++ /dev/null @@ -1,46 +0,0 @@ ---TEST-- -Check key execution order with &new. ---FILE-- -a =& new $a[$i=2][++$i]; -$o->a->b =& new $a[$i=2][++$i]; -print_r($o); -?> ---EXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s.php on line 3 - -Deprecated: Assigning the return value of new by reference is deprecated in %s.php on line 7 - -Deprecated: Assigning the return value of new by reference is deprecated in %s.php on line 8 -Array -( - [2] => Array - ( - [3] => stdClass - ) - - [0] => Array - ( - [1] => stdClass Object - ( - ) - - ) - -) -stdClass Object -( - [a] => stdClass Object - ( - [b] => stdClass Object - ( - ) - - ) - -) From 375435fac4af80a499acf6ecdc380f19438c8021 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 16:01:53 +0200 Subject: [PATCH 02/12] Remove # comments in ini files --- Zend/zend_ini_scanner.c | 3818 ++++++++--------- Zend/zend_ini_scanner.l | 7 - .../general_functions/parse_ini_file.phpt | 22 - 3 files changed, 1862 insertions(+), 1985 deletions(-) diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c index 2abf1140fcdd5..5127e6fa9c525 100644 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@ -468,7 +468,6 @@ int ini_lex(zval *ini_lval TSRMLS_DC) case '|': case '}': case '~': goto yy10; - case '#': goto yy12; case '%': case '\'': case '*': @@ -482,27 +481,27 @@ int ini_lex(zval *ini_lval TSRMLS_DC) case '>': case '?': case '@': - case ']': goto yy13; - case ';': goto yy14; - case '=': goto yy16; + case ']': goto yy12; + case ';': goto yy13; + case '=': goto yy15; case 'F': - case 'f': goto yy18; + case 'f': goto yy17; case 'N': - case 'n': goto yy19; + case 'n': goto yy18; case 'O': - case 'o': goto yy20; + case 'o': goto yy19; case 'T': - case 't': goto yy21; + case 't': goto yy20; case 'Y': - case 'y': goto yy22; - case '[': goto yy23; + case 'y': goto yy21; + case '[': goto yy22; default: goto yy2; } yy2: YYDEBUG(2, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy26; + goto yy25; yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@ -516,12 +515,12 @@ int ini_lex(zval *ini_lval TSRMLS_DC) RETURN_TOKEN(TC_LABEL, yytext, yyleng); } -#line 520 "Zend/zend_ini_scanner.c" +#line 519 "Zend/zend_ini_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy73; + goto yy63; yy5: YYDEBUG(5, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@ -530,7 +529,7 @@ int ini_lex(zval *ini_lval TSRMLS_DC) /* eat whitespace */ goto restart; } -#line 534 "Zend/zend_ini_scanner.c" +#line 533 "Zend/zend_ini_scanner.c" yy6: YYDEBUG(6, *YYCURSOR); ++YYCURSOR; @@ -542,34 +541,33 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 546 "Zend/zend_ini_scanner.c" +#line 545 "Zend/zend_ini_scanner.c" yy8: YYDEBUG(8, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy76; + if (yych == '\n') goto yy66; goto yy7; yy9: YYDEBUG(9, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ' ') { + if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy26; - if (yych <= '\t') goto yy72; - goto yy76; + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy62; + goto yy66; } else { - if (yych == '\r') goto yy77; - if (yych <= 0x1F) goto yy26; - goto yy74; + if (yych == '\r') goto yy67; + goto yy25; } } else { - if (yych <= ':') { - if (yych == '#') goto yy63; - goto yy26; + if (yych <= ';') { + if (yych <= ' ') goto yy64; + if (yych <= ':') goto yy25; + goto yy57; } else { - if (yych <= ';') goto yy58; - if (yych == '=') goto yy56; - goto yy26; + if (yych == '=') goto yy55; + goto yy25; } } yy10: @@ -581,35 +579,30 @@ int ini_lex(zval *ini_lval TSRMLS_DC) { /* Disallow these chars outside option values */ return yytext[0]; } -#line 585 "Zend/zend_ini_scanner.c" +#line 583 "Zend/zend_ini_scanner.c" yy12: YYDEBUG(12, *YYCURSOR); - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - goto yy64; + yych = *++YYCURSOR; + goto yy25; yy13: YYDEBUG(13, *YYCURSOR); - yych = *++YYCURSOR; - goto yy26; -yy14: - YYDEBUG(14, *YYCURSOR); yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - goto yy59; - YYDEBUG(15, *YYCURSOR); + goto yy58; + YYDEBUG(14, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 651 "Zend/zend_ini_scanner.l" +#line 644 "Zend/zend_ini_scanner.l" { return 0; } -#line 606 "Zend/zend_ini_scanner.c" -yy16: - YYDEBUG(16, *YYCURSOR); +#line 599 "Zend/zend_ini_scanner.c" +yy15: + YYDEBUG(15, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy57; -yy17: - YYDEBUG(17, *YYCURSOR); + goto yy56; +yy16: + YYDEBUG(16, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 487 "Zend/zend_ini_scanner.l" { /* Start option value */ @@ -620,61 +613,61 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } return '='; } -#line 624 "Zend/zend_ini_scanner.c" +#line 617 "Zend/zend_ini_scanner.c" +yy17: + YYDEBUG(17, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy52; + if (yych == 'a') goto yy52; + goto yy25; yy18: YYDEBUG(18, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy53; - if (yych == 'a') goto yy53; - goto yy26; -yy19: - YYDEBUG(19, *YYCURSOR); - yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'O') goto yy44; - if (yych <= 'T') goto yy26; - goto yy45; + if (yych == 'O') goto yy43; + if (yych <= 'T') goto yy25; + goto yy44; } else { if (yych <= 'o') { - if (yych <= 'n') goto yy26; - goto yy44; + if (yych <= 'n') goto yy25; + goto yy43; } else { - if (yych == 'u') goto yy45; - goto yy26; + if (yych == 'u') goto yy44; + goto yy25; } } -yy20: - YYDEBUG(20, *YYCURSOR); +yy19: + YYDEBUG(19, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'F') goto yy38; - if (yych <= 'M') goto yy26; - goto yy31; + if (yych == 'F') goto yy37; + if (yych <= 'M') goto yy25; + goto yy30; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy26; - goto yy38; + if (yych <= 'e') goto yy25; + goto yy37; } else { - if (yych == 'n') goto yy31; - goto yy26; + if (yych == 'n') goto yy30; + goto yy25; } } +yy20: + YYDEBUG(20, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy35; + if (yych == 'r') goto yy35; + goto yy25; yy21: YYDEBUG(21, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy36; - if (yych == 'r') goto yy36; - goto yy26; + if (yych == 'E') goto yy26; + if (yych == 'e') goto yy26; + goto yy25; yy22: YYDEBUG(22, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy27; - if (yych == 'e') goto yy27; - goto yy26; -yy23: - YYDEBUG(23, *YYCURSOR); ++YYCURSOR; - YYDEBUG(24, *YYCURSOR); + YYDEBUG(23, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 402 "Zend/zend_ini_scanner.l" { /* Section start */ @@ -686,35 +679,35 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } return TC_SECTION; } -#line 690 "Zend/zend_ini_scanner.c" -yy25: - YYDEBUG(25, *YYCURSOR); +#line 683 "Zend/zend_ini_scanner.c" +yy24: + YYDEBUG(24, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy26: - YYDEBUG(26, *YYCURSOR); +yy25: + YYDEBUG(25, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy25; + goto yy24; } - if (yych == '[') goto yy28; + if (yych == '[') goto yy27; goto yy3; +yy26: + YYDEBUG(26, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy30; + if (yych == 's') goto yy30; + goto yy25; yy27: YYDEBUG(27, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy31; - if (yych == 's') goto yy31; - goto yy26; -yy28: - YYDEBUG(28, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(29, *YYCURSOR); + YYDEBUG(28, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy28; + goto yy27; } - YYDEBUG(30, *YYCURSOR); + YYDEBUG(29, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 427 "Zend/zend_ini_scanner.l" { /* Start of option with offset */ @@ -729,303 +722,303 @@ int ini_lex(zval *ini_lval TSRMLS_DC) RETURN_TOKEN(TC_OFFSET, yytext, yyleng); } -#line 733 "Zend/zend_ini_scanner.c" -yy31: - YYDEBUG(31, *YYCURSOR); +#line 726 "Zend/zend_ini_scanner.c" +yy30: + YYDEBUG(30, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(32, *YYCURSOR); + YYDEBUG(31, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy31; + goto yy30; } if (yych <= '\'') { if (yych <= ' ') { if (yych <= '\n') { - if (yych <= 0x08) goto yy25; - if (yych <= '\t') goto yy34; + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy33; } else { - if (yych != '\r') goto yy25; + if (yych != '\r') goto yy24; } } else { if (yych <= '$') { - if (yych == '#') goto yy25; + if (yych == '#') goto yy24; } else { - if (yych != '&') goto yy25; + if (yych != '&') goto yy24; } } } else { if (yych <= 'Z') { if (yych <= ';') { - if (yych <= ')') goto yy33; - if (yych <= ':') goto yy25; + if (yych <= ')') goto yy32; + if (yych <= ':') goto yy24; } else { - if (yych != '=') goto yy25; + if (yych != '=') goto yy24; } } else { if (yych <= '^') { - if (yych <= '[') goto yy28; - if (yych <= ']') goto yy25; + if (yych <= '[') goto yy27; + if (yych <= ']') goto yy24; } else { - if (yych <= 'z') goto yy25; - if (yych >= 0x7F) goto yy25; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; } } } -yy33: - YYDEBUG(33, *YYCURSOR); +yy32: + YYDEBUG(32, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 465 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } -#line 783 "Zend/zend_ini_scanner.c" -yy34: - YYDEBUG(34, *YYCURSOR); +#line 776 "Zend/zend_ini_scanner.c" +yy33: + YYDEBUG(33, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(34, *YYCURSOR); + if (yych == '\t') goto yy33; + if (yych == ' ') goto yy33; + goto yy32; +yy35: YYDEBUG(35, *YYCURSOR); - if (yych == '\t') goto yy34; - if (yych == ' ') goto yy34; - goto yy33; + yych = *++YYCURSOR; + if (yych == 'U') goto yy36; + if (yych != 'u') goto yy25; yy36: YYDEBUG(36, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy37; - if (yych != 'u') goto yy26; + if (yych == 'E') goto yy30; + if (yych == 'e') goto yy30; + goto yy25; yy37: YYDEBUG(37, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy31; - if (yych == 'e') goto yy31; - goto yy26; + if (yych == 'F') goto yy38; + if (yych != 'f') goto yy25; yy38: YYDEBUG(38, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'F') goto yy39; - if (yych != 'f') goto yy26; -yy39: - YYDEBUG(39, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(40, *YYCURSOR); + YYDEBUG(39, *YYCURSOR); if (yych <= '&') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy25; - if (yych <= '\t') goto yy42; + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy41; } else { - if (yych != '\r') goto yy25; + if (yych != '\r') goto yy24; } } else { if (yych <= '#') { - if (yych <= ' ') goto yy39; - if (yych >= '#') goto yy25; + if (yych <= ' ') goto yy38; + if (yych >= '#') goto yy24; } else { - if (yych == '%') goto yy25; + if (yych == '%') goto yy24; } } } else { if (yych <= '=') { if (yych <= ':') { - if (yych <= '\'') goto yy25; - if (yych >= '*') goto yy25; + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; } else { - if (yych == '<') goto yy25; + if (yych == '<') goto yy24; } } else { if (yych <= ']') { - if (yych == '[') goto yy28; - goto yy25; + if (yych == '[') goto yy27; + goto yy24; } else { - if (yych <= '^') goto yy41; - if (yych <= 'z') goto yy25; - if (yych >= 0x7F) goto yy25; + if (yych <= '^') goto yy40; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; } } } -yy41: - YYDEBUG(41, *YYCURSOR); +yy40: + YYDEBUG(40, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 469 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } -#line 857 "Zend/zend_ini_scanner.c" -yy42: - YYDEBUG(42, *YYCURSOR); +#line 850 "Zend/zend_ini_scanner.c" +yy41: + YYDEBUG(41, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(42, *YYCURSOR); + if (yych == '\t') goto yy41; + if (yych == ' ') goto yy41; + goto yy40; +yy43: YYDEBUG(43, *YYCURSOR); - if (yych == '\t') goto yy42; - if (yych == ' ') goto yy42; - goto yy41; -yy44: - YYDEBUG(44, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\'') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy26; - if (yych <= '\t') goto yy42; - goto yy41; + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy41; + goto yy40; } else { - if (yych == '\r') goto yy41; - goto yy26; + if (yych == '\r') goto yy40; + goto yy25; } } else { if (yych <= '#') { - if (yych <= ' ') goto yy39; - if (yych <= '"') goto yy41; - goto yy26; + if (yych <= ' ') goto yy38; + if (yych <= '"') goto yy40; + goto yy25; } else { - if (yych == '%') goto yy26; - if (yych <= '&') goto yy41; - goto yy26; + if (yych == '%') goto yy25; + if (yych <= '&') goto yy40; + goto yy25; } } } else { if (yych <= 'N') { if (yych <= ';') { - if (yych <= ')') goto yy41; - if (yych <= ':') goto yy26; - goto yy41; + if (yych <= ')') goto yy40; + if (yych <= ':') goto yy25; + goto yy40; } else { - if (yych == '=') goto yy41; - if (yych <= 'M') goto yy26; - goto yy52; + if (yych == '=') goto yy40; + if (yych <= 'M') goto yy25; + goto yy51; } } else { if (yych <= 'm') { - if (yych == '^') goto yy41; - goto yy26; + if (yych == '^') goto yy40; + goto yy25; } else { - if (yych <= 'n') goto yy52; - if (yych <= 'z') goto yy26; - if (yych <= '~') goto yy41; - goto yy26; + if (yych <= 'n') goto yy51; + if (yych <= 'z') goto yy25; + if (yych <= '~') goto yy40; + goto yy25; } } } +yy44: + YYDEBUG(44, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy45; + if (yych != 'l') goto yy25; yy45: YYDEBUG(45, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'L') goto yy46; - if (yych != 'l') goto yy26; + if (yych != 'l') goto yy25; yy46: YYDEBUG(46, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'L') goto yy47; - if (yych != 'l') goto yy26; -yy47: - YYDEBUG(47, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(48, *YYCURSOR); + YYDEBUG(47, *YYCURSOR); if (yych <= '&') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy25; - if (yych <= '\t') goto yy50; + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy49; } else { - if (yych != '\r') goto yy25; + if (yych != '\r') goto yy24; } } else { if (yych <= '#') { - if (yych <= ' ') goto yy47; - if (yych >= '#') goto yy25; + if (yych <= ' ') goto yy46; + if (yych >= '#') goto yy24; } else { - if (yych == '%') goto yy25; + if (yych == '%') goto yy24; } } } else { if (yych <= '=') { if (yych <= ':') { - if (yych <= '\'') goto yy25; - if (yych >= '*') goto yy25; + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; } else { - if (yych == '<') goto yy25; + if (yych == '<') goto yy24; } } else { if (yych <= ']') { - if (yych == '[') goto yy28; - goto yy25; + if (yych == '[') goto yy27; + goto yy24; } else { - if (yych <= '^') goto yy49; - if (yych <= 'z') goto yy25; - if (yych >= 0x7F) goto yy25; + if (yych <= '^') goto yy48; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; } } } -yy49: - YYDEBUG(49, *YYCURSOR); +yy48: + YYDEBUG(48, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 473 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } -#line 972 "Zend/zend_ini_scanner.c" -yy50: - YYDEBUG(50, *YYCURSOR); +#line 965 "Zend/zend_ini_scanner.c" +yy49: + YYDEBUG(49, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(50, *YYCURSOR); + if (yych == '\t') goto yy49; + if (yych == ' ') goto yy49; + goto yy48; +yy51: YYDEBUG(51, *YYCURSOR); - if (yych == '\t') goto yy50; - if (yych == ' ') goto yy50; - goto yy49; + yych = *++YYCURSOR; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; yy52: YYDEBUG(52, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy39; - if (yych == 'e') goto yy39; - goto yy26; + if (yych == 'L') goto yy53; + if (yych != 'l') goto yy25; yy53: YYDEBUG(53, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy54; - if (yych != 'l') goto yy26; + if (yych == 'S') goto yy54; + if (yych != 's') goto yy25; yy54: YYDEBUG(54, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy55; - if (yych != 's') goto yy26; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; yy55: YYDEBUG(55, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy39; - if (yych == 'e') goto yy39; - goto yy26; -yy56: - YYDEBUG(56, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; +yy56: + YYDEBUG(56, *YYCURSOR); + if (yych == '\t') goto yy55; + if (yych == ' ') goto yy55; + goto yy16; yy57: YYDEBUG(57, *YYCURSOR); - if (yych == '\t') goto yy56; - if (yych == ' ') goto yy56; - goto yy17; -yy58: - YYDEBUG(58, *YYCURSOR); ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy59: - YYDEBUG(59, *YYCURSOR); +yy58: + YYDEBUG(58, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy58; + goto yy57; } - if (yych >= '\r') goto yy62; + if (yych >= '\r') goto yy61; +yy59: + YYDEBUG(59, *YYCURSOR); + ++YYCURSOR; yy60: YYDEBUG(60, *YYCURSOR); - ++YYCURSOR; -yy61: - YYDEBUG(61, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 633 "Zend/zend_ini_scanner.l" { /* Comment */ @@ -1033,183 +1026,96 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 1037 "Zend/zend_ini_scanner.c" +#line 1030 "Zend/zend_ini_scanner.c" +yy61: + YYDEBUG(61, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy59; + goto yy60; yy62: YYDEBUG(62, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == '\n') goto yy60; - goto yy61; -yy63: - YYDEBUG(63, *YYCURSOR); - yyaccept = 1; - YYMARKER = ++YYCURSOR; - YYFILL(2); - yych = *YYCURSOR; -yy64: - YYDEBUG(64, *YYCURSOR); - if (yych <= '\'') { - if (yych <= ' ') { - if (yych <= '\n') { - if (yych <= 0x08) goto yy63; - if (yych >= '\n') goto yy69; - } else { - if (yych == '\r') goto yy71; - goto yy63; - } - } else { - if (yych <= '$') { - if (yych == '#') goto yy63; - } else { - if (yych != '&') goto yy63; - } - } - } else { - if (yych <= 'Z') { - if (yych <= ';') { - if (yych <= ')') goto yy65; - if (yych <= ':') goto yy63; - } else { - if (yych != '=') goto yy63; - } - } else { - if (yych <= '^') { - if (yych <= '[') goto yy67; - if (yych <= ']') goto yy63; - } else { - if (yych <= 'z') goto yy63; - if (yych >= 0x7F) goto yy63; - } - } - } -yy65: - YYDEBUG(65, *YYCURSOR); - ++YYCURSOR; - YYFILL(2); - yych = *YYCURSOR; - YYDEBUG(66, *YYCURSOR); - if (yych == '\n') goto yy69; - if (yych == '\r') goto yy71; - goto yy65; -yy67: - YYDEBUG(67, *YYCURSOR); - yyaccept = 3; - YYMARKER = ++YYCURSOR; - YYFILL(2); - yych = *YYCURSOR; - YYDEBUG(68, *YYCURSOR); - if (yych <= '\f') { - if (yych <= 0x08) goto yy65; - if (yych <= '\t') goto yy67; - if (yych >= '\v') goto yy65; - } else { - if (yych <= '\r') goto yy71; - if (yych == ' ') goto yy67; - goto yy65; - } -yy69: - YYDEBUG(69, *YYCURSOR); - ++YYCURSOR; -yy70: - YYDEBUG(70, *YYCURSOR); - yyleng = YYCURSOR - SCNG(yy_text); -#line 639 "Zend/zend_ini_scanner.l" - { /* #Comment */ - zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno)); - BEGIN(INITIAL); - SCNG(lineno)++; - return END_OF_LINE; -} -#line 1123 "Zend/zend_ini_scanner.c" -yy71: - YYDEBUG(71, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == '\n') goto yy69; - goto yy70; -yy72: - YYDEBUG(72, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy73: - YYDEBUG(73, *YYCURSOR); - if (yych <= ' ') { +yy63: + YYDEBUG(63, *YYCURSOR); + if (yych <= 0x1F) { if (yych <= '\n') { if (yych <= 0x08) goto yy5; - if (yych <= '\t') goto yy72; - goto yy76; + if (yych <= '\t') goto yy62; + goto yy66; } else { - if (yych == '\r') goto yy77; - if (yych <= 0x1F) goto yy5; - goto yy72; + if (yych == '\r') goto yy67; + goto yy5; } } else { - if (yych <= ':') { - if (yych == '#') goto yy65; - goto yy5; + if (yych <= ';') { + if (yych <= ' ') goto yy62; + if (yych <= ':') goto yy5; + goto yy57; } else { - if (yych <= ';') goto yy58; - if (yych == '=') goto yy56; + if (yych == '=') goto yy55; goto yy5; } } -yy74: - YYDEBUG(74, *YYCURSOR); +yy64: + YYDEBUG(64, *YYCURSOR); yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; - YYDEBUG(75, *YYCURSOR); + YYDEBUG(65, *YYCURSOR); if (yych <= '&') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy25; - if (yych <= '\t') goto yy72; + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy62; } else { - if (yych == '\r') goto yy77; - goto yy25; + if (yych == '\r') goto yy67; + goto yy24; } } else { if (yych <= '#') { - if (yych <= ' ') goto yy74; + if (yych <= ' ') goto yy64; if (yych <= '"') goto yy3; - goto yy63; + goto yy24; } else { - if (yych == '%') goto yy25; + if (yych == '%') goto yy24; goto yy3; } } } else { if (yych <= '=') { if (yych <= ':') { - if (yych <= '\'') goto yy25; + if (yych <= '\'') goto yy24; if (yych <= ')') goto yy3; - goto yy25; + goto yy24; } else { - if (yych <= ';') goto yy58; - if (yych <= '<') goto yy25; - goto yy56; + if (yych <= ';') goto yy57; + if (yych <= '<') goto yy24; + goto yy55; } } else { if (yych <= ']') { - if (yych == '[') goto yy28; - goto yy25; + if (yych == '[') goto yy27; + goto yy24; } else { if (yych <= '^') goto yy3; - if (yych <= 'z') goto yy25; + if (yych <= 'z') goto yy24; if (yych <= '~') goto yy3; - goto yy25; + goto yy24; } } } -yy76: - YYDEBUG(76, *YYCURSOR); +yy66: + YYDEBUG(66, *YYCURSOR); yych = *++YYCURSOR; goto yy7; -yy77: - YYDEBUG(77, *YYCURSOR); +yy67: + YYDEBUG(67, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '\n') goto yy76; + if ((yych = *YYCURSOR) == '\n') goto yy66; goto yy7; } /* *********************************** */ @@ -1249,15 +1155,15 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - YYDEBUG(78, *YYCURSOR); + YYDEBUG(68, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; - if (yych == '"') goto yy82; - if (yych == '$') goto yy84; - YYDEBUG(80, *YYCURSOR); + if (yych == '"') goto yy72; + if (yych == '$') goto yy74; + YYDEBUG(70, *YYCURSOR); ++YYCURSOR; -yy81: - YYDEBUG(81, *YYCURSOR); +yy71: + YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 583 "Zend/zend_ini_scanner.l" { /* Escape double quoted string contents */ @@ -1295,46 +1201,46 @@ int ini_lex(zval *ini_lval TSRMLS_DC) zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC); return TC_QUOTED_STRING; } -#line 1299 "Zend/zend_ini_scanner.c" -yy82: - YYDEBUG(82, *YYCURSOR); +#line 1205 "Zend/zend_ini_scanner.c" +yy72: + YYDEBUG(72, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy88; -yy83: - YYDEBUG(83, *YYCURSOR); + goto yy78; +yy73: + YYDEBUG(73, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 578 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string ends */ yy_pop_state(TSRMLS_C); return '"'; } -#line 1313 "Zend/zend_ini_scanner.c" -yy84: - YYDEBUG(84, *YYCURSOR); +#line 1219 "Zend/zend_ini_scanner.c" +yy74: + YYDEBUG(74, *YYCURSOR); yych = *++YYCURSOR; - if (yych != '{') goto yy81; - YYDEBUG(85, *YYCURSOR); + if (yych != '{') goto yy71; + YYDEBUG(75, *YYCURSOR); ++YYCURSOR; - YYDEBUG(86, *YYCURSOR); + YYDEBUG(76, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 445 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 1327 "Zend/zend_ini_scanner.c" -yy87: - YYDEBUG(87, *YYCURSOR); +#line 1233 "Zend/zend_ini_scanner.c" +yy77: + YYDEBUG(77, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy88: - YYDEBUG(88, *YYCURSOR); +yy78: + YYDEBUG(78, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy87; + goto yy77; } - goto yy83; + goto yy73; } /* *********************************** */ yyc_ST_OFFSET: @@ -1373,494 +1279,494 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, }; - YYDEBUG(89, *YYCURSOR); + YYDEBUG(79, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { - if (yych <= 0x08) goto yy91; - if (yych <= '\t') goto yy93; - goto yy94; + if (yych <= 0x08) goto yy81; + if (yych <= '\t') goto yy83; + goto yy84; } else { - if (yych == '\r') goto yy94; - if (yych >= ' ') goto yy93; + if (yych == '\r') goto yy84; + if (yych >= ' ') goto yy83; } } else { if (yych <= '$') { - if (yych == '"') goto yy96; - if (yych >= '$') goto yy98; + if (yych == '"') goto yy86; + if (yych >= '$') goto yy88; } else { - if (yych == '\'') goto yy99; - if (yych >= '-') goto yy100; + if (yych == '\'') goto yy89; + if (yych >= '-') goto yy90; } } } else { if (yych <= 'Z') { if (yych <= '9') { - if (yych <= '.') goto yy101; - if (yych >= '0') goto yy102; + if (yych <= '.') goto yy91; + if (yych >= '0') goto yy92; } else { - if (yych == ';') goto yy94; - if (yych >= 'A') goto yy104; + if (yych == ';') goto yy84; + if (yych >= 'A') goto yy94; } } else { if (yych <= '^') { - if (yych <= '[') goto yy91; - if (yych <= '\\') goto yy106; - if (yych <= ']') goto yy107; + if (yych <= '[') goto yy81; + if (yych <= '\\') goto yy96; + if (yych <= ']') goto yy97; } else { - if (yych == '`') goto yy91; - if (yych <= 'z') goto yy104; + if (yych == '`') goto yy81; + if (yych <= 'z') goto yy94; } } } -yy91: - YYDEBUG(91, *YYCURSOR); +yy81: + YYDEBUG(81, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy110; -yy92: - YYDEBUG(92, *YYCURSOR); + goto yy100; +yy82: + YYDEBUG(82, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 569 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 1431 "Zend/zend_ini_scanner.c" -yy93: - YYDEBUG(93, *YYCURSOR); +#line 1337 "Zend/zend_ini_scanner.c" +yy83: + YYDEBUG(83, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 128) { - goto yy136; + goto yy126; } - if (yych == '"') goto yy138; - if (yych == ']') goto yy139; - goto yy110; -yy94: - YYDEBUG(94, *YYCURSOR); + if (yych == '"') goto yy128; + if (yych == ']') goto yy129; + goto yy100; +yy84: + YYDEBUG(84, *YYCURSOR); ++YYCURSOR; -yy95: - YYDEBUG(95, *YYCURSOR); +yy85: + YYDEBUG(85, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 651 "Zend/zend_ini_scanner.l" +#line 644 "Zend/zend_ini_scanner.l" { return 0; } -#line 1452 "Zend/zend_ini_scanner.c" -yy96: - YYDEBUG(96, *YYCURSOR); +#line 1358 "Zend/zend_ini_scanner.c" +yy86: + YYDEBUG(86, *YYCURSOR); ++YYCURSOR; -yy97: - YYDEBUG(97, *YYCURSOR); +yy87: + YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 573 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 1464 "Zend/zend_ini_scanner.c" -yy98: - YYDEBUG(98, *YYCURSOR); +#line 1370 "Zend/zend_ini_scanner.c" +yy88: + YYDEBUG(88, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy95; - if (yych <= '[') goto yy109; - goto yy114; + if (yych <= 0x00) goto yy85; + if (yych <= '[') goto yy99; + goto yy104; } else { - if (yych == '{') goto yy134; - goto yy109; + if (yych == '{') goto yy124; + goto yy99; } -yy99: - YYDEBUG(99, *YYCURSOR); +yy89: + YYDEBUG(89, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 64) { - goto yy130; + goto yy120; } - goto yy95; -yy100: - YYDEBUG(100, *YYCURSOR); + goto yy85; +yy90: + YYDEBUG(90, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy110; - if (yych <= '9') goto yy128; - goto yy110; -yy101: - YYDEBUG(101, *YYCURSOR); + if (yych <= '/') goto yy100; + if (yych <= '9') goto yy118; + goto yy100; +yy91: + YYDEBUG(91, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy110; - if (yych <= '9') goto yy126; - goto yy110; -yy102: - YYDEBUG(102, *YYCURSOR); + if (yych <= '/') goto yy100; + if (yych <= '9') goto yy116; + goto yy100; +yy92: + YYDEBUG(92, *YYCURSOR); yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { - if (yych == '\n') goto yy103; - if (yych <= '\f') goto yy110; + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy100; } else { - if (yych == '"') goto yy103; - if (yych <= '&') goto yy110; + if (yych == '"') goto yy93; + if (yych <= '&') goto yy100; } } else { if (yych <= '9') { - if (yych == '.') goto yy122; - if (yych <= '/') goto yy110; - goto yy124; + if (yych == '.') goto yy112; + if (yych <= '/') goto yy100; + goto yy114; } else { if (yych <= ';') { - if (yych <= ':') goto yy110; + if (yych <= ':') goto yy100; } else { - if (yych != ']') goto yy110; + if (yych != ']') goto yy100; } } } -yy103: - YYDEBUG(103, *YYCURSOR); +yy93: + YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 547 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 1530 "Zend/zend_ini_scanner.c" -yy104: - YYDEBUG(104, *YYCURSOR); +#line 1436 "Zend/zend_ini_scanner.c" +yy94: + YYDEBUG(94, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { - goto yy120; + goto yy110; } if (yych <= '"') { if (yych <= '\f') { - if (yych != '\n') goto yy110; + if (yych != '\n') goto yy100; } else { - if (yych <= '\r') goto yy105; - if (yych <= '!') goto yy110; + if (yych <= '\r') goto yy95; + if (yych <= '!') goto yy100; } } else { if (yych <= ':') { - if (yych != '\'') goto yy110; + if (yych != '\'') goto yy100; } else { - if (yych <= ';') goto yy105; - if (yych != ']') goto yy110; + if (yych <= ';') goto yy95; + if (yych != ']') goto yy100; } } -yy105: - YYDEBUG(105, *YYCURSOR); +yy95: + YYDEBUG(95, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 543 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 1560 "Zend/zend_ini_scanner.c" -yy106: - YYDEBUG(106, *YYCURSOR); +#line 1466 "Zend/zend_ini_scanner.c" +yy96: + YYDEBUG(96, *YYCURSOR); yych = *++YYCURSOR; - goto yy109; -yy107: - YYDEBUG(107, *YYCURSOR); + goto yy99; +yy97: + YYDEBUG(97, *YYCURSOR); ++YYCURSOR; -yy108: - YYDEBUG(108, *YYCURSOR); +yy98: + YYDEBUG(98, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 440 "Zend/zend_ini_scanner.l" { /* End of section or an option offset */ BEGIN(INITIAL); return ']'; } -#line 1576 "Zend/zend_ini_scanner.c" -yy109: - YYDEBUG(109, *YYCURSOR); +#line 1482 "Zend/zend_ini_scanner.c" +yy99: + YYDEBUG(99, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy110: - YYDEBUG(110, *YYCURSOR); +yy100: + YYDEBUG(100, *YYCURSOR); if (yybm[0+yych] & 2) { - goto yy109; + goto yy99; } - if (yych == '$') goto yy112; - if (yych != '\\') goto yy92; -yy111: - YYDEBUG(111, *YYCURSOR); + if (yych == '$') goto yy102; + if (yych != '\\') goto yy82; +yy101: + YYDEBUG(101, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - goto yy109; -yy112: - YYDEBUG(112, *YYCURSOR); + goto yy99; +yy102: + YYDEBUG(102, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy113; - if (yych <= '[') goto yy109; - goto yy114; + if (yych <= 0x00) goto yy103; + if (yych <= '[') goto yy99; + goto yy104; } else { - if (yych != '{') goto yy109; + if (yych != '{') goto yy99; } -yy113: - YYDEBUG(113, *YYCURSOR); +yy103: + YYDEBUG(103, *YYCURSOR); YYCURSOR = YYMARKER; if (yyaccept <= 1) { if (yyaccept <= 0) { - goto yy92; + goto yy82; } else { - goto yy95; + goto yy85; } } else { if (yyaccept <= 2) { - goto yy103; + goto yy93; } else { - goto yy105; + goto yy95; } } -yy114: - YYDEBUG(114, *YYCURSOR); +yy104: + YYDEBUG(104, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 4) { - goto yy115; + goto yy105; } - if (yych == '\\') goto yy117; - goto yy109; -yy115: - YYDEBUG(115, *YYCURSOR); + if (yych == '\\') goto yy107; + goto yy99; +yy105: + YYDEBUG(105, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(116, *YYCURSOR); + YYDEBUG(106, *YYCURSOR); if (yybm[0+yych] & 4) { - goto yy115; + goto yy105; } - if (yych == '\\') goto yy119; - goto yy109; -yy117: - YYDEBUG(117, *YYCURSOR); + if (yych == '\\') goto yy109; + goto yy99; +yy107: + YYDEBUG(107, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(118, *YYCURSOR); + YYDEBUG(108, *YYCURSOR); if (yybm[0+yych] & 4) { - goto yy115; + goto yy105; } - if (yych == '\\') goto yy117; - goto yy109; -yy119: - YYDEBUG(119, *YYCURSOR); + if (yych == '\\') goto yy107; + goto yy99; +yy109: + YYDEBUG(109, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 4) { - goto yy115; + goto yy105; } - if (yych == '\\') goto yy117; - goto yy109; -yy120: - YYDEBUG(120, *YYCURSOR); + if (yych == '\\') goto yy107; + goto yy99; +yy110: + YYDEBUG(110, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(121, *YYCURSOR); + YYDEBUG(111, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy120; + goto yy110; } if (yych <= '$') { if (yych <= '\r') { - if (yych == '\n') goto yy105; - if (yych <= '\f') goto yy109; - goto yy105; + if (yych == '\n') goto yy95; + if (yych <= '\f') goto yy99; + goto yy95; } else { - if (yych == '"') goto yy105; - if (yych <= '#') goto yy109; - goto yy112; + if (yych == '"') goto yy95; + if (yych <= '#') goto yy99; + goto yy102; } } else { if (yych <= ';') { - if (yych == '\'') goto yy105; - if (yych <= ':') goto yy109; - goto yy105; + if (yych == '\'') goto yy95; + if (yych <= ':') goto yy99; + goto yy95; } else { - if (yych <= '[') goto yy109; - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy105; - goto yy109; + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy95; + goto yy99; } } -yy122: - YYDEBUG(122, *YYCURSOR); +yy112: + YYDEBUG(112, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(123, *YYCURSOR); + YYDEBUG(113, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy122; + goto yy112; } if (yych <= '$') { if (yych <= '\r') { - if (yych == '\n') goto yy103; - if (yych <= '\f') goto yy109; - goto yy103; + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; } else { - if (yych == '"') goto yy103; - if (yych <= '#') goto yy109; - goto yy112; + if (yych == '"') goto yy93; + if (yych <= '#') goto yy99; + goto yy102; } } else { if (yych <= ';') { - if (yych == '\'') goto yy103; - if (yych <= ':') goto yy109; - goto yy103; + if (yych == '\'') goto yy93; + if (yych <= ':') goto yy99; + goto yy93; } else { - if (yych <= '[') goto yy109; - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy103; - goto yy109; + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; } } -yy124: - YYDEBUG(124, *YYCURSOR); +yy114: + YYDEBUG(114, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(125, *YYCURSOR); + YYDEBUG(115, *YYCURSOR); if (yych <= '\'') { if (yych <= '!') { if (yych <= '\n') { - if (yych <= '\t') goto yy109; - goto yy103; + if (yych <= '\t') goto yy99; + goto yy93; } else { - if (yych == '\r') goto yy103; - goto yy109; + if (yych == '\r') goto yy93; + goto yy99; } } else { if (yych <= '#') { - if (yych <= '"') goto yy103; - goto yy109; + if (yych <= '"') goto yy93; + goto yy99; } else { - if (yych <= '$') goto yy112; - if (yych <= '&') goto yy109; - goto yy103; + if (yych <= '$') goto yy102; + if (yych <= '&') goto yy99; + goto yy93; } } } else { if (yych <= ':') { if (yych <= '.') { - if (yych <= '-') goto yy109; - goto yy122; + if (yych <= '-') goto yy99; + goto yy112; } else { - if (yych <= '/') goto yy109; - if (yych <= '9') goto yy124; - goto yy109; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy114; + goto yy99; } } else { if (yych <= '[') { - if (yych <= ';') goto yy103; - goto yy109; + if (yych <= ';') goto yy93; + goto yy99; } else { - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy103; - goto yy109; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; } } } -yy126: - YYDEBUG(126, *YYCURSOR); +yy116: + YYDEBUG(116, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(127, *YYCURSOR); + YYDEBUG(117, *YYCURSOR); if (yych <= '&') { if (yych <= '\r') { - if (yych == '\n') goto yy103; - if (yych <= '\f') goto yy109; - goto yy103; + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; } else { if (yych <= '"') { - if (yych <= '!') goto yy109; - goto yy103; + if (yych <= '!') goto yy99; + goto yy93; } else { - if (yych == '$') goto yy112; - goto yy109; + if (yych == '$') goto yy102; + goto yy99; } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy103; - if (yych <= '/') goto yy109; - if (yych <= '9') goto yy126; - goto yy109; + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy116; + goto yy99; } else { if (yych <= '[') { - if (yych <= ';') goto yy103; - goto yy109; + if (yych <= ';') goto yy93; + goto yy99; } else { - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy103; - goto yy109; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; } } } -yy128: - YYDEBUG(128, *YYCURSOR); +yy118: + YYDEBUG(118, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(129, *YYCURSOR); + YYDEBUG(119, *YYCURSOR); if (yych <= '&') { if (yych <= '\r') { - if (yych == '\n') goto yy103; - if (yych <= '\f') goto yy109; - goto yy103; + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; } else { if (yych <= '"') { - if (yych <= '!') goto yy109; - goto yy103; + if (yych <= '!') goto yy99; + goto yy93; } else { - if (yych == '$') goto yy112; - goto yy109; + if (yych == '$') goto yy102; + goto yy99; } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy103; - if (yych <= '/') goto yy109; - if (yych <= '9') goto yy128; - goto yy109; + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy118; + goto yy99; } else { if (yych <= '[') { - if (yych <= ';') goto yy103; - goto yy109; + if (yych <= ';') goto yy93; + goto yy99; } else { - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy103; - goto yy109; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; } } } -yy130: - YYDEBUG(130, *YYCURSOR); +yy120: + YYDEBUG(120, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(131, *YYCURSOR); + YYDEBUG(121, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy130; + goto yy120; } - YYDEBUG(132, *YYCURSOR); + YYDEBUG(122, *YYCURSOR); ++YYCURSOR; - YYDEBUG(133, *YYCURSOR); + YYDEBUG(123, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 412 "Zend/zend_ini_scanner.l" { /* Raw string */ @@ -1871,59 +1777,59 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 1875 "Zend/zend_ini_scanner.c" -yy134: - YYDEBUG(134, *YYCURSOR); +#line 1781 "Zend/zend_ini_scanner.c" +yy124: + YYDEBUG(124, *YYCURSOR); ++YYCURSOR; - YYDEBUG(135, *YYCURSOR); + YYDEBUG(125, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 445 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 1886 "Zend/zend_ini_scanner.c" -yy136: - YYDEBUG(136, *YYCURSOR); +#line 1792 "Zend/zend_ini_scanner.c" +yy126: + YYDEBUG(126, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(137, *YYCURSOR); + YYDEBUG(127, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy136; + goto yy126; } if (yych <= '$') { if (yych <= '\r') { - if (yych == '\n') goto yy92; - if (yych <= '\f') goto yy109; - goto yy92; + if (yych == '\n') goto yy82; + if (yych <= '\f') goto yy99; + goto yy82; } else { - if (yych == '"') goto yy138; - if (yych <= '#') goto yy109; - goto yy112; + if (yych == '"') goto yy128; + if (yych <= '#') goto yy99; + goto yy102; } } else { if (yych <= ';') { - if (yych == '\'') goto yy92; - if (yych <= ':') goto yy109; - goto yy92; + if (yych == '\'') goto yy82; + if (yych <= ':') goto yy99; + goto yy82; } else { - if (yych <= '[') goto yy109; - if (yych <= '\\') goto yy111; - if (yych <= ']') goto yy139; - goto yy109; + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy129; + goto yy99; } } -yy138: - YYDEBUG(138, *YYCURSOR); +yy128: + YYDEBUG(128, *YYCURSOR); yych = *++YYCURSOR; - goto yy97; -yy139: - YYDEBUG(139, *YYCURSOR); + goto yy87; +yy129: + YYDEBUG(129, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy108; + goto yy98; } /* *********************************** */ yyc_ST_RAW: @@ -1962,42 +1868,42 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, }; - YYDEBUG(140, *YYCURSOR); + YYDEBUG(130, *YYCURSOR); YYFILL(3); yych = *YYCURSOR; if (yych <= '\f') { if (yych <= 0x08) { - if (yych >= 0x01) goto yy144; + if (yych >= 0x01) goto yy134; } else { - if (yych <= '\t') goto yy146; - if (yych <= '\n') goto yy147; - goto yy144; + if (yych <= '\t') goto yy136; + if (yych <= '\n') goto yy137; + goto yy134; } } else { if (yych <= ' ') { - if (yych <= '\r') goto yy149; - if (yych <= 0x1F) goto yy144; - goto yy146; + if (yych <= '\r') goto yy139; + if (yych <= 0x1F) goto yy134; + goto yy136; } else { - if (yych == ';') goto yy150; - goto yy144; + if (yych == ';') goto yy140; + goto yy134; } } - YYDEBUG(142, *YYCURSOR); + YYDEBUG(132, *YYCURSOR); ++YYCURSOR; - YYDEBUG(143, *YYCURSOR); + YYDEBUG(133, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 646 "Zend/zend_ini_scanner.l" +#line 639 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } -#line 1996 "Zend/zend_ini_scanner.c" -yy144: - YYDEBUG(144, *YYCURSOR); +#line 1902 "Zend/zend_ini_scanner.c" +yy134: + YYDEBUG(134, *YYCURSOR); ++YYCURSOR; -yy145: - YYDEBUG(145, *YYCURSOR); +yy135: + YYDEBUG(135, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 496 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ @@ -2036,30 +1942,30 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2040 "Zend/zend_ini_scanner.c" -yy146: - YYDEBUG(146, *YYCURSOR); +#line 1946 "Zend/zend_ini_scanner.c" +yy136: + YYDEBUG(136, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\r') { - if (yych <= 0x08) goto yy145; - if (yych <= '\n') goto yy158; - if (yych <= '\f') goto yy145; - goto yy158; + if (yych <= 0x08) goto yy135; + if (yych <= '\n') goto yy148; + if (yych <= '\f') goto yy135; + goto yy148; } else { if (yych <= ' ') { - if (yych <= 0x1F) goto yy145; - goto yy158; + if (yych <= 0x1F) goto yy135; + goto yy148; } else { - if (yych == ';') goto yy158; - goto yy145; + if (yych == ';') goto yy148; + goto yy135; } } -yy147: - YYDEBUG(147, *YYCURSOR); +yy137: + YYDEBUG(137, *YYCURSOR); ++YYCURSOR; -yy148: - YYDEBUG(148, *YYCURSOR); +yy138: + YYDEBUG(138, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 537 "Zend/zend_ini_scanner.l" { /* End of option value */ @@ -2067,33 +1973,33 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 2071 "Zend/zend_ini_scanner.c" -yy149: - YYDEBUG(149, *YYCURSOR); +#line 1977 "Zend/zend_ini_scanner.c" +yy139: + YYDEBUG(139, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy156; - goto yy148; -yy150: - YYDEBUG(150, *YYCURSOR); + if (yych == '\n') goto yy146; + goto yy138; +yy140: + YYDEBUG(140, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - goto yy152; -yy151: - YYDEBUG(151, *YYCURSOR); + goto yy142; +yy141: + YYDEBUG(141, *YYCURSOR); ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy152: - YYDEBUG(152, *YYCURSOR); +yy142: + YYDEBUG(142, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy151; + goto yy141; } - if (yych >= '\r') goto yy155; -yy153: - YYDEBUG(153, *YYCURSOR); + if (yych >= '\r') goto yy145; +yy143: + YYDEBUG(143, *YYCURSOR); ++YYCURSOR; -yy154: - YYDEBUG(154, *YYCURSOR); +yy144: + YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 633 "Zend/zend_ini_scanner.l" { /* Comment */ @@ -2101,46 +2007,46 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 2105 "Zend/zend_ini_scanner.c" -yy155: - YYDEBUG(155, *YYCURSOR); +#line 2011 "Zend/zend_ini_scanner.c" +yy145: + YYDEBUG(145, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy153; - goto yy154; -yy156: - YYDEBUG(156, *YYCURSOR); + if (yych == '\n') goto yy143; + goto yy144; +yy146: + YYDEBUG(146, *YYCURSOR); yych = *++YYCURSOR; - goto yy148; -yy157: - YYDEBUG(157, *YYCURSOR); + goto yy138; +yy147: + YYDEBUG(147, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy158: - YYDEBUG(158, *YYCURSOR); +yy148: + YYDEBUG(148, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy157; + goto yy147; } if (yych <= '\f') { - if (yych == '\n') goto yy156; + if (yych == '\n') goto yy146; } else { - if (yych <= '\r') goto yy160; - if (yych == ';') goto yy151; + if (yych <= '\r') goto yy150; + if (yych == ';') goto yy141; } - YYDEBUG(159, *YYCURSOR); + YYDEBUG(149, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 623 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; } -#line 2139 "Zend/zend_ini_scanner.c" -yy160: - YYDEBUG(160, *YYCURSOR); +#line 2045 "Zend/zend_ini_scanner.c" +yy150: + YYDEBUG(150, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '\n') goto yy156; - goto yy148; + if ((yych = *YYCURSOR) == '\n') goto yy146; + goto yy138; } /* *********************************** */ yyc_ST_SECTION_RAW: @@ -2179,44 +2085,44 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; - YYDEBUG(161, *YYCURSOR); + YYDEBUG(151, *YYCURSOR); YYFILL(3); yych = *YYCURSOR; if (yych <= '\f') { - if (yych == '\n') goto yy165; + if (yych == '\n') goto yy155; } else { - if (yych <= '\r') goto yy165; - if (yych == ']') goto yy167; + if (yych <= '\r') goto yy155; + if (yych == ']') goto yy157; } - YYDEBUG(163, *YYCURSOR); + YYDEBUG(153, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy174; -yy164: - YYDEBUG(164, *YYCURSOR); + goto yy164; +yy154: + YYDEBUG(154, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 533 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2203 "Zend/zend_ini_scanner.c" -yy165: - YYDEBUG(165, *YYCURSOR); +#line 2109 "Zend/zend_ini_scanner.c" +yy155: + YYDEBUG(155, *YYCURSOR); ++YYCURSOR; - YYDEBUG(166, *YYCURSOR); + YYDEBUG(156, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 651 "Zend/zend_ini_scanner.l" +#line 644 "Zend/zend_ini_scanner.l" { return 0; } -#line 2213 "Zend/zend_ini_scanner.c" -yy167: - YYDEBUG(167, *YYCURSOR); +#line 2119 "Zend/zend_ini_scanner.c" +yy157: + YYDEBUG(157, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy170; -yy168: - YYDEBUG(168, *YYCURSOR); + goto yy160; +yy158: + YYDEBUG(158, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 421 "Zend/zend_ini_scanner.l" { /* End of section */ @@ -2224,40 +2130,40 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return ']'; } -#line 2228 "Zend/zend_ini_scanner.c" -yy169: - YYDEBUG(169, *YYCURSOR); +#line 2134 "Zend/zend_ini_scanner.c" +yy159: + YYDEBUG(159, *YYCURSOR); ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy170: - YYDEBUG(170, *YYCURSOR); +yy160: + YYDEBUG(160, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy169; + goto yy159; } - if (yych == '\n') goto yy171; - if (yych == '\r') goto yy172; - goto yy168; -yy171: - YYDEBUG(171, *YYCURSOR); + if (yych == '\n') goto yy161; + if (yych == '\r') goto yy162; + goto yy158; +yy161: + YYDEBUG(161, *YYCURSOR); yych = *++YYCURSOR; - goto yy168; -yy172: - YYDEBUG(172, *YYCURSOR); + goto yy158; +yy162: + YYDEBUG(162, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy171; - goto yy168; -yy173: - YYDEBUG(173, *YYCURSOR); + if (yych == '\n') goto yy161; + goto yy158; +yy163: + YYDEBUG(163, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy174: - YYDEBUG(174, *YYCURSOR); +yy164: + YYDEBUG(164, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy173; + goto yy163; } - goto yy164; + goto yy154; } /* *********************************** */ yyc_ST_SECTION_VALUE: @@ -2296,203 +2202,203 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, }; - YYDEBUG(175, *YYCURSOR); + YYDEBUG(165, *YYCURSOR); YYFILL(3); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { - if (yych <= 0x08) goto yy177; - if (yych <= '\t') goto yy179; - goto yy180; + if (yych <= 0x08) goto yy167; + if (yych <= '\t') goto yy169; + goto yy170; } else { - if (yych == '\r') goto yy180; - if (yych >= ' ') goto yy179; + if (yych == '\r') goto yy170; + if (yych >= ' ') goto yy169; } } else { if (yych <= '$') { - if (yych == '"') goto yy182; - if (yych >= '$') goto yy184; + if (yych == '"') goto yy172; + if (yych >= '$') goto yy174; } else { - if (yych == '\'') goto yy185; - if (yych >= '-') goto yy186; + if (yych == '\'') goto yy175; + if (yych >= '-') goto yy176; } } } else { if (yych <= 'Z') { if (yych <= '9') { - if (yych <= '.') goto yy187; - if (yych >= '0') goto yy188; + if (yych <= '.') goto yy177; + if (yych >= '0') goto yy178; } else { - if (yych == ';') goto yy180; - if (yych >= 'A') goto yy190; + if (yych == ';') goto yy170; + if (yych >= 'A') goto yy180; } } else { if (yych <= '^') { - if (yych <= '[') goto yy177; - if (yych <= '\\') goto yy192; - if (yych <= ']') goto yy193; + if (yych <= '[') goto yy167; + if (yych <= '\\') goto yy182; + if (yych <= ']') goto yy183; } else { - if (yych == '`') goto yy177; - if (yych <= 'z') goto yy190; + if (yych == '`') goto yy167; + if (yych <= 'z') goto yy180; } } } -yy177: - YYDEBUG(177, *YYCURSOR); +yy167: + YYDEBUG(167, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy200; -yy178: - YYDEBUG(178, *YYCURSOR); + goto yy190; +yy168: + YYDEBUG(168, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 569 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 2354 "Zend/zend_ini_scanner.c" -yy179: - YYDEBUG(179, *YYCURSOR); +#line 2260 "Zend/zend_ini_scanner.c" +yy169: + YYDEBUG(169, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy226; - goto yy200; + if (yych == '\t') goto yy216; + goto yy190; } else { - if (yych <= ' ') goto yy226; - if (yych == '"') goto yy228; - goto yy200; + if (yych <= ' ') goto yy216; + if (yych == '"') goto yy218; + goto yy190; } -yy180: - YYDEBUG(180, *YYCURSOR); +yy170: + YYDEBUG(170, *YYCURSOR); ++YYCURSOR; -yy181: - YYDEBUG(181, *YYCURSOR); +yy171: + YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 651 "Zend/zend_ini_scanner.l" +#line 644 "Zend/zend_ini_scanner.l" { return 0; } -#line 2377 "Zend/zend_ini_scanner.c" -yy182: - YYDEBUG(182, *YYCURSOR); +#line 2283 "Zend/zend_ini_scanner.c" +yy172: + YYDEBUG(172, *YYCURSOR); ++YYCURSOR; -yy183: - YYDEBUG(183, *YYCURSOR); +yy173: + YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 573 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 2389 "Zend/zend_ini_scanner.c" -yy184: - YYDEBUG(184, *YYCURSOR); +#line 2295 "Zend/zend_ini_scanner.c" +yy174: + YYDEBUG(174, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy181; - if (yych <= '[') goto yy199; - goto yy204; + if (yych <= 0x00) goto yy171; + if (yych <= '[') goto yy189; + goto yy194; } else { - if (yych == '{') goto yy224; - goto yy199; + if (yych == '{') goto yy214; + goto yy189; } -yy185: - YYDEBUG(185, *YYCURSOR); +yy175: + YYDEBUG(175, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 128) { - goto yy220; + goto yy210; } - goto yy181; -yy186: - YYDEBUG(186, *YYCURSOR); + goto yy171; +yy176: + YYDEBUG(176, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy200; - if (yych <= '9') goto yy218; - goto yy200; -yy187: - YYDEBUG(187, *YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy208; + goto yy190; +yy177: + YYDEBUG(177, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy200; - if (yych <= '9') goto yy216; - goto yy200; -yy188: - YYDEBUG(188, *YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy206; + goto yy190; +yy178: + YYDEBUG(178, *YYCURSOR); yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { - if (yych == '\n') goto yy189; - if (yych <= '\f') goto yy200; + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy190; } else { - if (yych == '"') goto yy189; - if (yych <= '&') goto yy200; + if (yych == '"') goto yy179; + if (yych <= '&') goto yy190; } } else { if (yych <= '9') { - if (yych == '.') goto yy212; - if (yych <= '/') goto yy200; - goto yy214; + if (yych == '.') goto yy202; + if (yych <= '/') goto yy190; + goto yy204; } else { if (yych <= ';') { - if (yych <= ':') goto yy200; + if (yych <= ':') goto yy190; } else { - if (yych != ']') goto yy200; + if (yych != ']') goto yy190; } } } -yy189: - YYDEBUG(189, *YYCURSOR); +yy179: + YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 547 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 2455 "Zend/zend_ini_scanner.c" -yy190: - YYDEBUG(190, *YYCURSOR); +#line 2361 "Zend/zend_ini_scanner.c" +yy180: + YYDEBUG(180, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 32) { - goto yy210; + goto yy200; } if (yych <= '"') { if (yych <= '\f') { - if (yych != '\n') goto yy200; + if (yych != '\n') goto yy190; } else { - if (yych <= '\r') goto yy191; - if (yych <= '!') goto yy200; + if (yych <= '\r') goto yy181; + if (yych <= '!') goto yy190; } } else { if (yych <= ':') { - if (yych != '\'') goto yy200; + if (yych != '\'') goto yy190; } else { - if (yych <= ';') goto yy191; - if (yych != ']') goto yy200; + if (yych <= ';') goto yy181; + if (yych != ']') goto yy190; } } -yy191: - YYDEBUG(191, *YYCURSOR); +yy181: + YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 543 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 2485 "Zend/zend_ini_scanner.c" -yy192: - YYDEBUG(192, *YYCURSOR); +#line 2391 "Zend/zend_ini_scanner.c" +yy182: + YYDEBUG(182, *YYCURSOR); yych = *++YYCURSOR; - goto yy199; -yy193: - YYDEBUG(193, *YYCURSOR); + goto yy189; +yy183: + YYDEBUG(183, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy196; -yy194: - YYDEBUG(194, *YYCURSOR); + goto yy186; +yy184: + YYDEBUG(184, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 421 "Zend/zend_ini_scanner.l" { /* End of section */ @@ -2500,317 +2406,317 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return ']'; } -#line 2504 "Zend/zend_ini_scanner.c" -yy195: - YYDEBUG(195, *YYCURSOR); +#line 2410 "Zend/zend_ini_scanner.c" +yy185: + YYDEBUG(185, *YYCURSOR); ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy196: - YYDEBUG(196, *YYCURSOR); +yy186: + YYDEBUG(186, *YYCURSOR); if (yybm[0+yych] & 2) { - goto yy195; + goto yy185; } - if (yych == '\n') goto yy197; - if (yych == '\r') goto yy198; - goto yy194; -yy197: - YYDEBUG(197, *YYCURSOR); + if (yych == '\n') goto yy187; + if (yych == '\r') goto yy188; + goto yy184; +yy187: + YYDEBUG(187, *YYCURSOR); yych = *++YYCURSOR; - goto yy194; -yy198: - YYDEBUG(198, *YYCURSOR); + goto yy184; +yy188: + YYDEBUG(188, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy197; - goto yy194; -yy199: - YYDEBUG(199, *YYCURSOR); + if (yych == '\n') goto yy187; + goto yy184; +yy189: + YYDEBUG(189, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy200: - YYDEBUG(200, *YYCURSOR); +yy190: + YYDEBUG(190, *YYCURSOR); if (yybm[0+yych] & 4) { - goto yy199; + goto yy189; } - if (yych == '$') goto yy202; - if (yych != '\\') goto yy178; -yy201: - YYDEBUG(201, *YYCURSOR); + if (yych == '$') goto yy192; + if (yych != '\\') goto yy168; +yy191: + YYDEBUG(191, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - goto yy199; -yy202: - YYDEBUG(202, *YYCURSOR); + goto yy189; +yy192: + YYDEBUG(192, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy203; - if (yych <= '[') goto yy199; - goto yy204; + if (yych <= 0x00) goto yy193; + if (yych <= '[') goto yy189; + goto yy194; } else { - if (yych != '{') goto yy199; + if (yych != '{') goto yy189; } -yy203: - YYDEBUG(203, *YYCURSOR); +yy193: + YYDEBUG(193, *YYCURSOR); YYCURSOR = YYMARKER; if (yyaccept <= 1) { if (yyaccept <= 0) { - goto yy178; + goto yy168; } else { - goto yy181; + goto yy171; } } else { if (yyaccept <= 2) { - goto yy189; + goto yy179; } else { - goto yy191; + goto yy181; } } -yy204: - YYDEBUG(204, *YYCURSOR); +yy194: + YYDEBUG(194, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 8) { - goto yy205; + goto yy195; } - if (yych == '\\') goto yy207; - goto yy199; -yy205: - YYDEBUG(205, *YYCURSOR); + if (yych == '\\') goto yy197; + goto yy189; +yy195: + YYDEBUG(195, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(206, *YYCURSOR); + YYDEBUG(196, *YYCURSOR); if (yybm[0+yych] & 8) { - goto yy205; + goto yy195; } - if (yych == '\\') goto yy209; - goto yy199; -yy207: - YYDEBUG(207, *YYCURSOR); + if (yych == '\\') goto yy199; + goto yy189; +yy197: + YYDEBUG(197, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(208, *YYCURSOR); + YYDEBUG(198, *YYCURSOR); if (yybm[0+yych] & 8) { - goto yy205; + goto yy195; } - if (yych == '\\') goto yy207; - goto yy199; -yy209: - YYDEBUG(209, *YYCURSOR); + if (yych == '\\') goto yy197; + goto yy189; +yy199: + YYDEBUG(199, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 8) { - goto yy205; + goto yy195; } - if (yych == '\\') goto yy207; - goto yy199; -yy210: - YYDEBUG(210, *YYCURSOR); + if (yych == '\\') goto yy197; + goto yy189; +yy200: + YYDEBUG(200, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(211, *YYCURSOR); + YYDEBUG(201, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy210; + goto yy200; } if (yych <= '$') { if (yych <= '\r') { - if (yych == '\n') goto yy191; - if (yych <= '\f') goto yy199; - goto yy191; + if (yych == '\n') goto yy181; + if (yych <= '\f') goto yy189; + goto yy181; } else { - if (yych == '"') goto yy191; - if (yych <= '#') goto yy199; - goto yy202; + if (yych == '"') goto yy181; + if (yych <= '#') goto yy189; + goto yy192; } } else { if (yych <= ';') { - if (yych == '\'') goto yy191; - if (yych <= ':') goto yy199; - goto yy191; + if (yych == '\'') goto yy181; + if (yych <= ':') goto yy189; + goto yy181; } else { - if (yych <= '[') goto yy199; - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy191; - goto yy199; + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy181; + goto yy189; } } -yy212: - YYDEBUG(212, *YYCURSOR); +yy202: + YYDEBUG(202, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(213, *YYCURSOR); + YYDEBUG(203, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy212; + goto yy202; } if (yych <= '$') { if (yych <= '\r') { - if (yych == '\n') goto yy189; - if (yych <= '\f') goto yy199; - goto yy189; + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; } else { - if (yych == '"') goto yy189; - if (yych <= '#') goto yy199; - goto yy202; + if (yych == '"') goto yy179; + if (yych <= '#') goto yy189; + goto yy192; } } else { if (yych <= ';') { - if (yych == '\'') goto yy189; - if (yych <= ':') goto yy199; - goto yy189; + if (yych == '\'') goto yy179; + if (yych <= ':') goto yy189; + goto yy179; } else { - if (yych <= '[') goto yy199; - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy189; - goto yy199; + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; } } -yy214: - YYDEBUG(214, *YYCURSOR); +yy204: + YYDEBUG(204, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(215, *YYCURSOR); + YYDEBUG(205, *YYCURSOR); if (yych <= '\'') { if (yych <= '!') { if (yych <= '\n') { - if (yych <= '\t') goto yy199; - goto yy189; + if (yych <= '\t') goto yy189; + goto yy179; } else { - if (yych == '\r') goto yy189; - goto yy199; + if (yych == '\r') goto yy179; + goto yy189; } } else { if (yych <= '#') { - if (yych <= '"') goto yy189; - goto yy199; - } else { - if (yych <= '$') goto yy202; - if (yych <= '&') goto yy199; + if (yych <= '"') goto yy179; goto yy189; + } else { + if (yych <= '$') goto yy192; + if (yych <= '&') goto yy189; + goto yy179; } } } else { if (yych <= ':') { if (yych <= '.') { - if (yych <= '-') goto yy199; - goto yy212; + if (yych <= '-') goto yy189; + goto yy202; } else { - if (yych <= '/') goto yy199; - if (yych <= '9') goto yy214; - goto yy199; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy204; + goto yy189; } } else { if (yych <= '[') { - if (yych <= ';') goto yy189; - goto yy199; + if (yych <= ';') goto yy179; + goto yy189; } else { - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy189; - goto yy199; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; } } } -yy216: - YYDEBUG(216, *YYCURSOR); +yy206: + YYDEBUG(206, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(217, *YYCURSOR); + YYDEBUG(207, *YYCURSOR); if (yych <= '&') { if (yych <= '\r') { - if (yych == '\n') goto yy189; - if (yych <= '\f') goto yy199; - goto yy189; + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; } else { if (yych <= '"') { - if (yych <= '!') goto yy199; - goto yy189; + if (yych <= '!') goto yy189; + goto yy179; } else { - if (yych == '$') goto yy202; - goto yy199; + if (yych == '$') goto yy192; + goto yy189; } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy189; - if (yych <= '/') goto yy199; - if (yych <= '9') goto yy216; - goto yy199; + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy206; + goto yy189; } else { if (yych <= '[') { - if (yych <= ';') goto yy189; - goto yy199; + if (yych <= ';') goto yy179; + goto yy189; } else { - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy189; - goto yy199; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; } } } -yy218: - YYDEBUG(218, *YYCURSOR); +yy208: + YYDEBUG(208, *YYCURSOR); yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(219, *YYCURSOR); + YYDEBUG(209, *YYCURSOR); if (yych <= '&') { if (yych <= '\r') { - if (yych == '\n') goto yy189; - if (yych <= '\f') goto yy199; - goto yy189; + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; } else { if (yych <= '"') { - if (yych <= '!') goto yy199; - goto yy189; + if (yych <= '!') goto yy189; + goto yy179; } else { - if (yych == '$') goto yy202; - goto yy199; + if (yych == '$') goto yy192; + goto yy189; } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy189; - if (yych <= '/') goto yy199; - if (yych <= '9') goto yy218; - goto yy199; + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy208; + goto yy189; } else { if (yych <= '[') { - if (yych <= ';') goto yy189; - goto yy199; + if (yych <= ';') goto yy179; + goto yy189; } else { - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy189; - goto yy199; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; } } } -yy220: - YYDEBUG(220, *YYCURSOR); +yy210: + YYDEBUG(210, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(221, *YYCURSOR); + YYDEBUG(211, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy220; + goto yy210; } - YYDEBUG(222, *YYCURSOR); + YYDEBUG(212, *YYCURSOR); ++YYCURSOR; - YYDEBUG(223, *YYCURSOR); + YYDEBUG(213, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 412 "Zend/zend_ini_scanner.l" { /* Raw string */ @@ -2821,65 +2727,65 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2825 "Zend/zend_ini_scanner.c" -yy224: - YYDEBUG(224, *YYCURSOR); +#line 2731 "Zend/zend_ini_scanner.c" +yy214: + YYDEBUG(214, *YYCURSOR); ++YYCURSOR; - YYDEBUG(225, *YYCURSOR); + YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 445 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 2836 "Zend/zend_ini_scanner.c" -yy226: - YYDEBUG(226, *YYCURSOR); +#line 2742 "Zend/zend_ini_scanner.c" +yy216: + YYDEBUG(216, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(227, *YYCURSOR); + YYDEBUG(217, *YYCURSOR); if (yych <= '"') { if (yych <= '\f') { - if (yych <= 0x08) goto yy199; - if (yych <= '\t') goto yy226; - if (yych <= '\n') goto yy178; - goto yy199; + if (yych <= 0x08) goto yy189; + if (yych <= '\t') goto yy216; + if (yych <= '\n') goto yy168; + goto yy189; } else { if (yych <= 0x1F) { - if (yych <= '\r') goto yy178; - goto yy199; + if (yych <= '\r') goto yy168; + goto yy189; } else { - if (yych <= ' ') goto yy226; - if (yych <= '!') goto yy199; + if (yych <= ' ') goto yy216; + if (yych <= '!') goto yy189; } } } else { if (yych <= ':') { if (yych <= '$') { - if (yych <= '#') goto yy199; - goto yy202; + if (yych <= '#') goto yy189; + goto yy192; } else { - if (yych == '\'') goto yy178; - goto yy199; + if (yych == '\'') goto yy168; + goto yy189; } } else { if (yych <= '[') { - if (yych <= ';') goto yy178; - goto yy199; + if (yych <= ';') goto yy168; + goto yy189; } else { - if (yych <= '\\') goto yy201; - if (yych <= ']') goto yy178; - goto yy199; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy168; + goto yy189; } } } -yy228: - YYDEBUG(228, *YYCURSOR); +yy218: + YYDEBUG(218, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy183; + goto yy173; } /* *********************************** */ yyc_ST_VALUE: @@ -2918,28 +2824,28 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, }; - YYDEBUG(229, *YYCURSOR); + YYDEBUG(219, *YYCURSOR); YYFILL(6); yych = *YYCURSOR; YYDEBUG(-1, yych); switch (yych) { - case 0x00: goto yy231; + case 0x00: goto yy221; case '\t': - case ' ': goto yy235; - case '\n': goto yy237; - case '\r': goto yy239; + case ' ': goto yy225; + case '\n': goto yy227; + case '\r': goto yy229; case '!': case '&': case '(': case ')': case '^': case '|': - case '~': goto yy240; - case '"': goto yy242; - case '$': goto yy244; - case '\'': goto yy245; - case '-': goto yy246; - case '.': goto yy247; + case '~': goto yy230; + case '"': goto yy232; + case '$': goto yy234; + case '\'': goto yy235; + case '-': goto yy236; + case '.': goto yy237; case '0': case '1': case '2': @@ -2949,9 +2855,9 @@ int ini_lex(zval *ini_lval TSRMLS_DC) case '6': case '7': case '8': - case '9': goto yy248; - case ';': goto yy250; - case '=': goto yy251; + case '9': goto yy238; + case ';': goto yy240; + case '=': goto yy241; case 'A': case 'B': case 'C': @@ -2994,62 +2900,62 @@ int ini_lex(zval *ini_lval TSRMLS_DC) case 'v': case 'w': case 'x': - case 'z': goto yy253; + case 'z': goto yy243; case 'F': - case 'f': goto yy255; + case 'f': goto yy245; case 'N': - case 'n': goto yy256; + case 'n': goto yy246; case 'O': - case 'o': goto yy257; + case 'o': goto yy247; case 'T': - case 't': goto yy258; + case 't': goto yy248; case 'Y': - case 'y': goto yy259; - default: goto yy233; + case 'y': goto yy249; + default: goto yy223; } -yy231: - YYDEBUG(231, *YYCURSOR); +yy221: + YYDEBUG(221, *YYCURSOR); ++YYCURSOR; -yy232: - YYDEBUG(232, *YYCURSOR); +yy222: + YYDEBUG(222, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 646 "Zend/zend_ini_scanner.l" +#line 639 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } -#line 3022 "Zend/zend_ini_scanner.c" -yy233: - YYDEBUG(233, *YYCURSOR); +#line 2928 "Zend/zend_ini_scanner.c" +yy223: + YYDEBUG(223, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - goto yy261; -yy234: - YYDEBUG(234, *YYCURSOR); + goto yy251; +yy224: + YYDEBUG(224, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 565 "Zend/zend_ini_scanner.l" { /* Get everything else as option/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 3035 "Zend/zend_ini_scanner.c" -yy235: - YYDEBUG(235, *YYCURSOR); +#line 2941 "Zend/zend_ini_scanner.c" +yy225: + YYDEBUG(225, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - goto yy315; -yy236: - YYDEBUG(236, *YYCURSOR); + goto yy305; +yy226: + YYDEBUG(226, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 619 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng); } -#line 3048 "Zend/zend_ini_scanner.c" -yy237: - YYDEBUG(237, *YYCURSOR); +#line 2954 "Zend/zend_ini_scanner.c" +yy227: + YYDEBUG(227, *YYCURSOR); ++YYCURSOR; -yy238: - YYDEBUG(238, *YYCURSOR); +yy228: + YYDEBUG(228, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 537 "Zend/zend_ini_scanner.l" { /* End of option value */ @@ -3057,125 +2963,125 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 3061 "Zend/zend_ini_scanner.c" -yy239: - YYDEBUG(239, *YYCURSOR); +#line 2967 "Zend/zend_ini_scanner.c" +yy229: + YYDEBUG(229, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy313; - goto yy238; -yy240: - YYDEBUG(240, *YYCURSOR); + if (yych == '\n') goto yy303; + goto yy228; +yy230: + YYDEBUG(230, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy312; -yy241: - YYDEBUG(241, *YYCURSOR); + goto yy302; +yy231: + YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 555 "Zend/zend_ini_scanner.l" { /* Boolean operators */ return yytext[0]; } -#line 3079 "Zend/zend_ini_scanner.c" -yy242: - YYDEBUG(242, *YYCURSOR); +#line 2985 "Zend/zend_ini_scanner.c" +yy232: + YYDEBUG(232, *YYCURSOR); ++YYCURSOR; -yy243: - YYDEBUG(243, *YYCURSOR); +yy233: + YYDEBUG(233, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 573 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 3091 "Zend/zend_ini_scanner.c" -yy244: - YYDEBUG(244, *YYCURSOR); +#line 2997 "Zend/zend_ini_scanner.c" +yy234: + YYDEBUG(234, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy232; - if (yych <= '[') goto yy260; - goto yy267; + if (yych <= 0x00) goto yy222; + if (yych <= '[') goto yy250; + goto yy257; } else { - if (yych == '{') goto yy309; - goto yy260; + if (yych == '{') goto yy299; + goto yy250; } -yy245: - YYDEBUG(245, *YYCURSOR); +yy235: + YYDEBUG(235, *YYCURSOR); yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 128) { - goto yy305; + goto yy295; } - goto yy232; -yy246: - YYDEBUG(246, *YYCURSOR); + goto yy222; +yy236: + YYDEBUG(236, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy261; - if (yych <= '9') goto yy303; - goto yy261; -yy247: - YYDEBUG(247, *YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy293; + goto yy251; +yy237: + YYDEBUG(237, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy261; - if (yych <= '9') goto yy301; - goto yy261; -yy248: - YYDEBUG(248, *YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy291; + goto yy251; +yy238: + YYDEBUG(238, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x00) goto yy249; - if (yych <= 0x08) goto yy261; + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy251; } else { - if (yych != '\r') goto yy261; + if (yych != '\r') goto yy251; } } else { if (yych <= ')') { - if (yych <= '"') goto yy249; - if (yych <= '%') goto yy261; + if (yych <= '"') goto yy239; + if (yych <= '%') goto yy251; } else { - if (yych == '.') goto yy297; - goto yy261; + if (yych == '.') goto yy287; + goto yy251; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= '9') goto yy299; - if (yych <= ':') goto yy261; + if (yych <= '9') goto yy289; + if (yych <= ':') goto yy251; } else { - if (yych != '=') goto yy261; + if (yych != '=') goto yy251; } } else { if (yych <= '|') { - if (yych <= '^') goto yy249; - if (yych <= '{') goto yy261; + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy251; } else { - if (yych != '~') goto yy261; + if (yych != '~') goto yy251; } } } -yy249: - YYDEBUG(249, *YYCURSOR); +yy239: + YYDEBUG(239, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 547 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 3170 "Zend/zend_ini_scanner.c" -yy250: - YYDEBUG(250, *YYCURSOR); +#line 3076 "Zend/zend_ini_scanner.c" +yy240: + YYDEBUG(240, *YYCURSOR); yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); - goto yy293; -yy251: - YYDEBUG(251, *YYCURSOR); + goto yy283; +yy241: + YYDEBUG(241, *YYCURSOR); ++YYCURSOR; - YYDEBUG(252, *YYCURSOR); + YYDEBUG(242, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 559 "Zend/zend_ini_scanner.l" { /* Make = used in option value to trigger error */ @@ -3183,1222 +3089,1222 @@ int ini_lex(zval *ini_lval TSRMLS_DC) BEGIN(INITIAL); return END_OF_LINE; } -#line 3187 "Zend/zend_ini_scanner.c" -yy253: - YYDEBUG(253, *YYCURSOR); +#line 3093 "Zend/zend_ini_scanner.c" +yy243: + YYDEBUG(243, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { - goto yy262; + goto yy252; } if (yych <= ':') { if (yych <= '\r') { if (yych <= 0x08) { - if (yych >= 0x01) goto yy261; + if (yych >= 0x01) goto yy251; } else { - if (yych <= '\n') goto yy254; - if (yych <= '\f') goto yy261; + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy251; } } else { if (yych <= '"') { - if (yych <= 0x1F) goto yy261; + if (yych <= 0x1F) goto yy251; } else { - if (yych <= '%') goto yy261; - if (yych >= '*') goto yy261; + if (yych <= '%') goto yy251; + if (yych >= '*') goto yy251; } } } else { if (yych <= '^') { if (yych <= '<') { - if (yych >= '<') goto yy261; + if (yych >= '<') goto yy251; } else { - if (yych <= '=') goto yy254; - if (yych <= ']') goto yy261; + if (yych <= '=') goto yy244; + if (yych <= ']') goto yy251; } } else { if (yych <= '|') { - if (yych <= '{') goto yy261; + if (yych <= '{') goto yy251; } else { - if (yych != '~') goto yy261; + if (yych != '~') goto yy251; } } } -yy254: - YYDEBUG(254, *YYCURSOR); +yy244: + YYDEBUG(244, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 543 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 3234 "Zend/zend_ini_scanner.c" -yy255: - YYDEBUG(255, *YYCURSOR); +#line 3140 "Zend/zend_ini_scanner.c" +yy245: + YYDEBUG(245, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '/') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - goto yy261; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + goto yy251; } else { - if (yych <= '9') goto yy262; - if (yych == ';') goto yy254; - goto yy261; + if (yych <= '9') goto yy252; + if (yych == ';') goto yy244; + goto yy251; } } } else { if (yych <= '_') { if (yych <= 'A') { - if (yych <= '=') goto yy254; - if (yych <= '@') goto yy261; - goto yy289; + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy279; } else { - if (yych <= 'Z') goto yy262; - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - goto yy262; + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + goto yy252; } } else { if (yych <= '{') { - if (yych <= '`') goto yy261; - if (yych <= 'a') goto yy289; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych <= '`') goto yy251; + if (yych <= 'a') goto yy279; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy256: - YYDEBUG(256, *YYCURSOR); +yy246: + YYDEBUG(246, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '%') { if (yych <= '\f') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - if (yych <= '\n') goto yy254; - goto yy261; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; } else { - if (yych <= '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - if (yych <= '"') goto yy254; - goto yy261; + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; } } else { if (yych <= ':') { - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - if (yych <= '9') goto yy262; - goto yy261; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; } else { if (yych <= '<') { - if (yych <= ';') goto yy254; - goto yy261; + if (yych <= ';') goto yy244; + goto yy251; } else { - if (yych <= '=') goto yy254; - if (yych <= '@') goto yy261; - goto yy262; + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; } } } } else { if (yych <= 'n') { if (yych <= 'Z') { - if (yych <= 'O') goto yy281; - if (yych == 'U') goto yy282; - goto yy262; + if (yych <= 'O') goto yy271; + if (yych == 'U') goto yy272; + goto yy252; } else { if (yych <= '^') { - if (yych <= ']') goto yy261; - goto yy254; + if (yych <= ']') goto yy251; + goto yy244; } else { - if (yych == '`') goto yy261; - goto yy262; + if (yych == '`') goto yy251; + goto yy252; } } } else { if (yych <= 'z') { - if (yych <= 'o') goto yy281; - if (yych == 'u') goto yy282; - goto yy262; + if (yych <= 'o') goto yy271; + if (yych == 'u') goto yy272; + goto yy252; } else { if (yych <= '|') { - if (yych <= '{') goto yy261; - goto yy254; + if (yych <= '{') goto yy251; + goto yy244; } else { - if (yych == '~') goto yy254; - goto yy261; + if (yych == '~') goto yy244; + goto yy251; } } } } -yy257: - YYDEBUG(257, *YYCURSOR); +yy247: + YYDEBUG(247, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { if (yych <= '%') { if (yych <= '\f') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - if (yych <= '\n') goto yy254; - goto yy261; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; } else { - if (yych <= '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - if (yych <= '"') goto yy254; - goto yy261; + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; } } else { if (yych <= ':') { - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - if (yych <= '9') goto yy262; - goto yy261; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; } else { if (yych <= '<') { - if (yych <= ';') goto yy254; - goto yy261; + if (yych <= ';') goto yy244; + goto yy251; } else { - if (yych <= '=') goto yy254; - if (yych <= '@') goto yy261; - goto yy262; + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; } } } } else { if (yych <= 'e') { if (yych <= 'Z') { - if (yych <= 'F') goto yy276; - if (yych == 'N') goto yy270; - goto yy262; + if (yych <= 'F') goto yy266; + if (yych == 'N') goto yy260; + goto yy252; } else { if (yych <= '^') { - if (yych <= ']') goto yy261; - goto yy254; + if (yych <= ']') goto yy251; + goto yy244; } else { - if (yych == '`') goto yy261; - goto yy262; + if (yych == '`') goto yy251; + goto yy252; } } } else { if (yych <= 'z') { - if (yych <= 'f') goto yy276; - if (yych == 'n') goto yy270; - goto yy262; + if (yych <= 'f') goto yy266; + if (yych == 'n') goto yy260; + goto yy252; } else { if (yych <= '|') { - if (yych <= '{') goto yy261; - goto yy254; + if (yych <= '{') goto yy251; + goto yy244; } else { - if (yych == '~') goto yy254; - goto yy261; + if (yych == '~') goto yy244; + goto yy251; } } } - } -yy258: - YYDEBUG(258, *YYCURSOR); + } +yy248: + YYDEBUG(248, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'R') goto yy274; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'R') goto yy264; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'r') goto yy274; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'r') goto yy264; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy259: - YYDEBUG(259, *YYCURSOR); +yy249: + YYDEBUG(249, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'E') goto yy264; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy254; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'e') goto yy264; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'e') goto yy254; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy260: - YYDEBUG(260, *YYCURSOR); +yy250: + YYDEBUG(250, *YYCURSOR); yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy261: - YYDEBUG(261, *YYCURSOR); +yy251: + YYDEBUG(251, *YYCURSOR); if (yybm[0+yych] & 2) { - goto yy260; + goto yy250; } - if (yych == '$') goto yy265; - goto yy234; -yy262: - YYDEBUG(262, *YYCURSOR); + if (yych == '$') goto yy255; + goto yy224; +yy252: + YYDEBUG(252, *YYCURSOR); yyaccept = 4; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(263, *YYCURSOR); + YYDEBUG(253, *YYCURSOR); if (yybm[0+yych] & 4) { - goto yy262; + goto yy252; } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy254; - goto yy260; + if (yych <= 0x00) goto yy244; + goto yy250; } else { - if (yych <= '\n') goto yy254; - if (yych <= '\f') goto yy260; - goto yy254; + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy250; + goto yy244; } } else { if (yych <= '#') { - if (yych <= 0x1F) goto yy260; - if (yych <= '"') goto yy254; - goto yy260; + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy244; + goto yy250; } else { - if (yych <= '$') goto yy265; - if (yych <= '%') goto yy260; - goto yy254; + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy244; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= ':') goto yy260; - goto yy254; + if (yych <= ':') goto yy250; + goto yy244; } else { - if (yych == '=') goto yy254; - goto yy260; + if (yych == '=') goto yy244; + goto yy250; } } else { if (yych <= '|') { - if (yych <= '^') goto yy254; - if (yych <= '{') goto yy260; - goto yy254; + if (yych <= '^') goto yy244; + if (yych <= '{') goto yy250; + goto yy244; } else { - if (yych == '~') goto yy254; - goto yy260; + if (yych == '~') goto yy244; + goto yy250; } } } -yy264: - YYDEBUG(264, *YYCURSOR); +yy254: + YYDEBUG(254, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'S') goto yy270; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'S') goto yy260; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 's') goto yy270; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 's') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy265: - YYDEBUG(265, *YYCURSOR); +yy255: + YYDEBUG(255, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { - if (yych <= 0x00) goto yy266; - if (yych <= '[') goto yy260; - goto yy267; + if (yych <= 0x00) goto yy256; + if (yych <= '[') goto yy250; + goto yy257; } else { - if (yych != '{') goto yy260; + if (yych != '{') goto yy250; } -yy266: - YYDEBUG(266, *YYCURSOR); +yy256: + YYDEBUG(256, *YYCURSOR); YYCURSOR = YYMARKER; if (yyaccept <= 3) { if (yyaccept <= 1) { if (yyaccept <= 0) { - goto yy234; + goto yy224; } else { - goto yy236; + goto yy226; } } else { if (yyaccept <= 2) { - goto yy232; + goto yy222; } else { - goto yy249; + goto yy239; } } } else { if (yyaccept <= 5) { if (yyaccept <= 4) { - goto yy254; + goto yy244; } else { - goto yy271; + goto yy261; } } else { if (yyaccept <= 6) { - goto yy278; + goto yy268; } else { - goto yy285; + goto yy275; } } } -yy267: - YYDEBUG(267, *YYCURSOR); +yy257: + YYDEBUG(257, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 8) { - goto yy268; + goto yy258; } - goto yy260; -yy268: - YYDEBUG(268, *YYCURSOR); + goto yy250; +yy258: + YYDEBUG(258, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(269, *YYCURSOR); + YYDEBUG(259, *YYCURSOR); if (yybm[0+yych] & 8) { - goto yy268; + goto yy258; } - if (yych <= 0x00) goto yy234; - if (yych == '\\') goto yy267; - goto yy260; -yy270: - YYDEBUG(270, *YYCURSOR); + if (yych <= 0x00) goto yy224; + if (yych == '\\') goto yy257; + goto yy250; +yy260: + YYDEBUG(260, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 16) { - goto yy272; + goto yy262; } if (yych <= ';') { if (yych <= ' ') { if (yych <= '\n') { - if (yych <= 0x00) goto yy271; - if (yych <= '\t') goto yy261; + if (yych <= 0x00) goto yy261; + if (yych <= '\t') goto yy251; } else { - if (yych != '\r') goto yy261; + if (yych != '\r') goto yy251; } } else { if (yych <= ')') { - if (yych <= '"') goto yy271; - if (yych <= '%') goto yy261; + if (yych <= '"') goto yy261; + if (yych <= '%') goto yy251; } else { - if (yych <= '/') goto yy261; - if (yych <= '9') goto yy262; - if (yych <= ':') goto yy261; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + if (yych <= ':') goto yy251; } } } else { if (yych <= '_') { if (yych <= '@') { - if (yych != '=') goto yy261; + if (yych != '=') goto yy251; } else { - if (yych <= 'Z') goto yy262; - if (yych <= ']') goto yy261; - if (yych >= '_') goto yy262; + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych >= '_') goto yy252; } } else { if (yych <= '{') { - if (yych <= '`') goto yy261; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych <= '`') goto yy251; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych >= 0x7F) goto yy261; + if (yych == '}') goto yy251; + if (yych >= 0x7F) goto yy251; } } } -yy271: - YYDEBUG(271, *YYCURSOR); +yy261: + YYDEBUG(261, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 465 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } -#line 3750 "Zend/zend_ini_scanner.c" -yy272: - YYDEBUG(272, *YYCURSOR); +#line 3656 "Zend/zend_ini_scanner.c" +yy262: + YYDEBUG(262, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(273, *YYCURSOR); + YYDEBUG(263, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy272; + goto yy262; } - goto yy271; -yy274: - YYDEBUG(274, *YYCURSOR); + goto yy261; +yy264: + YYDEBUG(264, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'U') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'U') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'u') goto yy275; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'u') goto yy265; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy275: - YYDEBUG(275, *YYCURSOR); +yy265: + YYDEBUG(265, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'E') goto yy270; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy260; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'e') goto yy270; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'e') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy276: - YYDEBUG(276, *YYCURSOR); +yy266: + YYDEBUG(266, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'F') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'F') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'f') goto yy277; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'f') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy277: - YYDEBUG(277, *YYCURSOR); +yy267: + YYDEBUG(267, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { - goto yy262; + goto yy252; } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { - if (yych >= 0x01) goto yy261; + if (yych >= 0x01) goto yy251; } else { - if (yych <= '\t') goto yy279; - if (yych >= '\v') goto yy261; + if (yych <= '\t') goto yy269; + if (yych >= '\v') goto yy251; } } else { if (yych <= ' ') { - if (yych <= '\r') goto yy278; - if (yych <= 0x1F) goto yy261; - goto yy279; + if (yych <= '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; } else { - if (yych <= '"') goto yy278; - if (yych <= '%') goto yy261; + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= ':') goto yy261; + if (yych <= ':') goto yy251; } else { - if (yych != '=') goto yy261; + if (yych != '=') goto yy251; } } else { if (yych <= '|') { - if (yych <= '^') goto yy278; - if (yych <= '{') goto yy261; + if (yych <= '^') goto yy268; + if (yych <= '{') goto yy251; } else { - if (yych != '~') goto yy261; + if (yych != '~') goto yy251; } } } -yy278: - YYDEBUG(278, *YYCURSOR); +yy268: + YYDEBUG(268, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 469 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } -#line 3960 "Zend/zend_ini_scanner.c" -yy279: - YYDEBUG(279, *YYCURSOR); +#line 3866 "Zend/zend_ini_scanner.c" +yy269: + YYDEBUG(269, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(280, *YYCURSOR); - if (yych == '\t') goto yy279; - if (yych == ' ') goto yy279; - goto yy278; -yy281: - YYDEBUG(281, *YYCURSOR); + YYDEBUG(270, *YYCURSOR); + if (yych == '\t') goto yy269; + if (yych == ' ') goto yy269; + goto yy268; +yy271: + YYDEBUG(271, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= ' ') { if (yych <= '\n') { - if (yych <= 0x00) goto yy278; - if (yych <= 0x08) goto yy261; - if (yych <= '\t') goto yy279; - goto yy278; + if (yych <= 0x00) goto yy268; + if (yych <= 0x08) goto yy251; + if (yych <= '\t') goto yy269; + goto yy268; } else { - if (yych == '\r') goto yy278; - if (yych <= 0x1F) goto yy261; - goto yy279; + if (yych == '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; } } else { if (yych <= '/') { - if (yych <= '"') goto yy278; - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy278; - goto yy261; + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy268; + goto yy251; } else { - if (yych <= '9') goto yy262; - if (yych == ';') goto yy278; - goto yy261; + if (yych <= '9') goto yy252; + if (yych == ';') goto yy268; + goto yy251; } } } else { if (yych <= '_') { if (yych <= 'N') { - if (yych <= '=') goto yy278; - if (yych <= '@') goto yy261; - if (yych <= 'M') goto yy262; - goto yy288; + if (yych <= '=') goto yy268; + if (yych <= '@') goto yy251; + if (yych <= 'M') goto yy252; + goto yy278; } else { - if (yych <= 'Z') goto yy262; - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy278; - goto yy262; + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy268; + goto yy252; } } else { if (yych <= 'z') { - if (yych <= '`') goto yy261; - if (yych == 'n') goto yy288; - goto yy262; + if (yych <= '`') goto yy251; + if (yych == 'n') goto yy278; + goto yy252; } else { if (yych <= '|') { - if (yych <= '{') goto yy261; - goto yy278; + if (yych <= '{') goto yy251; + goto yy268; } else { - if (yych == '~') goto yy278; - goto yy261; + if (yych == '~') goto yy268; + goto yy251; } } } } -yy282: - YYDEBUG(282, *YYCURSOR); +yy272: + YYDEBUG(272, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'L') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'l') goto yy283; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'l') goto yy273; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy283: - YYDEBUG(283, *YYCURSOR); +yy273: + YYDEBUG(273, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'L') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'l') goto yy284; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'l') goto yy274; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy284: - YYDEBUG(284, *YYCURSOR); +yy274: + YYDEBUG(274, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { - goto yy262; + goto yy252; } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { - if (yych >= 0x01) goto yy261; + if (yych >= 0x01) goto yy251; } else { - if (yych <= '\t') goto yy286; - if (yych >= '\v') goto yy261; + if (yych <= '\t') goto yy276; + if (yych >= '\v') goto yy251; } } else { if (yych <= ' ') { - if (yych <= '\r') goto yy285; - if (yych <= 0x1F) goto yy261; - goto yy286; + if (yych <= '\r') goto yy275; + if (yych <= 0x1F) goto yy251; + goto yy276; } else { - if (yych <= '"') goto yy285; - if (yych <= '%') goto yy261; + if (yych <= '"') goto yy275; + if (yych <= '%') goto yy251; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= ':') goto yy261; + if (yych <= ':') goto yy251; } else { - if (yych != '=') goto yy261; + if (yych != '=') goto yy251; } } else { if (yych <= '|') { - if (yych <= '^') goto yy285; - if (yych <= '{') goto yy261; + if (yych <= '^') goto yy275; + if (yych <= '{') goto yy251; } else { - if (yych != '~') goto yy261; + if (yych != '~') goto yy251; } } } -yy285: - YYDEBUG(285, *YYCURSOR); +yy275: + YYDEBUG(275, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 473 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } -#line 4175 "Zend/zend_ini_scanner.c" -yy286: - YYDEBUG(286, *YYCURSOR); +#line 4081 "Zend/zend_ini_scanner.c" +yy276: + YYDEBUG(276, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(287, *YYCURSOR); - if (yych == '\t') goto yy286; - if (yych == ' ') goto yy286; - goto yy285; -yy288: - YYDEBUG(288, *YYCURSOR); + YYDEBUG(277, *YYCURSOR); + if (yych == '\t') goto yy276; + if (yych == ' ') goto yy276; + goto yy275; +yy278: + YYDEBUG(278, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'E') goto yy277; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'e') goto yy277; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy289: - YYDEBUG(289, *YYCURSOR); +yy279: + YYDEBUG(279, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'L') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'l') goto yy290; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'l') goto yy280; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy290: - YYDEBUG(290, *YYCURSOR); +yy280: + YYDEBUG(280, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych != 'S') goto yy262; + if (yych <= '@') goto yy251; + if (yych != 'S') goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 's') goto yy291; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 's') goto yy281; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy291: - YYDEBUG(291, *YYCURSOR); +yy281: + YYDEBUG(281, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { - if (yych <= 0x00) goto yy254; - if (yych <= 0x08) goto yy261; - goto yy254; + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; } else { - if (yych == '\r') goto yy254; - if (yych <= 0x1F) goto yy261; - goto yy254; + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; } } else { if (yych <= '9') { - if (yych <= '%') goto yy261; - if (yych <= ')') goto yy254; - if (yych <= '/') goto yy261; - goto yy262; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; } else { - if (yych == ';') goto yy254; - if (yych <= '<') goto yy261; - goto yy254; + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= '@') goto yy261; - if (yych == 'E') goto yy277; - goto yy262; + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; } else { - if (yych <= ']') goto yy261; - if (yych <= '^') goto yy254; - if (yych <= '_') goto yy262; - goto yy261; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; } } else { if (yych <= '{') { - if (yych == 'e') goto yy277; - if (yych <= 'z') goto yy262; - goto yy261; + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; } else { - if (yych == '}') goto yy261; - if (yych <= '~') goto yy254; - goto yy261; + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } } -yy292: - YYDEBUG(292, *YYCURSOR); +yy282: + YYDEBUG(282, *YYCURSOR); ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy293: - YYDEBUG(293, *YYCURSOR); +yy283: + YYDEBUG(283, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy292; + goto yy282; } - if (yych >= '\r') goto yy296; -yy294: - YYDEBUG(294, *YYCURSOR); + if (yych >= '\r') goto yy286; +yy284: + YYDEBUG(284, *YYCURSOR); ++YYCURSOR; -yy295: - YYDEBUG(295, *YYCURSOR); +yy285: + YYDEBUG(285, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 633 "Zend/zend_ini_scanner.l" { /* Comment */ @@ -4406,223 +4312,223 @@ int ini_lex(zval *ini_lval TSRMLS_DC) SCNG(lineno)++; return END_OF_LINE; } -#line 4410 "Zend/zend_ini_scanner.c" -yy296: - YYDEBUG(296, *YYCURSOR); +#line 4316 "Zend/zend_ini_scanner.c" +yy286: + YYDEBUG(286, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\n') goto yy294; - goto yy295; -yy297: - YYDEBUG(297, *YYCURSOR); + if (yych == '\n') goto yy284; + goto yy285; +yy287: + YYDEBUG(287, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(298, *YYCURSOR); + YYDEBUG(288, *YYCURSOR); if (yybm[0+yych] & 64) { - goto yy297; + goto yy287; } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy249; - goto yy260; + if (yych <= 0x00) goto yy239; + goto yy250; } else { - if (yych <= '\n') goto yy249; - if (yych <= '\f') goto yy260; - goto yy249; + if (yych <= '\n') goto yy239; + if (yych <= '\f') goto yy250; + goto yy239; } } else { if (yych <= '#') { - if (yych <= 0x1F) goto yy260; - if (yych <= '"') goto yy249; - goto yy260; + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy239; + goto yy250; } else { - if (yych <= '$') goto yy265; - if (yych <= '%') goto yy260; - goto yy249; + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy239; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= ':') goto yy260; - goto yy249; + if (yych <= ':') goto yy250; + goto yy239; } else { - if (yych == '=') goto yy249; - goto yy260; + if (yych == '=') goto yy239; + goto yy250; } } else { if (yych <= '|') { - if (yych <= '^') goto yy249; - if (yych <= '{') goto yy260; - goto yy249; + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; } else { - if (yych == '~') goto yy249; - goto yy260; + if (yych == '~') goto yy239; + goto yy250; } } } -yy299: - YYDEBUG(299, *YYCURSOR); +yy289: + YYDEBUG(289, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(300, *YYCURSOR); + YYDEBUG(290, *YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x00) goto yy249; - if (yych <= 0x08) goto yy260; - goto yy249; + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; } else { - if (yych == '\r') goto yy249; - goto yy260; + if (yych == '\r') goto yy239; + goto yy250; } } else { if (yych <= '$') { - if (yych <= '"') goto yy249; - if (yych <= '#') goto yy260; - goto yy265; + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; } else { - if (yych <= '%') goto yy260; - if (yych <= ')') goto yy249; - if (yych <= '-') goto yy260; - goto yy297; + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + if (yych <= '-') goto yy250; + goto yy287; } } } else { if (yych <= '=') { if (yych <= ':') { - if (yych <= '/') goto yy260; - if (yych <= '9') goto yy299; - goto yy260; + if (yych <= '/') goto yy250; + if (yych <= '9') goto yy289; + goto yy250; } else { - if (yych == '<') goto yy260; - goto yy249; + if (yych == '<') goto yy250; + goto yy239; } } else { if (yych <= '{') { - if (yych == '^') goto yy249; - goto yy260; + if (yych == '^') goto yy239; + goto yy250; } else { - if (yych == '}') goto yy260; - if (yych <= '~') goto yy249; - goto yy260; + if (yych == '}') goto yy250; + if (yych <= '~') goto yy239; + goto yy250; } } } -yy301: - YYDEBUG(301, *YYCURSOR); +yy291: + YYDEBUG(291, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(302, *YYCURSOR); + YYDEBUG(292, *YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x00) goto yy249; - if (yych <= 0x08) goto yy260; - goto yy249; + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; } else { - if (yych == '\r') goto yy249; - goto yy260; + if (yych == '\r') goto yy239; + goto yy250; } } else { if (yych <= '$') { - if (yych <= '"') goto yy249; - if (yych <= '#') goto yy260; - goto yy265; + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; } else { - if (yych <= '%') goto yy260; - if (yych <= ')') goto yy249; - goto yy260; + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= '9') goto yy301; - if (yych <= ':') goto yy260; - goto yy249; + if (yych <= '9') goto yy291; + if (yych <= ':') goto yy250; + goto yy239; } else { - if (yych == '=') goto yy249; - goto yy260; + if (yych == '=') goto yy239; + goto yy250; } } else { if (yych <= '|') { - if (yych <= '^') goto yy249; - if (yych <= '{') goto yy260; - goto yy249; + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; } else { - if (yych == '~') goto yy249; - goto yy260; + if (yych == '~') goto yy239; + goto yy250; } } } -yy303: - YYDEBUG(303, *YYCURSOR); +yy293: + YYDEBUG(293, *YYCURSOR); yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(304, *YYCURSOR); + YYDEBUG(294, *YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x00) goto yy249; - if (yych <= 0x08) goto yy260; - goto yy249; + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; } else { - if (yych == '\r') goto yy249; - goto yy260; + if (yych == '\r') goto yy239; + goto yy250; } } else { if (yych <= '$') { - if (yych <= '"') goto yy249; - if (yych <= '#') goto yy260; - goto yy265; + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; } else { - if (yych <= '%') goto yy260; - if (yych <= ')') goto yy249; - goto yy260; + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; } } } else { if (yych <= ']') { if (yych <= ';') { - if (yych <= '9') goto yy303; - if (yych <= ':') goto yy260; - goto yy249; + if (yych <= '9') goto yy293; + if (yych <= ':') goto yy250; + goto yy239; } else { - if (yych == '=') goto yy249; - goto yy260; + if (yych == '=') goto yy239; + goto yy250; } } else { if (yych <= '|') { - if (yych <= '^') goto yy249; - if (yych <= '{') goto yy260; - goto yy249; + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; } else { - if (yych == '~') goto yy249; - goto yy260; + if (yych == '~') goto yy239; + goto yy250; } } } -yy305: - YYDEBUG(305, *YYCURSOR); +yy295: + YYDEBUG(295, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(306, *YYCURSOR); + YYDEBUG(296, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy305; + goto yy295; } - YYDEBUG(307, *YYCURSOR); + YYDEBUG(297, *YYCURSOR); ++YYCURSOR; - YYDEBUG(308, *YYCURSOR); + YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 412 "Zend/zend_ini_scanner.l" { /* Raw string */ @@ -4633,66 +4539,66 @@ int ini_lex(zval *ini_lval TSRMLS_DC) } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 4637 "Zend/zend_ini_scanner.c" -yy309: - YYDEBUG(309, *YYCURSOR); +#line 4543 "Zend/zend_ini_scanner.c" +yy299: + YYDEBUG(299, *YYCURSOR); ++YYCURSOR; - YYDEBUG(310, *YYCURSOR); + YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 445 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 4648 "Zend/zend_ini_scanner.c" -yy311: - YYDEBUG(311, *YYCURSOR); +#line 4554 "Zend/zend_ini_scanner.c" +yy301: + YYDEBUG(301, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy312: - YYDEBUG(312, *YYCURSOR); - if (yych == '\t') goto yy311; - if (yych == ' ') goto yy311; - goto yy241; -yy313: - YYDEBUG(313, *YYCURSOR); +yy302: + YYDEBUG(302, *YYCURSOR); + if (yych == '\t') goto yy301; + if (yych == ' ') goto yy301; + goto yy231; +yy303: + YYDEBUG(303, *YYCURSOR); yych = *++YYCURSOR; - goto yy238; -yy314: - YYDEBUG(314, *YYCURSOR); + goto yy228; +yy304: + YYDEBUG(304, *YYCURSOR); yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; -yy315: - YYDEBUG(315, *YYCURSOR); +yy305: + YYDEBUG(305, *YYCURSOR); if (yych <= 0x1F) { if (yych <= '\n') { - if (yych <= 0x08) goto yy236; - if (yych <= '\t') goto yy314; - goto yy313; + if (yych <= 0x08) goto yy226; + if (yych <= '\t') goto yy304; + goto yy303; } else { - if (yych == '\r') goto yy317; - goto yy236; + if (yych == '\r') goto yy307; + goto yy226; } } else { if (yych <= '"') { - if (yych <= ' ') goto yy314; - if (yych <= '!') goto yy236; + if (yych <= ' ') goto yy304; + if (yych <= '!') goto yy226; } else { - if (yych == ';') goto yy292; - goto yy236; + if (yych == ';') goto yy282; + goto yy226; } } - YYDEBUG(316, *YYCURSOR); + YYDEBUG(306, *YYCURSOR); yych = *++YYCURSOR; - goto yy243; -yy317: - YYDEBUG(317, *YYCURSOR); + goto yy233; +yy307: + YYDEBUG(307, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) == '\n') goto yy313; - goto yy238; + if ((yych = *YYCURSOR) == '\n') goto yy303; + goto yy228; } /* *********************************** */ yyc_ST_VARNAME: @@ -4731,49 +4637,49 @@ int ini_lex(zval *ini_lval TSRMLS_DC) 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; - YYDEBUG(318, *YYCURSOR); + YYDEBUG(308, *YYCURSOR); YYFILL(2); yych = *YYCURSOR; if (yych <= ')') { if (yych <= '"') { if (yych <= '\f') { - if (yych <= 0x08) goto yy320; - if (yych <= '\n') goto yy322; + if (yych <= 0x08) goto yy310; + if (yych <= '\n') goto yy312; } else { - if (yych <= '\r') goto yy322; - if (yych >= '!') goto yy322; + if (yych <= '\r') goto yy312; + if (yych >= '!') goto yy312; } } else { if (yych <= '%') { - if (yych == '$') goto yy322; + if (yych == '$') goto yy312; } else { - if (yych != '\'') goto yy322; + if (yych != '\'') goto yy312; } } } else { if (yych <= '[') { if (yych <= '<') { - if (yych == ';') goto yy322; + if (yych == ';') goto yy312; } else { - if (yych <= '=') goto yy322; - if (yych >= '[') goto yy322; + if (yych <= '=') goto yy312; + if (yych >= '[') goto yy312; } } else { if (yych <= 'z') { - if (yych == '^') goto yy322; + if (yych == '^') goto yy312; } else { - if (yych == '}') goto yy324; - if (yych <= '~') goto yy322; + if (yych == '}') goto yy314; + if (yych <= '~') goto yy312; } } } -yy320: - YYDEBUG(320, *YYCURSOR); +yy310: + YYDEBUG(310, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; - goto yy327; -yy321: - YYDEBUG(321, *YYCURSOR); + goto yy317; +yy311: + YYDEBUG(311, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 450 "Zend/zend_ini_scanner.l" { /* Variable name */ @@ -4785,41 +4691,41 @@ int ini_lex(zval *ini_lval TSRMLS_DC) RETURN_TOKEN(TC_VARNAME, yytext, yyleng); } -#line 4789 "Zend/zend_ini_scanner.c" -yy322: - YYDEBUG(322, *YYCURSOR); +#line 4695 "Zend/zend_ini_scanner.c" +yy312: + YYDEBUG(312, *YYCURSOR); ++YYCURSOR; - YYDEBUG(323, *YYCURSOR); + YYDEBUG(313, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 651 "Zend/zend_ini_scanner.l" +#line 644 "Zend/zend_ini_scanner.l" { return 0; } -#line 4799 "Zend/zend_ini_scanner.c" -yy324: - YYDEBUG(324, *YYCURSOR); +#line 4705 "Zend/zend_ini_scanner.c" +yy314: + YYDEBUG(314, *YYCURSOR); ++YYCURSOR; - YYDEBUG(325, *YYCURSOR); + YYDEBUG(315, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); #line 460 "Zend/zend_ini_scanner.l" { /* Variable end */ yy_pop_state(TSRMLS_C); return '}'; } -#line 4810 "Zend/zend_ini_scanner.c" -yy326: - YYDEBUG(326, *YYCURSOR); +#line 4716 "Zend/zend_ini_scanner.c" +yy316: + YYDEBUG(316, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; -yy327: - YYDEBUG(327, *YYCURSOR); +yy317: + YYDEBUG(317, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy326; + goto yy316; } - goto yy321; + goto yy311; } } -#line 655 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" } diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 3bfb1557b10ab..f50e9acc61b38 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -636,13 +636,6 @@ end_raw_value_chars: return END_OF_LINE; } -{TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */ - zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno)); - BEGIN(INITIAL); - SCNG(lineno)++; - return END_OF_LINE; -} - [^] { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index 240b0f3b1f7bf..c82eacf573ce9 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -105,18 +105,6 @@ INI; file_put_contents($filename, $ini); var_dump(parse_ini_file($filename, true)); -/* #44575, comments starting with '#' */ -$ini = <<<'INI' -foo=bar1 -; comment -_foo=bar2 -# comment -foo_=bar3 -INI; -file_put_contents($filename, $ini); -var_dump(parse_ini_file($filename, true)); - - @unlink($filename); echo "Done\n"; ?> @@ -205,14 +193,4 @@ array(3) { ["foo_"]=> string(4) "bar3" } - -Deprecated: Comments starting with '#' are deprecated in %s -array(3) { - ["foo"]=> - string(4) "bar1" - ["_foo"]=> - string(4) "bar2" - ["foo_"]=> - string(4) "bar3" -} Done From 10dd0fe1041c7317b05317217b4a5564175c07a2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 16:08:20 +0200 Subject: [PATCH 03/12] Remove static calls from incompatible $this context --- Zend/tests/incompat_ctx_user.phpt | 3 +- Zend/zend_vm_def.h | 12 +-- Zend/zend_vm_execute.h | 120 ++++++++---------------------- 3 files changed, 34 insertions(+), 101 deletions(-) diff --git a/Zend/tests/incompat_ctx_user.phpt b/Zend/tests/incompat_ctx_user.phpt index 2d9b59c1e8030..5923d5a7023b0 100644 --- a/Zend/tests/incompat_ctx_user.phpt +++ b/Zend/tests/incompat_ctx_user.phpt @@ -16,5 +16,4 @@ $b->bar(); ?> --EXPECTF-- -Deprecated: Non-static method A::foo() should not be called statically, assuming $this from incompatible context in %s on line %d -string(1) "B" +Fatal error: Non-static method A::foo() cannot be called statically, assuming $this from incompatible context in %s on line %d diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index f478571c9c31d..ef833fa3aebd2 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2344,15 +2344,9 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e60c853a7e3a3..78699890b47f0 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4165,15 +4165,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER( object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -5473,15 +5467,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -6656,15 +6644,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -7581,15 +7563,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -8566,15 +8542,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -18583,15 +18553,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -20825,15 +20789,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -23028,15 +22986,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -24511,15 +24463,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } @@ -26415,15 +26361,9 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_ object = EX(object); GC_REFCOUNT(object)++; if (object->handlers->get_class_entry && - !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC)) { - /* We are calling method of the other (incompatible) class, - but passing $this. This is done for compatibility with php-4. */ - if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { - zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } else { - /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); - } + !instanceof_function(zend_get_class_entry(object TSRMLS_CC), ce TSRMLS_CC) + ) { + zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", fbc->common.scope->name->val, fbc->common.function_name->val); } } } From 07a56157e1272ac826b0ed65c6a4e84483c8ecf7 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 16:25:19 +0200 Subject: [PATCH 04/12] Remove deprecated mcrypt functions Removes the following functions: mcrypt_ecb mcrypt_cbc mcrypt_cfb mcrypt_ofb mcrypt_generic_end --- ext/mcrypt/mcrypt.c | 101 ------- ext/mcrypt/tests/mcrypt_cbc.phpt | 31 --- ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt | 120 -------- ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt | 103 ------- ext/mcrypt/tests/mcrypt_cbc_error.phpt | 56 ---- ext/mcrypt/tests/mcrypt_cbc_variation1.phpt | 256 ------------------ ext/mcrypt/tests/mcrypt_cbc_variation2.phpt | 255 ----------------- ext/mcrypt/tests/mcrypt_cbc_variation3.phpt | 235 ---------------- ext/mcrypt/tests/mcrypt_cbc_variation4.phpt | 231 ---------------- ext/mcrypt/tests/mcrypt_cbc_variation5.phpt | 256 ------------------ ext/mcrypt/tests/mcrypt_cfb.phpt | 30 -- ext/mcrypt/tests/mcrypt_ecb.phpt | 27 -- ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt | 103 ------- ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt | 88 ------ ext/mcrypt/tests/mcrypt_ecb_error.phpt | 54 ---- ext/mcrypt/tests/mcrypt_ecb_variation1.phpt | 232 ---------------- ext/mcrypt/tests/mcrypt_ecb_variation2.phpt | 232 ---------------- ext/mcrypt/tests/mcrypt_ecb_variation3.phpt | 212 --------------- ext/mcrypt/tests/mcrypt_ecb_variation4.phpt | 207 -------------- ext/mcrypt/tests/mcrypt_ecb_variation5.phpt | 212 --------------- ext/mcrypt/tests/mcrypt_ofb.phpt | 27 -- .../tests/mcrypt_rijndael128_128BitKey.phpt | 36 +-- 22 files changed, 9 insertions(+), 3095 deletions(-) delete mode 100644 ext/mcrypt/tests/mcrypt_cbc.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_error.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_variation1.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_variation2.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_variation3.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_variation4.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cbc_variation5.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_cfb.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_error.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_variation1.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_variation2.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_variation3.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_variation4.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ecb_variation5.phpt delete mode 100644 ext/mcrypt/tests/mcrypt_ofb.phpt diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index bfd9003e55bff..c7a8e8bc4ca45 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -200,38 +200,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_decrypt, 0, 0, 5) ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ecb, 0, 0, 5) - ZEND_ARG_INFO(0, cipher) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, iv) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cbc, 0, 0, 5) - ZEND_ARG_INFO(0, cipher) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, iv) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cfb, 0, 0, 5) - ZEND_ARG_INFO(0, cipher) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, iv) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ofb, 0, 0, 5) - ZEND_ARG_INFO(0, cipher) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, iv) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_create_iv, 0, 0, 1) ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(0, source) @@ -239,10 +207,6 @@ ZEND_END_ARG_INFO() /* }}} */ const zend_function_entry mcrypt_functions[] = { /* {{{ */ - PHP_DEP_FE(mcrypt_ecb, arginfo_mcrypt_ecb) - PHP_DEP_FE(mcrypt_cbc, arginfo_mcrypt_cbc) - PHP_DEP_FE(mcrypt_cfb, arginfo_mcrypt_cfb) - PHP_DEP_FE(mcrypt_ofb, arginfo_mcrypt_ofb) PHP_FE(mcrypt_get_key_size, arginfo_mcrypt_get_key_size) PHP_FE(mcrypt_get_block_size, arginfo_mcrypt_get_block_size) PHP_FE(mcrypt_get_cipher_name, arginfo_mcrypt_get_cipher_name) @@ -258,7 +222,6 @@ const zend_function_entry mcrypt_functions[] = { /* {{{ */ PHP_FE(mcrypt_generic_init, arginfo_mcrypt_generic_init) PHP_FE(mcrypt_generic, arginfo_mcrypt_generic) PHP_FE(mdecrypt_generic, arginfo_mdecrypt_generic) - PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, arginfo_mcrypt_generic_deinit) PHP_FE(mcrypt_generic_deinit, arginfo_mcrypt_generic_deinit) PHP_FE(mcrypt_enc_self_test, arginfo_mcrypt_enc_self_test) @@ -1331,70 +1294,6 @@ PHP_FUNCTION(mcrypt_decrypt) } /* }}} */ -/* {{{ proto string mcrypt_ecb(int cipher, string key, string data, int mode, string iv) - ECB crypt/decrypt data using key key with cipher cipher starting with iv */ -PHP_FUNCTION(mcrypt_ecb) -{ - zval *mode; - char *cipher, *key, *data, *iv = NULL; - size_t cipher_len, key_len, data_len, iv_len = 0; - - MCRYPT_GET_CRYPT_ARGS - - convert_to_long_ex(mode); - - php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "ecb", iv, iv_len, Z_LVAL_P(mode), return_value TSRMLS_CC); -} -/* }}} */ - -/* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode, string iv) - CBC crypt/decrypt data using key key with cipher cipher starting with iv */ -PHP_FUNCTION(mcrypt_cbc) -{ - zval *mode; - char *cipher, *key, *data, *iv = NULL; - size_t cipher_len, key_len, data_len, iv_len = 0; - - MCRYPT_GET_CRYPT_ARGS - - convert_to_long_ex(mode); - - php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "cbc", iv, iv_len, Z_LVAL_P(mode), return_value TSRMLS_CC); -} -/* }}} */ - -/* {{{ proto string mcrypt_cfb(int cipher, string key, string data, int mode, string iv) - CFB crypt/decrypt data using key key with cipher cipher starting with iv */ -PHP_FUNCTION(mcrypt_cfb) -{ - zval *mode; - char *cipher, *key, *data, *iv = NULL; - size_t cipher_len, key_len, data_len, iv_len = 0; - - MCRYPT_GET_CRYPT_ARGS - - convert_to_long_ex(mode); - - php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "cfb", iv, iv_len, Z_LVAL_P(mode), return_value TSRMLS_CC); -} -/* }}} */ - -/* {{{ proto string mcrypt_ofb(int cipher, string key, string data, int mode, string iv) - OFB crypt/decrypt data using key key with cipher cipher starting with iv */ -PHP_FUNCTION(mcrypt_ofb) -{ - zval *mode; - char *cipher, *key, *data, *iv = NULL; - size_t cipher_len, key_len, data_len, iv_len = 0; - - MCRYPT_GET_CRYPT_ARGS - - convert_to_long_ex(mode); - - php_mcrypt_do_crypt(cipher, key, key_len, data, data_len, "ofb", iv, iv_len, Z_LVAL_P(mode), return_value TSRMLS_CC); -} -/* }}} */ - /* {{{ proto string mcrypt_create_iv(int size, int source) Create an initialization vector (IV) */ PHP_FUNCTION(mcrypt_create_iv) diff --git a/ext/mcrypt/tests/mcrypt_cbc.phpt b/ext/mcrypt/tests/mcrypt_cbc.phpt deleted file mode 100644 index c2e879370d8ab..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -mcrypt_cbc ---SKIPIF-- - ---FILE-- - ---EXPECTF-- - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d -PHP Testfest 2008 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Encryption mode requires an initialization vector of size 16 in %s on line %d -bool(false) diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt deleted file mode 100644 index e610f7cfa0cf3..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_3des_decrypt.phpt +++ /dev/null @@ -1,120 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : basic functionality ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : basic functionality *** - ---- testing different key lengths - -key length=8 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=20 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=24 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d -string(32) "736563726574206d6573736167650000" - -key length=26 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - ---- testing different iv lengths - -iv length=4 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d -string(0) "" - -iv length=8 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d -string(32) "659ec947f4dc3a3b9c50de744598d3c8" - -iv length=9 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d -string(0) "" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt deleted file mode 100644 index c5606e71a028b..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_3des_encrypt.phpt +++ /dev/null @@ -1,103 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : basic functionality ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : basic functionality *** - ---- testing different key lengths - -key length=8 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=20 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=24 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d -string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac" - -key length=26 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - ---- testing different iv lengths - -iv length=4 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Received initialization vector of size 4, but size 8 is required for this encryption mode in %s on line %d -string(0) "" - -iv length=8 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d -string(112) "b85e21072239d60c63a80e7c9ae493cb741a1cd407e52f451c5f43a0d103f55a7b62617eb2e44213c2d44462d388bc0b8f119384b12c84ac" - -iv length=9 - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc(): Received initialization vector of size 9, but size 8 is required for this encryption mode in %s on line %d -string(0) "" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_cbc_error.phpt b/ext/mcrypt/tests/mcrypt_cbc_error.phpt deleted file mode 100644 index 3c221802147e4..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_error.phpt +++ /dev/null @@ -1,56 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : error conditions ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : error conditions *** - --- Testing mcrypt_cbc() function with more than expected no. of arguments -- - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc() expects at most 5 parameters, 6 given in %s on line %d -NULL - --- Testing mcrypt_cbc() function with less than expected no. of arguments -- - -Deprecated: Function mcrypt_cbc() is deprecated in %s on line %d - -Warning: mcrypt_cbc() expects at least 4 parameters, 3 given in %s on line %d -NULL -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_cbc_variation1.phpt b/ext/mcrypt/tests/mcrypt_cbc_variation1.phpt deleted file mode 100644 index eb233e3f92e90..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_variation1.phpt +++ /dev/null @@ -1,256 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for cipher - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump( mcrypt_cbc($value, $key, $data, $mode, $iv) ); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : usage variation *** - ---int 0-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---int 1-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---int 12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---int -12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---float 10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---float -10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---float 12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---float -12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---float .5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---empty array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d) -NULL - ---int indexed array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d) -NULL - ---associative array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d) -NULL - ---nested arrays-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, array given, %s(%d) -NULL - ---uppercase NULL-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---lowercase null-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---lowercase true-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---lowercase false-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---uppercase TRUE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---uppercase FALSE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---empty string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---empty string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---instance of classWithToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---instance of classWithoutToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, object given, %s(%d) -NULL - ---undefined var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---unset var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Module initialization failed, %s(%d) -bool(false) - ---resource-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 1 to be string, resource given, %s(%d) -NULL -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_cbc_variation2.phpt b/ext/mcrypt/tests/mcrypt_cbc_variation2.phpt deleted file mode 100644 index 8efbf82f740c9..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_variation2.phpt +++ /dev/null @@ -1,255 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for key - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_cbc($cipher, $value, $data, $mode, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : usage variation *** - ---int 0-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int 1-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int 12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int -12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float 10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float -10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float 12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float -12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float .5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase null-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase true-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase false-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---uppercase TRUE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---uppercase FALSE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---instance of classWithToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---instance of classWithoutToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---unset var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---resource-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 2 to be string, resource given, %s(%d) -string(0) "" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_cbc_variation3.phpt b/ext/mcrypt/tests/mcrypt_cbc_variation3.phpt deleted file mode 100644 index f9098a4221b2b..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_variation3.phpt +++ /dev/null @@ -1,235 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for data - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_cbc($cipher, $key, $value, $mode, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : usage variation *** - ---int 0-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "ce5fcfe737859795" - ---int 1-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "84df495f6cd82dd9" - ---int 12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "905ab1ae27ee9991" - ---int -12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "5835174e9c67c3e7" - ---float 10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "28ff0601ad9e47fa" - ---float -10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "ce9f2b6e2fc3d9f7" - ---float 12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "24eb882ce9763e4018fba9b7f01b0c3e" - ---float -12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5eed30e428f32de1d7a7064d0ed4d3eb" - ---float .5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "bebf2a13676e1e30" - ---empty array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---lowercase null-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---lowercase true-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "84df495f6cd82dd9" - ---lowercase false-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---uppercase TRUE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "84df495f6cd82dd9" - ---uppercase FALSE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---empty string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---empty string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---instance of classWithToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "7c91cdf8f8c51485034a9ee528eb016b" - ---instance of classWithoutToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---unset var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(16) "206f6d3617a5ab32" - ---resource-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 3 to be string, resource given, %s(%d) -string(0) "" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_cbc_variation4.phpt b/ext/mcrypt/tests/mcrypt_cbc_variation4.phpt deleted file mode 100644 index a13e4ffb7c3cf..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_variation4.phpt +++ /dev/null @@ -1,231 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for mode - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_cbc($cipher, $key, $data, $value, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : usage variation *** - ---float 10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---float -10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---float 12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---float -12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---float .5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---empty array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---int indexed array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---associative array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---nested arrays-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---uppercase NULL-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---lowercase null-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---lowercase true-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---lowercase false-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---uppercase TRUE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---uppercase FALSE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---empty string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---empty string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---mixed case string-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---heredoc-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---instance of classWithToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 8 - Object of class classWithToString could not be converted to int, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---instance of classWithoutToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 8 - Object of class classWithoutToString could not be converted to int, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" - ---undefined var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---unset var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "5f781523f696d596e4b809d72197a0cc" - ---resource-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -string(32) "983d5edc5f77fe42e2372a0339dc22b0" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_cbc_variation5.phpt b/ext/mcrypt/tests/mcrypt_cbc_variation5.phpt deleted file mode 100644 index 884d90963eced..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cbc_variation5.phpt +++ /dev/null @@ -1,256 +0,0 @@ ---TEST-- -Test mcrypt_cbc() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for iv - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump( bin2hex(mcrypt_cbc($cipher, $key, $data, $mode, $value)) ); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_cbc() : usage variation *** - ---int 0-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---int 1-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---int 12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---int -12345-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---float 10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---float -10.5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---float 12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---float -12.3456789000e10-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---float .5-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---empty array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---lowercase null-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---lowercase true-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---lowercase false-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---uppercase TRUE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---uppercase FALSE-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---empty string DQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---empty string SQ-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---instance of classWithToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---instance of classWithoutToString-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---unset var-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc(): Received initialization vector of size %d, but size 8 is required for this encryption mode, %s(%d) -string(0) "" - ---resource-- -Error: 8192 - Function mcrypt_cbc() is deprecated, %s(%d) -Error: 2 - mcrypt_cbc() expects parameter 5 to be string, resource given, %s(%d) -string(0) "" -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_cfb.phpt b/ext/mcrypt/tests/mcrypt_cfb.phpt deleted file mode 100644 index 5b6842310bbb5..0000000000000 --- a/ext/mcrypt/tests/mcrypt_cfb.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -mcrypt_cfb ---SKIPIF-- - ---FILE-- - ---FILE-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : basic functionality *** - ---- testing different key lengths - -key length=8 - -Warning: mcrypt_ecb(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=20 - -Warning: mcrypt_ecb(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=24 -string(32) "736563726574206d6573736167650000" - -key length=26 - -Warning: mcrypt_ecb(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - ---- testing different iv lengths - -iv length=4 -string(32) "a9298896ed1b7335f8f10f7ff6d7a239" - -iv length=8 -string(32) "a9298896ed1b7335f8f10f7ff6d7a239" - -iv length=9 -string(32) "a9298896ed1b7335f8f10f7ff6d7a239" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt b/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt deleted file mode 100644 index 7e29579779301..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt +++ /dev/null @@ -1,88 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : basic functionality ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : basic functionality *** - ---- testing different key lengths - -key length=8 - -Warning: mcrypt_ecb(): Key of size 8 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=20 - -Warning: mcrypt_ecb(): Key of size 20 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - -key length=24 -string(112) "923eedcb20e18e3efa466a6ca1b842b34e6ac46aa3690ef739d0d68a26eb64e1a6ad42e7d18312ae8a57ab927e1dc892e5ff56c061864f27" - -key length=26 - -Warning: mcrypt_ecb(): Key of size 26 not supported by this algorithm. Only keys of size 24 supported in %s on line %d -string(0) "" - ---- testing different iv lengths - -iv length=4 -string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165" - -iv length=8 -string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165" - -iv length=9 -string(112) "440a6f54601969b15e81df09cd381ef585fede5f3620587fd1a949c520aed9f6d10ebbabf2cea3e1f04c9251c2878c0ca37d51c80d490165" -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_ecb_error.phpt b/ext/mcrypt/tests/mcrypt_ecb_error.phpt deleted file mode 100644 index 7e521f2225e6c..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_error.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : error conditions ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : error conditions *** - --- Testing mcrypt_ecb() function with more than expected no. of arguments -- - -Warning: mcrypt_ecb() expects at most 5 parameters, 6 given in %s on line %d -NULL - --- Testing mcrypt_ecb() function with less than expected no. of arguments -- - -Warning: mcrypt_ecb() expects at least 4 parameters, 3 given in %s on line %d -NULL -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_ecb_variation1.phpt b/ext/mcrypt/tests/mcrypt_ecb_variation1.phpt deleted file mode 100644 index 7271deec132ee..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_variation1.phpt +++ /dev/null @@ -1,232 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for cipher - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump( mcrypt_ecb($value, $key, $data, $mode, $iv) ); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : usage variation *** - ---int 0-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---int 1-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---int 12345-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---int -12345-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---float 10.5-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---float -10.5-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---float 12.3456789000e10-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---float -12.3456789000e10-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---float .5-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---empty array-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d) -NULL - ---int indexed array-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d) -NULL - ---associative array-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d) -NULL - ---nested arrays-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, array given, %s(%d) -NULL - ---uppercase NULL-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---lowercase null-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---lowercase true-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---lowercase false-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---uppercase TRUE-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---uppercase FALSE-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---empty string DQ-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---empty string SQ-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---instance of classWithToString-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---instance of classWithoutToString-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, object given, %s(%d) -NULL - ---undefined var-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---unset var-- -Error: 2 - mcrypt_ecb(): Module initialization failed, %s(%d) -bool(false) - ---resource-- -Error: 2 - mcrypt_ecb() expects parameter 1 to be string, resource given, %s(%d) -NULL -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_ecb_variation2.phpt b/ext/mcrypt/tests/mcrypt_ecb_variation2.phpt deleted file mode 100644 index 246533b722bda..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_variation2.phpt +++ /dev/null @@ -1,232 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for key - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_ecb($cipher, $value, $data, $mode, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : usage variation *** - ---int 0-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int 1-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int 12345-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---int -12345-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float 10.5-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float -10.5-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float 12.3456789000e10-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float -12.3456789000e10-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---float .5-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty array-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase null-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase true-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---lowercase false-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---uppercase TRUE-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---uppercase FALSE-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty string DQ-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---empty string SQ-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---instance of classWithToString-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---instance of classWithoutToString-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---unset var-- -Error: 2 - mcrypt_ecb(): Key of size %d not supported by this algorithm. Only keys of size 24 supported, %s(%d) -string(0) "" - ---resource-- -Error: 2 - mcrypt_ecb() expects parameter 2 to be string, resource given, %s(%d) -string(0) "" -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_ecb_variation3.phpt b/ext/mcrypt/tests/mcrypt_ecb_variation3.phpt deleted file mode 100644 index 171468f82fb55..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_variation3.phpt +++ /dev/null @@ -1,212 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for data - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_ecb($cipher, $key, $value, $mode, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : usage variation *** - ---int 0-- -string(16) "51dc9cd9179b718b" - ---int 1-- -string(16) "619c335f8c4f9cbf" - ---int 12345-- -string(16) "b1258d67ab73de00" - ---int -12345-- -string(16) "8eecf134443bd6b9" - ---float 10.5-- -string(16) "34b5750a793baff5" - ---float -10.5-- -string(16) "7a605f2aacc8a11d" - ---float 12.3456789000e10-- -string(32) "74a0d7026ae586f476d4b17808851e86" - ---float -12.3456789000e10-- -string(32) "bfb155997017986c01090afebd62c7ca" - ---float .5-- -string(16) "cc60ac201164b6c7" - ---empty array-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -string(16) "6ece228c41457539" - ---lowercase null-- -string(16) "6ece228c41457539" - ---lowercase true-- -string(16) "619c335f8c4f9cbf" - ---lowercase false-- -string(16) "6ece228c41457539" - ---uppercase TRUE-- -string(16) "619c335f8c4f9cbf" - ---uppercase FALSE-- -string(16) "6ece228c41457539" - ---empty string DQ-- -string(16) "6ece228c41457539" - ---empty string SQ-- -string(16) "6ece228c41457539" - ---instance of classWithToString-- -string(32) "749c3b4d16731d98370128754b7c930f" - ---instance of classWithoutToString-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -string(16) "6ece228c41457539" - ---unset var-- -string(16) "6ece228c41457539" - ---resource-- -Error: 2 - mcrypt_ecb() expects parameter 3 to be string, resource given, %s(%d) -string(0) "" -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_ecb_variation4.phpt b/ext/mcrypt/tests/mcrypt_ecb_variation4.phpt deleted file mode 100644 index b5c4f294eb521..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_variation4.phpt +++ /dev/null @@ -1,207 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for mode - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex(mcrypt_ecb($cipher, $key, $data, $value, $iv))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : usage variation *** - ---float 10.5-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---float -10.5-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---float 12.3456789000e10-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---float -12.3456789000e10-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---float .5-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty array-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---int indexed array-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---associative array-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---nested arrays-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---uppercase NULL-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---lowercase null-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---lowercase true-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---lowercase false-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---uppercase TRUE-- -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---uppercase FALSE-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty string DQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty string SQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---string DQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---string SQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---mixed case string-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---heredoc-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---instance of classWithToString-- -Error: 8 - Object of class classWithToString could not be converted to int, %s(%d) -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---instance of classWithoutToString-- -Error: 8 - Object of class classWithoutToString could not be converted to int, %s(%d) -string(32) "a80c6cef6b42c8759143586a57bb7dc6" - ---undefined var-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---unset var-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---resource-- -string(%d) %s -===DONE=== diff --git a/ext/mcrypt/tests/mcrypt_ecb_variation5.phpt b/ext/mcrypt/tests/mcrypt_ecb_variation5.phpt deleted file mode 100644 index 8771b9a78c714..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ecb_variation5.phpt +++ /dev/null @@ -1,212 +0,0 @@ ---TEST-- -Test mcrypt_ecb() function : usage variation ---SKIPIF-- - ---FILE-- - 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 1' => 1, - 'int 12345' => 12345, - 'int -12345' => -2345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource variable - 'resource' => $fp -); - -// loop through each element of the array for iv - -foreach($inputs as $valueType =>$value) { - echo "\n--$valueType--\n"; - var_dump(bin2hex( mcrypt_ecb($cipher, $key, $data, $mode, $value))); -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -*** Testing mcrypt_ecb() : usage variation *** - ---int 0-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---int 1-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---int 12345-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---int -12345-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---float 10.5-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---float -10.5-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---float 12.3456789000e10-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---float -12.3456789000e10-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---float .5-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty array-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---int indexed array-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---associative array-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---nested arrays-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, array given, %s(%d) -string(0) "" - ---uppercase NULL-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---lowercase null-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---lowercase true-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---lowercase false-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---uppercase TRUE-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---uppercase FALSE-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty string DQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---empty string SQ-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---instance of classWithToString-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---instance of classWithoutToString-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, object given, %s(%d) -string(0) "" - ---undefined var-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---unset var-- -string(32) "6438db90653c4d300909aa02fd6163c2" - ---resource-- -Error: 2 - mcrypt_ecb() expects parameter 5 to be string, resource given, %s(%d) -string(0) "" -===DONE=== - diff --git a/ext/mcrypt/tests/mcrypt_ofb.phpt b/ext/mcrypt/tests/mcrypt_ofb.phpt deleted file mode 100644 index 5580575a4826c..0000000000000 --- a/ext/mcrypt/tests/mcrypt_ofb.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -mcrypt_ofb ---SKIPIF-- - ---FILE-- - Date: Wed, 10 Sep 2014 16:44:54 +0200 Subject: [PATCH 05/12] Remove unsafe curl file uploads --- ext/curl/interface.c | 54 ++++------------------------ ext/curl/php_curl.h | 3 -- ext/curl/tests/bug27023.phpt | 26 ++++++-------- ext/curl/tests/bug27023_2.phpt | 44 ----------------------- ext/curl/tests/curl_file_upload.phpt | 9 ----- 5 files changed, 18 insertions(+), 118 deletions(-) delete mode 100644 ext/curl/tests/bug27023_2.phpt diff --git a/ext/curl/interface.c b/ext/curl/interface.c index d8e084796d637..45e9bb13f9610 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1199,7 +1199,6 @@ PHP_MINIT_FUNCTION(curl) #if CURLOPT_PASSWDFUNCTION != 0 REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION); #endif - REGISTER_CURL_CONSTANT(CURLOPT_SAFE_UPLOAD); #ifdef PHP_CURL_NEED_OPENSSL_TSL if (!CRYPTO_get_id_callback()) { @@ -1727,7 +1726,6 @@ static php_curl *alloc_curl_handle() zend_llist_init(&ch->to_free->str, sizeof(char *), (llist_dtor_func_t)curl_free_string, 0); zend_llist_init(&ch->to_free->post, sizeof(struct HttpPost), (llist_dtor_func_t)curl_free_post, 0); - ch->safe_upload = 1; /* for now, for BC reason we allow unsafe API */ ch->to_free->slist = emalloc(sizeof(HashTable)); zend_hash_init(ch->to_free->slist, 4, NULL, curl_free_slist, 0); @@ -2158,10 +2156,6 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue TSRMLS_ #endif error = curl_easy_setopt(ch->cp, option, Z_LVAL_P(zvalue)); break; - case CURLOPT_SAFE_UPLOAD: - convert_to_long_ex(zvalue); - ch->safe_upload = (Z_LVAL_P(zvalue) != 0); - break; /* String options */ case CURLOPT_CAINFO: @@ -2523,46 +2517,12 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue TSRMLS_ postval = Z_STRVAL_P(current); - /* The arguments after _NAMELENGTH and _CONTENTSLENGTH - * must be explicitly cast to long in curl_formadd - * use since curl needs a long not an int. */ - if (!ch->safe_upload && *postval == '@') { - char *name, *type, *filename; - ++postval; - - php_error_docref("curl.curlfile" TSRMLS_CC, E_DEPRECATED, - "The usage of the @filename API for file uploading is deprecated. Please use the CURLFile class instead"); - - name = estrndup(postval, Z_STRLEN_P(current)); - if ((type = (char *)php_memnstr(name, ";type=", sizeof(";type=") - 1, - name + Z_STRLEN_P(current)))) { - *type = '\0'; - } - if ((filename = (char *)php_memnstr(name, ";filename=", sizeof(";filename=") - 1, - name + Z_STRLEN_P(current)))) { - *filename = '\0'; - } - /* open_basedir check */ - if (php_check_open_basedir(name TSRMLS_CC)) { - efree(name); - return FAILURE; - } - error = curl_formadd(&first, &last, - CURLFORM_COPYNAME, string_key->val, - CURLFORM_NAMELENGTH, string_key->len, - CURLFORM_FILENAME, filename ? filename + sizeof(";filename=") - 1 : name, - CURLFORM_CONTENTTYPE, type ? type + sizeof(";type=") - 1 : "application/octet-stream", - CURLFORM_FILE, name, - CURLFORM_END); - efree(name); - } else { - error = curl_formadd(&first, &last, - CURLFORM_COPYNAME, string_key->val, - CURLFORM_NAMELENGTH, (zend_long)string_key->len, - CURLFORM_COPYCONTENTS, postval, - CURLFORM_CONTENTSLENGTH, (zend_long)Z_STRLEN_P(current), - CURLFORM_END); - } + error = curl_formadd(&first, &last, + CURLFORM_COPYNAME, string_key->val, + CURLFORM_NAMELENGTH, (zend_long)string_key->len, + CURLFORM_COPYCONTENTS, postval, + CURLFORM_CONTENTSLENGTH, (zend_long)Z_STRLEN_P(current), + CURLFORM_END); zend_string_release(string_key); } ZEND_HASH_FOREACH_END(); @@ -2753,7 +2713,7 @@ PHP_FUNCTION(curl_setopt) ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl); - if (options <= 0 && options != CURLOPT_SAFE_UPLOAD) { + if (options <= 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option"); RETURN_FALSE; } diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c75d7f80d1866..dbce36f1d5c7d 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -180,11 +180,8 @@ typedef struct { zend_resource *res; zend_bool in_callback; uint32_t clone; - zend_bool safe_upload; } php_curl; -#define CURLOPT_SAFE_UPLOAD -1 - typedef struct { int still_running; CURLM *multi; diff --git a/ext/curl/tests/bug27023.phpt b/ext/curl/tests/bug27023.phpt index fce69f5708bb5..f75d73982a907 100644 --- a/ext/curl/tests/bug27023.phpt +++ b/ext/curl/tests/bug27023.phpt @@ -3,36 +3,33 @@ Bug #27023 (CURLOPT_POSTFIELDS does not parse content types for files) --INI-- error_reporting = E_ALL & ~E_DEPRECATED --SKIPIF-- - + --FILE-- '@' . __DIR__ . '/curl_testdata1.txt'); +$file = curl_file_create(__DIR__ . '/curl_testdata1.txt'); +$params = array('file' => $file); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); -$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt;type=text/plain'); +$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain"); +$params = array('file' => $file); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); -$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt;filename=foo.txt'); +$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', null, "foo.txt"); +$params = array('file' => $file); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); -$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt;type=text/plain;filename=foo.txt'); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - -$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt;filename=foo.txt;type=text/plain'); +$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt"); +$params = array('file' => $file); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); @@ -44,4 +41,3 @@ string(%d) "curl_testdata1.txt|application/octet-stream" string(%d) "curl_testdata1.txt|text/plain" string(%d) "foo.txt|application/octet-stream" string(%d) "foo.txt|text/plain" -string(%d) "foo.txt|text/plain" diff --git a/ext/curl/tests/bug27023_2.phpt b/ext/curl/tests/bug27023_2.phpt deleted file mode 100644 index c878ebac312f6..0000000000000 --- a/ext/curl/tests/bug27023_2.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -Bug #27023 (CURLOPT_POSTFIELDS does not parse content types for files) ---INI-- -error_reporting = E_ALL & ~E_DEPRECATED ---SKIPIF-- - ---FILE-- - $file); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - -$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain"); -$params = array('file' => $file); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - -$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', null, "foo.txt"); -$params = array('file' => $file); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - -$file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt"); -$params = array('file' => $file); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - - -curl_close($ch); -?> ---EXPECTF-- -string(%d) "curl_testdata1.txt|application/octet-stream" -string(%d) "curl_testdata1.txt|text/plain" -string(%d) "foo.txt|application/octet-stream" -string(%d) "foo.txt|text/plain" diff --git a/ext/curl/tests/curl_file_upload.phpt b/ext/curl/tests/curl_file_upload.phpt index 3a5a78fde36ca..4f283a6618bae 100644 --- a/ext/curl/tests/curl_file_upload.phpt +++ b/ext/curl/tests/curl_file_upload.phpt @@ -43,12 +43,6 @@ var_dump($file->getPostFilename()); curl_setopt($ch, CURLOPT_POSTFIELDS, array("file" => $file)); var_dump(curl_exec($ch)); -curl_setopt($ch, CURLOPT_SAFE_UPLOAD, 0); -$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt'); -curl_setopt($ch, CURLOPT_POSTFIELDS, $params); -var_dump(curl_exec($ch)); - -curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true); $params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt'); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); @@ -70,9 +64,6 @@ string(%d) "%s/curl_testdata1.txt" string(%d) "curl_testdata1.txt|text/plain" string(%d) "foo.txt" string(%d) "foo.txt|application/octet-stream" - -Deprecated: curl_setopt(): The usage of the @filename API for file uploading is deprecated. Please use the CURLFile class instead in %s on line %d -string(%d) "curl_testdata1.txt|application/octet-stream" string(0) "" string(%d) "array(1) { ["file"]=> From f71aaa812e80d30e61be469001430dc7068e2d52 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 17:19:02 +0200 Subject: [PATCH 06/12] Remove preg_replace /e modifier --- ext/pcre/php_pcre.c | 113 +++---------------------------- ext/pcre/tests/002.phpt | 8 +-- ext/pcre/tests/004.phpt | 9 --- ext/pcre/tests/preg_replace.phpt | 10 --- tests/lang/bug24403.phpt | 21 ------ 5 files changed, 11 insertions(+), 150 deletions(-) delete mode 100644 tests/lang/bug24403.phpt diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 89c5f1155bef6..d3470ff3177f0 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -992,88 +992,6 @@ static zend_string *preg_do_repl_func(zval *function, char *subject, int *offset } /* }}} */ -/* {{{ preg_do_eval - */ -static zend_string *preg_do_eval(char *eval_str, int eval_str_len, char *subject, - int *offsets, int count TSRMLS_DC) -{ - zval retval; /* Return value from evaluation */ - char *eval_str_end, /* End of eval string */ - *match, /* Current match for a backref */ - *walk, /* Used to walk the code string */ - *segment, /* Start of segment to append while walking */ - walk_last; /* Last walked character */ - int match_len; /* Length of the match */ - int backref; /* Current backref */ - zend_string *esc_match; /* Quote-escaped match */ - zend_string *result_str; - char *compiled_string_description; - smart_str code = {0}; - - eval_str_end = eval_str + eval_str_len; - walk = segment = eval_str; - walk_last = 0; - - while (walk < eval_str_end) { - /* If found a backreference.. */ - if ('\\' == *walk || '$' == *walk) { - smart_str_appendl(&code, segment, walk - segment); - if (walk_last == '\\') { - code.s->val[code.s->len-1] = *walk++; - segment = walk; - walk_last = 0; - continue; - } - segment = walk; - if (preg_get_backref(&walk, &backref)) { - if (backref < count) { - /* Find the corresponding string match and substitute it - in instead of the backref */ - match = subject + offsets[backref<<1]; - match_len = offsets[(backref<<1)+1] - offsets[backref<<1]; - if (match_len) { - esc_match = php_addslashes(match, match_len, 0 TSRMLS_CC); - } else { - esc_match = zend_string_init(match, match_len, 0); - } - } else { - esc_match = STR_EMPTY_ALLOC(); - } - smart_str_appendl(&code, esc_match->val, esc_match->len); - - segment = walk; - - /* Clean up and reassign */ - zend_string_release(esc_match); - continue; - } - } - walk++; - walk_last = walk[-1]; - } - smart_str_appendl(&code, segment, walk - segment); - smart_str_0(&code); - - compiled_string_description = zend_make_compiled_string_description("regexp code" TSRMLS_CC); - /* Run the code */ - if (zend_eval_stringl(code.s->val, code.s->len, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { - efree(compiled_string_description); - php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code: %s%s", PHP_EOL, code.s->val); - /* zend_error() does not return in this case */ - } - efree(compiled_string_description); - - /* Save the return string */ - result_str = zval_get_string(&retval); - - /* Clean up */ - zval_dtor(&retval); - smart_str_free(&code); - - return result_str; -} -/* }}} */ - /* {{{ php_pcre_replace */ PHPAPI zend_string *php_pcre_replace(zend_string *regex, @@ -1109,7 +1027,6 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int alloc_len; /* Actual allocated length */ int match_len; /* Length of the current match */ int backref; /* Backreference number */ - int eval; /* If the replacement string should be eval'ed */ int start_offset; /* Where the new search starts */ int g_notempty=0; /* If the match should not be empty */ int replace_len=0; /* Length of replacement string */ @@ -1123,7 +1040,7 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int result_len; /* Length of result */ unsigned char *mark = NULL; /* Target for MARK name */ zend_string *result; /* Result of replacement */ - zend_string *eval_result=NULL; /* Result of eval or custom function */ + zend_string *eval_result=NULL; /* Result of custom function */ ALLOCA_FLAG(use_heap); if (extra == NULL) { @@ -1133,22 +1050,16 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, extra->match_limit = PCRE_G(backtrack_limit); extra->match_limit_recursion = PCRE_G(recursion_limit); - eval = pce->preg_options & PREG_REPLACE_EVAL; - if (is_callable_replace) { - if (eval) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modifier /e cannot be used with replacement callback"); - return NULL; - } - } else { + if (pce->preg_options & PREG_REPLACE_EVAL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The /e modifier is no longer supported, use preg_replace_callback instead"); + return NULL; + } + if (!is_callable_replace) { replace = Z_STRVAL_P(replace_val); replace_len = Z_STRLEN_P(replace_val); replace_end = replace + replace_len; } - if (eval) { - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The /e modifier is deprecated, use preg_replace_callback instead"); - } - /* Calculate the size of the offsets array, and allocate memory for it. */ num_subpats = pce->capture_count + 1; size_offsets = num_subpats * 3; @@ -1208,12 +1119,7 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, new_len = result_len + offsets[0] - start_offset; /* part before the match */ - /* If evaluating, do it and add the return string's length */ - if (eval) { - eval_result = preg_do_eval(replace, replace_len, subject, - offsets, count TSRMLS_CC); - new_len += eval_result->len; - } else if (is_callable_replace) { + if (is_callable_replace) { /* Use custom function to get replacement string and its length. */ eval_result = preg_do_repl_func(replace_val, subject, offsets, subpat_names, count, mark TSRMLS_CC); new_len += eval_result->len; @@ -1250,9 +1156,8 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, /* copy replacement and backrefs */ walkbuf = result->val + result_len; - /* If evaluating or using custom function, copy result to the buffer - * and clean up. */ - if (eval || is_callable_replace) { + /* If suing custom function, copy result to the buffer and clean up. */ + if (is_callable_replace) { memcpy(walkbuf, eval_result->val, eval_result->len); result_len += eval_result->len; if (eval_result) zend_string_release(eval_result); diff --git a/ext/pcre/tests/002.phpt b/ext/pcre/tests/002.phpt index fd245633d3487..42b63c7d1b55d 100644 --- a/ext/pcre/tests/002.phpt +++ b/ext/pcre/tests/002.phpt @@ -34,9 +34,5 @@ string(12) "a${1b${1c${1" Warning: preg_replace(): Compilation failed: missing terminating ] for character class at offset 8 in %s002.php on line 11 NULL -Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in %s on line 12 - -Parse error: %s in %s002.php(12) : regexp code on line 1 - -Fatal error: preg_replace(): Failed evaluating code: -for ($ in %s002.php on line 12 +Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in %s on line 12 +NULL diff --git a/ext/pcre/tests/004.phpt b/ext/pcre/tests/004.phpt index 1fae406b16b31..11361d1b32d14 100644 --- a/ext/pcre/tests/004.phpt +++ b/ext/pcre/tests/004.phpt @@ -12,8 +12,6 @@ var_dump($m); var_dump(preg_match_all('/zend_parse_parameters(?:_ex\s*\([^,]+,[^,]+|\s*\([^,]+),\s*"([^"]*)"\s*,\s*([^{;]*)/S', 'zend_parse_parameters( 0, "addd|s/", a, b, &c);', $m, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)); var_dump($m); -var_dump(preg_replace(array('@//.*@S', '@/\*.*\*/@SsUe'), array('', 'preg_replace("/[^\r\n]+/S", "", \'$0\')'), "hello\n//x \n/*\ns\n*/")); - var_dump(preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)/S', "PHP_FUNCTION(s, preg_match)\n{\nlalala", -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE)); ?> --EXPECTF-- @@ -117,13 +115,6 @@ array(1) { } } } - -Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in %s on line %d -string(9) "hello - - - -" array(3) { [0]=> array(2) { diff --git a/ext/pcre/tests/preg_replace.phpt b/ext/pcre/tests/preg_replace.phpt index f7b5f7415762b..092857c57ea49 100644 --- a/ext/pcre/tests/preg_replace.phpt +++ b/ext/pcre/tests/preg_replace.phpt @@ -8,18 +8,8 @@ var_dump(preg_replace('{{\D+}}', 'ddd', 'abcd')); var_dump(preg_replace('/(ab)(c)(d)(e)(f)(g)(h)(i)(j)(k)/', 'a${1}2$103', 'zabcdefghijkl')); -var_dump(preg_replace_callback('//e', '', '')); - -var_dump(preg_replace_callback('//e', 'strtolower', '')); - ?> --EXPECTF-- string(1) "x" string(4) "abcd" string(8) "zaab2k3l" - -Warning: preg_replace_callback(): Requires argument 2, '', to be a valid callback in %spreg_replace.php on line 8 -string(0) "" - -Warning: preg_replace_callback(): Modifier /e cannot be used with replacement callback in %spreg_replace.php on line 10 -NULL diff --git a/tests/lang/bug24403.phpt b/tests/lang/bug24403.phpt deleted file mode 100644 index 8f4934e7b9ff8..0000000000000 --- a/tests/lang/bug24403.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Bug #24403 (scope doesn't properly propagate into internal functions) ---FILE-- -a) ? '\'.\$p[\'\\1\'].\'' : -'\'.\$r[\'\\1\'].\'')", - "{a} b {c}"); - } -} -new a(); -?> ---EXPECTF-- -Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in %s on line %d From 449786c4666cabeace5c3464be4d1e34de53fc6d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 17:30:25 +0200 Subject: [PATCH 07/12] Remove set_magic_quotes_runtime And the alias magic_quotes_runtime --- .gitattributes | 1 - ext/standard/basic_functions.c | 23 ---------- ext/standard/basic_functions.h | 1 - .../set_magic_quotes_runtime_basic.phpt | 46 ------------------- .../set_magic_quotes_runtime_error.phpt | 37 --------------- run-tests.php | 2 - server-tests.php | 1 - 7 files changed, 111 deletions(-) delete mode 100644 ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt delete mode 100644 ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt diff --git a/.gitattributes b/.gitattributes index 091043a35b4ca..a237ec7f843bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -49,7 +49,6 @@ UPGRADING.INTERNALS merge=NEWS /ext/spl/tests/SplArray_fromArray.phpt -crlf /ext/standard/tests/dir/scandir_variation3.phpt -crlf /ext/standard/tests/general_functions/escapeshellcmd-win32.phpt -crlf -/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt -crlf /ext/standard/tests/strings/bug26817.phpt -crlf /ext/standard/tests/strings/bug26973.phpt -crlf /ext/standard/tests/strings/bug27457.phpt -crlf diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index b45db8a9b492e..18647bbfc7918 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -610,10 +610,6 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_runtime, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_set_magic_quotes_runtime, 0, 0, 1) - ZEND_ARG_INFO(0, new_setting) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO(arginfo_constant, 0) ZEND_ARG_INFO(0, const_name) ZEND_END_ARG_INFO() @@ -2940,8 +2936,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(header_register_callback, arginfo_header_register_callback) PHP_FE(get_cfg_var, arginfo_get_cfg_var) - PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) - PHP_DEP_FE(set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) PHP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc) PHP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime) @@ -4569,23 +4563,6 @@ PHP_FUNCTION(get_cfg_var) } /* }}} */ -/* {{{ proto bool set_magic_quotes_runtime(int new_setting) - magic_quotes_runtime is not supported anymore */ -PHP_FUNCTION(set_magic_quotes_runtime) -{ - zend_bool new_setting; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &new_setting) == FAILURE) { - return; - } - - if (new_setting) { - php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "magic_quotes_runtime is not supported anymore"); - } - RETURN_FALSE; -} -/* }}} */ - /* {{{ proto int get_magic_quotes_runtime(void) Get the current active configuration setting of magic_quotes_runtime */ PHP_FUNCTION(get_magic_quotes_runtime) diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 64a6c5363c569..3818d043d92da 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -72,7 +72,6 @@ PHP_FUNCTION(set_time_limit); PHP_FUNCTION(header_register_callback); PHP_FUNCTION(get_cfg_var); -PHP_FUNCTION(set_magic_quotes_runtime); PHP_FUNCTION(get_magic_quotes_runtime); PHP_FUNCTION(get_magic_quotes_gpc); diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt deleted file mode 100644 index ad786fb5258be..0000000000000 --- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt +++ /dev/null @@ -1,46 +0,0 @@ ---TEST-- -Test set_magic_quotes_runtime() function - basic test ---INI-- -magic_quotes_runtime = 0 ---FILE-- - -===DONE=== ---EXPECTF-- -Simple testcase for set_magic_quotes_runtime() function - basic test - --- magic quotes runtime set in INI file: -- - --- Set magic quotes runtime to 0: -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(false) - --- magic quotes runtime after set: -- - --- Set magic quotes runtime to 1: -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Fatal error: set_magic_quotes_runtime(): magic_quotes_runtime is not supported anymore in Unknown on line 0 - - diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt deleted file mode 100644 index c54846cb24b4e..0000000000000 --- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test set_magic_quotes_runtime() function - error conditions - pass function incorrect arguments ---FILE-- - -===DONE=== ---EXPECTF-- -Simple testcase for set_magic_quotes_runtime() - error test - --- Testing set_magic_quotes_runtime() function with less than expected no. of arguments -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Warning: set_magic_quotes_runtime() expects exactly 1 parameter, 0 given in %s on line %d -NULL - --- Testing set_magic_quotes_runtime() function with more than expected no. of arguments -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Warning: set_magic_quotes_runtime() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== diff --git a/run-tests.php b/run-tests.php index 1b5bcec253218..2fbe073fa9d02 100755 --- a/run-tests.php +++ b/run-tests.php @@ -114,7 +114,6 @@ error_reporting(E_ALL); if (PHP_MAJOR_VERSION < 6) { - ini_set('magic_quotes_runtime',0); // this would break tests by modifying EXPECT sections if (ini_get('safe_mode')) { echo <<< SAFE_MODE_WARNING @@ -236,7 +235,6 @@ function verify_config() 'error_append_string=', 'auto_prepend_file=', 'auto_append_file=', - 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', 'precision=14', 'memory_limit=128M', diff --git a/server-tests.php b/server-tests.php index 688fee485a00d..13f35ceb92602 100755 --- a/server-tests.php +++ b/server-tests.php @@ -472,7 +472,6 @@ class testHarness { 'error_append_string'=>'', 'auto_prepend_file'=>'', 'auto_append_file'=>'', - 'magic_quotes_runtime'=>'0', ); public $env = array(); public $info_params = array(); From 04da7169071b356f030c0dbcee552bb5048fe6e6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 17:31:37 +0200 Subject: [PATCH 08/12] Remove set_socket_blocking --- ext/standard/basic_functions.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 18647bbfc7918..fe58604e680a0 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3103,7 +3103,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FALIAS(set_file_buffer, stream_set_write_buffer, arginfo_stream_set_write_buffer) PHP_FE(stream_set_chunk_size, arginfo_stream_set_chunk_size) - PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking, arginfo_stream_set_blocking) PHP_FE(stream_set_blocking, arginfo_stream_set_blocking) PHP_FALIAS(socket_set_blocking, stream_set_blocking, arginfo_stream_set_blocking) From 9b250ab7f2d65c7146028c30cedbf8f671e5ae31 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 17:46:54 +0200 Subject: [PATCH 09/12] Remove string category support in setlocale() --- ext/standard/string.c | 45 ++----------------- .../tests/strings/setlocale_error.phpt | 14 +----- 2 files changed, 5 insertions(+), 54 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 0c41249473e51..e80f4d405f0d5 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4181,54 +4181,17 @@ PHP_FUNCTION(strip_tags) PHP_FUNCTION(setlocale) { zval *args = NULL; - zval *pcategory, *plocale; - int num_args, cat, i = 0; + zval *plocale; + zend_long cat; + int num_args, i = 0; char *loc, *retval; HashPosition pos; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z+", &pcategory, &args, &num_args) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l+", &cat, &args, &num_args) == FAILURE) { return; } #ifdef HAVE_SETLOCALE - if (Z_TYPE_P(pcategory) == IS_LONG) { - cat = Z_LVAL_P(pcategory); - } else { - /* FIXME: The following behaviour should be removed. */ - char *category; - zval tmp; - - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Passing locale category name as string is deprecated. Use the LC_* -constants instead"); - - ZVAL_DUP(&tmp, pcategory); - convert_to_string_ex(&tmp); - category = Z_STRVAL(tmp); - - if (!strcasecmp("LC_ALL", category)) { - cat = LC_ALL; - } else if (!strcasecmp("LC_COLLATE", category)) { - cat = LC_COLLATE; - } else if (!strcasecmp("LC_CTYPE", category)) { - cat = LC_CTYPE; -#ifdef LC_MESSAGES - } else if (!strcasecmp("LC_MESSAGES", category)) { - cat = LC_MESSAGES; -#endif - } else if (!strcasecmp("LC_MONETARY", category)) { - cat = LC_MONETARY; - } else if (!strcasecmp("LC_NUMERIC", category)) { - cat = LC_NUMERIC; - } else if (!strcasecmp("LC_TIME", category)) { - cat = LC_TIME; - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME", category); - - zval_dtor(&tmp); - RETURN_FALSE; - } - zval_dtor(&tmp); - } - if (Z_TYPE(args[0]) == IS_ARRAY) { zend_hash_internal_pointer_reset_ex(Z_ARRVAL(args[0]), &pos); } diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index 361d00c5843aa..ca46764ed1a75 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -1,7 +1,7 @@ --TEST-- Test setlocale() function : error condition --INI-- -error_reporting=14335 +error_reporting=E_ALL --SKIPIF-- --EXPECTF-- @@ -59,11 +54,4 @@ bool(false) -- Testing setlocale() function with invalid multiple locales, 'category' = LC_ALL -- bool(false) --- Testing setlocale() function with invalid category -- - -Deprecated: setlocale(): Passing locale category name as string is deprecated. Use the LC_* -constants instead in %s on line %d - -Warning: setlocale(): Invalid locale category name TEST, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME in %s on line %d -bool(false) - Done From 0e04e04ca6943278c87a3d6d69a2205e648ee75c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 18:06:21 +0200 Subject: [PATCH 10/12] Remove xsl.security_prefs ini option --- ext/xsl/php_xsl.c | 11 ------ ext/xsl/tests/bug54446_with_ini.phpt | 50 +++------------------------- ext/xsl/xsltprocessor.c | 17 ---------- 3 files changed, 5 insertions(+), 73 deletions(-) diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index bda02498edcd1..e4ffefd7c9b8d 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -129,13 +129,6 @@ zend_object *xsl_objects_new(zend_class_entry *class_type TSRMLS_DC) } /* }}} */ -PHP_INI_BEGIN() -/* Default is not allowing any write operations. - XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE == 44 -*/ -PHP_INI_ENTRY("xsl.security_prefs", "44", PHP_INI_ALL, NULL) -PHP_INI_END() - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(xsl) @@ -181,8 +174,6 @@ PHP_MINIT_FUNCTION(xsl) REGISTER_STRING_CONSTANT("LIBEXSLT_DOTTED_VERSION", LIBEXSLT_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); #endif - REGISTER_INI_ENTRIES(); - return SUCCESS; } /* }}} */ @@ -260,8 +251,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl) xsltSetGenericErrorFunc(NULL, NULL); xsltCleanupGlobals(); - UNREGISTER_INI_ENTRIES(); - return SUCCESS; } /* }}} */ diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt index fbe03659d325c..9edc8b38f39a9 100644 --- a/ext/xsl/tests/bug54446_with_ini.phpt +++ b/ext/xsl/tests/bug54446_with_ini.phpt @@ -44,9 +44,9 @@ if (file_exists($outputfile)) { } #SET NO SECURITY PREFS -ini_set("xsl.security_prefs", XSL_SECPREF_NONE); +$proc->setSecurityPrefs(XSL_SECPREF_NONE); -# TRASNFORM & PRINT +# TRANSFORM & PRINT print $proc->transformToXML( $dom ); @@ -59,9 +59,9 @@ if (file_exists($outputfile)) { unlink($outputfile); #SET SECURITY PREFS AGAIN -ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); +$proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); -# TRASNFORM & PRINT +# TRANSFORM & PRINT print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { @@ -70,31 +70,7 @@ if (file_exists($outputfile)) { print "OK, no file created\n"; } -#SET NO SECURITY PREFS with ini, but set them with ->setSecurityPrefs -ini_set("xsl.security_prefs", XSL_SECPREF_NONE); -$proc->setSecurityPrefs( XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); - -print $proc->transformToXML( $dom ); -if (file_exists($outputfile)) { - print "$outputfile exists, but shouldn't!\n"; -} else { - print "OK, no file created\n"; -} - -#don't throw a warning if both ini and through-the-method have the same value -$proc->setSecurityPrefs(XSL_SECPREF_NONE); - -print $proc->transformToXML( $dom ); - -if (file_exists($outputfile)) { - print "OK, file exists\n"; -} else { - print "$outputfile doesn't exist, but should!\n"; -} -unlink($outputfile); - - - +?> --EXPECTF-- Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d @@ -104,8 +80,6 @@ Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d OK, no file created - -Deprecated: XSLTProcessor::transformToXml(): The xsl.security_prefs php.ini option is deprecated; use XsltProcessor->setSecurityPrefs() instead in %s on line %d OK, file exists Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d @@ -116,20 +90,6 @@ Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d OK, no file created - -Deprecated: XSLTProcessor::transformToXml(): The xsl.security_prefs php.ini option is deprecated; use XsltProcessor->setSecurityPrefs() instead in %s on line %d - -Notice: XSLTProcessor::transformToXml(): The xsl.security_prefs php.ini was not used, since the XsltProcessor->setSecurityPrefs() method was used in %s on line %d - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d - -Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test.txt refused in %s on line %s - -Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element output in %s on line %d - -Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d -OK, no file created -OK, file exists --CREDITS-- Christian Stocker, chregu@php.net diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index cd828c75a0d02..8076ab0f42cd9 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -543,23 +543,6 @@ static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, xsltStyl secPrefsValue = intern->securityPrefs; - /* This whole if block can be removed, when we remove the xsl.security_prefs php.ini option in PHP 6+ */ - secPrefsIni= INI_INT("xsl.security_prefs"); - /* if secPrefsIni has the same value as secPrefsValue, all is fine */ - if (secPrefsIni != secPrefsValue) { - if (secPrefsIni != XSL_SECPREF_DEFAULT) { - /* if the ini value is not set to the default, throw an E_DEPRECATED warning */ - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The xsl.security_prefs php.ini option is deprecated; use XsltProcessor->setSecurityPrefs() instead"); - if (intern->securityPrefsSet == 0) { - /* if securityPrefs were not set through the setSecurityPrefs method, take the ini setting */ - secPrefsValue = secPrefsIni; - } else { - /* else throw a notice, that the ini setting was not used */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The xsl.security_prefs php.ini was not used, since the XsltProcessor->setSecurityPrefs() method was used"); - } - } - } - /* if securityPrefs is set to NONE, we don't have to do any checks, but otherwise... */ if (secPrefsValue != XSL_SECPREF_NONE) { secPrefs = xsltNewSecurityPrefs(); From a1acbb8e19e879b6a73c0024455f40248bb10601 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 10 Sep 2014 18:18:02 +0200 Subject: [PATCH 11/12] Remove mktime() and gmmktime() $is_dst parameter --- ext/date/php_date.c | 25 +-- ext/date/tests/bug27719.phpt | 67 ------- ext/date/tests/gmmktime_error.phpt | 12 +- ext/date/tests/mktime-1.phpt | 42 ++--- ext/date/tests/mktime-2.phpt | 51 ------ ext/date/tests/mktime_basic1.phpt | 5 - ext/date/tests/mktime_error.phpt | 5 +- ext/date/tests/mktime_variation7.phpt | 251 -------------------------- 8 files changed, 19 insertions(+), 439 deletions(-) delete mode 100644 ext/date/tests/bug27719.phpt delete mode 100644 ext/date/tests/mktime-2.phpt delete mode 100644 ext/date/tests/mktime_variation7.phpt diff --git a/ext/date/php_date.c b/ext/date/php_date.c index cf3f6214a59f6..d51b11344af63 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1499,13 +1499,13 @@ PHP_FUNCTION(strtotime) /* {{{ php_mktime - (gm)mktime helper */ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) { - zend_long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0, dst = -1; + zend_long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0; timelib_time *now; timelib_tzinfo *tzi = NULL; zend_long ts, adjust_seconds = 0; int error; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lllllll", &hou, &min, &sec, &mon, &day, &yea, &dst) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|llllll", &hou, &min, &sec, &mon, &day, &yea) == FAILURE) { RETURN_FALSE; } /* Initialize structure with current time */ @@ -1554,27 +1554,6 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } else { timelib_update_ts(now, tzi); } - /* Support for the deprecated is_dst parameter */ - if (dst != -1) { - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The is_dst parameter is deprecated"); - if (gmt) { - /* GMT never uses DST */ - if (dst == 1) { - adjust_seconds = -3600; - } - } else { - /* Figure out is_dst for current TS */ - timelib_time_offset *tmp_offset; - tmp_offset = timelib_get_time_zone_info(now->sse, tzi); - if (dst == 1 && tmp_offset->is_dst == 0) { - adjust_seconds = -3600; - } - if (dst == 0 && tmp_offset->is_dst == 1) { - adjust_seconds = +3600; - } - timelib_time_offset_dtor(tmp_offset); - } - } /* Clean up and return */ ts = timelib_date_to_int(now, &error); ts += adjust_seconds; diff --git a/ext/date/tests/bug27719.phpt b/ext/date/tests/bug27719.phpt deleted file mode 100644 index 88c17704e5050..0000000000000 --- a/ext/date/tests/bug27719.phpt +++ /dev/null @@ -1,67 +0,0 @@ ---TEST-- -Bug #27719 (mktime returns incorrect timestamp for dst days) ---INI-- -date.timezone=EST -error_reporting=2047 ---FILE-- - ---EXPECTF-- -1081054800 04/04/04 12:00:00 -%s -1081054800 04/04/04 12:00:00 - -1075870800 02/04/04 12:00:00 -1075867200 02/03/04 11:00:00 -1075870800 02/04/04 12:00:00 - -1081054800 04/04/04 12:00:00 -1081051200 04/03/04 11:00:00 -1081054800 04/04/04 12:00:00 - -1081065600 04/04/04 04:00:00 -1081062000 04/04/04 03:00:00 -1081062000 04/04/04 03:00:00 - -1086325200 06/04/04 01:00:00 -1086321600 06/04/04 12:00:00 -1086321600 06/04/04 12:00:00 diff --git a/ext/date/tests/gmmktime_error.phpt b/ext/date/tests/gmmktime_error.phpt index 9f5882da94b7c..62e62057ea7fd 100644 --- a/ext/date/tests/gmmktime_error.phpt +++ b/ext/date/tests/gmmktime_error.phpt @@ -18,12 +18,9 @@ $sec = 8; $mon = 8; $day = 8; $year = 2008; -$extra_arg1 = 10; -$extra_arg2 = 10; +$extra_arg = 10; -var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1) ); - -var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1, $extra_arg2) ); +var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg) ); ?> ===DONE=== --EXPECTF-- @@ -31,9 +28,6 @@ var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1, $extra_arg -- Testing gmmktime() function with more than expected no. of arguments -- -Deprecated: gmmktime(): The is_dst parameter is deprecated in %s on line %d -int(1218182888) - -Warning: gmmktime() expects at most 7 parameters, 8 given in %s on line %d +Warning: gmmktime() expects at most 6 parameters, 7 given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime-1.phpt b/ext/date/tests/mktime-1.phpt index 87fc0df68573d..86723e01acaff 100644 --- a/ext/date/tests/mktime-1.phpt +++ b/ext/date/tests/mktime-1.phpt @@ -1,30 +1,21 @@ --TEST-- Check for mktime with out-of-range parameters --INI-- -error_reporting=2047 +error_reporting=E_ALL --FILE-- --EXPECT-- 2000-02-29 @@ -33,12 +24,3 @@ error_reporting=2047 2001-02-28 2001-03-01 1999-11-30 -2000-05-29 12:00:00 -2000-05-29 13:00:00 -2000-05-29 12:00:00 -2000-01-31 12:00:00 -2000-01-31 12:00:00 -2000-01-31 11:00:00 -2000-04-29 12:00:00 -2000-04-29 13:00:00 -2000-04-29 12:00:00 diff --git a/ext/date/tests/mktime-2.phpt b/ext/date/tests/mktime-2.phpt deleted file mode 100644 index 931f6375594d6..0000000000000 --- a/ext/date/tests/mktime-2.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -mktime() [2] ---INI-- -error_reporting=2047 ---FILE-- - ---EXPECTF-- -int(1009843200) -int(1009843200) -int(1009843200) -int(%s) -int(1025481600) -int(1025481600) -int(1025481600) -int(%s) -int(1009843200) -int(1009843200) -int(1009843200) -int(1009839600) -int(1025478000) -int(1025478000) -int(1025481600) -int(1025478000) diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index dc17c29b786f4..da1f3d63bfeb0 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -20,7 +20,6 @@ $sec = 45; $month = 7; $day = 2; $year = 1963; -$is_dst = 0; var_dump( mktime($hour) ); var_dump( mktime($hour, $minute) ); @@ -28,7 +27,6 @@ var_dump( mktime($hour, $minute, $sec) ); var_dump( mktime($hour, $minute, $sec, $month) ); var_dump( mktime($hour, $minute, $sec, $month, $day) ); var_dump( mktime($hour, $minute, $sec, $month, $day, $year) ); -var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst) ); ?> ===DONE=== @@ -40,8 +38,5 @@ int(%i) int(%i) int(%i) int(%i) - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) ===DONE=== diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index f517dc8aa321e..eb1cc6e19a194 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -24,9 +24,8 @@ $sec = 45; $month = 7; $day = 2; $year = 1963; -$is_dst = 0; $extra_arg = 10; -var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst, $extra_arg) ); +var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) ); ?> ===DONE=== @@ -40,6 +39,6 @@ int(%d) -- Testing mktime() function with more than expected no. of arguments -- -Warning: mktime() expects at most 7 parameters, 8 given in %s on line %d +Warning: mktime() expects at most 6 parameters, 7 given in %s on line %d bool(false) ===DONE=== diff --git a/ext/date/tests/mktime_variation7.phpt b/ext/date/tests/mktime_variation7.phpt deleted file mode 100644 index 33c36d54f97e5..0000000000000 --- a/ext/date/tests/mktime_variation7.phpt +++ /dev/null @@ -1,251 +0,0 @@ ---TEST-- -Test mktime() function : usage variation - Passing unexpected values to seventh argument $is_dst. ---FILE-- - 1, 'two' => 2); - -// resource -$file_handle = fopen(__FILE__, 'r'); - -//array of values to iterate over -$inputs = array( - - // int data - 'int 0' => 0, - 'int 0' => 1, - 'int 0' => -1, - 'int 12345' => 12345, - 'int -12345' => -12345, - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, - - // resource - 'resource' => $file_handle -); - -$hour = 10; -$minute = 30; -$second = 45; -$month = 7; -$day = 2; -$year = 1963; - -foreach($inputs as $variation =>$is_dst) { - echo "\n-- $variation --\n"; - var_dump( mktime($hour, $minute, $second, $month, $day, $year, $is_dst) ); -}; - -// closing the resource -fclose( $file_handle ); - -?> -===DONE=== ---EXPECTF-- -*** Testing mktime() : usage variation - unexpected values to seventh argument $is_dst*** - --- int 0 -- -int(%i) - --- int 12345 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- int -12345 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- float 10.5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(-205165755) - --- float -10.5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- float .5 -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(-205162155) - --- empty array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- int indexed array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- associative array -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- nested arrays -- - -Warning: mktime() expects parameter 7 to be long, array given in %s on line %d -bool(false) - --- uppercase NULL -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase null -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase true -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- lowercase false -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- uppercase TRUE -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- uppercase FALSE -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- empty string DQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- empty string SQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- string DQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- string SQ -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- mixed case string -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- heredoc -- - -Warning: mktime() expects parameter 7 to be long, string given in %s on line %d -bool(false) - --- instance of classWithToString -- - -Warning: mktime() expects parameter 7 to be long, object given in %s on line %d -bool(false) - --- instance of classWithoutToString -- - -Warning: mktime() expects parameter 7 to be long, object given in %s on line %d -bool(false) - --- undefined var -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- unset var -- - -Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d -int(%i) - --- resource -- - -Warning: mktime() expects parameter 7 to be long, resource given in %s on line %d -bool(false) -===DONE=== From 21c5af78cd7f7a3bd493a683e31ca0536e6fca90 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 11 Sep 2014 13:03:58 +0200 Subject: [PATCH 12/12] Remove dl() on fpm-fcgi --- ext/standard/dl.c | 12 ------------ sapi/fpm/fpm/fpm_main.c | 13 +------------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 7a2a1648d4d63..dafa8b2d14eaf 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -70,18 +70,6 @@ PHPAPI PHP_FUNCTION(dl) RETURN_FALSE; } - if ((strncmp(sapi_module.name, "cgi", 3) != 0) && - (strcmp(sapi_module.name, "cli") != 0) && - (strncmp(sapi_module.name, "embed", 5) != 0) - ) { -#ifdef ZTS - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in multithreaded Web servers - use extension=%s in your php.ini", filename); - RETURN_FALSE; -#else - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "dl() is deprecated - use extension=%s in your php.ini", filename); -#endif - } - php_dl(filename, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC); if (Z_LVAL_P(return_value) == 1) { EG(full_tables_cleanup) = 1; diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index ff303696975b6..e9547e2ca709c 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -887,17 +887,6 @@ static sapi_module_struct cgi_sapi_module = { }; /* }}} */ -/* {{{ arginfo ext/standard/dl.c */ -ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) - ZEND_ARG_INFO(0, extension_filename) -ZEND_END_ARG_INFO() -/* }}} */ - -static const zend_function_entry additional_functions[] = { - ZEND_FE(dl, arginfo_dl) - {NULL, NULL, NULL} -}; - /* {{{ php_cgi_usage */ static void php_cgi_usage(char *argv0) @@ -1774,7 +1763,7 @@ int main(int argc, char *argv[]) SG(request_info).path_translated = NULL; #endif - cgi_sapi_module.additional_functions = additional_functions; + cgi_sapi_module.additional_functions = NULL; cgi_sapi_module.executable_location = argv[0]; /* startup after we get the above ini override se we get things right */