Remove PHP Short Tags.

Girgias · Girgias · commit 2b6cdcf35e65 · 2019-04-13T04:36:00.000+02:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -511,17 +511,14 @@ static FILE *zend_fopen_wrapper(const char *filename, zend_string **opened_path)
 /* }}} */
 
 #ifdef ZTS
-static zend_bool short_tags_default      = 0;
 static uint32_t compiler_options_default = ZEND_COMPILE_DEFAULT;
 #else
-# define short_tags_default			0
 # define compiler_options_default	ZEND_COMPILE_DEFAULT
 #endif
 
 static void zend_set_default_compile_time_values(void) /* {{{ */
 {
 	/* default compile-time values */
-	CG(short_tags) = short_tags_default;
 	CG(compiler_options) = compiler_options_default;
 }
 /* }}} */
@@ -1002,7 +999,6 @@ int zend_post_startup(void) /* {{{ */
 	*GLOBAL_CONSTANTS_TABLE = *executor_globals->zend_constants;
 	global_map_ptr_last = compiler_globals->map_ptr_last;
 
-	short_tags_default = CG(short_tags);
 	compiler_options_default = CG(compiler_options);
 
 	zend_destroy_rsrc_list(&EG(persistent_list));
diff --git 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--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -43,7 +41,6 @@ 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
@@ -1,7 +1,5 @@
 --TEST--
 Test strip_tags() function : basic functionality - with all arguments
---INI--
-short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -39,7 +37,6 @@ 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) "<html>helloworldOther text</html>"
diff --git 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--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -39,7 +37,6 @@ 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) "<html> \$ -> This represents the dollar sign</html>"
diff --git 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--
 <?php
 
@@ -29,7 +27,6 @@ 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
@@ -1,7 +1,5 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for 'allowable_tags'
---INI--
-short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -86,7 +84,6 @@ 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
@@ -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--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -46,7 +44,6 @@ 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
@@ -1,7 +1,5 @@
 --TEST--
 Test strip_tags() function : usage variations - heredoc strings
---INI--
-short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -78,7 +76,6 @@ 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) ""
diff --git 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--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -35,7 +33,6 @@ 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
@@ -1,7 +1,5 @@
 --TEST--
 Test strip_tags() function : usage variations - invalid values for 'str' and 'allowable_tags'
---INI--
-short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -44,7 +42,6 @@ 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) "<abc>hello</abc> 		world... strip_tags_test"
diff --git 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--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -39,7 +37,6 @@ 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
@@ -1,7 +1,5 @@
 --TEST--
 Test strip_tags() function : usage variations - double quoted strings
---INI--
-short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -37,7 +35,6 @@ 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) "<html> $ -> This represents the dollar sign</html>"
diff --git a/ext/tokenizer/tests/002.phpt b/ext/tokenizer/tests/002.phpt
@@ -2,8 +2,6 @@
 token_get_all()
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
---INI--
-short_open_tag=On
 --FILE--
 <?php
 
@@ -22,7 +20,6 @@ foreach ($strings as $s) {
 echo "Done\n";
 ?>
 --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
@@ -2,8 +2,6 @@
 Test token_get_all() function : usage variations - heredoc string for 'source'
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
---INI--
-short_open_tag=On
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
@@ -49,7 +47,6 @@ 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]=>
diff --git a/main/main.c b/main/main.c
@@ -728,7 +728,6 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("output_handler",			NULL,		PHP_INI_PERDIR|PHP_INI_SYSTEM,	OnUpdateString,	output_handler,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("register_argc_argv",	"1",		PHP_INI_PERDIR|PHP_INI_SYSTEM,	OnUpdateBool,	register_argc_argv,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("auto_globals_jit",		"1",		PHP_INI_PERDIR|PHP_INI_SYSTEM,	OnUpdateBool,	auto_globals_jit,	php_core_globals,	core_globals)
-	STD_PHP_INI_BOOLEAN("short_open_tag",	DEFAULT_SHORT_OPEN_TAG,	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			short_tags,				zend_compiler_globals,	compiler_globals)
 
 	STD_PHP_INI_ENTRY("unserialize_callback_func",	NULL,	PHP_INI_ALL,		OnUpdateString,			unserialize_callback_func,	php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("serialize_precision",	"-1",	PHP_INI_ALL,		OnSetSerializePrecision,			serialize_precision,	php_core_globals,	core_globals)
@@ -2344,7 +2343,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 		struct {
 			const long error_level;
 			const char *phrase;
-			const char *directives[18]; /* Remember to change this if the number of directives change */
+			const char *directives[17]; /* Remember to change this if the number of directives change */
 		} directives[2] = {
 			{
 				E_DEPRECATED,
diff --git a/tests/lang/short_tags.001.phpt b/tests/lang/short_tags.001.phpt
diff --git a/tests/lang/short_tags.002.phpt b/tests/lang/short_tags.002.phpt
diff --git a/tests/lang/short_tags.004.phpt b/tests/lang/short_tags.004.phpt
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
@@ -24,7 +24,6 @@
 /* PHP Runtime Configuration */
 #define PHP_URL_FOPEN 1
 #define USE_CONFIG_FILE 1
-#define DEFAULT_SHORT_OPEN_TAG "0"
 
 /* Platform-Specific Configuration. Should not be changed. */
 #define PHP_SIGCHILD 0
