From 3b4e64b35d70158085c4cc68b4d4c6a946b4baf1 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 21 Mar 2019 01:00:02 +0100 Subject: [PATCH 01/11] Deprecate Short tags --- main/main.c | 1 + php.ini-development | 3 ++- php.ini-production | 3 ++- tests/lang/short_tags.001.phpt | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/main/main.c b/main/main.c index 54afd23789d39..905700aecff7a 100644 --- a/main/main.c +++ b/main/main.c @@ -2413,6 +2413,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod "Directive '%s' is deprecated", { "track_errors", + "short_open_tag", NULL } }, diff --git a/php.ini-development b/php.ini-development index dd015e489403c..4efc3239b8049 100644 --- a/php.ini-development +++ b/php.ini-development @@ -143,8 +143,9 @@ ; Development Value: 5 ; Production Value: 5 +; This directive is DEPRECATED. ; short_open_tag -; Default Value: On +; Default Value: Off ; Development Value: Off ; Production Value: Off diff --git a/php.ini-production b/php.ini-production index 34d428fe18592..ff6673232d005 100644 --- a/php.ini-production +++ b/php.ini-production @@ -143,8 +143,9 @@ ; Development Value: 5 ; Production Value: 5 +; This directive is DEPRECATED. ; short_open_tag -; Default Value: On +; Default Value: Off ; Development Value: Off ; Production Value: Off diff --git a/tests/lang/short_tags.001.phpt b/tests/lang/short_tags.001.phpt index 522018e3068fa..a9145a1150643 100644 --- a/tests/lang/short_tags.001.phpt +++ b/tests/lang/short_tags.001.phpt @@ -8,5 +8,6 @@ echo "Used a short tag\n"; ?> Finished --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 Used a short tag Finished From b4dbf87f0ab9e449fe4bc186b2321e268fdec643 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 21 Mar 2019 22:19:14 +0100 Subject: [PATCH 02/11] Add depracation notice in strip_tags tests which use short_tags ini setting. --- ext/standard/tests/strings/strip_tags_basic1.phpt | 1 + ext/standard/tests/strings/strip_tags_basic2.phpt | 1 + ext/standard/tests/strings/strip_tags_variation10.phpt | 1 + ext/standard/tests/strings/strip_tags_variation11.phpt | 1 + ext/standard/tests/strings/strip_tags_variation2.phpt | 1 + ext/standard/tests/strings/strip_tags_variation4.phpt | 1 + ext/standard/tests/strings/strip_tags_variation5.phpt | 4 +++- ext/standard/tests/strings/strip_tags_variation6.phpt | 1 + ext/standard/tests/strings/strip_tags_variation7.phpt | 1 + ext/standard/tests/strings/strip_tags_variation8.phpt | 1 + ext/standard/tests/strings/strip_tags_variation9.phpt | 7 +++++-- 11 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 164cf504522a9..865ae3823ce3d 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -43,6 +43,7 @@ foreach($string_array as $string) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(5) "hello" diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt index e9a48af79d5d3..17b5f9cd6465e 100644 --- a/ext/standard/tests/strings/strip_tags_basic2.phpt +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt @@ -39,6 +39,7 @@ foreach($allowed_tags_array as $tags) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(33) "helloworldOther text" diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt index eef338fa9ca04..c03ceac632650 100644 --- a/ext/standard/tests/strings/strip_tags_variation10.phpt +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt @@ -39,6 +39,7 @@ foreach($single_quote_string as $string_value) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(51) " \$ -> This represents the dollar sign" diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 63d579f4adaba..6b83f7ce19f61 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -29,6 +29,7 @@ foreach($string_array as $string) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : obscure functionality *** -- Iteration 1 -- string(12) "hello world" diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt index ee7d5c6cbc5c4..af1bb101c5966 100644 --- a/ext/standard/tests/strings/strip_tags_variation2.phpt +++ b/ext/standard/tests/strings/strip_tags_variation2.phpt @@ -86,6 +86,7 @@ foreach($values as $value) { echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(10) "helloworld" diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt index 2118d58959fe9..3c5f0392ad1d2 100644 --- a/ext/standard/tests/strings/strip_tags_variation4.phpt +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt @@ -46,6 +46,7 @@ foreach($strings as $string_value) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(32) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index e6b19540e3949..1edbeedd2fda9 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -78,6 +78,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(0) "" @@ -89,7 +90,8 @@ string(67) "hello world This is a double quoted string" -- Iteration 4 -- -string(44) "hello world +string(44) "hello + world 1111 != 2222 " -- Iteration 5 -- diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index b066e718b39b2..dfe86302544f1 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -35,6 +35,7 @@ foreach($strings as $value) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(18) " I am html string " diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt index 5ff9177b18463..43bd5d8e60d27 100644 --- a/ext/standard/tests/strings/strip_tags_variation7.phpt +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt @@ -44,6 +44,7 @@ foreach($strings as $string_value) echo "Done"; ?> --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(43) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation8.phpt b/ext/standard/tests/strings/strip_tags_variation8.phpt index f3c5a17136ad2..0b2bf124fd375 100644 --- a/ext/standard/tests/strings/strip_tags_variation8.phpt +++ b/ext/standard/tests/strings/strip_tags_variation8.phpt @@ -39,6 +39,7 @@ foreach($quotes as $string_value) echo "Done"; --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(33) "hello world... strip_tags_test " diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index 843653c208df5..83a9932491bf8 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -37,11 +37,13 @@ foreach($double_quote_string as $string_value) echo "Done"; --EXPECT-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(50) " $ -> This represents the dollar sign" -- Iteration 2 -- -string(59) " The quick brown fo x jumped over the lazy dog

" +string(59) " + The quick brown fo x jumped over the lazy dog

" -- Iteration 3 -- string(31) "This is a hyper text tag" -- Iteration 4 -- @@ -49,6 +51,7 @@ string(0) "" -- Iteration 5 -- string(26) "

This is a paragraph

" -- Iteration 6 -- -string(62) "This is a text in bold letters \s\malong with slashes +string(62) "This is a text in bold letters +\s\malong with slashes " Done From b542aa35c079e34fae259c94ea1c3cb6ebb90338 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Fri, 22 Mar 2019 01:58:01 +0100 Subject: [PATCH 03/11] Changed default value of PHP short tags in Zend engine and Windows headers. --- Zend/zend.c | 4 ++-- win32/build/config.w32.h.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 5670dae703ba9..b81474a62c7da 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -511,10 +511,10 @@ static FILE *zend_fopen_wrapper(const char *filename, zend_string **opened_path) /* }}} */ #ifdef ZTS -static zend_bool short_tags_default = 1; +static zend_bool short_tags_default = 0; static uint32_t compiler_options_default = ZEND_COMPILE_DEFAULT; #else -# define short_tags_default 1 +# define short_tags_default 0 # define compiler_options_default ZEND_COMPILE_DEFAULT #endif diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 0403f6c5428bb..c6d9ce2f9868b 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -24,7 +24,7 @@ /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 #define USE_CONFIG_FILE 1 -#define DEFAULT_SHORT_OPEN_TAG "1" +#define DEFAULT_SHORT_OPEN_TAG "0" /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 From 4335db908c00dc562e1ba0aaeb3bd2a790744cca Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Fri, 22 Mar 2019 02:09:43 +0100 Subject: [PATCH 04/11] Add Depreciation notice to tokeniser tests which use short tag INI. --- ext/tokenizer/tests/002.phpt | 3 ++- ext/tokenizer/tests/token_get_all_variation15.phpt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/tokenizer/tests/002.phpt b/ext/tokenizer/tests/002.phpt index 2a40ffe292fd5..68e13b365a4d9 100644 --- a/ext/tokenizer/tests/002.phpt +++ b/ext/tokenizer/tests/002.phpt @@ -3,7 +3,7 @@ token_get_all() --SKIPIF-- --INI-- -short_open_tag=1 +short_open_tag=On --FILE-- --EXPECTF-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 array(49) { [0]=> array(3) { diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt index 56269f5d01463..88d112c8518b6 100644 --- a/ext/tokenizer/tests/token_get_all_variation15.phpt +++ b/ext/tokenizer/tests/token_get_all_variation15.phpt @@ -49,6 +49,7 @@ var_dump( token_get_all($source)); echo "Done" ?> --EXPECTF-- +Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing token_get_all() : with heredoc source string *** array(103) { [0]=> From e48bffcc4d4c011329041affd55c94b74ff8ff44 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Fri, 22 Mar 2019 03:15:51 +0100 Subject: [PATCH 05/11] Fix strip_tags tests. --- ext/standard/tests/strings/strip_tags_variation5.phpt | 3 +-- ext/standard/tests/strings/strip_tags_variation9.phpt | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 1edbeedd2fda9..4c7944ba1b308 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -90,8 +90,7 @@ string(67) "hello world This is a double quoted string" -- Iteration 4 -- -string(44) "hello - world +string(44) "hello world 1111 != 2222 " -- Iteration 5 -- diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index 83a9932491bf8..78a34dcf6f572 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -42,8 +42,7 @@ Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 -- Iteration 1 -- string(50) " $ -> This represents the dollar sign" -- Iteration 2 -- -string(59) " - The quick brown fo x jumped over the lazy dog

" +string(59) " The quick brown fo x jumped over the lazy dog

" -- Iteration 3 -- string(31) "This is a hyper text tag" -- Iteration 4 -- @@ -51,7 +50,6 @@ string(0) "" -- Iteration 5 -- string(26) "

This is a paragraph

" -- Iteration 6 -- -string(62) "This is a text in bold letters -\s\malong with slashes +string(62) "This is a text in bold letters \s\malong with slashes " Done From e1e9e78b7b37c2eed8922a56358342afd376af17 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Fri, 22 Mar 2019 18:03:41 +0100 Subject: [PATCH 06/11] Changed default value for short_tags in the About section of PHP INI files --- php.ini-development | 3 ++- php.ini-production | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/php.ini-development b/php.ini-development index 4efc3239b8049..43101fc376926 100644 --- a/php.ini-development +++ b/php.ini-development @@ -174,6 +174,7 @@ ; http://php.net/engine engine = On +; This directive is DEPRECATED. ; This directive determines whether or not PHP will recognize code between ; tags as PHP source which should be processed as such. It is ; generally recommended that should be used and that this feature @@ -181,7 +182,7 @@ engine = On ; documents, however this remains supported for backward compatibility reasons. ; Note that this directive does not control the tags as PHP source which should be processed as such. It is ; generally recommended that should be used and that this feature @@ -186,7 +187,7 @@ engine = On ; documents, however this remains supported for backward compatibility reasons. ; Note that this directive does not control the Date: Wed, 24 Apr 2019 15:17:47 +0200 Subject: [PATCH 07/11] Removed short_open_tag from section detailling different configurated INI setting from the engine default. Commented out short_open_tag INI setting. --- php.ini-development | 8 +------- php.ini-production | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/php.ini-development b/php.ini-development index 43101fc376926..41db2dd286d49 100644 --- a/php.ini-development +++ b/php.ini-development @@ -143,12 +143,6 @@ ; Development Value: 5 ; Production Value: 5 -; This directive is DEPRECATED. -; short_open_tag -; Default Value: Off -; Development Value: Off -; Production Value: Off - ; variables_order ; Default Value: "EGPCS" ; Development Value: "GPCS" @@ -186,7 +180,7 @@ engine = On ; Development Value: Off ; Production Value: Off ; http://php.net/short-open-tag -short_open_tag = Off +;short_open_tag = ; The number of significant digits displayed in floating point numbers. ; http://php.net/precision diff --git a/php.ini-production b/php.ini-production index 89f6ef3d1b88d..8f20f0c958dff 100644 --- a/php.ini-production +++ b/php.ini-production @@ -143,12 +143,6 @@ ; Development Value: 5 ; Production Value: 5 -; This directive is DEPRECATED. -; short_open_tag -; Default Value: Off -; Development Value: Off -; Production Value: Off - ; track_errors ; Default Value: Off ; Development Value: On @@ -191,7 +185,7 @@ engine = On ; Development Value: Off ; Production Value: Off ; http://php.net/short-open-tag -short_open_tag = Off +;short_open_tag = ; The number of significant digits displayed in floating point numbers. ; http://php.net/precision From b0cd3a93a06e05b810e74e33f90c5e0dcea56985 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 24 Apr 2019 15:39:47 +0200 Subject: [PATCH 08/11] Remove short_open_tag INI setting definition in strip_tags tests. --- ext/standard/tests/strings/strip_tags_basic1.phpt | 3 --- ext/standard/tests/strings/strip_tags_basic2.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation10.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation11.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation2.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation4.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation5.phpt | 6 ++---- ext/standard/tests/strings/strip_tags_variation6.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation7.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation8.phpt | 3 --- ext/standard/tests/strings/strip_tags_variation9.phpt | 9 ++++----- 11 files changed, 6 insertions(+), 36 deletions(-) diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 865ae3823ce3d..77cab238769fc 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : basic functionality - with default arguments ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(5) "hello" diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt index 17b5f9cd6465e..854c267b2266f 100644 --- a/ext/standard/tests/strings/strip_tags_basic2.phpt +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : basic functionality - with all arguments ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(33) "helloworldOther text" diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt index c03ceac632650..f04f06a527a3b 100644 --- a/ext/standard/tests/strings/strip_tags_variation10.phpt +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - single quoted strings ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(51) " \$ -> This represents the dollar sign" diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 6b83f7ce19f61..eb8193833c926 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : obscure values within attributes ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : obscure functionality *** -- Iteration 1 -- string(12) "hello world" diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt index af1bb101c5966..1a504530d29f3 100644 --- a/ext/standard/tests/strings/strip_tags_variation2.phpt +++ b/ext/standard/tests/strings/strip_tags_variation2.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - unexpected values for 'allowable_tags' ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(10) "helloworld" diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt index 3c5f0392ad1d2..484438ef6e5c2 100644 --- a/ext/standard/tests/strings/strip_tags_variation4.phpt +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - invalid values for 'str' and valid 'allowable_tags' ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(32) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 4c7944ba1b308..bf584a33cd009 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - heredoc strings ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(0) "" @@ -90,7 +87,8 @@ string(67) "hello world This is a double quoted string" -- Iteration 4 -- -string(44) "hello world +string(44) "hello + world 1111 != 2222 " -- Iteration 5 -- diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index dfe86302544f1..3fbda44023ff1 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - binary safe checking ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(18) " I am html string " diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt index 43bd5d8e60d27..7c2d9255d6f51 100644 --- a/ext/standard/tests/strings/strip_tags_variation7.phpt +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - invalid values for 'str' and 'allowable_tags' ---INI-- -short_open_tag = on --FILE-- --EXPECT-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(43) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation8.phpt b/ext/standard/tests/strings/strip_tags_variation8.phpt index 0b2bf124fd375..e44e296c5ddd2 100644 --- a/ext/standard/tests/strings/strip_tags_variation8.phpt +++ b/ext/standard/tests/strings/strip_tags_variation8.phpt @@ -1,7 +1,5 @@ --TEST-- Test strip_tags() function : usage variations - valid value for 'str' and invalid values for 'allowable_tags' ---INI-- -short_open_tag = on --FILE-- $ -> This represents the dollar sign" -- Iteration 2 -- -string(59) " The quick brown fo x jumped over the lazy dog

" +string(59) " + The quick brown fo x jumped over the lazy dog

" -- Iteration 3 -- string(31) "This is a hyper text tag" -- Iteration 4 -- @@ -50,6 +48,7 @@ string(0) "" -- Iteration 5 -- string(26) "

This is a paragraph

" -- Iteration 6 -- -string(62) "This is a text in bold letters \s\malong with slashes +string(62) "This is a text in bold letters +\s\malong with slashes " Done From 6f2ea359f737d921eba9f2da600598cd817f2f70 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 24 Apr 2019 15:46:24 +0200 Subject: [PATCH 09/11] Fix carriage return in tests (again) --- ext/standard/tests/strings/strip_tags_variation5.phpt | 3 +-- ext/standard/tests/strings/strip_tags_variation9.phpt | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index bf584a33cd009..e96d2c55c139e 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -87,8 +87,7 @@ string(67) "hello world This is a double quoted string" -- Iteration 4 -- -string(44) "hello - world +string(44) "hello world 1111 != 2222 " -- Iteration 5 -- diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index adea5bc6d6cb5..a4e9951ba511a 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -39,8 +39,7 @@ echo "Done"; -- Iteration 1 -- string(50) " $ -> This represents the dollar sign" -- Iteration 2 -- -string(59) " - The quick brown fo x jumped over the lazy dog

" +string(59) " The quick brown fo x jumped over the lazy dog

" -- Iteration 3 -- string(31) "This is a hyper text tag" -- Iteration 4 -- @@ -48,7 +47,6 @@ string(0) "" -- Iteration 5 -- string(26) "

This is a paragraph

" -- Iteration 6 -- -string(62) "This is a text in bold letters -\s\malong with slashes +string(62) "This is a text in bold letters \s\malong with slashes " Done From 29de8f2f8448934c01278b7b1027c91ba792a7ce Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 24 Apr 2019 16:39:03 +0200 Subject: [PATCH 10/11] [skip ci] Add INI setting value --- php.ini-development | 5 +---- php.ini-production | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/php.ini-development b/php.ini-development index 41db2dd286d49..184b520b5e148 100644 --- a/php.ini-development +++ b/php.ini-development @@ -176,11 +176,8 @@ engine = On ; documents, however this remains supported for backward compatibility reasons. ; Note that this directive does not control the Date: Wed, 24 Apr 2019 19:58:59 +0200 Subject: [PATCH 11/11] Remove short_open_tags INI declaration in test. --- ext/tokenizer/tests/token_get_all_variation15.phpt | 3 --- 1 file changed, 3 deletions(-) diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt index 88d112c8518b6..b9e6c1fd9f00c 100644 --- a/ext/tokenizer/tests/token_get_all_variation15.phpt +++ b/ext/tokenizer/tests/token_get_all_variation15.phpt @@ -2,8 +2,6 @@ Test token_get_all() function : usage variations - heredoc string for 'source' --SKIPIF-- ---INI-- -short_open_tag=On --FILE-- --EXPECTF-- -Deprecated: Directive 'short_open_tag' is deprecated in Unknown on line 0 *** Testing token_get_all() : with heredoc source string *** array(103) { [0]=>