-
-
Save nikic/d3d74d88178ea6946305e0b2d38a84f9 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Zend/tests/attributes/002_rfcexample.phpt b/Zend/tests/attributes/002_rfcexample.phpt | |
| index 8a0abf7878..a89f7e0346 100644 | |
| --- a/Zend/tests/attributes/002_rfcexample.phpt | |
| +++ b/Zend/tests/attributes/002_rfcexample.phpt | |
| @@ -32,7 +32,7 @@ namespace { | |
| } | |
| ?> | |
| --EXPECTF-- | |
| -string(28) "My\Attributes\SingleArgument" | |
| +string(28) "My\\Attributes\\SingleArgument" | |
| array(1) { | |
| [0]=> | |
| string(11) "Hello World" | |
| diff --git a/Zend/tests/attributes/003_ast_nodes.phpt b/Zend/tests/attributes/003_ast_nodes.phpt | |
| index 854edf3d63..8df698e120 100644 | |
| --- a/Zend/tests/attributes/003_ast_nodes.phpt | |
| +++ b/Zend/tests/attributes/003_ast_nodes.phpt | |
| @@ -104,5 +104,5 @@ array(1) { | |
| } | |
| int(1) | |
| -string(30) "Class "MissingClass" not found" | |
| -string(30) "Class "MissingClass" not found" | |
| +string(30) "Class \"MissingClass\" not found" | |
| +string(30) "Class \"MissingClass\" not found" | |
| diff --git a/Zend/tests/attributes/004_name_resolution.phpt b/Zend/tests/attributes/004_name_resolution.phpt | |
| index aececca0d4..aa92ecebec 100644 | |
| --- a/Zend/tests/attributes/004_name_resolution.phpt | |
| +++ b/Zend/tests/attributes/004_name_resolution.phpt | |
| @@ -48,7 +48,7 @@ array(5) { | |
| [0]=> | |
| array(2) { | |
| ["name"]=> | |
| - string(27) "Doctrine\ORM\Mapping\Entity" | |
| + string(27) "Doctrine\\ORM\\Mapping\\Entity" | |
| ["args"]=> | |
| array(1) { | |
| [0]=> | |
| @@ -58,7 +58,7 @@ array(5) { | |
| [1]=> | |
| array(2) { | |
| ["name"]=> | |
| - string(27) "Doctrine\ORM\Mapping\Entity" | |
| + string(27) "Doctrine\\ORM\\Mapping\\Entity" | |
| ["args"]=> | |
| array(1) { | |
| [0]=> | |
| @@ -68,7 +68,7 @@ array(5) { | |
| [2]=> | |
| array(2) { | |
| ["name"]=> | |
| - string(27) "Doctrine\ORM\Mapping\Entity" | |
| + string(27) "Doctrine\\ORM\\Mapping\\Entity" | |
| ["args"]=> | |
| array(1) { | |
| [0]=> | |
| @@ -88,7 +88,7 @@ array(5) { | |
| [4]=> | |
| array(2) { | |
| ["name"]=> | |
| - string(29) "Doctrine\ORM\Attributes\Table" | |
| + string(29) "Doctrine\\ORM\\Attributes\\Table" | |
| ["args"]=> | |
| array(0) { | |
| } | |
| diff --git a/Zend/tests/attributes/005_objects.phpt b/Zend/tests/attributes/005_objects.phpt | |
| index db0107500c..3b39c2a859 100644 | |
| --- a/Zend/tests/attributes/005_objects.phpt | |
| +++ b/Zend/tests/attributes/005_objects.phpt | |
| @@ -108,7 +108,7 @@ string(7) "ERROR 2" | |
| string(%d) "A1::__construct(): Argument #1 ($name) must be of type string, array given, called in %s005_objects.php on line 36" | |
| string(7) "ERROR 3" | |
| -string(30) "Attribute class "A2" not found" | |
| +string(30) "Attribute class \"A2\" not found" | |
| string(7) "ERROR 4" | |
| string(48) "Attribute constructor of class A3 must be public" | |
| @@ -117,4 +117,4 @@ string(7) "ERROR 5" | |
| string(69) "Attribute class A4 does not have a constructor, cannot pass arguments" | |
| string(7) "ERROR 6" | |
| -string(55) "Attempting to use non-attribute class "A5" as attribute" | |
| +string(55) "Attempting to use non-attribute class \"A5\" as attribute" | |
| diff --git a/Zend/tests/attributes/006_filter.phpt b/Zend/tests/attributes/006_filter.phpt | |
| index 2924e6ed79..0c86d7b8b1 100644 | |
| --- a/Zend/tests/attributes/006_filter.phpt | |
| +++ b/Zend/tests/attributes/006_filter.phpt | |
| @@ -109,4 +109,4 @@ Array | |
| string(7) "ERROR 1" | |
| string(103) "ReflectionFunctionAbstract::getAttributes(): Argument #2 ($flags) must be a valid attribute filter flag" | |
| string(7) "ERROR 2" | |
| -string(34) "Class "SomeMissingClass" not found" | |
| +string(34) "Class \"SomeMissingClass\" not found" | |
| diff --git a/Zend/tests/attributes/009_doctrine_annotations_example.phpt b/Zend/tests/attributes/009_doctrine_annotations_example.phpt | |
| index 1f2aa647f0..08e34f5bd8 100644 | |
| --- a/Zend/tests/attributes/009_doctrine_annotations_example.phpt | |
| +++ b/Zend/tests/attributes/009_doctrine_annotations_example.phpt | |
| @@ -87,36 +87,36 @@ foreach ($class->getProperties() as $property) { | |
| } | |
| ?> | |
| --EXPECT-- | |
| -string(30) "Doctrine\ORM\Attributes\Entity" | |
| +string(30) "Doctrine\\ORM\\Attributes\\Entity" | |
| array(0) { | |
| } | |
| -string(26) "Doctrine\ORM\Attributes\Id" | |
| +string(26) "Doctrine\\ORM\\Attributes\\Id" | |
| array(0) { | |
| } | |
| -string(30) "Doctrine\ORM\Attributes\Column" | |
| +string(30) "Doctrine\\ORM\\Attributes\\Column" | |
| array(1) { | |
| [0]=> | |
| string(7) "integer" | |
| } | |
| -string(38) "Doctrine\ORM\Attributes\GeneratedValue" | |
| +string(38) "Doctrine\\ORM\\Attributes\\GeneratedValue" | |
| array(0) { | |
| } | |
| -string(30) "Doctrine\ORM\Attributes\Column" | |
| +string(30) "Doctrine\\ORM\\Attributes\\Column" | |
| array(2) { | |
| [0]=> | |
| string(6) "string" | |
| [1]=> | |
| string(6) "unique" | |
| } | |
| -string(45) "Symfony\Component\Validator\Constraints\Email" | |
| +string(45) "Symfony\\Component\\Validator\\Constraints\\Email" | |
| array(1) { | |
| [0]=> | |
| array(1) { | |
| ["message"]=> | |
| - string(45) "The email '{{ value }}' is not a valid email." | |
| + string(45) "The email \'{{ value }}\' is not a valid email." | |
| } | |
| } | |
| -string(45) "Symfony\Component\Validator\Constraints\Range" | |
| +string(45) "Symfony\\Component\\Validator\\Constraints\\Range" | |
| array(1) { | |
| [0]=> | |
| array(3) { | |
| @@ -128,29 +128,29 @@ array(1) { | |
| string(48) "You must be at least {{ limit }}cm tall to enter" | |
| } | |
| } | |
| -string(30) "Doctrine\ORM\Attributes\Column" | |
| +string(30) "Doctrine\\ORM\\Attributes\\Column" | |
| array(1) { | |
| [0]=> | |
| string(7) "integer" | |
| } | |
| -string(34) "Doctrine\ORM\Attributes\ManyToMany" | |
| +string(34) "Doctrine\\ORM\\Attributes\\ManyToMany" | |
| array(1) { | |
| [0]=> | |
| string(11) "Phonenumber" | |
| } | |
| -string(33) "Doctrine\ORM\Attributes\JoinTable" | |
| +string(33) "Doctrine\\ORM\\Attributes\\JoinTable" | |
| array(1) { | |
| [0]=> | |
| string(18) "users_phonenumbers" | |
| } | |
| -string(34) "Doctrine\ORM\Attributes\JoinColumn" | |
| +string(34) "Doctrine\\ORM\\Attributes\\JoinColumn" | |
| array(2) { | |
| [0]=> | |
| string(7) "user_id" | |
| [1]=> | |
| string(2) "id" | |
| } | |
| -string(41) "Doctrine\ORM\Attributes\InverseJoinColumn" | |
| +string(41) "Doctrine\\ORM\\Attributes\\InverseJoinColumn" | |
| array(3) { | |
| [0]=> | |
| string(14) "phonenumber_id" | |
| diff --git a/Zend/tests/attributes/020_userland_attribute_validation.phpt b/Zend/tests/attributes/020_userland_attribute_validation.phpt | |
| index ce2acb26db..38f7e3e6f6 100644 | |
| --- a/Zend/tests/attributes/020_userland_attribute_validation.phpt | |
| +++ b/Zend/tests/attributes/020_userland_attribute_validation.phpt | |
| @@ -56,13 +56,13 @@ string(2) "A1" | |
| bool(true) | |
| bool(false) | |
| string(7) "ERROR 1" | |
| -string(70) "Attribute "A1" cannot target class (allowed targets: function, method)" | |
| +string(70) "Attribute \"A1\" cannot target class (allowed targets: function, method)" | |
| string(2) "A1" | |
| bool(true) | |
| bool(true) | |
| string(7) "ERROR 2" | |
| -string(35) "Attribute "A1" must not be repeated" | |
| +string(35) "Attribute \"A1\" must not be repeated" | |
| string(2) "A2" | |
| bool(true) | |
| diff --git a/Zend/tests/bug29015.phpt b/Zend/tests/bug29015.phpt | |
| index b13dc74060..4e984b0ae7 100644 | |
| --- a/Zend/tests/bug29015.phpt | |
| +++ b/Zend/tests/bug29015.phpt | |
| @@ -12,7 +12,7 @@ var_dump($a); | |
| --EXPECTF-- | |
| object(stdClass)#1 (1) { | |
| [""]=> | |
| - string(10) "string('')" | |
| + string(10) "string(\'\')" | |
| } | |
| Fatal error: Uncaught Error: Cannot access property starting with "\0" in %s:%d | |
| diff --git a/Zend/tests/bug44830.phpt b/Zend/tests/bug44830.phpt | |
| index 21a35ff0cb..892cfbfe13 100644 | |
| --- a/Zend/tests/bug44830.phpt | |
| +++ b/Zend/tests/bug44830.phpt | |
| @@ -11,4 +11,4 @@ var_dump($backslash); | |
| ?> | |
| --EXPECT-- | |
| -string(1) "\" | |
| +string(1) "\\" | |
| diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/bug46665.phpt | |
| index d8de8159a5..a2be76042a 100644 | |
| --- a/Zend/tests/bug46665.phpt | |
| +++ b/Zend/tests/bug46665.phpt | |
| @@ -13,4 +13,4 @@ new $baz(); | |
| ?> | |
| --EXPECT-- | |
| -string(11) "Foo\Bar\Baz" | |
| +string(11) "Foo\\Bar\\Baz" | |
| diff --git a/Zend/tests/bug64578.phpt b/Zend/tests/bug64578.phpt | |
| index 7d4a32be87..0453b19d4b 100644 | |
| --- a/Zend/tests/bug64578.phpt | |
| +++ b/Zend/tests/bug64578.phpt | |
| @@ -11,5 +11,5 @@ x($y); | |
| print_r($y); | |
| ?> | |
| --EXPECT-- | |
| -string(26) "Illegal string offset "2a"" | |
| +string(26) "Illegal string offset \"2a\"" | |
| 1 | |
| diff --git a/Zend/tests/bug65322.phpt b/Zend/tests/bug65322.phpt | |
| index 0a64783d68..a2a3371d1f 100644 | |
| --- a/Zend/tests/bug65322.phpt | |
| +++ b/Zend/tests/bug65322.phpt | |
| @@ -20,5 +20,5 @@ eval('class A { private function __invoke() { } }'); | |
| ?> | |
| --EXPECTF-- | |
| string(%d) "The magic method A::__invoke() must have public visibility" | |
| -string(%d) "%s(%d) : eval()'d code" | |
| +string(67) "/home/nikic/php/php-src/Zend/tests/bug65322.php(15) : eval()\'d code" | |
| string(1) "X" | |
| diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt | |
| index 51f592d24d..d517e29d33 100644 | |
| --- a/Zend/tests/bug70124.phpt | |
| +++ b/Zend/tests/bug70124.phpt | |
| @@ -43,5 +43,5 @@ Warning: Undefined variable $f in %s on line %d | |
| string(34) "Value of type null is not callable" | |
| string(31) "Call to undefined method A::y()" | |
| string(31) "Call to undefined method A::y()" | |
| -string(34) "Call to undefined function bar\y()" | |
| +string(34) "Call to undefined function bar\\y()" | |
| string(30) "Call to undefined function y()" | |
| diff --git a/Zend/tests/bug70187.phpt b/Zend/tests/bug70187.phpt | |
| index a675fff507..a91e69353c 100644 | |
| --- a/Zend/tests/bug70187.phpt | |
| +++ b/Zend/tests/bug70187.phpt | |
| @@ -16,4 +16,4 @@ object(A)#1 (1) { | |
| ["b"]=> | |
| NULL | |
| } | |
| -string(12) "O:1:"A":0:{}" | |
| +string(12) "O:1:\"A\":0:{}" | |
| diff --git a/Zend/tests/bug70918.phpt b/Zend/tests/bug70918.phpt | |
| index 54f3a3c72a..fe41cb3ef5 100644 | |
| --- a/Zend/tests/bug70918.phpt | |
| +++ b/Zend/tests/bug70918.phpt | |
| @@ -39,9 +39,9 @@ try { | |
| } | |
| ?> | |
| --EXPECT-- | |
| -string(52) "Cannot access "static" when no class scope is active" | |
| -string(52) "Cannot access "parent" when no class scope is active" | |
| -string(50) "Cannot access "self" when no class scope is active" | |
| -string(52) "Cannot access "static" when no class scope is active" | |
| -string(52) "Cannot access "static" when no class scope is active" | |
| -string(52) "Cannot access "static" when no class scope is active" | |
| +string(52) "Cannot access \"static\" when no class scope is active" | |
| +string(52) "Cannot access \"parent\" when no class scope is active" | |
| +string(50) "Cannot access \"self\" when no class scope is active" | |
| +string(52) "Cannot access \"static\" when no class scope is active" | |
| +string(52) "Cannot access \"static\" when no class scope is active" | |
| +string(52) "Cannot access \"static\" when no class scope is active" | |
| diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/bug71086.phpt | |
| index 3e64f9c13a..6029d3ba8c 100644 | |
| --- a/Zend/tests/bug71086.phpt | |
| +++ b/Zend/tests/bug71086.phpt | |
| @@ -8,7 +8,7 @@ var_dump($highlightedString); | |
| ?> | |
| --EXPECT-- | |
| -string(169) "<code><span style="color: #000000"> | |
| -<span style="color: #0000BB"><?php <br /> 09 09 09</span><span style="color: #007700">;</span> | |
| +string(169) "<code><span style=\"color: #000000\"> | |
| +<span style=\"color: #0000BB\"><?php <br /> 09 09 09</span><span style=\"color: #007700\">;</span> | |
| </span> | |
| </code>" | |
| diff --git a/Zend/tests/bug75252.phpt b/Zend/tests/bug75252.phpt | |
| index b4e0a1b5bd..829365af7f 100644 | |
| --- a/Zend/tests/bug75252.phpt | |
| +++ b/Zend/tests/bug75252.phpt | |
| @@ -24,5 +24,5 @@ try { | |
| ?> | |
| --EXPECT-- | |
| -string(41) "syntax error, unexpected identifier "FOO"" | |
| -string(41) "syntax error, unexpected identifier "FOO"" | |
| +string(41) "syntax error, unexpected identifier \"FOO\"" | |
| +string(41) "syntax error, unexpected identifier \"FOO\"" | |
| diff --git a/Zend/tests/bug76965.phpt b/Zend/tests/bug76965.phpt | |
| index 64165e81f6..56afb413b9 100644 | |
| --- a/Zend/tests/bug76965.phpt | |
| +++ b/Zend/tests/bug76965.phpt | |
| @@ -30,5 +30,5 @@ array(7) { | |
| [6]=> | |
| string(7) "foo;bar" | |
| [7]=> | |
| - string(7) "foo"bar" | |
| + string(7) "foo\"bar" | |
| } | |
| diff --git a/Zend/tests/bug79934.phpt b/Zend/tests/bug79934.phpt | |
| index a983cb742d..dc275b7e90 100644 | |
| --- a/Zend/tests/bug79934.phpt | |
| +++ b/Zend/tests/bug79934.phpt | |
| @@ -23,7 +23,7 @@ var_dump(addcslashes($s4, "\n\r")); | |
| ?> | |
| --EXPECT-- | |
| -string(10) "a\r\n\r\nb" | |
| -string(6) "a\n\nb" | |
| -string(6) "a\r\rb" | |
| -string(10) "a\r\n\r\nb" | |
| +string(10) "a\\r\\n\\r\\nb" | |
| +string(6) "a\\n\\nb" | |
| +string(6) "a\\r\\rb" | |
| +string(10) "a\\r\\n\\r\\nb" | |
| diff --git a/Zend/tests/class_name_as_scalar.phpt b/Zend/tests/class_name_as_scalar.phpt | |
| index 72a460abaa..8537790c77 100644 | |
| --- a/Zend/tests/class_name_as_scalar.phpt | |
| +++ b/Zend/tests/class_name_as_scalar.phpt | |
| @@ -53,25 +53,25 @@ namespace { | |
| ?> | |
| --EXPECT-- | |
| In NS | |
| -string(11) "Foo\Bar\Moo" | |
| +string(11) "Foo\\Bar\\Moo" | |
| Top | |
| -string(11) "Foo\Bar\One" | |
| +string(11) "Foo\\Bar\\One" | |
| string(3) "Boo" | |
| -string(7) "Bee\Bop" | |
| +string(7) "Bee\\Bop" | |
| string(3) "Moo" | |
| object(Foo\Bar\One)#1 (0) { | |
| } | |
| -string(11) "Foo\Bar\Two" | |
| -string(11) "Foo\Bar\Two" | |
| -string(11) "Foo\Bar\One" | |
| -string(11) "Foo\Bar\Baz" | |
| +string(11) "Foo\\Bar\\Two" | |
| +string(11) "Foo\\Bar\\Two" | |
| +string(11) "Foo\\Bar\\One" | |
| +string(11) "Foo\\Bar\\Baz" | |
| Parent | |
| -string(11) "Foo\Bar\Two" | |
| -string(13) "Foo\Bar\Three" | |
| -string(11) "Foo\Bar\One" | |
| -string(11) "Foo\Bar\Baz" | |
| +string(11) "Foo\\Bar\\Two" | |
| +string(13) "Foo\\Bar\\Three" | |
| +string(11) "Foo\\Bar\\One" | |
| +string(11) "Foo\\Bar\\Baz" | |
| Compile Check | |
| -string(13) "Foo\Bar\Three" | |
| -string(11) "Foo\Bar\Baz" | |
| -string(11) "Foo\Bar\One" | |
| -string(11) "Foo\Bar\Two" | |
| +string(13) "Foo\\Bar\\Three" | |
| +string(11) "Foo\\Bar\\Baz" | |
| +string(11) "Foo\\Bar\\One" | |
| +string(11) "Foo\\Bar\\Two" | |
| diff --git a/Zend/tests/class_name_as_scalar_error_004.phpt b/Zend/tests/class_name_as_scalar_error_004.phpt | |
| index 5b743df2db..2821e1bf3a 100644 | |
| --- a/Zend/tests/class_name_as_scalar_error_004.phpt | |
| +++ b/Zend/tests/class_name_as_scalar_error_004.phpt | |
| @@ -14,4 +14,4 @@ namespace Foo\Bar { | |
| } | |
| ?> | |
| --EXPECT-- | |
| -string(11) "Foo\Bar\One" | |
| +string(11) "Foo\\Bar\\One" | |
| diff --git a/Zend/tests/constants_006.phpt b/Zend/tests/constants_006.phpt | |
| index 77e71de437..eb17ea1cd4 100644 | |
| --- a/Zend/tests/constants_006.phpt | |
| +++ b/Zend/tests/constants_006.phpt | |
| @@ -26,7 +26,7 @@ var_dump(__namespace__); | |
| string(%d) "%s" | |
| string(%d) "%s" | |
| int(%d) | |
| -string(21) "test\foo::__construct" | |
| -string(8) "test\foo" | |
| +string(21) "test\\foo::__construct" | |
| +string(8) "test\\foo" | |
| string(11) "__construct" | |
| string(4) "test" | |
| diff --git a/Zend/tests/enum/json_encode.phpt b/Zend/tests/enum/json_encode.phpt | |
| index 12ed0d3d44..a6a0a5af28 100644 | |
| --- a/Zend/tests/enum/json_encode.phpt | |
| +++ b/Zend/tests/enum/json_encode.phpt | |
| @@ -49,11 +49,11 @@ string(1) "0" | |
| No error | |
| string(1) "0" | |
| No error | |
| -string(5) ""Bar"" | |
| +string(5) "\"Bar\"" | |
| No error | |
| -string(5) ""Bar"" | |
| +string(5) "\"Bar\"" | |
| No error | |
| -string(12) ""Custom Bar"" | |
| +string(12) "\"Custom Bar\"" | |
| No error | |
| -string(12) ""Custom Bar"" | |
| +string(12) "\"Custom Bar\"" | |
| No error | |
| diff --git a/Zend/tests/enum/spl-object-storage.phpt b/Zend/tests/enum/spl-object-storage.phpt | |
| index 7c72299c34..bf45050e64 100644 | |
| --- a/Zend/tests/enum/spl-object-storage.phpt | |
| +++ b/Zend/tests/enum/spl-object-storage.phpt | |
| @@ -32,6 +32,6 @@ string(3) "Bar" | |
| string(3) "Baz" | |
| bool(true) | |
| bool(false) | |
| -string(112) "O:16:"SplObjectStorage":2:{i:0;a:4:{i:0;E:7:"Foo:Bar";i:1;s:3:"Bar";i:2;E:7:"Foo:Baz";i:3;s:3:"Baz";}i:1;a:0:{}}" | |
| +string(112) "O:16:\"SplObjectStorage\":2:{i:0;a:4:{i:0;E:7:\"Foo:Bar\";i:1;s:3:\"Bar\";i:2;E:7:\"Foo:Baz\";i:3;s:3:\"Baz\";}i:1;a:0:{}}" | |
| string(3) "Bar" | |
| string(3) "Baz" | |
| diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg_045.phpt | |
| index 4a75cf5df4..e7b22af26a 100644 | |
| --- a/Zend/tests/errmsg_045.phpt | |
| +++ b/Zend/tests/errmsg_045.phpt | |
| @@ -15,6 +15,6 @@ eval('class A { private function __invoke() { } }'); | |
| ?> | |
| --EXPECTF-- | |
| string(%d) "The magic method A::__invoke() must have public visibility" | |
| -string(%d) "%s(%d) : eval()'d code" | |
| +string(69) "/home/nikic/php/php-src/Zend/tests/errmsg_045.php(10) : eval()\'d code" | |
| Warning: Undefined variable $undefined in %s on line %d | |
| diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt | |
| index 5965a9274c..1ffb9f120c 100644 | |
| --- a/Zend/tests/nested_method_and_function.phpt | |
| +++ b/Zend/tests/nested_method_and_function.phpt | |
| @@ -28,12 +28,12 @@ $c = Foo::bar(); | |
| $c(); | |
| ?> | |
| --EXPECT-- | |
| -string(7) "Baz\foo" | |
| -string(7) "Baz\foo" | |
| +string(7) "Baz\\foo" | |
| +string(7) "Baz\\foo" | |
| string(0) "" | |
| string(3) "bar" | |
| -string(12) "Baz\Foo::bar" | |
| -string(7) "Baz\Foo" | |
| -string(13) "Baz\{closure}" | |
| -string(13) "Baz\{closure}" | |
| -string(7) "Baz\Foo" | |
| +string(12) "Baz\\Foo::bar" | |
| +string(7) "Baz\\Foo" | |
| +string(13) "Baz\\{closure}" | |
| +string(13) "Baz\\{closure}" | |
| +string(7) "Baz\\Foo" | |
| diff --git a/Zend/tests/ns_023.phpt b/Zend/tests/ns_023.phpt | |
| index ed9c3e52de..e1abc3839d 100644 | |
| --- a/Zend/tests/ns_023.phpt | |
| +++ b/Zend/tests/ns_023.phpt | |
| @@ -7,4 +7,4 @@ namespace test\foo; | |
| var_dump(__NAMESPACE__); | |
| ?> | |
| --EXPECT-- | |
| -string(8) "test\foo" | |
| +string(8) "test\\foo" | |
| diff --git a/Zend/tests/ns_095.phpt b/Zend/tests/ns_095.phpt | |
| index 521926330d..23394b8c1d 100644 | |
| --- a/Zend/tests/ns_095.phpt | |
| +++ b/Zend/tests/ns_095.phpt | |
| @@ -37,12 +37,12 @@ namespace Baz { | |
| } | |
| ?> | |
| --EXPECT-- | |
| -string(14) "Foo\Bar\ClassA" | |
| -string(14) "Foo\Bar\ClassB" | |
| -string(14) "Foo\Bar\ClassC" | |
| -string(12) "Foo\Bar\fn_a" | |
| -string(12) "Foo\Bar\fn_b" | |
| -string(12) "Foo\Bar\fn_c" | |
| +string(14) "Foo\\Bar\\ClassA" | |
| +string(14) "Foo\\Bar\\ClassB" | |
| +string(14) "Foo\\Bar\\ClassC" | |
| +string(12) "Foo\\Bar\\fn_a" | |
| +string(12) "Foo\\Bar\\fn_b" | |
| +string(12) "Foo\\Bar\\fn_c" | |
| int(1) | |
| int(2) | |
| int(3) | |
| diff --git a/Zend/tests/traits/get_declared_traits_002.phpt b/Zend/tests/traits/get_declared_traits_002.phpt | |
| index 76e5294536..aff32e4be5 100644 | |
| --- a/Zend/tests/traits/get_declared_traits_002.phpt | |
| +++ b/Zend/tests/traits/get_declared_traits_002.phpt | |
| @@ -14,7 +14,9 @@ namespace test { | |
| ?> | |
| --EXPECTF-- | |
| -array(%d) {%A | |
| +array(2) { | |
| [%d]=> | |
| - string(6) "test\c" | |
| + string(14) "_ZendTestTrait" | |
| + [1]=> | |
| + string(6) "test\\c" | |
| } | |
| diff --git a/Zend/tests/traits/interface_003.phpt b/Zend/tests/traits/interface_003.phpt | |
| index c4c3f1e57b..49425e2db0 100644 | |
| --- a/Zend/tests/traits/interface_003.phpt | |
| +++ b/Zend/tests/traits/interface_003.phpt | |
| @@ -22,7 +22,7 @@ var_dump(unserialize($o)); | |
| ?> | |
| --EXPECTF-- | |
| Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d | |
| -string(20) "C:3:"bar":6:{foobar}" | |
| +string(20) "C:3:\"bar\":6:{foobar}" | |
| string(6) "foobar" | |
| object(bar)#%d (0) { | |
| } | |
| diff --git a/Zend/tests/weakrefs/weakrefs_002.phpt b/Zend/tests/weakrefs/weakrefs_002.phpt | |
| index f550302aec..f85ef765c9 100644 | |
| --- a/Zend/tests/weakrefs/weakrefs_002.phpt | |
| +++ b/Zend/tests/weakrefs/weakrefs_002.phpt | |
| @@ -15,5 +15,5 @@ $wrs = 'O:13:"WeakReference":0:{}'; | |
| var_dump(@unserialize($wrs)); | |
| ?> | |
| --EXPECT-- | |
| -string(47) "Serialization of 'WeakReference' is not allowed" | |
| +string(47) "Serialization of \'WeakReference\' is not allowed" | |
| bool(false) | |
| diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt | |
| index bb4dbc4af6..2700ed7f46 100644 | |
| --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt | |
| +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt | |
| @@ -32,9 +32,9 @@ echo "Done"; | |
| array(10) { | |
| [""]=> | |
| int(2) | |
| - ["\a"]=> | |
| + ["\\a"]=> | |
| int(3) | |
| - ["\cx"]=> | |
| + ["\\cx"]=> | |
| int(4) | |
| [""]=> | |
| int(5) | |
| @@ -45,9 +45,9 @@ array(10) { | |
| int(7) | |
| [" "]=> | |
| int(8) | |
| - ["\xhh"]=> | |
| + ["\\xhh"]=> | |
| int(9) | |
| - ["\ddd"]=> | |
| + ["\\ddd"]=> | |
| int(10) | |
| [" "]=> | |
| int(11) | |
| @@ -56,9 +56,9 @@ array(10) { | |
| array(10) { | |
| [""]=> | |
| int(2) | |
| - ["\A"]=> | |
| + ["\\A"]=> | |
| int(3) | |
| - ["\CX"]=> | |
| + ["\\CX"]=> | |
| int(4) | |
| [""]=> | |
| int(5) | |
| @@ -69,9 +69,9 @@ array(10) { | |
| int(7) | |
| [" "]=> | |
| int(8) | |
| - ["\XHH"]=> | |
| + ["\\XHH"]=> | |
| int(9) | |
| - ["\DDD"]=> | |
| + ["\\DDD"]=> | |
| int(10) | |
| [" "]=> | |
| int(11) | |
| diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt | |
| index 94901eedf6..4a406c1518 100644 | |
| --- a/ext/standard/tests/array/array_combine_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_combine_variation3.phpt | |
| @@ -121,23 +121,23 @@ array(6) { | |
| string(5) "b bbb" | |
| ["c"]=> | |
| string(1) "c" | |
| - ["\[\]\!\@\#$\%\^\&\*\(\)\{\}"]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + ["\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}"]=> | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 7 -- | |
| array(6) { | |
| - ["a\v\f"]=> | |
| - string(5) "a\v\f" | |
| - ["aaaa\r"]=> | |
| - string(6) "aaaa\r" | |
| + ["a\\v\\f"]=> | |
| + string(5) "a\\v\\f" | |
| + ["aaaa\\r"]=> | |
| + string(6) "aaaa\\r" | |
| ["b"]=> | |
| string(1) "b" | |
| - ["b\tbbb"]=> | |
| - string(6) "b\tbbb" | |
| + ["b\\tbbb"]=> | |
| + string(6) "b\\tbbb" | |
| ["c"]=> | |
| string(1) "c" | |
| - ["\[\]\!\@\#\$\%\^\&\*\(\)\{\}"]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + ["\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}"]=> | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 8 -- | |
| array(4) { | |
| @@ -162,13 +162,13 @@ double quoted string. with different white spaces"]=> | |
| heredoc | |
| double quoted string. with different white spaces" | |
| ["11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| "]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| } | |
| diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt | |
| index ef0859373e..873781636f 100644 | |
| --- a/ext/standard/tests/array/array_combine_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_combine_variation5.phpt | |
| @@ -130,14 +130,14 @@ array(4) { | |
| } | |
| -- Iteration 8 -- | |
| array(4) { | |
| - ["\tHello"]=> | |
| - string(7) "\tHello" | |
| - ["col\tor"]=> | |
| - string(7) "col\tor" | |
| - ["\v\fworld"]=> | |
| - string(9) "\v\fworld" | |
| - ["pen\n"]=> | |
| - string(5) "pen\n" | |
| + ["\\tHello"]=> | |
| + string(7) "\\tHello" | |
| + ["col\\tor"]=> | |
| + string(7) "col\\tor" | |
| + ["\\v\\fworld"]=> | |
| + string(9) "\\v\\fworld" | |
| + ["pen\\n"]=> | |
| + string(5) "pen\\n" | |
| } | |
| -- Iteration 9 -- | |
| array(2) { | |
| diff --git a/ext/standard/tests/array/array_diff_variation8.phpt b/ext/standard/tests/array/array_diff_variation8.phpt | |
| index 5a1b2c4f30..e9fd6e15cf 100644 | |
| --- a/ext/standard/tests/array/array_diff_variation8.phpt | |
| +++ b/ext/standard/tests/array/array_diff_variation8.phpt | |
| @@ -150,13 +150,13 @@ array(3) { | |
| } | |
| array(4) { | |
| [111]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [3]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| } | |
| -- Iteration 7 -- | |
| array(3) { | |
| diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt | |
| index f631295bcf..959c8cb347 100644 | |
| --- a/ext/standard/tests/array/array_flip_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_flip_variation3.phpt | |
| @@ -87,11 +87,11 @@ array(24) { | |
| string(14) "numeric_value1" | |
| ["!@#$%"]=> | |
| string(19) "special_char_value1" | |
| - ["\t"]=> | |
| + ["\\t"]=> | |
| string(18) "whitespace1_value1" | |
| - ["\n"]=> | |
| + ["\\n"]=> | |
| string(18) "whitespace2_value1" | |
| - ["\0"]=> | |
| + ["\\0"]=> | |
| string(16) "null_char_value1" | |
| ["b"]=> | |
| string(11) "char_value2" | |
| diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt | |
| index bb439a053b..c6e022cccb 100644 | |
| --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt | |
| @@ -134,11 +134,11 @@ array(0) { | |
| -- Iteration 7 -- | |
| array(1) { | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| array(1) { | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| -- Iteration 8 -- | |
| array(1) { | |
| diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt | |
| index f971b356ba..0b4be8be83 100644 | |
| --- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt | |
| @@ -152,11 +152,11 @@ array(1) { | |
| -- Iteration 8 -- | |
| array(1) { | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| array(1) { | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| -- Iteration 9 -- | |
| array(1) { | |
| diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt | |
| index c4a26c09d5..024f887678 100644 | |
| --- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt | |
| @@ -152,11 +152,11 @@ array(1) { | |
| -- Iteration 8 -- | |
| array(1) { | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| array(1) { | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| -- Iteration 9 -- | |
| array(1) { | |
| diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt | |
| index 1f3258ae83..a258205bae 100644 | |
| --- a/ext/standard/tests/array/array_intersect_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_variation3.phpt | |
| @@ -158,11 +158,11 @@ array(1) { | |
| -- Iterator 7 -- | |
| array(1) { | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| array(1) { | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| -- Iterator 8 -- | |
| array(2) { | |
| @@ -173,8 +173,8 @@ heredoc | |
| double quoted string. with different white spaces" | |
| [3]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| } | |
| @@ -186,8 +186,8 @@ heredoc | |
| double quoted string. with different white spaces" | |
| [3]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| } | |
| diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt | |
| index ce0fa47b03..71bab38c5d 100644 | |
| --- a/ext/standard/tests/array/array_intersect_variation4.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_variation4.phpt | |
| @@ -169,18 +169,18 @@ array(1) { | |
| -- Iteration 7 -- | |
| array(1) { | |
| [9]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| array(1) { | |
| [9]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| } | |
| -- Iteration 8 -- | |
| array(2) { | |
| [11]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| [12]=> | |
| @@ -192,8 +192,8 @@ double quoted string. with different white spaces" | |
| array(2) { | |
| [11]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| [12]=> | |
| diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt | |
| index 04eb9b43c3..2bfbfd1341 100644 | |
| --- a/ext/standard/tests/array/array_intersect_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_variation5.phpt | |
| @@ -97,15 +97,15 @@ array(1) { | |
| } | |
| -- Iterator 5 -- | |
| array(2) { | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| } | |
| array(2) { | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| } | |
| -- Iterator 6 -- | |
| diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt | |
| index 559783b96c..dbafb64e1a 100644 | |
| --- a/ext/standard/tests/array/array_intersect_variation7.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_variation7.phpt | |
| @@ -146,11 +146,11 @@ array(1) { | |
| -- Iterator 8 -- | |
| array(1) { | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| } | |
| array(1) { | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| } | |
| -- Iterator 9 -- | |
| array(1) { | |
| diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt | |
| index 319804bbc7..c4dda4eb87 100644 | |
| --- a/ext/standard/tests/array/array_intersect_variation8.phpt | |
| +++ b/ext/standard/tests/array/array_intersect_variation8.phpt | |
| @@ -146,11 +146,11 @@ array(1) { | |
| -- Iterator 8 -- | |
| array(1) { | |
| [5]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| } | |
| array(1) { | |
| [5]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| } | |
| -- Iterator 9 -- | |
| array(2) { | |
| diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt | |
| index ea495cbcd8..db6f12350b 100644 | |
| --- a/ext/standard/tests/array/array_map_variation4.phpt | |
| +++ b/ext/standard/tests/array/array_map_variation4.phpt | |
| @@ -99,13 +99,13 @@ array(4) { | |
| } | |
| -- Iteration 5 -- | |
| array(4) { | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| int(111) | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| - ["pen\n"]=> | |
| + ["pen\\n"]=> | |
| int(33) | |
| } | |
| -- Iteration 6 -- | |
| diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt | |
| index c7ff35d9b2..ca182ae2e3 100644 | |
| --- a/ext/standard/tests/array/array_map_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_map_variation5.phpt | |
| @@ -128,13 +128,13 @@ array(4) { | |
| -- Iteration 8 -- | |
| array(4) { | |
| [111]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| -- Iteration 9 -- | |
| array(2) { | |
| diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt | |
| index 214d765442..3c7d1f9d01 100644 | |
| --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt | |
| @@ -240,7 +240,7 @@ array(4) { | |
| [2]=> | |
| string(1) "b" | |
| [3]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- With more arguments -- | |
| array(8) { | |
| @@ -251,7 +251,7 @@ array(8) { | |
| [2]=> | |
| string(1) "b" | |
| [3]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| [4]=> | |
| string(3) "one" | |
| [5]=> | |
| @@ -272,24 +272,24 @@ array(8) { | |
| -- With default argument -- | |
| array(4) { | |
| [0]=> | |
| - string(5) "a\v\f" | |
| + string(5) "a\\v\\f" | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| [2]=> | |
| string(1) "b" | |
| [3]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- With more arguments -- | |
| array(8) { | |
| [0]=> | |
| - string(5) "a\v\f" | |
| + string(5) "a\\v\\f" | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| [2]=> | |
| string(1) "b" | |
| [3]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| [4]=> | |
| string(3) "one" | |
| [5]=> | |
| diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt | |
| index 71f4a4d66f..de55da1dd9 100644 | |
| --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt | |
| +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt | |
| @@ -159,30 +159,30 @@ array(6) { | |
| -- Iteration 3 -- | |
| -- With default argument -- | |
| array(3) { | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| array(2) { | |
| [0]=> | |
| string(5) "hello" | |
| [1]=> | |
| string(5) "world" | |
| } | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| - ["pen\n"]=> | |
| + ["pen\\n"]=> | |
| int(111) | |
| } | |
| -- With more arguments -- | |
| array(7) { | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| array(2) { | |
| [0]=> | |
| string(5) "hello" | |
| [1]=> | |
| string(5) "world" | |
| } | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| - ["pen\n"]=> | |
| + ["pen\\n"]=> | |
| int(111) | |
| [0]=> | |
| string(3) "one" | |
| diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt | |
| index 617811b5f6..47da8803ef 100644 | |
| --- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt | |
| @@ -276,22 +276,22 @@ array(7) { | |
| -- With default argument -- | |
| array(4) { | |
| [0]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["array"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [1]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [2]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| } | |
| -- With more arguments -- | |
| array(7) { | |
| [0]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["array"]=> | |
| array(4) { | |
| [0]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [1]=> | |
| string(1) "a" | |
| [2]=> | |
| @@ -300,9 +300,9 @@ array(7) { | |
| string(1) "c" | |
| } | |
| [1]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [2]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| [3]=> | |
| string(3) "one" | |
| [4]=> | |
| diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt | |
| index cd3937e683..74b9af746f 100644 | |
| --- a/ext/standard/tests/array/array_pad_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_pad_variation3.phpt | |
| @@ -738,15 +738,15 @@ array(4) { | |
| [1]=> | |
| int(2) | |
| [2]=> | |
| - string(30) "\v\fHello\t world!! \rstring\n" | |
| + string(30) "\\v\\fHello\\t world!! \\rstring\\n" | |
| [3]=> | |
| - string(30) "\v\fHello\t world!! \rstring\n" | |
| + string(30) "\\v\\fHello\\t world!! \\rstring\\n" | |
| } | |
| array(4) { | |
| [0]=> | |
| - string(30) "\v\fHello\t world!! \rstring\n" | |
| + string(30) "\\v\\fHello\\t world!! \\rstring\\n" | |
| [1]=> | |
| - string(30) "\v\fHello\t world!! \rstring\n" | |
| + string(30) "\\v\\fHello\\t world!! \\rstring\\n" | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt | |
| index fc2d705dbe..97702e10b6 100644 | |
| --- a/ext/standard/tests/array/array_pad_variation6.phpt | |
| +++ b/ext/standard/tests/array/array_pad_variation6.phpt | |
| @@ -241,7 +241,7 @@ array(6) { | |
| [2]=> | |
| string(5) "b bbb" | |
| [3]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| [4]=> | |
| string(5) "HELLO" | |
| [5]=> | |
| @@ -259,18 +259,18 @@ array(6) { | |
| [4]=> | |
| string(5) "b bbb" | |
| [5]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 7 -- | |
| array(6) { | |
| [0]=> | |
| - string(5) "a\v\f" | |
| + string(5) "a\\v\\f" | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| [2]=> | |
| - string(6) "b\tbbb" | |
| + string(6) "b\\tbbb" | |
| [3]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| [4]=> | |
| string(5) "HELLO" | |
| [5]=> | |
| @@ -282,13 +282,13 @@ array(6) { | |
| [1]=> | |
| string(5) "HELLO" | |
| [2]=> | |
| - string(5) "a\v\f" | |
| + string(5) "a\\v\\f" | |
| [3]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| [4]=> | |
| - string(6) "b\tbbb" | |
| + string(6) "b\\tbbb" | |
| [5]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 8 -- | |
| array(6) { | |
| @@ -307,8 +307,8 @@ heredoc | |
| double quoted string. with different white spaces" | |
| [0]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| [1]=> | |
| @@ -336,8 +336,8 @@ heredoc | |
| double quoted string. with different white spaces" | |
| [2]=> | |
| string(90) "11 < 12. 123 >22 | |
| -'single quoted string' | |
| -"double quoted string" | |
| +\'single quoted string\' | |
| +\"double quoted string\" | |
| 2222 != 1111. 0000 = 0000 | |
| " | |
| } | |
| diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt | |
| index dcefab26a3..4b8441b52d 100644 | |
| --- a/ext/standard/tests/array/array_reverse_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_reverse_variation5.phpt | |
| @@ -247,35 +247,35 @@ array(4) { | |
| - default argument - | |
| array(4) { | |
| [0]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| [1]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| } | |
| - $preserve keys = true - | |
| array(4) { | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [111]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| } | |
| - $preserve_keys = false - | |
| array(4) { | |
| [0]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| [1]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| } | |
| -- Iteration 9 -- | |
| - default argument - | |
| diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt | |
| index 6a9d8e36fd..2dde4e62eb 100644 | |
| --- a/ext/standard/tests/array/array_unique_variation2.phpt | |
| +++ b/ext/standard/tests/array/array_unique_variation2.phpt | |
| @@ -115,18 +115,18 @@ array(4) { | |
| [2]=> | |
| string(1) "b" | |
| [4]=> | |
| - string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}" | |
| + string(27) "\\[\\]\\!\\@\\#$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 7 -- | |
| array(4) { | |
| [0]=> | |
| - string(5) "a\v\f" | |
| + string(5) "a\\v\\f" | |
| [1]=> | |
| - string(6) "aaaa\r" | |
| + string(6) "aaaa\\r" | |
| [2]=> | |
| string(1) "b" | |
| [4]=> | |
| - string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}" | |
| + string(28) "\\[\\]\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\{\\}" | |
| } | |
| -- Iteration 8 -- | |
| array(3) { | |
| diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt | |
| index b412a19a42..4cf7c3b645 100644 | |
| --- a/ext/standard/tests/array/array_unique_variation3.phpt | |
| +++ b/ext/standard/tests/array/array_unique_variation3.phpt | |
| @@ -76,11 +76,11 @@ array(3) { | |
| } | |
| -- Iteration 3 -- | |
| array(3) { | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| int(111) | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| } | |
| -- Iteration 4 -- | |
| diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt | |
| index 7b4f8bd443..b6ccaa7e83 100644 | |
| --- a/ext/standard/tests/array/array_unique_variation4.phpt | |
| +++ b/ext/standard/tests/array/array_unique_variation4.phpt | |
| @@ -82,11 +82,11 @@ array(3) { | |
| -- Iteration 4 -- | |
| array(3) { | |
| [111]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| } | |
| -- Iteration 5 -- | |
| array(2) { | |
| diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt | |
| index 4a5c53c472..1010b9c88c 100644 | |
| --- a/ext/standard/tests/array/array_unshift_variation4.phpt | |
| +++ b/ext/standard/tests/array/array_unshift_variation4.phpt | |
| @@ -182,13 +182,13 @@ int(5) | |
| array(5) { | |
| [0]=> | |
| int(10) | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| int(111) | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| - ["pen\n"]=> | |
| + ["pen\\n"]=> | |
| int(33) | |
| } | |
| int(7) | |
| @@ -199,13 +199,13 @@ array(7) { | |
| string(5) "hello" | |
| [2]=> | |
| string(5) "world" | |
| - ["\tHello"]=> | |
| + ["\\tHello"]=> | |
| int(111) | |
| - ["re\td"]=> | |
| + ["re\\td"]=> | |
| string(5) "color" | |
| - ["\v\fworld"]=> | |
| + ["\\v\\fworld"]=> | |
| float(2.2) | |
| - ["pen\n"]=> | |
| + ["pen\\n"]=> | |
| int(33) | |
| } | |
| -- Iteration 6 -- | |
| diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt | |
| index ed3087cb57..f8aeba9026 100644 | |
| --- a/ext/standard/tests/array/array_unshift_variation5.phpt | |
| +++ b/ext/standard/tests/array/array_unshift_variation5.phpt | |
| @@ -264,13 +264,13 @@ array(5) { | |
| [0]=> | |
| int(10) | |
| [1]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [2]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [3]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| int(7) | |
| array(7) { | |
| @@ -281,13 +281,13 @@ array(7) { | |
| [2]=> | |
| string(5) "world" | |
| [3]=> | |
| - string(7) "\tHello" | |
| + string(7) "\\tHello" | |
| ["red"]=> | |
| - string(7) "col\tor" | |
| + string(7) "col\\tor" | |
| [4]=> | |
| - string(9) "\v\fworld" | |
| + string(9) "\\v\\fworld" | |
| [5]=> | |
| - string(5) "pen\n" | |
| + string(5) "pen\\n" | |
| } | |
| -- Iteration 9 -- | |
| int(3) | |
| diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt | |
| index f42ac1cfa8..79001ae7c8 100644 | |
| --- a/ext/standard/tests/array/array_unshift_variation7.phpt | |
| +++ b/ext/standard/tests/array/array_unshift_variation7.phpt | |
| @@ -117,7 +117,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(55) "This is a text with special chars: \!\@\#$\%\^\&\*\(\)\" | |
| + string(55) "This is a text with special chars: \\!\\@\\#$\\%\\^\\&\\*\\(\\)\\" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -130,7 +130,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(55) "This is a text with special chars: \!\@\#$\%\^\&\*\(\)\" | |
| + string(55) "This is a text with special chars: \\!\\@\\#$\\%\\^\\&\\*\\(\\)\\" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -148,7 +148,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(13) "hello world\t" | |
| + string(13) "hello world\\t" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -161,7 +161,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(13) "hello world\t" | |
| + string(13) "hello world\\t" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -179,7 +179,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(70) "This is a text in bold letters | |
| \s\malong with slashes | |
| + string(70) "This is a text in bold letters | |
| \\s\\malong with slashes | |
| : HELLO WORLD " | |
| ["f"]=> | |
| string(5) "first" | |
| @@ -193,7 +193,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(70) "This is a text in bold letters | |
| \s\malong with slashes | |
| + string(70) "This is a text in bold letters | |
| \\s\\malong with slashes | |
| : HELLO WORLD " | |
| [1]=> | |
| string(5) "hello" | |
| diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt | |
| index ff87f370f4..0d40ff239e 100644 | |
| --- a/ext/standard/tests/array/array_unshift_variation8.phpt | |
| +++ b/ext/standard/tests/array/array_unshift_variation8.phpt | |
| @@ -55,7 +55,7 @@ echo "Done"; | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(54) "\$ -> This represents the dollar sign. hello dollar!!!" | |
| + string(54) "\\$ -> This represents the dollar sign. hello dollar!!!" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -68,7 +68,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(54) "\$ -> This represents the dollar sign. hello dollar!!!" | |
| + string(54) "\\$ -> This represents the dollar sign. hello dollar!!!" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -86,7 +86,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(53) "\t\r\v The quick brown fo\fx jumped over the lazy dog" | |
| + string(53) "\\t\\r\\v The quick brown fo\\fx jumped over the lazy dog" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -99,7 +99,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(53) "\t\r\v The quick brown fo\fx jumped over the lazy dog" | |
| + string(53) "\\t\\r\\v The quick brown fo\\fx jumped over the lazy dog" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -117,7 +117,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(56) "This is a text with special chars: \!\@\#\$\%\^\&\*\(\)\" | |
| + string(56) "This is a text with special chars: \\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -130,7 +130,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(56) "This is a text with special chars: \!\@\#\$\%\^\&\*\(\)\" | |
| + string(56) "This is a text with special chars: \\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -148,7 +148,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(13) "hello world\t" | |
| + string(13) "hello world\\t" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -161,7 +161,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(13) "hello world\t" | |
| + string(13) "hello world\\t" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| @@ -179,7 +179,7 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(74) "This is \ta text in bold letters\r\s\malong with slashes\n : HELLO WORLD\t" | |
| + string(74) "This is \\ta text in bold letters\\r\\s\\malong with slashes\\n : HELLO WORLD\\t" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -192,7 +192,7 @@ array(5) { | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(74) "This is \ta text in bold letters\r\s\malong with slashes\n : HELLO WORLD\t" | |
| + string(74) "This is \\ta text in bold letters\\r\\s\\malong with slashes\\n : HELLO WORLD\\t" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt | |
| index 133f8f91fe..4e831627fd 100644 | |
| --- a/ext/standard/tests/array/array_unshift_variation9.phpt | |
| +++ b/ext/standard/tests/array/array_unshift_variation9.phpt | |
| @@ -268,10 +268,10 @@ array(7) { | |
| int(5) | |
| array(5) { | |
| [0]=> | |
| - string(123) "This's a string with quotes: | |
| -"strings in double quote"; | |
| -'strings in single quote'; | |
| -this\line is single quoted /with\slashes" | |
| + string(123) "This\'s a string with quotes: | |
| +\"strings in double quote\"; | |
| +\'strings in single quote\'; | |
| +this\\line is single quoted /with\\slashes" | |
| ["f"]=> | |
| string(5) "first" | |
| ["s"]=> | |
| @@ -284,10 +284,10 @@ this\line is single quoted /with\slashes" | |
| int(7) | |
| array(7) { | |
| [0]=> | |
| - string(123) "This's a string with quotes: | |
| -"strings in double quote"; | |
| -'strings in single quote'; | |
| -this\line is single quoted /with\slashes" | |
| + string(123) "This\'s a string with quotes: | |
| +\"strings in double quote\"; | |
| +\'strings in single quote\'; | |
| +this\\line is single quoted /with\\slashes" | |
| [1]=> | |
| string(5) "hello" | |
| [2]=> | |
| diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt | |
| index eb3f2f9567..664aba794f 100644 | |
| --- a/ext/standard/tests/array/arsort_variation5.phpt | |
| +++ b/ext/standard/tests/array/arsort_variation5.phpt | |
| @@ -60,14 +60,14 @@ echo "Done\n"; | |
| - With default sort_flag - | |
| bool(true) | |
| array(12) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| @@ -90,14 +90,14 @@ array(12) { | |
| - Sort_flag = SORT_REGULAR - | |
| bool(true) | |
| array(12) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| @@ -120,14 +120,14 @@ array(12) { | |
| - Sort_flag = SORT_STRING - | |
| bool(true) | |
| array(12) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt | |
| index f39c4829b1..ffe2f8d0b2 100644 | |
| --- a/ext/standard/tests/array/asort_variation5.phpt | |
| +++ b/ext/standard/tests/array/asort_variation5.phpt | |
| @@ -78,14 +78,14 @@ array(12) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| - Sort_flag = SORT_REGULAR - | |
| bool(true) | |
| @@ -108,14 +108,14 @@ array(12) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| - Sort_flag = SORT_STRING - | |
| bool(true) | |
| @@ -138,14 +138,14 @@ array(12) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| -- Iteration 2 -- | |
| diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt | |
| index 7475805f8d..04568a226e 100644 | |
| --- a/ext/standard/tests/array/krsort_variation5.phpt | |
| +++ b/ext/standard/tests/array/krsort_variation5.phpt | |
| @@ -61,14 +61,14 @@ echo "Done\n"; | |
| - With default sort flag - | |
| bool(true) | |
| array(11) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| @@ -89,14 +89,14 @@ array(11) { | |
| - Sort flag = SORT_REGULAR - | |
| bool(true) | |
| array(11) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| @@ -117,14 +117,14 @@ array(11) { | |
| - Sort flag = SORT_STRING - | |
| bool(true) | |
| array(11) { | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| [""]=> | |
| string(1) "" | |
| [" | |
| "]=> | |
| diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt | |
| index 0538043744..3693709572 100644 | |
| --- a/ext/standard/tests/array/ksort_variation5.phpt | |
| +++ b/ext/standard/tests/array/ksort_variation5.phpt | |
| @@ -77,14 +77,14 @@ array(11) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| - Sort flag = SORT_REGULAR - | |
| bool(true) | |
| @@ -105,14 +105,14 @@ array(11) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| - Sort flag = SORT_STRING - | |
| bool(true) | |
| @@ -133,14 +133,14 @@ array(11) { | |
| string(1) " | |
| " | |
| [""]=> | |
| string(1) "" | |
| - ["\a"]=> | |
| - string(2) "\a" | |
| - ["\cx"]=> | |
| - string(3) "\cx" | |
| - ["\ddd"]=> | |
| - string(4) "\ddd" | |
| - ["\xhh"]=> | |
| - string(4) "\xhh" | |
| + ["\\a"]=> | |
| + string(2) "\\a" | |
| + ["\\cx"]=> | |
| + string(3) "\\cx" | |
| + ["\\ddd"]=> | |
| + string(4) "\\ddd" | |
| + ["\\xhh"]=> | |
| + string(4) "\\xhh" | |
| } | |
| -- Iteration 2 -- | |
| diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/natcasesort_variation4.phpt | |
| index 4e3477bbea..9419abff9b 100644 | |
| --- a/ext/standard/tests/array/natcasesort_variation4.phpt | |
| +++ b/ext/standard/tests/array/natcasesort_variation4.phpt | |
| @@ -43,13 +43,13 @@ array(11) { | |
| [4]=> | |
| string(1) "" | |
| [2]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [3]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [9]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [8]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| } | |
| bool(true) | |
| array(12) { | |
| diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt | |
| index 6b05443b52..34954e9f1f 100644 | |
| --- a/ext/standard/tests/array/rsort_variation5.phpt | |
| +++ b/ext/standard/tests/array/rsort_variation5.phpt | |
| @@ -49,13 +49,13 @@ echo "Done"; | |
| bool(true) | |
| array(11) { | |
| [0]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| [1]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [2]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [3]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [4]=> | |
| string(1) "" | |
| [5]=> | |
| @@ -76,13 +76,13 @@ array(11) { | |
| bool(true) | |
| array(11) { | |
| [0]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| [1]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [2]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [3]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [4]=> | |
| string(1) "" | |
| [5]=> | |
| @@ -103,13 +103,13 @@ array(11) { | |
| bool(true) | |
| array(11) { | |
| [0]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| [1]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [2]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [3]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [4]=> | |
| string(1) "" | |
| [5]=> | |
| diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt | |
| index 6c49342df2..afa3f12eaf 100644 | |
| --- a/ext/standard/tests/array/sort_variation5.phpt | |
| +++ b/ext/standard/tests/array/sort_variation5.phpt | |
| @@ -72,13 +72,13 @@ array(12) { | |
| [7]=> | |
| string(1) "" | |
| [8]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [9]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [10]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [11]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| } | |
| - Sort flag = SORT_REGULAR - | |
| bool(true) | |
| @@ -101,13 +101,13 @@ array(12) { | |
| [7]=> | |
| string(1) "" | |
| [8]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [9]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [10]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [11]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| } | |
| - Sort flag = SORT_STRING - | |
| bool(true) | |
| @@ -130,13 +130,13 @@ array(12) { | |
| [7]=> | |
| string(1) "" | |
| [8]=> | |
| - string(2) "\a" | |
| + string(2) "\\a" | |
| [9]=> | |
| - string(3) "\cx" | |
| + string(3) "\\cx" | |
| [10]=> | |
| - string(4) "\ddd" | |
| + string(4) "\\ddd" | |
| [11]=> | |
| - string(4) "\xhh" | |
| + string(4) "\\xhh" | |
| } | |
| -- Iteration 2 -- | |
| diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt | |
| index 4160f4a2bd..a8716400fe 100644 | |
| --- a/ext/standard/tests/array/uasort_variation5.phpt | |
| +++ b/ext/standard/tests/array/uasort_variation5.phpt | |
| @@ -77,7 +77,7 @@ array(10) { | |
| [0]=> | |
| string(1) " " | |
| [9]=> | |
| - string(1) "'" | |
| + string(1) "\'" | |
| [7]=> | |
| string(1) "0" | |
| [8]=> | |
| @@ -89,7 +89,7 @@ array(10) { | |
| [3]=> | |
| string(5) "Hello" | |
| [6]=> | |
| - string(2) "\t" | |
| + string(2) "\\t" | |
| [1]=> | |
| string(4) "test" | |
| } | |
| @@ -103,7 +103,7 @@ array(10) { | |
| [0]=> | |
| string(1) " " | |
| [9]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [7]=> | |
| string(1) "0" | |
| [8]=> | |
| diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt | |
| index 4bad83005b..fa2176763e 100644 | |
| --- a/ext/standard/tests/array/usort_variation5.phpt | |
| +++ b/ext/standard/tests/array/usort_variation5.phpt | |
| @@ -79,7 +79,7 @@ array(10) { | |
| [1]=> | |
| string(1) " " | |
| [2]=> | |
| - string(1) "'" | |
| + string(1) "\'" | |
| [3]=> | |
| string(1) "0" | |
| [4]=> | |
| @@ -91,7 +91,7 @@ array(10) { | |
| [7]=> | |
| string(5) "Hello" | |
| [8]=> | |
| - string(2) "\t" | |
| + string(2) "\\t" | |
| [9]=> | |
| string(4) "test" | |
| } | |
| @@ -106,7 +106,7 @@ array(10) { | |
| [2]=> | |
| string(1) " " | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "0" | |
| [5]=> | |
| diff --git a/ext/standard/tests/file/basename_basic.phpt b/ext/standard/tests/file/basename_basic.phpt | |
| index bd86695b92..94744bb347 100644 | |
| --- a/ext/standard/tests/file/basename_basic.phpt | |
| +++ b/ext/standard/tests/file/basename_basic.phpt | |
| @@ -74,22 +74,22 @@ string(3) "bar" | |
| string(3) "bar" | |
| string(3) "bar" | |
| string(3) "bar" | |
| -string(8) "\foo\bar" | |
| -string(7) "foo\bar" | |
| -string(4) "\bar" | |
| -string(4) "bar\" | |
| -string(5) "\bar\" | |
| -string(9) "\foo\bar\" | |
| -string(8) "foo\bar\" | |
| -string(5) "\bar\" | |
| -string(9) "10.5\10.5" | |
| +string(8) "\\foo\\bar" | |
| +string(7) "foo\\bar" | |
| +string(4) "\\bar" | |
| +string(4) "bar\\" | |
| +string(5) "\\bar\\" | |
| +string(9) "\\foo\\bar\\" | |
| +string(8) "foo\\bar\\" | |
| +string(5) "\\bar\\" | |
| +string(9) "10.5\\10.5" | |
| string(4) "10.5" | |
| string(4) "10.5" | |
| string(3) "105" | |
| string(4) "10.5" | |
| -string(5) "\10.5" | |
| +string(5) "\\10.5" | |
| string(4) "10.5" | |
| -string(5) "10.5\" | |
| +string(5) "10.5\\" | |
| string(6) "10.zip" | |
| string(1) "0" | |
| string(1) "0" | |
| diff --git a/ext/standard/tests/file/basename_variation1.phpt b/ext/standard/tests/file/basename_variation1.phpt | |
| index 2b2ac3110e..5ebdf4ddc9 100644 | |
| --- a/ext/standard/tests/file/basename_variation1.phpt | |
| +++ b/ext/standard/tests/file/basename_variation1.phpt | |
| @@ -59,180 +59,180 @@ string(3) "foo" | |
| basename for path A:/foo/ is: | |
| string(3) "foo" | |
| basename for path A:/foo\ is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path A:/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path A:/foo.bar/ is: | |
| string(7) "foo.bar" | |
| basename for path A:/foo.bar\ is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path A:/dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path A:/dir\foo.bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path A:/dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path A:/dir with spaces\foo.bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path Z:/foo is: | |
| string(3) "foo" | |
| basename for path Z:/foo/ is: | |
| string(3) "foo" | |
| basename for path Z:/foo\ is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path Z:/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path Z:/foo.bar/ is: | |
| string(7) "foo.bar" | |
| basename for path Z:/foo.bar\ is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path Z:/dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path Z:/dir\foo.bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path Z:/dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path Z:/dir with spaces\foo.bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path A:\foo is: | |
| -string(6) "A:\foo" | |
| +string(6) "A:\\foo" | |
| basename for path A:\foo/ is: | |
| -string(6) "A:\foo" | |
| +string(6) "A:\\foo" | |
| basename for path A:\foo\ is: | |
| -string(7) "A:\foo\" | |
| +string(7) "A:\\foo\\" | |
| basename for path A:\foo.bar is: | |
| -string(10) "A:\foo.bar" | |
| +string(10) "A:\\foo.bar" | |
| basename for path A:\foo.bar/ is: | |
| -string(10) "A:\foo.bar" | |
| +string(10) "A:\\foo.bar" | |
| basename for path A:\foo.bar\ is: | |
| -string(11) "A:\foo.bar\" | |
| +string(11) "A:\\foo.bar\\" | |
| basename for path A:\dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path A:\dir\foo.bar is: | |
| -string(14) "A:\dir\foo.bar" | |
| +string(14) "A:\\dir\\foo.bar" | |
| basename for path A:\dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path A:\dir with spaces\foo.bar is: | |
| -string(26) "A:\dir with spaces\foo.bar" | |
| +string(26) "A:\\dir with spaces\\foo.bar" | |
| basename for path http://foo is: | |
| string(3) "foo" | |
| basename for path http://foo/ is: | |
| string(3) "foo" | |
| basename for path http://foo\ is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path http://foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path http://foo.bar/ is: | |
| string(7) "foo.bar" | |
| basename for path http://foo.bar\ is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path http://dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path http://dir\foo.bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path http://dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path http://dir with spaces\foo.bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path blah://foo is: | |
| string(3) "foo" | |
| basename for path blah://foo/ is: | |
| string(3) "foo" | |
| basename for path blah://foo\ is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path blah://foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path blah://foo.bar/ is: | |
| string(7) "foo.bar" | |
| basename for path blah://foo.bar\ is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path blah://dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path blah://dir\foo.bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path blah://dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path blah://dir with spaces\foo.bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path blah:\foo is: | |
| -string(9) "blah:\foo" | |
| +string(9) "blah:\\foo" | |
| basename for path blah:\foo/ is: | |
| -string(9) "blah:\foo" | |
| +string(9) "blah:\\foo" | |
| basename for path blah:\foo\ is: | |
| -string(10) "blah:\foo\" | |
| +string(10) "blah:\\foo\\" | |
| basename for path blah:\foo.bar is: | |
| -string(13) "blah:\foo.bar" | |
| +string(13) "blah:\\foo.bar" | |
| basename for path blah:\foo.bar/ is: | |
| -string(13) "blah:\foo.bar" | |
| +string(13) "blah:\\foo.bar" | |
| basename for path blah:\foo.bar\ is: | |
| -string(14) "blah:\foo.bar\" | |
| +string(14) "blah:\\foo.bar\\" | |
| basename for path blah:\dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path blah:\dir\foo.bar is: | |
| -string(17) "blah:\dir\foo.bar" | |
| +string(17) "blah:\\dir\\foo.bar" | |
| basename for path blah:\dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path blah:\dir with spaces\foo.bar is: | |
| -string(29) "blah:\dir with spaces\foo.bar" | |
| +string(29) "blah:\\dir with spaces\\foo.bar" | |
| basename for path hostname:foo is: | |
| string(12) "hostname:foo" | |
| basename for path hostname:foo/ is: | |
| string(12) "hostname:foo" | |
| basename for path hostname:foo\ is: | |
| -string(13) "hostname:foo\" | |
| +string(13) "hostname:foo\\" | |
| basename for path hostname:foo.bar is: | |
| string(16) "hostname:foo.bar" | |
| basename for path hostname:foo.bar/ is: | |
| string(16) "hostname:foo.bar" | |
| basename for path hostname:foo.bar\ is: | |
| -string(17) "hostname:foo.bar\" | |
| +string(17) "hostname:foo.bar\\" | |
| basename for path hostname:dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path hostname:dir\foo.bar is: | |
| -string(20) "hostname:dir\foo.bar" | |
| +string(20) "hostname:dir\\foo.bar" | |
| basename for path hostname:dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path hostname:dir with spaces\foo.bar is: | |
| -string(32) "hostname:dir with spaces\foo.bar" | |
| +string(32) "hostname:dir with spaces\\foo.bar" | |
| basename for path ~/foo is: | |
| string(3) "foo" | |
| basename for path ~/foo/ is: | |
| string(3) "foo" | |
| basename for path ~/foo\ is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path ~/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path ~/foo.bar/ is: | |
| string(7) "foo.bar" | |
| basename for path ~/foo.bar\ is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path ~/dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path ~/dir\foo.bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path ~/dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path ~/dir with spaces\foo.bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path ~\foo is: | |
| -string(5) "~\foo" | |
| +string(5) "~\\foo" | |
| basename for path ~\foo/ is: | |
| -string(5) "~\foo" | |
| +string(5) "~\\foo" | |
| basename for path ~\foo\ is: | |
| -string(6) "~\foo\" | |
| +string(6) "~\\foo\\" | |
| basename for path ~\foo.bar is: | |
| -string(9) "~\foo.bar" | |
| +string(9) "~\\foo.bar" | |
| basename for path ~\foo.bar/ is: | |
| -string(9) "~\foo.bar" | |
| +string(9) "~\\foo.bar" | |
| basename for path ~\foo.bar\ is: | |
| -string(10) "~\foo.bar\" | |
| +string(10) "~\\foo.bar\\" | |
| basename for path ~\dir/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path ~\dir\foo.bar is: | |
| -string(13) "~\dir\foo.bar" | |
| +string(13) "~\\dir\\foo.bar" | |
| basename for path ~\dir with spaces/foo.bar is: | |
| string(7) "foo.bar" | |
| basename for path ~\dir with spaces\foo.bar is: | |
| -string(25) "~\dir with spaces\foo.bar" | |
| +string(25) "~\\dir with spaces\\foo.bar" | |
| done | |
| diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt | |
| index a428d84e06..1921ba9557 100644 | |
| --- a/ext/standard/tests/file/basename_variation2.phpt | |
| +++ b/ext/standard/tests/file/basename_variation2.phpt | |
| @@ -90,23 +90,23 @@ string(3) "foo" | |
| basename for path foo/, supplying suffix \ is: | |
| string(3) "foo" | |
| basename for path foo\, supplying suffix .bar is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix .b is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix . is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix foo is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix foo.bar is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix foo/bar is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix foo\bar is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix / is: | |
| -string(4) "foo\" | |
| +string(4) "foo\\" | |
| basename for path foo\, supplying suffix \ is: | |
| string(3) "foo" | |
| basename for path foo.bar, supplying suffix .bar is: | |
| @@ -150,23 +150,23 @@ string(7) "foo.bar" | |
| basename for path foo.bar/, supplying suffix \ is: | |
| string(7) "foo.bar" | |
| basename for path foo.bar\, supplying suffix .bar is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix .b is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix . is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix foo is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix foo.bar is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix foo/bar is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix foo\bar is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix / is: | |
| -string(8) "foo.bar\" | |
| +string(8) "foo.bar\\" | |
| basename for path foo.bar\, supplying suffix \ is: | |
| string(7) "foo.bar" | |
| basename for path dir/foo.bar, supplying suffix .bar is: | |
| @@ -190,25 +190,25 @@ string(7) "foo.bar" | |
| basename for path dir/foo.bar, supplying suffix \ is: | |
| string(7) "foo.bar" | |
| basename for path dir\foo.bar, supplying suffix .bar is: | |
| -string(7) "dir\foo" | |
| +string(7) "dir\\foo" | |
| basename for path dir\foo.bar, supplying suffix .b is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix . is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix foo is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix foo.bar is: | |
| -string(4) "dir\" | |
| +string(4) "dir\\" | |
| basename for path dir\foo.bar, supplying suffix foo/bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix foo\bar is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix / is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir\foo.bar, supplying suffix \ is: | |
| -string(11) "dir\foo.bar" | |
| +string(11) "dir\\foo.bar" | |
| basename for path dir with spaces/foo.bar, supplying suffix .bar is: | |
| string(3) "foo" | |
| basename for path dir with spaces/foo.bar, supplying suffix .b is: | |
| @@ -230,24 +230,24 @@ string(7) "foo.bar" | |
| basename for path dir with spaces/foo.bar, supplying suffix \ is: | |
| string(7) "foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix .bar is: | |
| -string(19) "dir with spaces\foo" | |
| +string(19) "dir with spaces\\foo" | |
| basename for path dir with spaces\foo.bar, supplying suffix .b is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix . is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix foo is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix foo.bar is: | |
| -string(16) "dir with spaces\" | |
| +string(16) "dir with spaces\\" | |
| basename for path dir with spaces\foo.bar, supplying suffix foo/bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix foo\bar is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix / is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| basename for path dir with spaces\foo.bar, supplying suffix \ is: | |
| -string(23) "dir with spaces\foo.bar" | |
| +string(23) "dir with spaces\\foo.bar" | |
| done | |
| diff --git a/ext/standard/tests/file/bug22382.phpt b/ext/standard/tests/file/bug22382.phpt | |
| index c8dd01efd0..82b90e572b 100644 | |
| --- a/ext/standard/tests/file/bug22382.phpt | |
| +++ b/ext/standard/tests/file/bug22382.phpt | |
| @@ -13,13 +13,13 @@ array(6) { | |
| [0]=> | |
| string(3) "One" | |
| [1]=> | |
| - string(7) "\"Two\"" | |
| + string(7) "\\\"Two\\\"" | |
| [2]=> | |
| - string(7) "Three\"" | |
| + string(7) "Three\\\"" | |
| [3]=> | |
| string(4) "Four" | |
| [4]=> | |
| - string(2) "\\" | |
| + string(2) "\\\\" | |
| [5]=> | |
| - string(28) "\\\\\\\\\\\\\\\\\\\\\\\"\\\\" | |
| + string(28) "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"\\\\\\\\" | |
| } | |
| diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt | |
| index ed9b7cc114..b9a7ce2e36 100644 | |
| --- a/ext/standard/tests/file/bug38086.phpt | |
| +++ b/ext/standard/tests/file/bug38086.phpt | |
| @@ -40,16 +40,16 @@ echo "Done\n"; | |
| --EXPECTF-- | |
| int(%d) | |
| string(134) "Nabgure qnl | |
| -Jura gur cnvaf bs yvsr jba'g one zl jnl | |
| -V'yy oernx gurfr punvaf | |
| +Jura gur cnvaf bs yvsr jba\'g one zl jnl | |
| +V\'yy oernx gurfr punvaf | |
| Gung ubyq zr qbja | |
| -V'yy grne lbh qbja vagb zl cevingr uryy | |
| +V\'yy grne lbh qbja vagb zl cevingr uryy | |
| " | |
| int(%d) | |
| string(134) "Nabgure qnl | |
| -Jura gur cnvaf bs yvsr jba'g one zl jnl | |
| -V'yy oernx gurfr punvaf | |
| +Jura gur cnvaf bs yvsr jba\'g one zl jnl | |
| +V\'yy oernx gurfr punvaf | |
| Gung ubyq zr qbja | |
| -V'yy grne lbh qbja vagb zl cevingr uryy | |
| +V\'yy grne lbh qbja vagb zl cevingr uryy | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/bug40501.phpt b/ext/standard/tests/file/bug40501.phpt | |
| index 42fcd296cf..bcb2f16942 100644 | |
| --- a/ext/standard/tests/file/bug40501.phpt | |
| +++ b/ext/standard/tests/file/bug40501.phpt | |
| @@ -14,7 +14,7 @@ var_dump($data); | |
| array(2) { | |
| [0]=> | |
| string(%d) "this element contains the delimiter, and ends with an odd number of | |
| -backslashes (ex: 1)\" | |
| +backslashes (ex: 1)\\" | |
| [1]=> | |
| - string(%d) "and it isn't the last element$" | |
| + string(30) "and it isn\'t the last element$" | |
| } | |
| diff --git a/ext/standard/tests/file/bug51094.phpt b/ext/standard/tests/file/bug51094.phpt | |
| index 77d7470cb5..8b95ee6d3d 100644 | |
| --- a/ext/standard/tests/file/bug51094.phpt | |
| +++ b/ext/standard/tests/file/bug51094.phpt | |
| @@ -16,7 +16,7 @@ var_dump($ini['ini']); | |
| ?> | |
| --EXPECT-- | |
| string(7) "ini;raw" | |
| -string(4) ""ini" | |
| +string(4) "\"ini" | |
| string(3) "ini" | |
| -string(7) "ini"raw" | |
| +string(7) "ini\"raw" | |
| string(0) "" | |
| diff --git a/ext/standard/tests/file/bug63512.phpt b/ext/standard/tests/file/bug63512.phpt | |
| index c5683a6d51..7dae9349d2 100644 | |
| --- a/ext/standard/tests/file/bug63512.phpt | |
| +++ b/ext/standard/tests/file/bug63512.phpt | |
| @@ -23,11 +23,11 @@ array(7) { | |
| ["quotedString"]=> | |
| string(6) "string" | |
| ["a"]=> | |
| - string(18) "INSTALL_ROOT "waa"" | |
| + string(18) "INSTALL_ROOT \"waa\"" | |
| ["b"]=> | |
| string(12) "INSTALL_ROOT" | |
| ["c"]=> | |
| - string(18) ""waa" INSTALL_ROOT" | |
| + string(18) "\"waa\" INSTALL_ROOT" | |
| ["d"]=> | |
| - string(27) "INSTALL_ROOT "INSTALL_ROOT"" | |
| + string(27) "INSTALL_ROOT \"INSTALL_ROOT\"" | |
| } | |
| diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt | |
| index 97fbe85a28..8ceea3873d 100644 | |
| --- a/ext/standard/tests/file/dirname_basic.phpt | |
| +++ b/ext/standard/tests/file/dirname_basic.phpt | |
| @@ -71,8 +71,8 @@ string(1) "/" | |
| string(1) "/" | |
| string(1) "/" | |
| string(15) "/usr/lib/locale" | |
| -string(27) "c:\windows/system32\drivers" | |
| -string(8) "/usr\lib" | |
| +string(27) "c:\\windows/system32\\drivers" | |
| +string(8) "/usr\\lib" | |
| string(1) "." | |
| string(1) "." | |
| string(1) "." | |
| diff --git a/ext/standard/tests/file/fgetcsv.phpt b/ext/standard/tests/file/fgetcsv.phpt | |
| index 17ac19ca60..995ded6524 100644 | |
| --- a/ext/standard/tests/file/fgetcsv.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv.phpt | |
| @@ -99,31 +99,31 @@ array(2) { | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(2) "\"" | |
| + string(2) "\\\"" | |
| [1]=> | |
| string(3) "aaa" | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(2) """" | |
| + string(2) "\"\"" | |
| [1]=> | |
| string(0) "" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(7) """,aaa | |
| + string(7) "\"\",aaa | |
| " | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(8) "\"",aaa | |
| + string(8) "\\\"\",aaa | |
| " | |
| } | |
| array(2) { | |
| [0]=> | |
| string(3) "aaa" | |
| [1]=> | |
| - string(10) "\"bbb,ccc | |
| + string(10) "\\\"bbb,ccc | |
| " | |
| } | |
| array(2) { | |
| @@ -140,19 +140,19 @@ array(2) { | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(8) "aaa"aaa"" | |
| + string(8) "aaa\"aaa\"" | |
| [1]=> | |
| string(6) "bbbbbb" | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(10) "aaa"aaa"""" | |
| + string(10) "aaa\"aaa\"\"\"" | |
| [1]=> | |
| string(3) "bbb" | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(8) "aaa"\"a"" | |
| + string(8) "aaa\"\\\"a\"" | |
| [1]=> | |
| string(3) "bbb" | |
| } | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt | |
| index 04936b8c81..94f8ca0753 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation1.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation1.phpt | |
| @@ -1142,13 +1142,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1160,13 +1160,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1178,13 +1178,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1196,13 +1196,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1214,13 +1214,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1232,13 +1232,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1250,13 +1250,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1268,13 +1268,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1286,13 +1286,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1304,13 +1304,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1322,13 +1322,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1340,13 +1340,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1358,13 +1358,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1376,13 +1376,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1394,13 +1394,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt | |
| index 30b1feb3bf..2046c08ac0 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation11.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt | |
| @@ -91,7 +91,7 @@ echo "Done\n"; | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -101,7 +101,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -111,7 +111,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -121,7 +121,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -131,7 +131,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -141,7 +141,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -151,7 +151,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -161,7 +161,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -171,7 +171,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -181,7 +181,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -191,7 +191,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -201,7 +201,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -211,7 +211,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -221,7 +221,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -231,7 +231,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| string(5) "fruit" | |
| } | |
| @@ -241,9 +241,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -251,9 +251,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -261,9 +261,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -271,9 +271,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -281,9 +281,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -291,9 +291,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -301,9 +301,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -311,9 +311,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -321,9 +321,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -331,9 +331,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -341,9 +341,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -351,9 +351,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -361,9 +361,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -371,9 +371,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -381,9 +381,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(2) { | |
| [0]=> | |
| - string(7) ""water"" | |
| + string(7) "\"water\"" | |
| [1]=> | |
| - string(7) ""fruit"" | |
| + string(7) "\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -1561,13 +1561,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1579,13 +1579,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1597,13 +1597,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1615,13 +1615,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1633,13 +1633,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1651,13 +1651,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1669,13 +1669,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1687,13 +1687,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1705,13 +1705,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1723,13 +1723,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1741,13 +1741,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1759,13 +1759,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1777,13 +1777,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1795,13 +1795,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| @@ -1813,13 +1813,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(6) "&""""&" | |
| + string(6) "&\"\"\"\"&" | |
| [1]=> | |
| - string(3) "&"&" | |
| + string(3) "&\"&" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(3) "&,&" | |
| [5]=> | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt | |
| index 7400d5bd1a..f3d27d9f0d 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation15.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt | |
| @@ -715,7 +715,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -730,7 +730,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -745,7 +745,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -760,7 +760,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -775,7 +775,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -790,7 +790,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -805,7 +805,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -820,7 +820,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -835,7 +835,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -850,7 +850,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -865,7 +865,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -880,7 +880,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -895,7 +895,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -910,7 +910,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -925,7 +925,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt | |
| index 0c5981ff6c..12c130b468 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation16.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation16.phpt | |
| @@ -719,7 +719,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -734,7 +734,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -749,7 +749,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -764,7 +764,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -779,7 +779,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -794,7 +794,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -809,7 +809,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -824,7 +824,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -839,7 +839,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -854,7 +854,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -869,7 +869,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -884,7 +884,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -899,7 +899,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -914,7 +914,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -929,7 +929,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt | |
| index 0010b87b6f..5bfc9aed7c 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation17.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation17.phpt | |
| @@ -1295,7 +1295,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1313,7 +1313,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1331,7 +1331,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1349,7 +1349,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1367,7 +1367,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1385,7 +1385,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1403,7 +1403,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1421,7 +1421,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1439,7 +1439,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1457,7 +1457,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1475,7 +1475,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1493,7 +1493,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1511,7 +1511,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1529,7 +1529,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| @@ -1547,7 +1547,7 @@ array(3) { | |
| [1]=> | |
| string(5) "fruit" | |
| [2]=> | |
| - string(43) "" | |
| + string(43) "\" | |
| This is line of text without csv fields | |
| " | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt | |
| index b991afda4e..2e3cec785c 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation18.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation18.phpt | |
| @@ -330,7 +330,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -338,7 +338,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -346,7 +346,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -354,7 +354,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -362,7 +362,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -370,7 +370,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -378,7 +378,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -386,7 +386,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -394,7 +394,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -402,7 +402,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -410,7 +410,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -418,7 +418,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -426,7 +426,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -434,7 +434,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -442,7 +442,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water "fruit"" | |
| + string(13) "water \"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -450,7 +450,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -458,7 +458,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -466,7 +466,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -474,7 +474,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -482,7 +482,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -490,7 +490,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -498,7 +498,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -506,7 +506,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -514,7 +514,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -522,7 +522,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -530,7 +530,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -538,7 +538,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -546,7 +546,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -554,7 +554,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -562,7 +562,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(19) "water\"fruit"\"air"" | |
| + string(19) "water\\\"fruit\"\\\"air\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -570,7 +570,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -578,7 +578,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -586,7 +586,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -594,7 +594,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -602,7 +602,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -610,7 +610,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -618,7 +618,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -626,7 +626,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -634,7 +634,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -642,7 +642,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -650,7 +650,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -658,7 +658,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -666,7 +666,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -674,7 +674,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| @@ -682,7 +682,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(17) "water\"fruit"\"""" | |
| + string(17) "water\\\"fruit\"\\\"\"\"" | |
| } | |
| int(20) | |
| bool(false) | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt | |
| index 2f88dcad60..21c75f791e 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation2.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation2.phpt | |
| @@ -1139,13 +1139,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1157,13 +1157,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1175,13 +1175,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1193,13 +1193,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1211,13 +1211,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1229,13 +1229,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1247,13 +1247,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1265,13 +1265,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1283,13 +1283,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1301,13 +1301,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1319,13 +1319,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1337,13 +1337,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1355,13 +1355,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1373,13 +1373,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -1391,13 +1391,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt | |
| index bd1442155d..64c44e8e3d 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation6.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation6.phpt | |
| @@ -1986,13 +1986,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2010,13 +2010,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2034,13 +2034,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2058,13 +2058,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2082,13 +2082,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2106,13 +2106,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2130,13 +2130,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2154,13 +2154,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2178,13 +2178,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2202,13 +2202,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2226,13 +2226,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2250,13 +2250,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2274,13 +2274,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2298,13 +2298,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| @@ -2322,13 +2322,13 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(6) { | |
| [0]=> | |
| - string(4) """""" | |
| + string(4) "\"\"\"\"" | |
| [1]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [2]=> | |
| string(1) "," | |
| [3]=> | |
| - string(1) """ | |
| + string(1) "\"" | |
| [4]=> | |
| string(1) "," | |
| [5]=> | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt | |
| index 0d5c6dc113..90ac162266 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation7.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation7.phpt | |
| @@ -992,9 +992,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1012,9 +1012,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1032,9 +1032,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1052,9 +1052,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1072,9 +1072,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1092,9 +1092,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1112,9 +1112,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1132,9 +1132,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1152,9 +1152,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1172,9 +1172,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1192,9 +1192,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1212,9 +1212,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1232,9 +1232,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1252,9 +1252,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| @@ -1272,9 +1272,9 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(7) { | |
| [0]=> | |
| - string(11) "&""""&:&"&:" | |
| + string(11) "&\"\"\"\"&:&\"&:" | |
| [1]=> | |
| - string(4) ":":&" | |
| + string(4) ":\":&" | |
| [2]=> | |
| string(2) "&:" | |
| [3]=> | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt | |
| index 7978e82e31..2214a68150 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation8.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation8.phpt | |
| @@ -94,7 +94,7 @@ echo "Done\n"; | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -102,7 +102,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -110,7 +110,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -118,7 +118,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -126,7 +126,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -134,7 +134,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -142,7 +142,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -150,7 +150,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -158,7 +158,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -166,7 +166,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -174,7 +174,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -182,7 +182,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -190,7 +190,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -198,7 +198,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -206,7 +206,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) ""water",fruit" | |
| + string(13) "\"water\",fruit" | |
| } | |
| int(14) | |
| bool(false) | |
| @@ -214,7 +214,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -222,7 +222,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -230,7 +230,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -238,7 +238,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -246,7 +246,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -254,7 +254,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -262,7 +262,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -270,7 +270,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -278,7 +278,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -286,7 +286,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -294,7 +294,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -302,7 +302,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -310,7 +310,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -318,7 +318,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -326,7 +326,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(15) ""water","fruit"" | |
| + string(15) "\"water\",\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -934,7 +934,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -942,7 +942,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -950,7 +950,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -958,7 +958,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -966,7 +966,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -974,7 +974,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -982,7 +982,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -990,7 +990,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -998,7 +998,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1006,7 +1006,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1014,7 +1014,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1022,7 +1022,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1030,7 +1030,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1038,7 +1038,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1046,7 +1046,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(23) "&""""&:&"&:,:":&,&:,,,," | |
| + string(23) "&\"\"\"\"&:&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt | |
| index b1f14db1c8..5a941f53ac 100644 | |
| --- a/ext/standard/tests/file/fgetcsv_variation9.phpt | |
| +++ b/ext/standard/tests/file/fgetcsv_variation9.phpt | |
| @@ -216,7 +216,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -224,7 +224,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -232,7 +232,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -240,7 +240,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -248,7 +248,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -256,7 +256,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -264,7 +264,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -272,7 +272,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -280,7 +280,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -288,7 +288,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -296,7 +296,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -304,7 +304,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -312,7 +312,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -320,7 +320,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -328,7 +328,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(13) "water,"fruit"" | |
| + string(13) "water,\"fruit\"" | |
| } | |
| int(16) | |
| bool(false) | |
| @@ -936,7 +936,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -944,7 +944,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rb mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -952,7 +952,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using rt mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -960,7 +960,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -968,7 +968,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -976,7 +976,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using r+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -984,7 +984,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -992,7 +992,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1000,7 +1000,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using a+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1008,7 +1008,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1016,7 +1016,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1024,7 +1024,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using w+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1032,7 +1032,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+ mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1040,7 +1040,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+b mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| @@ -1048,7 +1048,7 @@ bool(false) | |
| -- Testing fgetcsv() with file opened using x+t mode -- | |
| array(1) { | |
| [0]=> | |
| - string(21) """"":&"&:,:":&,&:,,,," | |
| + string(21) "\"\"\"\":&\"&:,:\":&,&:,,,," | |
| } | |
| int(24) | |
| bool(false) | |
| diff --git a/ext/standard/tests/file/file_variation7.phpt b/ext/standard/tests/file/file_variation7.phpt | |
| index 3cd9d7fc88..c8688da49b 100644 | |
| --- a/ext/standard/tests/file/file_variation7.phpt | |
| +++ b/ext/standard/tests/file/file_variation7.phpt | |
| @@ -39,7 +39,7 @@ array(5) { | |
| string(3) " | |
| " | |
| [4]=> | |
| - string(7) "\Line 3" | |
| + string(7) "\\Line 3" | |
| } | |
| file() with FILE_IGNORE_NEW_LINES: | |
| @@ -53,7 +53,7 @@ array(5) { | |
| [3]=> | |
| string(2) " " | |
| [4]=> | |
| - string(7) "\Line 3" | |
| + string(7) "\\Line 3" | |
| } | |
| file() with FILE_SKIP_EMPTY_LINES: | |
| @@ -71,7 +71,7 @@ array(5) { | |
| string(3) " | |
| " | |
| [4]=> | |
| - string(7) "\Line 3" | |
| + string(7) "\\Line 3" | |
| } | |
| file() with FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES: | |
| @@ -83,5 +83,5 @@ array(4) { | |
| [2]=> | |
| string(2) " " | |
| [3]=> | |
| - string(7) "\Line 3" | |
| + string(7) "\\Line 3" | |
| } | |
| diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt | |
| index ba82b20428..ccb5f9083d 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation1.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation1.phpt | |
| @@ -158,168 +158,168 @@ string(%d) "water,fruit | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+ -- | |
| @@ -746,83 +746,83 @@ string(%d) "---water------fruit------air--- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in r+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in r+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt | |
| index ecd1846143..bb4edd6162 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation10.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation10.phpt | |
| @@ -67,180 +67,180 @@ echo "Done\n"; | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in r+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in r+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in a+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in a+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in a+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in w+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in w+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in w+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in x+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in x+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in x+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water_fruit\n" | |
| +string(16) "\"water_fruit\\n\" | |
| " | |
| -- file opened in r+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in r+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in r+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in a+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in a+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in a+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in w+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in w+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in w+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in x+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in x+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in x+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water_fruit | |
| -" | |
| +string(15) "\"water_fruit | |
| +\" | |
| " | |
| -- file opened in r+ -- | |
| diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt | |
| index 2347b9332c..11fdbff17c 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation11.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation11.phpt | |
| @@ -67,762 +67,762 @@ foreach ($csv_lists as $csv_list) { | |
| echo "Done\n"; | |
| ?> | |
| ---EXPECTF-- | |
| +--EXPECT-- | |
| *** Testing fputcsv() : with default enclosure value *** | |
| -- file opened in r+ -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(%d) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(%d) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(%d) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(14) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(14) | |
| int(14) | |
| bool(false) | |
| -string(%d) ""water,fruit" | |
| +string(14) "\"water,fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""&water&:&fruit&" | |
| +string(18) "\"&water&:&fruit&\" | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""=water===fruit=" | |
| +string(18) "\"=water===fruit=\" | |
| " | |
| -- file opened in r+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) ""-water--fruit-air" | |
| +string(20) "\"-water--fruit-air\" | |
| " | |
| -- file opened in r+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in r+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in r+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in a+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in a+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in a+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in w+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in w+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in w+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in x+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in x+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in x+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) ""-water---fruit---air-" | |
| +string(24) "\"-water---fruit---air-\" | |
| " | |
| -- file opened in r+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt | |
| index e5e14c0c91..4e65838191 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation12.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation12.phpt | |
| @@ -159,252 +159,252 @@ string(%d) "water,fruit | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+ -- | |
| @@ -747,83 +747,83 @@ string(%d) "-water---fruit---air- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt | |
| index 9261f1d2c1..2a04ae99dd 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation5.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation5.phpt | |
| @@ -158,252 +158,252 @@ string(%d) "water,fruit | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) ""^water^ ^fruit^" | |
| +string(18) "\"^water^ ^fruit^\" | |
| " | |
| -- file opened in r+ -- | |
| @@ -746,83 +746,83 @@ string(%d) "-water---fruit---air- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in r+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in a+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in w+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| -- file opened in x+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," | |
| +string(32) "\"&\"\"\"\"\"\"\"\"&:&\"\"&:,:\"\":&,&:,,,,\" | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt | |
| index a385c61ce9..bb28c50068 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation6.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation6.phpt | |
| @@ -161,168 +161,168 @@ string(%d) "water,fruit | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in r+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in r+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in a+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in a+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in a+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in w+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in w+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in w+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in x+ -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in x+b -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(15) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in x+t -- | |
| int(15) | |
| int(15) | |
| bool(false) | |
| -string(%d) ""water","fruit | |
| +string(15) "\"water\",\"fruit | |
| " | |
| -- file opened in r+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(16) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(16) | |
| int(16) | |
| bool(false) | |
| -string(%d) ""water","fruit" | |
| +string(16) "\"water\",\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| @@ -749,83 +749,83 @@ string(%d) "-water---fruit---air- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in r+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in r+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in a+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in a+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in a+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in w+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in w+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in w+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in x+ -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in x+b -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(24) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| -- file opened in x+t -- | |
| int(24) | |
| int(24) | |
| bool(false) | |
| -string(%d) "&""""&:&"&:,:":&,&:,,,, | |
| +string(24) "&\"\"\"\"&:&\"&:,:\":&,&:,,,, | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt | |
| index 7d7586cebf..98e4f9eda2 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation7.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation7.phpt | |
| @@ -161,168 +161,168 @@ string(%d) "water+fruit | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in a+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in w+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+ -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+b -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(20) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in x+t -- | |
| int(20) | |
| int(20) | |
| bool(false) | |
| -string(%d) """"water"",""fruit" | |
| +string(20) "\"\"\"water\"\",\"\"fruit\" | |
| " | |
| -- file opened in r+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in a+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in w+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+ -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+b -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(22) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in x+t -- | |
| int(22) | |
| int(22) | |
| bool(false) | |
| -string(%d) """"water"",""fruit""" | |
| +string(22) "\"\"\"water\"\",\"\"fruit\"\"\" | |
| " | |
| -- file opened in r+ -- | |
| @@ -749,83 +749,83 @@ string(%d) "---water------fruit------air--- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in r+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in r+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in a+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in w+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+ -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+b -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(32) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| -- file opened in x+t -- | |
| int(32) | |
| int(32) | |
| bool(false) | |
| -string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& | |
| +string(32) "&&&\"\"\"\"&&:&&\"&&:,:\":&&,&&:,,,,& | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt | |
| index ed981284f5..a6b3138cb6 100644 | |
| --- a/ext/standard/tests/file/fputcsv_variation8.phpt | |
| +++ b/ext/standard/tests/file/fputcsv_variation8.phpt | |
| @@ -161,168 +161,168 @@ string(%d) "+water,fruit+ | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in r+b -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in r+t -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(%d) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in a+ -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in a+b -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in a+t -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(%d) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in w+ -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in w+b -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in w+t -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(%d) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in x+ -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in x+b -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(17) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in x+t -- | |
| int(17) | |
| int(17) | |
| bool(false) | |
| -string(%d) "+"water","fruit+ | |
| +string(17) "+\"water\",\"fruit+ | |
| " | |
| -- file opened in r+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in r+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in r+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in a+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in a+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in a+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in w+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in w+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in w+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in x+ -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in x+b -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(18) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in x+t -- | |
| int(18) | |
| int(18) | |
| bool(false) | |
| -string(%d) "+"water","fruit"+ | |
| +string(18) "+\"water\",\"fruit\"+ | |
| " | |
| -- file opened in r+ -- | |
| @@ -749,83 +749,83 @@ string(%d) "+-water---fruit---air-+ | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in r+b -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in r+t -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(%d) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in a+ -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in a+b -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in a+t -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(%d) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in w+ -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in w+b -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in w+t -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(%d) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in x+ -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in x+b -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(26) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| -- file opened in x+t -- | |
| int(26) | |
| int(26) | |
| bool(false) | |
| -string(%d) "+&""""&:&"&:,:":&,&:,,,,+ | |
| +string(26) "+&\"\"\"\"&:&\"&:,:\":&,&:,,,,+ | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt | |
| index 97a07a98f2..0c0b3e3b09 100644 | |
| --- a/ext/standard/tests/file/fscanf_variation14.phpt | |
| +++ b/ext/standard/tests/file/fscanf_variation14.phpt | |
| @@ -147,11 +147,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -222,11 +222,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -297,11 +297,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -372,11 +372,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -447,11 +447,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -522,11 +522,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -624,11 +624,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -699,11 +699,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -774,11 +774,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -849,11 +849,11 @@ NULL | |
| NULL | |
| array(1) { | |
| [0]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\060" | |
| + string(4) "\\060" | |
| } | |
| array(1) { | |
| [0]=> | |
| diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt | |
| index 4c46cf58da..4a218bc339 100644 | |
| --- a/ext/standard/tests/file/fscanf_variation24.phpt | |
| +++ b/ext/standard/tests/file/fscanf_variation24.phpt | |
| @@ -117,7 +117,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -125,7 +125,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -192,7 +192,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -200,7 +200,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -267,7 +267,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -275,7 +275,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -342,7 +342,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -350,7 +350,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -411,7 +411,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -419,7 +419,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -486,7 +486,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -494,7 +494,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -576,7 +576,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -584,7 +584,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -645,7 +645,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -653,7 +653,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -720,7 +720,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\x01" | |
| + string(4) "\\x01" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -728,7 +728,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(3) "\01" | |
| + string(3) "\\01" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -795,7 +795,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(4) "\x01" | |
| + string(4) "\\x01" | |
| } | |
| array(1) { | |
| [0]=> | |
| @@ -803,7 +803,7 @@ array(1) { | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(3) "\01" | |
| + string(3) "\\01" | |
| } | |
| array(1) { | |
| [0]=> | |
| diff --git a/ext/standard/tests/file/ftruncate_bug76803.phpt b/ext/standard/tests/file/ftruncate_bug76803.phpt | |
| index df7136f1ca..5a8e526be1 100644 | |
| --- a/ext/standard/tests/file/ftruncate_bug76803.phpt | |
| +++ b/ext/standard/tests/file/ftruncate_bug76803.phpt | |
| @@ -33,6 +33,6 @@ $fn = __DIR__ . DIRECTORY_SEPARATOR . "test76803"; | |
| unlink($fn); | |
| ?> | |
| --EXPECT-- | |
| -string(13) "He\0\0\0World" | |
| +string(13) "He\\0\\0\\0World" | |
| string(2) "He" | |
| string(7) "HeWorld" | |
| diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt | |
| index 41a065e4e1..10d624d5fa 100644 | |
| --- a/ext/standard/tests/file/pathinfo_basic1.phpt | |
| +++ b/ext/standard/tests/file/pathinfo_basic1.phpt | |
| @@ -108,16 +108,16 @@ array(3) { | |
| } | |
| -- Iteration 4 -- | |
| string(1) "." | |
| -string(3) "c:\" | |
| +string(3) "c:\\" | |
| string(0) "" | |
| -string(3) "c:\" | |
| +string(3) "c:\\" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(3) "c:\" | |
| + string(3) "c:\\" | |
| ["filename"]=> | |
| - string(3) "c:\" | |
| + string(3) "c:\\" | |
| } | |
| -- Iteration 5 -- | |
| string(1) "." | |
| @@ -147,29 +147,29 @@ array(3) { | |
| } | |
| -- Iteration 7 -- | |
| string(1) "." | |
| -string(12) "c:\test\adir" | |
| +string(12) "c:\\test\\adir" | |
| string(0) "" | |
| -string(12) "c:\test\adir" | |
| +string(12) "c:\\test\\adir" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(12) "c:\test\adir" | |
| + string(12) "c:\\test\\adir" | |
| ["filename"]=> | |
| - string(12) "c:\test\adir" | |
| + string(12) "c:\\test\\adir" | |
| } | |
| -- Iteration 8 -- | |
| string(1) "." | |
| -string(13) "c:\test\adir\" | |
| +string(13) "c:\\test\\adir\\" | |
| string(0) "" | |
| -string(13) "c:\test\adir\" | |
| +string(13) "c:\\test\\adir\\" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(13) "c:\test\adir\" | |
| + string(13) "c:\\test\\adir\\" | |
| ["filename"]=> | |
| - string(13) "c:\test\adir\" | |
| + string(13) "c:\\test\\adir\\" | |
| } | |
| -- Iteration 9 -- | |
| string(12) "/usr/include" | |
| @@ -225,29 +225,29 @@ array(3) { | |
| } | |
| -- Iteration 13 -- | |
| string(1) "." | |
| -string(13) "c:\test\afile" | |
| +string(13) "c:\\test\\afile" | |
| string(0) "" | |
| -string(13) "c:\test\afile" | |
| +string(13) "c:\\test\\afile" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(13) "c:\test\afile" | |
| + string(13) "c:\\test\\afile" | |
| ["filename"]=> | |
| - string(13) "c:\test\afile" | |
| + string(13) "c:\\test\\afile" | |
| } | |
| -- Iteration 14 -- | |
| string(1) "." | |
| -string(13) "c:\test\afile" | |
| +string(13) "c:\\test\\afile" | |
| string(0) "" | |
| -string(13) "c:\test\afile" | |
| +string(13) "c:\\test\\afile" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(13) "c:\test\afile" | |
| + string(13) "c:\\test\\afile" | |
| ["filename"]=> | |
| - string(13) "c:\test\afile" | |
| + string(13) "c:\\test\\afile" | |
| } | |
| -- Iteration 15 -- | |
| string(8) "c://test" | |
| @@ -264,46 +264,46 @@ array(3) { | |
| } | |
| -- Iteration 16 -- | |
| string(1) "." | |
| -string(14) "c:\test\afile\" | |
| +string(14) "c:\\test\\afile\\" | |
| string(0) "" | |
| -string(14) "c:\test\afile\" | |
| +string(14) "c:\\test\\afile\\" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(14) "c:\test\afile\" | |
| + string(14) "c:\\test\\afile\\" | |
| ["filename"]=> | |
| - string(14) "c:\test\afile\" | |
| + string(14) "c:\\test\\afile\\" | |
| } | |
| -- Iteration 17 -- | |
| string(1) "." | |
| -string(16) "c:\test\prog.exe" | |
| +string(16) "c:\\test\\prog.exe" | |
| string(3) "exe" | |
| -string(12) "c:\test\prog" | |
| +string(12) "c:\\test\\prog" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(16) "c:\test\prog.exe" | |
| + string(16) "c:\\test\\prog.exe" | |
| ["extension"]=> | |
| string(3) "exe" | |
| ["filename"]=> | |
| - string(12) "c:\test\prog" | |
| + string(12) "c:\\test\\prog" | |
| } | |
| -- Iteration 18 -- | |
| string(1) "." | |
| -string(16) "c:\test\prog.exe" | |
| +string(16) "c:\\test\\prog.exe" | |
| string(3) "exe" | |
| -string(12) "c:\test\prog" | |
| +string(12) "c:\\test\\prog" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(16) "c:\test\prog.exe" | |
| + string(16) "c:\\test\\prog.exe" | |
| ["extension"]=> | |
| string(3) "exe" | |
| ["filename"]=> | |
| - string(12) "c:\test\prog" | |
| + string(12) "c:\\test\\prog" | |
| } | |
| -- Iteration 19 -- | |
| string(7) "c:/test" | |
| @@ -352,29 +352,29 @@ array(4) { | |
| } | |
| -- Iteration 22 -- | |
| string(1) "." | |
| -string(1) "\" | |
| +string(1) "\\" | |
| string(0) "" | |
| -string(1) "\" | |
| +string(1) "\\" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| ["filename"]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| } | |
| -- Iteration 23 -- | |
| string(1) "." | |
| -string(2) "\\" | |
| +string(2) "\\\\" | |
| string(0) "" | |
| -string(2) "\\" | |
| +string(2) "\\\\" | |
| array(3) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(2) "\\" | |
| + string(2) "\\\\" | |
| ["filename"]=> | |
| - string(2) "\\" | |
| + string(2) "\\\\" | |
| } | |
| -- Iteration 24 -- | |
| string(1) "/" | |
| @@ -431,77 +431,77 @@ array(4) { | |
| string(4) "inet" | |
| } | |
| -- Iteration 28 -- | |
| -string(27) "c:\windows/system32\drivers" | |
| -string(9) "etc\hosts" | |
| +string(27) "c:\\windows/system32\\drivers" | |
| +string(9) "etc\\hosts" | |
| string(0) "" | |
| -string(9) "etc\hosts" | |
| +string(9) "etc\\hosts" | |
| array(3) { | |
| ["dirname"]=> | |
| - string(27) "c:\windows/system32\drivers" | |
| + string(27) "c:\\windows/system32\\drivers" | |
| ["basename"]=> | |
| - string(9) "etc\hosts" | |
| + string(9) "etc\\hosts" | |
| ["filename"]=> | |
| - string(9) "etc\hosts" | |
| + string(9) "etc\\hosts" | |
| } | |
| -- Iteration 29 -- | |
| -string(12) "/usr\include" | |
| -string(11) "arpa\inet.h" | |
| +string(12) "/usr\\include" | |
| +string(11) "arpa\\inet.h" | |
| string(1) "h" | |
| -string(9) "arpa\inet" | |
| +string(9) "arpa\\inet" | |
| array(4) { | |
| ["dirname"]=> | |
| - string(12) "/usr\include" | |
| + string(12) "/usr\\include" | |
| ["basename"]=> | |
| - string(11) "arpa\inet.h" | |
| + string(11) "arpa\\inet.h" | |
| ["extension"]=> | |
| string(1) "h" | |
| ["filename"]=> | |
| - string(9) "arpa\inet" | |
| + string(9) "arpa\\inet" | |
| } | |
| -- Iteration 30 -- | |
| string(1) "." | |
| -string(25) " c:\test\adir\afile.txt" | |
| +string(25) " c:\\test\\adir\\afile.txt" | |
| string(3) "txt" | |
| -string(21) " c:\test\adir\afile" | |
| +string(21) " c:\\test\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(25) " c:\test\adir\afile.txt" | |
| + string(25) " c:\\test\\adir\\afile.txt" | |
| ["extension"]=> | |
| string(3) "txt" | |
| ["filename"]=> | |
| - string(21) " c:\test\adir\afile" | |
| + string(21) " c:\\test\\adir\\afile" | |
| } | |
| -- Iteration 31 -- | |
| string(1) "." | |
| -string(25) "c:\test\adir\afile.txt " | |
| +string(25) "c:\\test\\adir\\afile.txt " | |
| string(6) "txt " | |
| -string(18) "c:\test\adir\afile" | |
| +string(18) "c:\\test\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(25) "c:\test\adir\afile.txt " | |
| + string(25) "c:\\test\\adir\\afile.txt " | |
| ["extension"]=> | |
| string(6) "txt " | |
| ["filename"]=> | |
| - string(18) "c:\test\adir\afile" | |
| + string(18) "c:\\test\\adir\\afile" | |
| } | |
| -- Iteration 32 -- | |
| string(1) "." | |
| -string(28) " c:\test\adir\afile.txt " | |
| +string(28) " c:\\test\\adir\\afile.txt " | |
| string(6) "txt " | |
| -string(21) " c:\test\adir\afile" | |
| +string(21) " c:\\test\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(28) " c:\test\adir\afile.txt " | |
| + string(28) " c:\\test\\adir\\afile.txt " | |
| ["extension"]=> | |
| string(6) "txt " | |
| ["filename"]=> | |
| - string(21) " c:\test\adir\afile" | |
| + string(21) " c:\\test\\adir\\afile" | |
| } | |
| -- Iteration 33 -- | |
| string(20) " /usr/include/arpa" | |
| @@ -563,18 +563,18 @@ array(3) { | |
| } | |
| -- Iteration 37 -- | |
| string(1) "." | |
| -string(24) " c:\test\adir\afile.txt" | |
| +string(24) " c:\\test\\adir\\afile.txt" | |
| string(3) "txt" | |
| -string(20) " c:\test\adir\afile" | |
| +string(20) " c:\\test\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(24) " c:\test\adir\afile.txt" | |
| + string(24) " c:\\test\\adir\\afile.txt" | |
| ["extension"]=> | |
| string(3) "txt" | |
| ["filename"]=> | |
| - string(20) " c:\test\adir\afile" | |
| + string(20) " c:\\test\\adir\\afile" | |
| } | |
| -- Iteration 38 -- | |
| string(1) "/" | |
| diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt | |
| index c3909295f9..6c781c5e99 100644 | |
| --- a/ext/standard/tests/file/pathinfo_basic2.phpt | |
| +++ b/ext/standard/tests/file/pathinfo_basic2.phpt | |
| @@ -48,33 +48,33 @@ echo "Done\n"; | |
| *** Testing basic functions of pathinfo() *** | |
| -- Iteration 1 -- | |
| string(1) "." | |
| -string(10) "c:\..\dir1" | |
| -string(5) "\dir1" | |
| -string(4) "c:\." | |
| +string(10) "c:\\..\\dir1" | |
| +string(5) "\\dir1" | |
| +string(4) "c:\\." | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(10) "c:\..\dir1" | |
| + string(10) "c:\\..\\dir1" | |
| ["extension"]=> | |
| - string(5) "\dir1" | |
| + string(5) "\\dir1" | |
| ["filename"]=> | |
| - string(4) "c:\." | |
| + string(4) "c:\\." | |
| } | |
| -- Iteration 2 -- | |
| string(1) "." | |
| -string(33) "c:\test\..\test2\.\adir\afile.txt" | |
| +string(33) "c:\\test\\..\\test2\\.\\adir\\afile.txt" | |
| string(3) "txt" | |
| -string(29) "c:\test\..\test2\.\adir\afile" | |
| +string(29) "c:\\test\\..\\test2\\.\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(33) "c:\test\..\test2\.\adir\afile.txt" | |
| + string(33) "c:\\test\\..\\test2\\.\\adir\\afile.txt" | |
| ["extension"]=> | |
| string(3) "txt" | |
| ["filename"]=> | |
| - string(29) "c:\test\..\test2\.\adir\afile" | |
| + string(29) "c:\\test\\..\\test2\\.\\adir\\afile" | |
| } | |
| -- Iteration 3 -- | |
| string(22) "/usr/include/../arpa/." | |
| @@ -93,18 +93,18 @@ array(4) { | |
| } | |
| -- Iteration 4 -- | |
| string(1) "." | |
| -string(23) "c:\test\adir\afile..txt" | |
| +string(23) "c:\\test\\adir\\afile..txt" | |
| string(3) "txt" | |
| -string(19) "c:\test\adir\afile." | |
| +string(19) "c:\\test\\adir\\afile." | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(23) "c:\test\adir\afile..txt" | |
| + string(23) "c:\\test\\adir\\afile..txt" | |
| ["extension"]=> | |
| string(3) "txt" | |
| ["filename"]=> | |
| - string(19) "c:\test\adir\afile." | |
| + string(19) "c:\\test\\adir\\afile." | |
| } | |
| -- Iteration 5 -- | |
| string(17) "/usr/include/arpa" | |
| @@ -123,18 +123,18 @@ array(4) { | |
| } | |
| -- Iteration 6 -- | |
| string(1) "." | |
| -string(19) "c:\test\adir\afile." | |
| +string(19) "c:\\test\\adir\\afile." | |
| string(0) "" | |
| -string(18) "c:\test\adir\afile" | |
| +string(18) "c:\\test\\adir\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(19) "c:\test\adir\afile." | |
| + string(19) "c:\\test\\adir\\afile." | |
| ["extension"]=> | |
| string(0) "" | |
| ["filename"]=> | |
| - string(18) "c:\test\adir\afile" | |
| + string(18) "c:\\test\\adir\\afile" | |
| } | |
| -- Iteration 7 -- | |
| string(17) "/usr/include/arpa" | |
| @@ -181,18 +181,18 @@ array(4) { | |
| } | |
| -- Iteration 10 -- | |
| string(1) "." | |
| -string(22) "..\.\..\test\afile.txt" | |
| +string(22) "..\\.\\..\\test\\afile.txt" | |
| string(3) "txt" | |
| -string(18) "..\.\..\test\afile" | |
| +string(18) "..\\.\\..\\test\\afile" | |
| array(4) { | |
| ["dirname"]=> | |
| string(1) "." | |
| ["basename"]=> | |
| - string(22) "..\.\..\test\afile.txt" | |
| + string(22) "..\\.\\..\\test\\afile.txt" | |
| ["extension"]=> | |
| string(3) "txt" | |
| ["filename"]=> | |
| - string(18) "..\.\..\test\afile" | |
| + string(18) "..\\.\\..\\test\\afile" | |
| } | |
| -- Iteration 11 -- | |
| string(12) ".././../test" | |
| diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt | |
| index 4aab2240ee..8c676ef1d0 100644 | |
| --- a/ext/standard/tests/file/stream_002.phpt | |
| +++ b/ext/standard/tests/file/stream_002.phpt | |
| @@ -22,25 +22,25 @@ echo "Done\n"; | |
| Warning: stream_socket_client(): Unable to connect to (Failed to parse address "") in %s on line %d | |
| bool(false) | |
| int(0) | |
| -string(26) "Failed to parse address """ | |
| +string(26) "Failed to parse address \"\"" | |
| Warning: stream_socket_client(): Unable to connect to [ (Failed to parse address "[") in %s on line %d | |
| bool(false) | |
| int(0) | |
| -string(27) "Failed to parse address "["" | |
| +string(27) "Failed to parse address \"[\"" | |
| Warning: stream_socket_client(): Unable to connect to [ (Failed to parse%saddress "[ ") in %s on line %d | |
| bool(false) | |
| int(0) | |
| -string(%d) "Failed to parse%saddress "[ "" | |
| +string(33) "Failed to parse IPv6 address \"[ \"" | |
| Warning: stream_socket_client(): Unable to connect to . (Failed to parse address ".") in %s on line %d | |
| bool(false) | |
| int(0) | |
| -string(27) "Failed to parse address "."" | |
| +string(27) "Failed to parse address \".\"" | |
| Warning: stream_socket_client(): Unable to connect to 1 (Failed to parse address "1") in %s on line %d | |
| bool(false) | |
| int(0) | |
| -string(27) "Failed to parse address "1"" | |
| +string(27) "Failed to parse address \"1\"" | |
| Done | |
| diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt | |
| index 1f34b84334..50f8b19a08 100644 | |
| --- a/ext/standard/tests/file/stream_copy_to_stream.phpt | |
| +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt | |
| @@ -116,39 +116,39 @@ int(0) | |
| string(0) "" | |
| int(%d) | |
| string(134) "Nabgure qnl | |
| -Jura gur cnvaf bs yvsr jba'g one zl jnl | |
| -V'yy oernx gurfr punvaf | |
| +Jura gur cnvaf bs yvsr jba\'g one zl jnl | |
| +V\'yy oernx gurfr punvaf | |
| Gung ubyq zr qbja | |
| -V'yy grne lbh qbja vagb zl cevingr uryy | |
| +V\'yy grne lbh qbja vagb zl cevingr uryy | |
| " | |
| int(%d) | |
| string(134) "Nabgure qnl | |
| -Jura gur cnvaf bs yvsr jba'g one zl jnl | |
| -V'yy oernx gurfr punvaf | |
| +Jura gur cnvaf bs yvsr jba\'g one zl jnl | |
| +V\'yy oernx gurfr punvaf | |
| Gung ubyq zr qbja | |
| -V'yy grne lbh qbja vagb zl cevingr uryy | |
| +V\'yy grne lbh qbja vagb zl cevingr uryy | |
| " | |
| int(%d) | |
| string(134) "Another day | |
| -When the pains of life won't bar my way | |
| -I'll break these chains | |
| +When the pains of life won\'t bar my way | |
| +I\'ll break these chains | |
| That hold me down | |
| -I'll tear you down into my private hell | |
| +I\'ll tear you down into my private hell | |
| " | |
| int(%d) | |
| string(134) "Another day | |
| -When the pains of life won't bar my way | |
| -I'll break these chains | |
| +When the pains of life won\'t bar my way | |
| +I\'ll break these chains | |
| That hold me down | |
| -I'll tear you down into my private hell | |
| +I\'ll tear you down into my private hell | |
| " | |
| int(%d) | |
| string(10) "Another da" | |
| int(%d) | |
| string(134) "Another day | |
| -When the pains of life won't bar my way | |
| -I'll break these chains | |
| +When the pains of life won\'t bar my way | |
| +I\'ll break these chains | |
| That hold me down | |
| -I'll tear you down into my private hell | |
| +I\'ll tear you down into my private hell | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt | |
| index f9a7702b9a..7fab2492cd 100644 | |
| --- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt | |
| +++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt | |
| @@ -18,8 +18,8 @@ echo "Done\n"; | |
| ?> | |
| --EXPECT-- | |
| Simple testcase for escapeshellarg() function | |
| -string(14) "'Mr O'\''Neil'" | |
| -string(15) "'Mr O\'\''Neil'" | |
| -string(11) "'%FILENAME'" | |
| -string(2) "''" | |
| +string(14) "\'Mr O\'\\\'\'Neil\'" | |
| +string(15) "\'Mr O\\\'\\\'\'Neil\'" | |
| +string(11) "\'%FILENAME\'" | |
| +string(2) "\'\'" | |
| Done | |
| diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt | |
| index 028b987eec..1d88920f47 100644 | |
| --- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt | |
| +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt | |
| @@ -58,49 +58,49 @@ foreach($inputs as $input) { | |
| *** Testing escapeshellarg() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(3) "'0'" | |
| +string(3) "\'0\'" | |
| -- Iteration 2 -- | |
| -string(3) "'1'" | |
| +string(3) "\'1\'" | |
| -- Iteration 3 -- | |
| -string(4) "'12'" | |
| +string(4) "\'12\'" | |
| -- Iteration 4 -- | |
| -string(5) "'-12'" | |
| +string(5) "\'-12\'" | |
| -- Iteration 5 -- | |
| -string(12) "'2147483647'" | |
| +string(12) "\'2147483647\'" | |
| -- Iteration 6 -- | |
| -string(6) "'10.5'" | |
| +string(6) "\'10.5\'" | |
| -- Iteration 7 -- | |
| -string(7) "'-10.5'" | |
| +string(7) "\'-10.5\'" | |
| -- Iteration 8 -- | |
| -string(10) "'123.4567'" | |
| +string(10) "\'123.4567\'" | |
| -- Iteration 9 -- | |
| -string(12) "'0.01234567'" | |
| +string(12) "\'0.01234567\'" | |
| -- Iteration 10 -- | |
| -string(5) "'0.5'" | |
| +string(5) "\'0.5\'" | |
| -- Iteration 11 -- | |
| -string(3) "'1'" | |
| +string(3) "\'1\'" | |
| -- Iteration 12 -- | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| -- Iteration 13 -- | |
| -string(3) "'1'" | |
| +string(3) "\'1\'" | |
| -- Iteration 14 -- | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| -- Iteration 15 -- | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| -- Iteration 16 -- | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt | |
| index 481f24045f..eb2c066589 100644 | |
| --- a/ext/standard/tests/general_functions/parse_ini_basic.phpt | |
| +++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt | |
| @@ -275,9 +275,9 @@ array(26) { | |
| ["windows paths"]=> | |
| array(2) { | |
| ["winpath1"]=> | |
| - string(69) "c:\some windows\path\test\new\r\quote " here\single ' quote\some more" | |
| + string(69) "c:\\some windows\\path\\test\\new\\r\\quote \" here\\single \' quote\\some more" | |
| ["winpath2"]=> | |
| - string(13) "special case\" | |
| + string(13) "special case\\" | |
| } | |
| } | |
| Done. | |
| diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt | |
| index 678da93fac..47422ec191 100644 | |
| --- a/ext/standard/tests/general_functions/strval.phpt | |
| +++ b/ext/standard/tests/general_functions/strval.phpt | |
| @@ -242,7 +242,7 @@ string(4) "0123" | |
| string(4) "new | |
| " | |
| -- Iteration 48 -- | |
| -string(5) "new\n" | |
| +string(5) "new\\n" | |
| -- Iteration 49 -- | |
| string(11) "@#$$%^&&*()" | |
| -- Iteration 50 -- | |
| diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt | |
| index 0bdb3bcf34..c804fda37c 100644 | |
| --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt | |
| +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt | |
| @@ -429,23 +429,23 @@ string(1) "0" | |
| -- Iteration 6 -- | |
| string(1) "\0" | |
| -- Iteration 7 -- | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| -- Iteration 8 -- | |
| string(1) " " | |
| -- Iteration 9 -- | |
| -string(2) "\t" | |
| +string(2) "\\t" | |
| -- Iteration 10 -- | |
| string(3) "PHP" | |
| -- Iteration 11 -- | |
| string(3) "PHP" | |
| -- Iteration 12 -- | |
| -string(29) "abcd\0n1234\005678\000efgh\xijkl" | |
| +string(29) "abcd\0n1234\005678\000efgh\\xijkl" | |
| -- Iteration 13 -- | |
| string(34) "abcd\0efgh\0ijkl\0mnop\00qrst\0uvwx\00yz" | |
| -- Iteration 14 -- | |
| string(22) "1234 | |
| 5678 | |
| - 9100"abcda" | |
| + 9100\"abcda" | |
| *** Testing var_dump() on boolean variables *** | |
| -- Iteration 1 -- | |
| @@ -915,7 +915,7 @@ array(4) { | |
| [2]=> | |
| float(4611333) | |
| [3]=> | |
| - string(5) "/00\7" | |
| + string(5) "/00\\7" | |
| } | |
| *** Testing var_dump() on miscellaneous input arguments *** | |
| @@ -1083,23 +1083,23 @@ array(14) { | |
| [5]=> | |
| string(1) "\0" | |
| [6]=> | |
| - string(2) "\0" | |
| + string(2) "\\0" | |
| [7]=> | |
| string(1) " " | |
| [8]=> | |
| - string(2) "\t" | |
| + string(2) "\\t" | |
| [9]=> | |
| string(3) "PHP" | |
| [10]=> | |
| string(3) "PHP" | |
| [11]=> | |
| - string(29) "abcd\0n1234\005678\000efgh\xijkl" | |
| + string(29) "abcd\0n1234\005678\000efgh\\xijkl" | |
| [12]=> | |
| string(34) "abcd\0efgh\0ijkl\0mnop\00qrst\0uvwx\00yz" | |
| [13]=> | |
| string(22) "1234 | |
| 5678 | |
| - 9100"abcda" | |
| + 9100\"abcda" | |
| } | |
| array(15) { | |
| [0]=> | |
| @@ -1541,7 +1541,7 @@ array(6) { | |
| [2]=> | |
| float(4611333) | |
| [3]=> | |
| - string(5) "/00\7" | |
| + string(5) "/00\\7" | |
| } | |
| } | |
| Done | |
| diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt | |
| index c9b0fa8d87..d8dce2fc9a 100644 | |
| --- a/ext/standard/tests/general_functions/var_export-locale.phpt | |
| +++ b/ext/standard/tests/general_functions/var_export-locale.phpt | |
| @@ -310,31 +310,31 @@ echo "\nDone"; | |
| Iteration 1 | |
| '0' | |
| '0' | |
| -string(3) "'0'" | |
| +string(3) "\'0\'" | |
| Iteration 2 | |
| '1' | |
| '1' | |
| -string(3) "'1'" | |
| +string(3) "\'1\'" | |
| Iteration 3 | |
| '-1' | |
| '-1' | |
| -string(4) "'-1'" | |
| +string(4) "\'-1\'" | |
| Iteration 4 | |
| '-2147483648' | |
| '-2147483648' | |
| -string(13) "'-2147483648'" | |
| +string(13) "\'-2147483648\'" | |
| Iteration 5 | |
| '-2147483647' | |
| '-2147483647' | |
| -string(13) "'-2147483647'" | |
| +string(13) "\'-2147483647\'" | |
| Iteration 6 | |
| @@ -358,19 +358,19 @@ string(4) "4667" | |
| Iteration 9 | |
| '0x12ab' | |
| '0x12ab' | |
| -string(8) "'0x12ab'" | |
| +string(8) "\'0x12ab\'" | |
| Iteration 10 | |
| '0Xfff' | |
| '0Xfff' | |
| -string(7) "'0Xfff'" | |
| +string(7) "\'0Xfff\'" | |
| Iteration 11 | |
| '0XFA' | |
| '0XFA' | |
| -string(6) "'0XFA'" | |
| +string(6) "\'0XFA\'" | |
| Iteration 12 | |
| @@ -382,7 +382,7 @@ string(11) "-2147483648" | |
| Iteration 13 | |
| '0x7fffffff' | |
| '0x7fffffff' | |
| -string(12) "'0x7fffffff'" | |
| +string(12) "\'0x7fffffff\'" | |
| Iteration 14 | |
| @@ -394,7 +394,7 @@ string(10) "2147483647" | |
| Iteration 15 | |
| '0123' | |
| '0123' | |
| -string(6) "'0123'" | |
| +string(6) "\'0123\'" | |
| Iteration 16 | |
| @@ -583,91 +583,91 @@ string(22) "3.4000000000000001E-33" | |
| Iteration 1 | |
| '' | |
| '' | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| Iteration 2 | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| Iteration 3 | |
| '' | |
| '' | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| Iteration 4 | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| Iteration 5 | |
| 'string' | |
| 'string' | |
| -string(8) "'string'" | |
| +string(8) "\'string\'" | |
| Iteration 6 | |
| 'string' | |
| 'string' | |
| -string(8) "'string'" | |
| +string(8) "\'string\'" | |
| Iteration 7 | |
| 'NULL' | |
| 'NULL' | |
| -string(6) "'NULL'" | |
| +string(6) "\'NULL\'" | |
| Iteration 8 | |
| 'null' | |
| 'null' | |
| -string(6) "'null'" | |
| +string(6) "\'null\'" | |
| Iteration 9 | |
| 'FALSE' | |
| 'FALSE' | |
| -string(7) "'FALSE'" | |
| +string(7) "\'FALSE\'" | |
| Iteration 10 | |
| 'false' | |
| 'false' | |
| -string(7) "'false'" | |
| +string(7) "\'false\'" | |
| Iteration 11 | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| Iteration 12 | |
| '' . "\0" . '' | |
| '' . "\0" . '' | |
| -string(14) "'' . "\0" . ''" | |
| +string(14) "\'\' . \"\\0\" . \'\'" | |
| Iteration 13 | |
| '\\0' | |
| '\\0' | |
| -string(5) "'\\0'" | |
| +string(5) "\'\\\\0\'" | |
| Iteration 14 | |
| '\\060' | |
| '\\060' | |
| -string(7) "'\\060'" | |
| +string(7) "\'\\\\060\'" | |
| Iteration 15 | |
| '8' | |
| '8' | |
| -string(3) "'8'" | |
| +string(3) "\'8\'" | |
| *** Testing var_export() with valid arrays *** | |
| @@ -726,7 +726,7 @@ array ( | |
| 0 => '', | |
| ) | |
| string(20) "array ( | |
| - 0 => '', | |
| + 0 => \'\', | |
| )" | |
| @@ -738,7 +738,7 @@ array ( | |
| 0 => '', | |
| ) | |
| string(20) "array ( | |
| - 0 => '', | |
| + 0 => \'\', | |
| )" | |
| @@ -802,8 +802,8 @@ string(107) "array ( | |
| ), | |
| 1 => | |
| array ( | |
| - 0 => 'a', | |
| - 1 => 'b', | |
| + 0 => \'a\', | |
| + 1 => \'b\', | |
| ), | |
| )" | |
| @@ -816,7 +816,7 @@ array ( | |
| 1 => 'One', | |
| ) | |
| string(23) "array ( | |
| - 1 => 'One', | |
| + 1 => \'One\', | |
| )" | |
| @@ -828,7 +828,7 @@ array ( | |
| 'test' => 'is_array', | |
| ) | |
| string(33) "array ( | |
| - 'test' => 'is_array', | |
| + \'test\' => \'is_array\', | |
| )" | |
| @@ -881,8 +881,8 @@ array ( | |
| 1 => 'test', | |
| ) | |
| string(41) "array ( | |
| - 0 => 'string', | |
| - 1 => 'test', | |
| + 0 => \'string\', | |
| + 1 => \'test\', | |
| )" | |
| @@ -896,8 +896,8 @@ array ( | |
| 1 => 'test', | |
| ) | |
| string(41) "array ( | |
| - 0 => 'string', | |
| - 1 => 'test', | |
| + 0 => \'string\', | |
| + 1 => \'test\', | |
| )" | |
| *** Testing var_export() with valid objects *** | |
| @@ -943,7 +943,7 @@ Value::__set_state(array( | |
| ), | |
| )) | |
| string(57) "Value::__set_state(array( | |
| - 'vars' => | |
| + \'vars\' => | |
| array ( | |
| ), | |
| ))" | |
| @@ -983,18 +983,18 @@ myClass::__set_state(array( | |
| )), | |
| )) | |
| string(293) "myClass::__set_state(array( | |
| - 'foo_object' => | |
| + \'foo_object\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'public_var' => 10, | |
| - 'public_var1' => | |
| + \'public_var\' => 10, | |
| + \'public_var1\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'private_var' => | |
| + \'private_var\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'protected_var' => NULL, | |
| - 'proected_var' => | |
| + \'protected_var\' => NULL, | |
| + \'proected_var\' => | |
| foo::__set_state(array( | |
| )), | |
| ))" | |
| @@ -1034,18 +1034,18 @@ myClass::__set_state(array( | |
| )), | |
| )) | |
| string(293) "myClass::__set_state(array( | |
| - 'foo_object' => | |
| + \'foo_object\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'public_var' => 10, | |
| - 'public_var1' => | |
| + \'public_var\' => 10, | |
| + \'public_var1\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'private_var' => | |
| + \'private_var\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'protected_var' => NULL, | |
| - 'proected_var' => | |
| + \'protected_var\' => NULL, | |
| + \'proected_var\' => | |
| foo::__set_state(array( | |
| )), | |
| ))" | |
| @@ -1090,7 +1090,7 @@ Value::__set_state(array( | |
| ), | |
| )) | |
| string(57) "Value::__set_state(array( | |
| - 'vars' => | |
| + \'vars\' => | |
| array ( | |
| ), | |
| ))" | |
| diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt | |
| index 51f957faf2..07f5b2488d 100644 | |
| --- a/ext/standard/tests/general_functions/var_export_basic1.phpt | |
| +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt | |
| @@ -51,27 +51,27 @@ foreach($valid_ints as $key => $int_value) { | |
| -- Iteration: 0 -- | |
| '0' | |
| '0' | |
| -string(3) "'0'" | |
| +string(3) "\'0\'" | |
| -- Iteration: 1 -- | |
| '1' | |
| '1' | |
| -string(3) "'1'" | |
| +string(3) "\'1\'" | |
| -- Iteration: -1 -- | |
| '-1' | |
| '-1' | |
| -string(4) "'-1'" | |
| +string(4) "\'-1\'" | |
| -- Iteration: -2147483648 -- | |
| '-2147483648' | |
| '-2147483648' | |
| -string(13) "'-2147483648'" | |
| +string(13) "\'-2147483648\'" | |
| -- Iteration: -2147483647 -- | |
| '-2147483647' | |
| '-2147483647' | |
| -string(13) "'-2147483647'" | |
| +string(13) "\'-2147483647\'" | |
| -- Iteration: 2147483647 -- | |
| 2147483647 | |
| @@ -91,17 +91,17 @@ string(4) "4667" | |
| -- Iteration: '0x12ab' -- | |
| '0x12ab' | |
| '0x12ab' | |
| -string(8) "'0x12ab'" | |
| +string(8) "\'0x12ab\'" | |
| -- Iteration: '0Xfff' -- | |
| '0Xfff' | |
| '0Xfff' | |
| -string(7) "'0Xfff'" | |
| +string(7) "\'0Xfff\'" | |
| -- Iteration: '0XFA' -- | |
| '0XFA' | |
| '0XFA' | |
| -string(6) "'0XFA'" | |
| +string(6) "\'0XFA\'" | |
| -- Iteration: -0x80000000 -- | |
| -2147483648 | |
| @@ -111,7 +111,7 @@ string(11) "-2147483648" | |
| -- Iteration: '0x7fffffff' -- | |
| '0x7fffffff' | |
| '0x7fffffff' | |
| -string(12) "'0x7fffffff'" | |
| +string(12) "\'0x7fffffff\'" | |
| -- Iteration: 0x7FFFFFFF -- | |
| 2147483647 | |
| @@ -121,7 +121,7 @@ string(10) "2147483647" | |
| -- Iteration: '0123' -- | |
| '0123' | |
| '0123' | |
| -string(6) "'0123'" | |
| +string(6) "\'0123\'" | |
| -- Iteration: 01912 -- | |
| 1 | |
| diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt | |
| index 4d41d2f38d..e7892596eb 100644 | |
| --- a/ext/standard/tests/general_functions/var_export_basic4.phpt | |
| +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt | |
| @@ -44,95 +44,94 @@ foreach($valid_strings as $key => $str) { | |
| -- Iteration: "" -- | |
| '' | |
| '' | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| -- Iteration: " " -- | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| -- Iteration: '' -- | |
| '' | |
| '' | |
| -string(2) "''" | |
| +string(2) "\'\'" | |
| -- Iteration: ' ' -- | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| -- Iteration: "string" -- | |
| 'string' | |
| 'string' | |
| -string(8) "'string'" | |
| +string(8) "\'string\'" | |
| -- Iteration: 'string' -- | |
| 'string' | |
| 'string' | |
| -string(8) "'string'" | |
| +string(8) "\'string\'" | |
| -- Iteration: "\0Hello\0 World\0" -- | |
| '' . "\0" . 'Hello' . "\0" . ' World' . "\0" . '' | |
| '' . "\0" . 'Hello' . "\0" . ' World' . "\0" . '' | |
| -string(49) "'' . "\0" . 'Hello' . "\0" . ' World' . "\0" . ''" | |
| +string(49) "\'\' . \"\\0\" . \'Hello\' . \"\\0\" . \' World\' . \"\\0\" . \'\'" | |
| -- Iteration: "NULL" -- | |
| 'NULL' | |
| 'NULL' | |
| -string(6) "'NULL'" | |
| +string(6) "\'NULL\'" | |
| -- Iteration: 'null' -- | |
| 'null' | |
| 'null' | |
| -string(6) "'null'" | |
| +string(6) "\'null\'" | |
| -- Iteration: "FALSE" -- | |
| 'FALSE' | |
| 'FALSE' | |
| -string(7) "'FALSE'" | |
| +string(7) "\'FALSE\'" | |
| -- Iteration: 'false' -- | |
| 'false' | |
| 'false' | |
| -string(7) "'false'" | |
| +string(7) "\'false\'" | |
| -- Iteration: "\x0b" -- | |
| ' ' | |
| ' ' | |
| -string(3) "' '" | |
| +string(3) "\' \'" | |
| -- Iteration: "\0" -- | |
| '' . "\0" . '' | |
| '' . "\0" . '' | |
| -string(14) "'' . "\0" . ''" | |
| +string(14) "\'\' . \"\\0\" . \'\'" | |
| -- Iteration: '\0' -- | |
| '\\0' | |
| '\\0' | |
| -string(5) "'\\0'" | |
| +string(5) "\'\\\\0\'" | |
| -- Iteration: '\060' -- | |
| '\\060' | |
| '\\060' | |
| -string(7) "'\\060'" | |
| +string(7) "\'\\\\060\'" | |
| -- Iteration: "\070" -- | |
| '8' | |
| '8' | |
| -string(3) "'8'" | |
| - | |
| +string(3) "\'8\'" | |
| diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt | |
| index 4712ba37a9..3562faa766 100644 | |
| --- a/ext/standard/tests/general_functions/var_export_basic5.phpt | |
| +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt | |
| @@ -94,7 +94,7 @@ array ( | |
| 0 => '', | |
| ) | |
| string(20) "array ( | |
| - 0 => '', | |
| + 0 => \'\', | |
| )" | |
| @@ -106,7 +106,7 @@ array ( | |
| 0 => '', | |
| ) | |
| string(20) "array ( | |
| - 0 => '', | |
| + 0 => \'\', | |
| )" | |
| @@ -170,8 +170,8 @@ string(107) "array ( | |
| ), | |
| 1 => | |
| array ( | |
| - 0 => 'a', | |
| - 1 => 'b', | |
| + 0 => \'a\', | |
| + 1 => \'b\', | |
| ), | |
| )" | |
| @@ -184,7 +184,7 @@ array ( | |
| 1 => 'One', | |
| ) | |
| string(23) "array ( | |
| - 1 => 'One', | |
| + 1 => \'One\', | |
| )" | |
| @@ -196,7 +196,7 @@ array ( | |
| 'test' => 'is_array', | |
| ) | |
| string(33) "array ( | |
| - 'test' => 'is_array', | |
| + \'test\' => \'is_array\', | |
| )" | |
| @@ -249,8 +249,8 @@ array ( | |
| 1 => 'test', | |
| ) | |
| string(41) "array ( | |
| - 0 => 'string', | |
| - 1 => 'test', | |
| + 0 => \'string\', | |
| + 1 => \'test\', | |
| )" | |
| @@ -264,7 +264,6 @@ array ( | |
| 1 => 'test', | |
| ) | |
| string(41) "array ( | |
| - 0 => 'string', | |
| - 1 => 'test', | |
| + 0 => \'string\', | |
| + 1 => \'test\', | |
| )" | |
| - | |
| diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt | |
| index a3d3ae639b..7fa272be54 100644 | |
| --- a/ext/standard/tests/general_functions/var_export_basic6.phpt | |
| +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt | |
| @@ -139,7 +139,7 @@ Value::__set_state(array( | |
| ), | |
| )) | |
| string(57) "Value::__set_state(array( | |
| - 'vars' => | |
| + \'vars\' => | |
| array ( | |
| ), | |
| ))" | |
| @@ -179,18 +179,18 @@ myClass::__set_state(array( | |
| )), | |
| )) | |
| string(293) "myClass::__set_state(array( | |
| - 'foo_object' => | |
| + \'foo_object\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'public_var' => 10, | |
| - 'public_var1' => | |
| + \'public_var\' => 10, | |
| + \'public_var1\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'private_var' => | |
| + \'private_var\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'protected_var' => NULL, | |
| - 'proected_var' => | |
| + \'protected_var\' => NULL, | |
| + \'proected_var\' => | |
| foo::__set_state(array( | |
| )), | |
| ))" | |
| @@ -230,18 +230,18 @@ myClass::__set_state(array( | |
| )), | |
| )) | |
| string(293) "myClass::__set_state(array( | |
| - 'foo_object' => | |
| + \'foo_object\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'public_var' => 10, | |
| - 'public_var1' => | |
| + \'public_var\' => 10, | |
| + \'public_var1\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'private_var' => | |
| + \'private_var\' => | |
| foo::__set_state(array( | |
| )), | |
| - 'protected_var' => NULL, | |
| - 'proected_var' => | |
| + \'protected_var\' => NULL, | |
| + \'proected_var\' => | |
| foo::__set_state(array( | |
| )), | |
| ))" | |
| @@ -286,7 +286,7 @@ Value::__set_state(array( | |
| ), | |
| )) | |
| string(57) "Value::__set_state(array( | |
| - 'vars' => | |
| + \'vars\' => | |
| array ( | |
| ), | |
| ))" | |
| @@ -299,4 +299,3 @@ concreteClass::__set_state(array( | |
| )) | |
| string(36) "concreteClass::__set_state(array( | |
| ))" | |
| - | |
| diff --git a/ext/standard/tests/image/bug13213.phpt b/ext/standard/tests/image/bug13213.phpt | |
| index 61fe245efe..fdc75a2c90 100644 | |
| --- a/ext/standard/tests/image/bug13213.phpt | |
| +++ b/ext/standard/tests/image/bug13213.phpt | |
| @@ -14,7 +14,7 @@ array(7) { | |
| [2]=> | |
| int(2) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| diff --git a/ext/standard/tests/image/bug70052.phpt b/ext/standard/tests/image/bug70052.phpt | |
| index 76ebda92b2..e4a7151c2a 100644 | |
| --- a/ext/standard/tests/image/bug70052.phpt | |
| +++ b/ext/standard/tests/image/bug70052.phpt | |
| @@ -15,7 +15,7 @@ array(5) { | |
| [2]=> | |
| int(15) | |
| [3]=> | |
| - string(20) "width="3" height="3"" | |
| + string(20) "width=\"3\" height=\"3\"" | |
| ["mime"]=> | |
| string(18) "image/vnd.wap.wbmp" | |
| } | |
| diff --git a/ext/standard/tests/image/bug71848.phpt b/ext/standard/tests/image/bug71848.phpt | |
| index 25c05689e6..0dc909a51e 100644 | |
| --- a/ext/standard/tests/image/bug71848.phpt | |
| +++ b/ext/standard/tests/image/bug71848.phpt | |
| @@ -14,7 +14,7 @@ array(7) { | |
| [2]=> | |
| int(2) | |
| [3]=> | |
| - string(20) "width="8" height="8"" | |
| + string(20) "width=\"8\" height=\"8\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt | |
| index 074338c18a..b08a64063c 100644 | |
| --- a/ext/standard/tests/image/bug72278.phpt | |
| +++ b/ext/standard/tests/image/bug72278.phpt | |
| @@ -16,7 +16,7 @@ array(7) { | |
| [2]=> | |
| int(2) | |
| [3]=> | |
| - string(24) "width="300" height="300"" | |
| + string(24) "width=\"300\" height=\"300\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt | |
| index 582959f3ae..31bd307532 100644 | |
| --- a/ext/standard/tests/image/getimagesize.phpt | |
| +++ b/ext/standard/tests/image/getimagesize.phpt | |
| @@ -33,7 +33,7 @@ array(16) { | |
| [2]=> | |
| int(6) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(24) | |
| ["mime"]=> | |
| @@ -48,7 +48,7 @@ array(16) { | |
| [2]=> | |
| int(18) | |
| [3]=> | |
| - string(20) "width="4" height="3"" | |
| + string(20) "width=\"4\" height=\"3\"" | |
| ["bits"]=> | |
| int(8) | |
| ["mime"]=> | |
| @@ -63,7 +63,7 @@ array(16) { | |
| [2]=> | |
| int(6) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(32) | |
| ["mime"]=> | |
| @@ -78,7 +78,7 @@ array(16) { | |
| [2]=> | |
| int(6) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(24) | |
| ["mime"]=> | |
| @@ -93,7 +93,7 @@ array(16) { | |
| [2]=> | |
| int(10) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -110,7 +110,7 @@ array(16) { | |
| [2]=> | |
| int(9) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -127,7 +127,7 @@ array(16) { | |
| [2]=> | |
| int(2) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -144,7 +144,7 @@ array(16) { | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| - string(20) "width="2" height="1"" | |
| + string(20) "width=\"2\" height=\"1\"" | |
| ["bits"]=> | |
| int(1) | |
| ["channels"]=> | |
| @@ -161,7 +161,7 @@ array(16) { | |
| [2]=> | |
| int(18) | |
| [3]=> | |
| - string(20) "width="1" height="3"" | |
| + string(20) "width=\"1\" height=\"3\"" | |
| ["bits"]=> | |
| int(8) | |
| ["mime"]=> | |
| @@ -176,7 +176,7 @@ array(16) { | |
| [2]=> | |
| int(18) | |
| [3]=> | |
| - string(20) "width="1" height="3"" | |
| + string(20) "width=\"1\" height=\"3\"" | |
| ["bits"]=> | |
| int(8) | |
| ["mime"]=> | |
| @@ -191,7 +191,7 @@ array(16) { | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["bits"]=> | |
| int(2) | |
| ["channels"]=> | |
| @@ -208,7 +208,7 @@ array(16) { | |
| [2]=> | |
| int(14) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["bits"]=> | |
| int(4) | |
| ["mime"]=> | |
| @@ -223,7 +223,7 @@ array(16) { | |
| [2]=> | |
| int(3) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["bits"]=> | |
| int(4) | |
| ["mime"]=> | |
| @@ -238,7 +238,7 @@ array(16) { | |
| [2]=> | |
| int(5) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["mime"]=> | |
| string(9) "image/psd" | |
| } | |
| @@ -251,7 +251,7 @@ array(16) { | |
| [2]=> | |
| int(4) | |
| [3]=> | |
| - string(24) "width="550" height="400"" | |
| + string(24) "width=\"550\" height=\"400\"" | |
| ["mime"]=> | |
| string(29) "application/x-shockwave-flash" | |
| } | |
| @@ -264,7 +264,7 @@ array(16) { | |
| [2]=> | |
| int(7) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["mime"]=> | |
| string(10) "image/tiff" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_246x247.phpt b/ext/standard/tests/image/getimagesize_246x247.phpt | |
| index c716ac3aeb..02d8d83365 100644 | |
| --- a/ext/standard/tests/image/getimagesize_246x247.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_246x247.phpt | |
| @@ -33,7 +33,7 @@ array(1) { | |
| [2]=> | |
| int(3) | |
| [3]=> | |
| - string(24) "width="246" height="247"" | |
| + string(24) "width=\"246\" height=\"247\"" | |
| ["bits"]=> | |
| int(4) | |
| ["mime"]=> | |
| diff --git a/ext/standard/tests/image/getimagesize_384x385.phpt b/ext/standard/tests/image/getimagesize_384x385.phpt | |
| index 57dc8a7192..1c0cbfa746 100644 | |
| --- a/ext/standard/tests/image/getimagesize_384x385.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_384x385.phpt | |
| @@ -33,7 +33,7 @@ array(1) { | |
| [2]=> | |
| int(3) | |
| [3]=> | |
| - string(24) "width="384" height="385"" | |
| + string(24) "width=\"384\" height=\"385\"" | |
| ["bits"]=> | |
| int(1) | |
| ["mime"]=> | |
| diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt | |
| index f1a6d108d3..5bba2b2cec 100644 | |
| --- a/ext/standard/tests/image/getimagesize_basic.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_basic.phpt | |
| @@ -52,7 +52,7 @@ array(7) { | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -72,7 +72,7 @@ array(7) { | |
| [2]=> | |
| int(2) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -94,7 +94,7 @@ array(6) { | |
| [2]=> | |
| int(3) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["bits"]=> | |
| int(8) | |
| ["mime"]=> | |
| @@ -112,7 +112,7 @@ array(5) { | |
| [2]=> | |
| int(4) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["mime"]=> | |
| string(29) "application/x-shockwave-flash" | |
| } | |
| @@ -128,7 +128,7 @@ array(6) { | |
| [2]=> | |
| int(6) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["bits"]=> | |
| int(24) | |
| ["mime"]=> | |
| @@ -146,7 +146,7 @@ array(5) { | |
| [2]=> | |
| int(7) | |
| [3]=> | |
| - string(24) "width="200" height="100"" | |
| + string(24) "width=\"200\" height=\"100\"" | |
| ["mime"]=> | |
| string(10) "image/tiff" | |
| } | |
| @@ -162,7 +162,7 @@ array(7) { | |
| [2]=> | |
| int(9) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -182,7 +182,7 @@ array(7) { | |
| [2]=> | |
| int(10) | |
| [3]=> | |
| - string(20) "width="1" height="1"" | |
| + string(20) "width=\"1\" height=\"1\"" | |
| ["bits"]=> | |
| int(8) | |
| ["channels"]=> | |
| @@ -202,7 +202,7 @@ array(6) { | |
| [2]=> | |
| int(14) | |
| [3]=> | |
| - string(20) "width="4" height="1"" | |
| + string(20) "width=\"4\" height=\"1\"" | |
| ["bits"]=> | |
| int(4) | |
| ["mime"]=> | |
| diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt | |
| index b5a0838eb6..99bc69b7bb 100644 | |
| --- a/ext/standard/tests/image/getimagesize_swc.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_swc.phpt | |
| @@ -19,7 +19,7 @@ array(5) { | |
| [2]=> | |
| int(13) | |
| [3]=> | |
| - string(24) "width="550" height="400"" | |
| + string(24) "width=\"550\" height=\"400\"" | |
| ["mime"]=> | |
| string(29) "application/x-shockwave-flash" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt | |
| index cd6f32f4d3..0a7633cf68 100644 | |
| --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt | |
| @@ -17,7 +17,7 @@ array(5) { | |
| [2]=> | |
| int(8) | |
| [3]=> | |
| - string(20) "width="2" height="2"" | |
| + string(20) "width=\"2\" height=\"2\"" | |
| ["mime"]=> | |
| string(10) "image/tiff" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt | |
| index 8ed39fc2ff..9105accdf9 100644 | |
| --- a/ext/standard/tests/image/getimagesize_variation4.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_variation4.phpt | |
| @@ -23,7 +23,7 @@ array(5) { | |
| [2]=> | |
| int(13) | |
| [3]=> | |
| - string(24) "width="550" height="400"" | |
| + string(24) "width=\"550\" height=\"400\"" | |
| ["mime"]=> | |
| string(29) "application/x-shockwave-flash" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt | |
| index d0c48f5112..405ddae303 100644 | |
| --- a/ext/standard/tests/image/getimagesize_variation_005.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt | |
| @@ -23,7 +23,7 @@ array(5) { | |
| [2]=> | |
| int(13) | |
| [3]=> | |
| - string(24) "width="550" height="400"" | |
| + string(24) "width=\"550\" height=\"400\"" | |
| ["mime"]=> | |
| string(29) "application/x-shockwave-flash" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt | |
| index 0b0ebe5234..339d9f16eb 100644 | |
| --- a/ext/standard/tests/image/getimagesize_wbmp.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt | |
| @@ -17,7 +17,7 @@ array(5) { | |
| [2]=> | |
| int(15) | |
| [3]=> | |
| - string(22) "width="75" height="50"" | |
| + string(22) "width=\"75\" height=\"50\"" | |
| ["mime"]=> | |
| string(18) "image/vnd.wap.wbmp" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt | |
| index 5ecd6ad206..b943aab3e8 100644 | |
| --- a/ext/standard/tests/image/getimagesize_xbm.phpt | |
| +++ b/ext/standard/tests/image/getimagesize_xbm.phpt | |
| @@ -17,7 +17,7 @@ array(5) { | |
| [2]=> | |
| int(16) | |
| [3]=> | |
| - string(22) "width="75" height="50"" | |
| + string(22) "width=\"75\" height=\"50\"" | |
| ["mime"]=> | |
| string(9) "image/xbm" | |
| } | |
| diff --git a/ext/standard/tests/image/getimagesizefromstring1.phpt b/ext/standard/tests/image/getimagesizefromstring1.phpt | |
| index 6202b38e89..c75639c999 100644 | |
| --- a/ext/standard/tests/image/getimagesizefromstring1.phpt | |
| +++ b/ext/standard/tests/image/getimagesizefromstring1.phpt | |
| @@ -22,7 +22,7 @@ array(7) { | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| - string(23) "width="120" height="67"" | |
| + string(23) "width=\"120\" height=\"67\"" | |
| ["bits"]=> | |
| int(7) | |
| ["channels"]=> | |
| @@ -38,7 +38,7 @@ array(7) { | |
| [2]=> | |
| int(1) | |
| [3]=> | |
| - string(23) "width="120" height="67"" | |
| + string(23) "width=\"120\" height=\"67\"" | |
| ["bits"]=> | |
| int(7) | |
| ["channels"]=> | |
| diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt | |
| index 353c0e53fd..36514f4226 100644 | |
| --- a/ext/standard/tests/misc/get_browser_basic.phpt | |
| +++ b/ext/standard/tests/misc/get_browser_basic.phpt | |
| @@ -17,7 +17,7 @@ for( $x = 0; $x < 20; $x++) { | |
| *** Testing get_browser() : basic functionality *** | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(41) "~^opera/7\.1.* \(windows nt 5\.1; .\).*$~" | |
| + string(41) "~^opera/7\\.1.* \\(windows nt 5\\.1; .\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(31) "Opera/7.1* (Windows NT 5.1; ?)*" | |
| ["parent"]=> | |
| @@ -89,7 +89,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(83) "~^mozilla/4\.0 \(compatible; msie 6\.0; msie 5\.5; windows nt 5\.0\) opera 7\.0.*$~" | |
| + string(83) "~^mozilla/4\\.0 \\(compatible; msie 6\\.0; msie 5\\.5; windows nt 5\\.0\\) opera 7\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(71) "Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.0) Opera 7.0*" | |
| ["parent"]=> | |
| @@ -161,7 +161,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(83) "~^mozilla/4\.0 \(compatible; msie 6\.0; msie 5\.5; windows nt 4\.0\) opera 7\.0.*$~" | |
| + string(83) "~^mozilla/4\\.0 \\(compatible; msie 6\\.0; msie 5\\.5; windows nt 4\\.0\\) opera 7\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(71) "Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 4.0) Opera 7.0*" | |
| ["parent"]=> | |
| @@ -233,7 +233,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(69) "~^mozilla/4\.0 \(compatible; msie 5\.0; windows 2000\) opera 6\.0.*$~" | |
| + string(69) "~^mozilla/4\\.0 \\(compatible; msie 5\\.0; windows 2000\\) opera 6\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(59) "Mozilla/4.0 (compatible; MSIE 5.0; Windows 2000) Opera 6.0*" | |
| ["parent"]=> | |
| @@ -305,7 +305,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(68) "~^mozilla/4\.0 \(compatible; msie 5\.0; mac_powerpc\) opera 5\.0.*$~" | |
| + string(68) "~^mozilla/4\\.0 \\(compatible; msie 5\\.0; mac_powerpc\\) opera 5\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(58) "Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC) Opera 5.0*" | |
| ["parent"]=> | |
| @@ -377,7 +377,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(65) "~^mozilla/4\.0 \(compatible; msie 6\.0; .*windows nt 5\.1.*\).*$~" | |
| + string(65) "~^mozilla/4\\.0 \\(compatible; msie 6\\.0; .*windows nt 5\\.1.*\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(53) "Mozilla/4.0 (compatible; MSIE 6.0; *Windows NT 5.1*)*" | |
| ["parent"]=> | |
| @@ -449,7 +449,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(40) "~^opera/9\.0.* \(windows nt 5\.1.*\).*$~" | |
| + string(40) "~^opera/9\\.0.* \\(windows nt 5\\.1.*\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(29) "Opera/9.0* (Windows NT 5.1*)*" | |
| ["parent"]=> | |
| @@ -521,7 +521,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(47) "~^opera/9\.2.* \(macintosh; .*mac os x;.*\).*$~" | |
| + string(47) "~^opera/9\\.2.* \\(macintosh; .*mac os x;.*\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(36) "Opera/9.2* (Macintosh; *Mac OS X;*)*" | |
| ["parent"]=> | |
| @@ -593,7 +593,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(65) "~^mozilla/4\.0 \(compatible; msie 6\.0; .*windows nt 5\.1.*\).*$~" | |
| + string(65) "~^mozilla/4\\.0 \\(compatible; msie 6\\.0; .*windows nt 5\\.1.*\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(53) "Mozilla/4.0 (compatible; MSIE 6.0; *Windows NT 5.1*)*" | |
| ["parent"]=> | |
| @@ -665,7 +665,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(65) "~^mozilla/4\.0 \(compatible; msie 6\.0; .*windows nt 5\.1.*\).*$~" | |
| + string(65) "~^mozilla/4\\.0 \\(compatible; msie 6\\.0; .*windows nt 5\\.1.*\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(53) "Mozilla/4.0 (compatible; MSIE 6.0; *Windows NT 5.1*)*" | |
| ["parent"]=> | |
| @@ -737,7 +737,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(59) "~^mozilla/.\.. \(compatible; msie 5\.2.*; .*mac_powerpc.*$~" | |
| + string(59) "~^mozilla/.\\.. \\(compatible; msie 5\\.2.*; .*mac_powerpc.*$~" | |
| ["browser_name_pattern"]=> | |
| string(49) "Mozilla/?.? (compatible; MSIE 5.2*; *Mac_PowerPC*" | |
| ["parent"]=> | |
| @@ -809,7 +809,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(59) "~^mozilla/.\.. \(compatible; msie 5\.0.*; .*mac_powerpc.*$~" | |
| + string(59) "~^mozilla/.\\.. \\(compatible; msie 5\\.0.*; .*mac_powerpc.*$~" | |
| ["browser_name_pattern"]=> | |
| string(49) "Mozilla/?.? (compatible; MSIE 5.0*; *Mac_PowerPC*" | |
| ["parent"]=> | |
| @@ -1231,7 +1231,7 @@ array(34) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(99) "~^mozilla/5\.0 \(windows; .; windows nt 6\.0; .*\) applewebkit/.* \(.*\) version/3\.0.* safari/.*$~" | |
| + string(99) "~^mozilla/5\\.0 \\(windows; .; windows nt 6\\.0; .*\\) applewebkit/.* \\(.*\\) version/3\\.0.* safari/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(83) "Mozilla/5.0 (Windows; ?; Windows NT 6.0; *) AppleWebKit/* (*) Version/3.0* Safari/*" | |
| ["parent"]=> | |
| @@ -1303,7 +1303,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(99) "~^mozilla/.* \(iphone; .; .*mac os x.*\) applewebkit/.* \(.*\) version/.*\..* mobile/.* safari/.*$~" | |
| + string(99) "~^mozilla/.* \\(iphone; .; .*mac os x.*\\) applewebkit/.* \\(.*\\) version/.*\\..* mobile/.* safari/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(81) "Mozilla/* (iPhone; ?; *Mac OS X*) AppleWebKit/* (*) Version/*.* Mobile/* Safari/*" | |
| ["parent"]=> | |
| @@ -1375,7 +1375,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(99) "~^mozilla/5\.0 \(ipod; u; .*mac os x; en\) applewebkit/.* \(.*\) version/3\.0 mobile/.* safari/.*$~" | |
| + string(99) "~^mozilla/5\\.0 \\(ipod; u; .*mac os x; en\\) applewebkit/.* \\(.*\\) version/3\\.0 mobile/.* safari/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(84) "Mozilla/5.0 (iPod; U; *Mac OS X; en) AppleWebKit/* (*) Version/3.0 Mobile/* Safari/*" | |
| ["parent"]=> | |
| diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt | |
| index 97c3240d83..e08f5b8a02 100644 | |
| --- a/ext/standard/tests/misc/get_browser_variation1.phpt | |
| +++ b/ext/standard/tests/misc/get_browser_variation1.phpt | |
| @@ -18,7 +18,7 @@ for( $x = 20; $x < $count; $x++) { | |
| *** Testing get_browser() : variation functionality: extra browser names *** | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(94) "~^mozilla/5\.0 \(macintosh; .; .*mac os x.*\) applewebkit/.* \(.*\) version/3\.1.* safari/.*$~" | |
| + string(94) "~^mozilla/5\\.0 \\(macintosh; .; .*mac os x.*\\) applewebkit/.* \\(.*\\) version/3\\.1.* safari/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(78) "Mozilla/5.0 (Macintosh; ?; *Mac OS X*) AppleWebKit/* (*) Version/3.1* Safari/*" | |
| ["parent"]=> | |
| @@ -160,7 +160,7 @@ array(34) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(67) "~^mozilla/5\.0 \(macintosh; .*mac os x.*\) gecko/.* camino/1\.5.*$~" | |
| + string(67) "~^mozilla/5\\.0 \\(macintosh; .*mac os x.*\\) gecko/.* camino/1\\.5.*$~" | |
| ["browser_name_pattern"]=> | |
| string(55) "Mozilla/5.0 (Macintosh; *Mac OS X*) Gecko/* Camino/1.5*" | |
| ["parent"]=> | |
| @@ -232,7 +232,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(29) "~^.*konqueror/3\.1.*linux.*$~" | |
| + string(29) "~^.*konqueror/3\\.1.*linux.*$~" | |
| ["browser_name_pattern"]=> | |
| string(21) "*Konqueror/3.1*Linux*" | |
| ["parent"]=> | |
| @@ -304,7 +304,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(29) "~^.*konqueror/3\.1.*linux.*$~" | |
| + string(29) "~^.*konqueror/3\\.1.*linux.*$~" | |
| ["browser_name_pattern"]=> | |
| string(21) "*Konqueror/3.1*Linux*" | |
| ["parent"]=> | |
| @@ -376,7 +376,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(21) "~^.*konqueror/2\..*$~" | |
| + string(21) "~^.*konqueror/2\\..*$~" | |
| ["browser_name_pattern"]=> | |
| string(14) "*Konqueror/2.*" | |
| ["parent"]=> | |
| @@ -448,7 +448,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(70) "~^mozilla/5\.0 \(windows; .; windows nt 5\.1; .*rv:1\.4.*\) gecko/.*$~" | |
| + string(70) "~^mozilla/5\\.0 \\(windows; .; windows nt 5\\.1; .*rv:1\\.4.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(58) "Mozilla/5.0 (Windows; ?; Windows NT 5.1; *rv:1.4*) Gecko/*" | |
| ["parent"]=> | |
| @@ -660,7 +660,7 @@ array(34) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(57) "~^mozilla/5\.0 \(x11; .*linux.*; .*rv:1\.7.*\) gecko/.*$~" | |
| + string(57) "~^mozilla/5\\.0 \\(x11; .*linux.*; .*rv:1\\.7.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(44) "Mozilla/5.0 (X11; *Linux*; *rv:1.7*) Gecko/*" | |
| ["parent"]=> | |
| @@ -732,7 +732,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(70) "~^mozilla/5\.0 \(windows; .; windows nt 5\.1; .*rv:1\.9.*\) gecko/.*$~" | |
| + string(70) "~^mozilla/5\\.0 \\(windows; .; windows nt 5\\.1; .*rv:1\\.9.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(58) "Mozilla/5.0 (Windows; ?; Windows NT 5.1; *rv:1.9*) Gecko/*" | |
| ["parent"]=> | |
| @@ -874,7 +874,7 @@ array(34) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(75) "~^mozilla/5\.0 \(x11; .*; linux.*; .*; rv:1\..*\) gecko/.* firebird/0\..*$~" | |
| + string(75) "~^mozilla/5\\.0 \\(x11; .*; linux.*; .*; rv:1\\..*\\) gecko/.* firebird/0\\..*$~" | |
| ["browser_name_pattern"]=> | |
| string(60) "Mozilla/5.0 (X11; *; Linux*; *; rv:1.*) Gecko/* Firebird/0.*" | |
| ["parent"]=> | |
| @@ -946,7 +946,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(57) "~^mozilla/5\.0 \(x11; .*linux.*; .*rv:1\.4.*\) gecko/.*$~" | |
| + string(57) "~^mozilla/5\\.0 \\(x11; .*linux.*; .*rv:1\\.4.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(44) "Mozilla/5.0 (X11; *Linux*; *rv:1.4*) Gecko/*" | |
| ["parent"]=> | |
| @@ -1018,7 +1018,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(86) "~^mozilla/5\.0 \(windows; .*; windows nt 5\.1; .*; rv:1\..*\) gecko/.* firefox/0\..*$~" | |
| + string(86) "~^mozilla/5\\.0 \\(windows; .*; windows nt 5\\.1; .*; rv:1\\..*\\) gecko/.* firefox/0\\..*$~" | |
| ["browser_name_pattern"]=> | |
| string(71) "Mozilla/5.0 (Windows; *; Windows NT 5.1; *; rv:1.*) Gecko/* Firefox/0.*" | |
| ["parent"]=> | |
| @@ -1090,7 +1090,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(41) "~^mozilla/5\.0 \(.*rv:1\.8.*\) gecko/.*$~" | |
| + string(41) "~^mozilla/5\\.0 \\(.*rv:1\\.8.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(30) "Mozilla/5.0 (*rv:1.8*) Gecko/*" | |
| ["parent"]=> | |
| @@ -1162,7 +1162,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(41) "~^mozilla/5\.0 \(.*rv:1\.8.*\) gecko/.*$~" | |
| + string(41) "~^mozilla/5\\.0 \\(.*rv:1\\.8.*\\) gecko/.*$~" | |
| ["browser_name_pattern"]=> | |
| string(30) "Mozilla/5.0 (*rv:1.8*) Gecko/*" | |
| ["parent"]=> | |
| @@ -1234,7 +1234,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(76) "~^mozilla/5\.0 \(x11; .*; sunos.*; .*; rv:1\.8.*\) gecko/.* firefox/2\.0.*$~" | |
| + string(76) "~^mozilla/5\\.0 \\(x11; .*; sunos.*; .*; rv:1\\.8.*\\) gecko/.* firefox/2\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(61) "Mozilla/5.0 (X11; *; SunOS*; *; rv:1.8*) Gecko/* Firefox/2.0*" | |
| ["parent"]=> | |
| @@ -1306,7 +1306,7 @@ array(35) { | |
| } | |
| array(35) { | |
| ["browser_name_regex"]=> | |
| - string(78) "~^mozilla/5\.0 \(x11; .*; .*linux.*; .*; rv:1\.8.*\) gecko/.* firefox/2\.0.*$~" | |
| + string(78) "~^mozilla/5\\.0 \\(x11; .*; .*linux.*; .*; rv:1\\.8.*\\) gecko/.* firefox/2\\.0.*$~" | |
| ["browser_name_pattern"]=> | |
| string(62) "Mozilla/5.0 (X11; *; *Linux*; *; rv:1.8*) Gecko/* Firefox/2.0*" | |
| ["parent"]=> | |
| diff --git a/ext/standard/tests/misc/get_browser_variation2.phpt b/ext/standard/tests/misc/get_browser_variation2.phpt | |
| index be487d8701..f6a6594e46 100644 | |
| --- a/ext/standard/tests/misc/get_browser_variation2.phpt | |
| +++ b/ext/standard/tests/misc/get_browser_variation2.phpt | |
| @@ -12,7 +12,7 @@ var_dump(get_browser($agent)); | |
| --EXPECT-- | |
| object(stdClass)#1 (35) { | |
| ["browser_name_regex"]=> | |
| - string(41) "~^opera/7\.1.* \(windows nt 5\.1; .\).*$~" | |
| + string(41) "~^opera/7\\.1.* \\(windows nt 5\\.1; .\\).*$~" | |
| ["browser_name_pattern"]=> | |
| string(31) "Opera/7.1* (Windows NT 5.1; ?)*" | |
| ["parent"]=> | |
| diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt | |
| index 0474d21d8e..dd600d48d6 100644 | |
| --- a/ext/standard/tests/network/fsockopen_error.phpt | |
| +++ b/ext/standard/tests/network/fsockopen_error.phpt | |
| @@ -29,13 +29,13 @@ echo "Done"; | |
| -- Attempting to connect to a non-existent socket -- | |
| -Warning: fsockopen(): Unable to connect to tcp://127.0.0.1:31337 (%a) in %s on line %d | |
| +Warning: fsockopen(): Unable to connect to tcp://127.0.0.1:31337 (Connection refused) in %s on line %d | |
| bool(false) | |
| -string(%d) "%a" | |
| +string(18) "Connection refused" | |
| -- Attempting to connect using an invalid protocol -- | |
| Warning: fsockopen(): Unable to connect to invalid://127.0.0.1:31337 (Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?) in %s on line %d | |
| bool(false) | |
| -string(100) "Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?" | |
| +string(100) "Unable to find the socket transport \"invalid\" - did you forget to enable it when you configured PHP?" | |
| Done | |
| diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt | |
| index 1ce0071060..35935921f5 100644 | |
| --- a/ext/standard/tests/serialize/005.phpt | |
| +++ b/ext/standard/tests/serialize/005.phpt | |
| @@ -131,7 +131,7 @@ var_dump(unserialize('O:22:"autoload_not_available":0:{}')); | |
| Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d | |
| ===O1=== | |
| TestOld::__sleep() | |
| -string(18) "O:7:"TestOld":0:{}" | |
| +string(18) "O:7:\"TestOld\":0:{}" | |
| TestOld::__wakeup() | |
| object(TestOld)#%d (0) { | |
| } | |
| @@ -141,7 +141,7 @@ string(2) "N;" | |
| NULL | |
| ===N2=== | |
| TestNew::serialize() | |
| -string(19) "C:7:"TestNew":1:{2}" | |
| +string(19) "C:7:\"TestNew\":1:{2}" | |
| TestNew::unserialize() | |
| object(TestNew)#%d (0) { | |
| } | |
| diff --git a/ext/standard/tests/serialize/006.phpt b/ext/standard/tests/serialize/006.phpt | |
| index 24b3cbbe2d..bf4e89d64d 100644 | |
| --- a/ext/standard/tests/serialize/006.phpt | |
| +++ b/ext/standard/tests/serialize/006.phpt | |
| @@ -17,12 +17,12 @@ serialize()/unserialize() with exotic letters | |
| var_dump(unserialize(serialize($åäöÅÄÖ))); | |
| ?> | |
| --EXPECT-- | |
| -string(55) "O:11:"ÜberKööliäå":1:{s:11:"åäöÅÄÖüÜber";s:6:"åäöÅÄÖ";}" | |
| +string(55) "O:11:\"ÜberKööliäå\":1:{s:11:\"åäöÅÄÖüÜber\";s:6:\"åäöÅÄÖ\";}" | |
| object(ÜberKööliäå)#2 (1) { | |
| ["åäöÅÄÖüÜber"]=> | |
| string(6) "åäöÅÄÖ" | |
| } | |
| -string(32) "a:1:{s:6:"åäöÅÄÖ";s:6:"åäöÅÄÖ";}" | |
| +string(32) "a:1:{s:6:\"åäöÅÄÖ\";s:6:\"åäöÅÄÖ\";}" | |
| array(1) { | |
| ["åäöÅÄÖ"]=> | |
| string(6) "åäöÅÄÖ" | |
| diff --git a/ext/standard/tests/serialize/__serialize_001.phpt b/ext/standard/tests/serialize/__serialize_001.phpt | |
| index ddfccfd4b6..cc501141d3 100644 | |
| --- a/ext/standard/tests/serialize/__serialize_001.phpt | |
| +++ b/ext/standard/tests/serialize/__serialize_001.phpt | |
| @@ -23,7 +23,7 @@ var_dump(unserialize($s)); | |
| ?> | |
| --EXPECT-- | |
| -string(58) "O:4:"Test":2:{s:5:"value";s:6:"foobar";i:42;s:6:"barfoo";}" | |
| +string(58) "O:4:\"Test\":2:{s:5:\"value\";s:6:\"foobar\";i:42;s:6:\"barfoo\";}" | |
| object(Test)#2 (2) { | |
| ["prop"]=> | |
| string(6) "foobar" | |
| diff --git a/ext/standard/tests/serialize/__serialize_003.phpt b/ext/standard/tests/serialize/__serialize_003.phpt | |
| index 13a9bf7be0..867a70d7a4 100644 | |
| --- a/ext/standard/tests/serialize/__serialize_003.phpt | |
| +++ b/ext/standard/tests/serialize/__serialize_003.phpt | |
| @@ -42,7 +42,7 @@ var_dump(unserialize('C:4:"Test":7:{payload}')); | |
| ?> | |
| --EXPECT-- | |
| __serialize() called | |
| -string(37) "O:4:"Test":1:{s:3:"key";s:5:"value";}" | |
| +string(37) "O:4:\"Test\":1:{s:3:\"key\";s:5:\"value\";}" | |
| __unserialize() called | |
| array(1) { | |
| ["key"]=> | |
| diff --git a/ext/standard/tests/serialize/__serialize_004.phpt b/ext/standard/tests/serialize/__serialize_004.phpt | |
| index cc55d67aa0..b64e54e86e 100644 | |
| --- a/ext/standard/tests/serialize/__serialize_004.phpt | |
| +++ b/ext/standard/tests/serialize/__serialize_004.phpt | |
| @@ -37,7 +37,7 @@ var_dump(unserialize($s)); | |
| ?> | |
| --EXPECT-- | |
| -string(126) "O:6:"Wakeup":1:{s:4:"data";a:1:{i:0;O:11:"Unserialize":1:{i:0;O:6:"Wakeup":1:{s:4:"data";a:1:{i:0;O:11:"Unserialize":0:{}}}}}}" | |
| +string(126) "O:6:\"Wakeup\":1:{s:4:\"data\";a:1:{i:0;O:11:\"Unserialize\":1:{i:0;O:6:\"Wakeup\":1:{s:4:\"data\";a:1:{i:0;O:11:\"Unserialize\":0:{}}}}}}" | |
| __unserialize() called | |
| array(0) { | |
| } | |
| diff --git a/ext/standard/tests/serialize/__serialize_005.phpt b/ext/standard/tests/serialize/__serialize_005.phpt | |
| index c65c0cdec8..0b88da442f 100644 | |
| --- a/ext/standard/tests/serialize/__serialize_005.phpt | |
| +++ b/ext/standard/tests/serialize/__serialize_005.phpt | |
| @@ -39,7 +39,7 @@ var_dump(unserialize($s)); | |
| ?> | |
| --EXPECT-- | |
| -string(63) "O:1:"B":2:{i:0;a:1:{i:0;O:8:"stdClass":0:{}}i:1;a:1:{i:0;r:3;}}" | |
| +string(63) "O:1:\"B\":2:{i:0;a:1:{i:0;O:8:\"stdClass\":0:{}}i:1;a:1:{i:0;r:3;}}" | |
| object(B)#3 (2) { | |
| ["data":"A":private]=> | |
| array(1) { | |
| diff --git a/ext/standard/tests/serialize/bug55798.phpt b/ext/standard/tests/serialize/bug55798.phpt | |
| index 539be8bb50..3065845041 100644 | |
| --- a/ext/standard/tests/serialize/bug55798.phpt | |
| +++ b/ext/standard/tests/serialize/bug55798.phpt | |
| @@ -13,7 +13,7 @@ var_dump(serialize($b)); | |
| var_dump($b->{0}); | |
| ?> | |
| --EXPECT-- | |
| -string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}" | |
| +string(51) "O:8:\"stdClass\":2:{s:1:\"0\";s:1:\"X\";s:1:\"1\";s:1:\"Y\";}" | |
| string(1) "X" | |
| -string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}" | |
| +string(51) "O:8:\"stdClass\":2:{s:1:\"0\";s:1:\"X\";s:1:\"1\";s:1:\"Y\";}" | |
| string(1) "X" | |
| diff --git a/ext/standard/tests/serialize/bug71995.phpt b/ext/standard/tests/serialize/bug71995.phpt | |
| index bf62c7da1e..66483164e6 100644 | |
| --- a/ext/standard/tests/serialize/bug71995.phpt | |
| +++ b/ext/standard/tests/serialize/bug71995.phpt | |
| @@ -19,7 +19,7 @@ var_dump(unserialize($s)); | |
| ?> | |
| --EXPECTF-- | |
| Notice: serialize(): "b" is returned from __sleep() multiple times in %s on line %d | |
| -string(39) "O:1:"A":1:{s:1:"b";O:8:"stdClass":0:{}}" | |
| +string(39) "O:1:\"A\":1:{s:1:\"b\";O:8:\"stdClass\":0:{}}" | |
| object(A)#%d (1) { | |
| ["b"]=> | |
| object(stdClass)#%d (0) { | |
| diff --git a/ext/standard/tests/serialize/bug73154.phpt b/ext/standard/tests/serialize/bug73154.phpt | |
| index 8d0f188bf7..05d9159d05 100644 | |
| --- a/ext/standard/tests/serialize/bug73154.phpt | |
| +++ b/ext/standard/tests/serialize/bug73154.phpt | |
| @@ -13,4 +13,4 @@ $s = 'a:1:{i:0;O:1:"a":1:{s:1:"a";R:2;}}'; | |
| var_dump(serialize(unserialize($s))); | |
| ?> | |
| --EXPECT-- | |
| -string(22) "a:1:{i:0;O:1:"a":0:{}}" | |
| +string(22) "a:1:{i:0;O:1:\"a\":0:{}}" | |
| diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt | |
| index c1fc093237..edd2ea723b 100644 | |
| --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt | |
| @@ -27,7 +27,7 @@ echo "\nDone"; | |
| --EXPECT-- | |
| --- Testing Circular reference of an array --- | |
| -- Normal array -- | |
| -string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}" | |
| +string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:\"a\";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:\"a\";i:5;a:0:{}i:6;R:8;}}" | |
| array(7) { | |
| [0]=> | |
| int(0) | |
| @@ -69,7 +69,7 @@ array(2) { | |
| ["b"]=> | |
| &string(4) "test" | |
| } | |
| -string(37) "a:2:{s:1:"a";s:4:"test";s:1:"b";R:2;}" | |
| +string(37) "a:2:{s:1:\"a\";s:4:\"test\";s:1:\"b\";R:2;}" | |
| array(2) { | |
| ["a"]=> | |
| &string(4) "test" | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt | |
| index 82f1973248..dd2c7fd8ab 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_001.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_001.phpt | |
| @@ -46,7 +46,7 @@ object(members)#%d (3) { | |
| bool(true) | |
| } | |
| } | |
| -string(195) "O:7:"members":3:{s:20:"\0members\0var_private";i:10;s:16:"\0*\0var_protected";s:6:"string";s:10:"var_public";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:"string";i:2;b:1;}}" | |
| +string(195) "O:7:\"members\":3:{s:20:\"\0members\0var_private\";i:10;s:16:\"\0*\0var_protected\";s:6:\"string\";s:10:\"var_public\";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:\"string\";i:2;b:1;}}" | |
| object(members)#%d (3) { | |
| ["var_private":"members":private]=> | |
| int(10) | |
| @@ -64,7 +64,7 @@ object(members)#%d (3) { | |
| } | |
| --- testing reference to an obj --- | |
| -string(195) "O:7:"members":3:{s:20:"\0members\0var_private";i:10;s:16:"\0*\0var_protected";s:6:"string";s:10:"var_public";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:"string";i:2;b:1;}}" | |
| +string(195) "O:7:\"members\":3:{s:20:\"\0members\0var_private\";i:10;s:16:\"\0*\0var_protected\";s:6:\"string\";s:10:\"var_public\";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:\"string\";i:2;b:1;}}" | |
| object(members)#%d (3) { | |
| ["var_private":"members":private]=> | |
| int(10) | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt | |
| index 78691cf1a8..c2fea5a88c 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_002.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_002.phpt | |
| @@ -74,7 +74,7 @@ echo "\nDone"; | |
| Warning: Undefined variable $file_handle in %s on line %d | |
| Warning: Undefined variable $file_handle in %s on line %d | |
| -After Serialization => string(493) "O:1:"C":8:{s:1:"a";i:10;s:1:"b";s:6:"string";s:1:"c";b:1;s:1:"d";d:-2.344440000000000079438677857979200780391693115234375;s:1:"e";a:7:{i:0;i:1;i:1;d:2.220000000000000195399252334027551114559173583984375;i:2;s:6:"string";i:3;b:1;i:4;a:0:{}i:5;O:7:"members":3:{s:20:"\0members\0var_private";i:10;s:16:"\0*\0var_protected";s:6:"string";s:10:"var_public";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:"string";i:2;b:1;}}i:6;N;}s:1:"f";O:9:"nomembers":0:{}s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(493) "O:1:\"C\":8:{s:1:\"a\";i:10;s:1:\"b\";s:6:\"string\";s:1:\"c\";b:1;s:1:\"d\";d:-2.344440000000000079438677857979200780391693115234375;s:1:\"e\";a:7:{i:0;i:1;i:1;d:2.220000000000000195399252334027551114559173583984375;i:2;s:6:\"string\";i:3;b:1;i:4;a:0:{}i:5;O:7:\"members\":3:{s:20:\"\0members\0var_private\";i:10;s:16:\"\0*\0var_protected\";s:6:\"string\";s:10:\"var_public\";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:\"string\";i:2;b:1;}}i:6;N;}s:1:\"f\";O:9:\"nomembers\":0:{}s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(C)#%d (8) { | |
| ["a"]=> | |
| int(10) | |
| @@ -124,7 +124,7 @@ After Unserialization => object(C)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(108) "O:1:"D":8:{s:1:"a";i:1;s:1:"b";i:2;s:1:"c";i:3333;s:1:"d";i:444444;s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(108) "O:1:\"D\":8:{s:1:\"a\";i:1;s:1:\"b\";i:2;s:1:\"c\";i:3333;s:1:\"d\";i:444444;s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| int(1) | |
| @@ -143,7 +143,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(223) "O:1:"D":8:{s:1:"a";d:0.5;s:1:"b";d:0.005000000000000000104083408558608425664715468883514404296875;s:1:"c";d:-1.3449999999999999733546474089962430298328399658203125;s:1:"d";d:1000500;s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(223) "O:1:\"D\":8:{s:1:\"a\";d:0.5;s:1:\"b\";d:0.005000000000000000104083408558608425664715468883514404296875;s:1:\"c\";d:-1.3449999999999999733546474089962430298328399658203125;s:1:\"d\";d:1000500;s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| float(0.5) | |
| @@ -162,7 +162,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(100) "O:1:"D":8:{s:1:"a";b:1;s:1:"b";b:1;s:1:"c";b:0;s:1:"d";b:0;s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(100) "O:1:\"D\":8:{s:1:\"a\";b:1;s:1:\"b\";b:1;s:1:\"c\";b:0;s:1:\"d\";b:0;s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| bool(true) | |
| @@ -181,7 +181,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(126) "O:1:"D":8:{s:1:"a";s:1:"a";s:1:"b";s:1:"a";s:1:"c";s:6:"string";s:1:"d";s:6:"string";s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(126) "O:1:\"D\":8:{s:1:\"a\";s:1:\"a\";s:1:\"b\";s:1:\"a\";s:1:\"c\";s:6:\"string\";s:1:\"d\";s:6:\"string\";s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| string(1) "a" | |
| @@ -200,7 +200,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(300) "O:1:"D":8:{s:1:"a";a:0:{}s:1:"b";a:5:{i:0;i:1;i:1;d:2.221999999999999975131004248396493494510650634765625;i:2;b:1;i:3;b:0;i:4;s:6:"string";}s:1:"c";a:4:{i:0;O:9:"nomembers":0:{}i:1;N;i:2;N;i:3;s:0:"";}s:1:"d";a:1:{i:0;a:4:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;a:0:{}}}s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(300) "O:1:\"D\":8:{s:1:\"a\";a:0:{}s:1:\"b\";a:5:{i:0;i:1;i:1;d:2.221999999999999975131004248396493494510650634765625;i:2;b:1;i:3;b:0;i:4;s:6:\"string\";}s:1:\"c\";a:4:{i:0;O:9:\"nomembers\":0:{}i:1;N;i:2;N;i:3;s:0:\"\";}s:1:\"d\";a:1:{i:0;a:4:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;a:0:{}}}s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| array(0) { | |
| @@ -254,7 +254,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(103) "O:1:"D":8:{s:1:"a";N;s:1:"b";N;s:1:"c";s:0:"";s:1:"d";s:1:"\0";s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(103) "O:1:\"D\":8:{s:1:\"a\";N;s:1:\"b\";N;s:1:\"c\";s:0:\"\";s:1:\"d\";s:1:\"\0\";s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| NULL | |
| @@ -273,7 +273,7 @@ After Unserialization => object(D)#%d (8) { | |
| ["h"]=> | |
| NULL | |
| } | |
| -After Serialization => string(303) "O:1:"D":8:{s:1:"a";O:7:"members":3:{s:20:"\0members\0var_private";i:10;s:16:"\0*\0var_protected";s:6:"string";s:10:"var_public";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:"string";i:2;b:1;}}s:1:"b";O:9:"nomembers":0:{}s:1:"c";N;s:1:"d";N;s:1:"e";N;s:1:"f";N;s:1:"g";N;s:1:"h";N;}" | |
| +After Serialization => string(303) "O:1:\"D\":8:{s:1:\"a\";O:7:\"members\":3:{s:20:\"\0members\0var_private\";i:10;s:16:\"\0*\0var_protected\";s:6:\"string\";s:10:\"var_public\";a:3:{i:0;d:-100.1230000000000046611603465862572193145751953125;i:1;s:6:\"string\";i:2;b:1;}}s:1:\"b\";O:9:\"nomembers\":0:{}s:1:\"c\";N;s:1:\"d\";N;s:1:\"e\";N;s:1:\"f\";N;s:1:\"g\";N;s:1:\"h\";N;}" | |
| After Unserialization => object(D)#%d (8) { | |
| ["a"]=> | |
| object(members)#%d (3) { | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt | |
| index e4b068b143..5a691a6b80 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_003.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_003.phpt | |
| @@ -43,7 +43,7 @@ echo "\nDone"; | |
| ?> | |
| --EXPECTF-- | |
| --- Testing Abstract Class --- | |
| -string(119) "O:10:"extendName":3:{s:1:"a";i:10;s:1:"b";d:12.2219999999999995310417943983338773250579833984375;s:1:"c";s:6:"string";}" | |
| +string(119) "O:10:\"extendName\":3:{s:1:\"a\";i:10;s:1:\"b\";d:12.2219999999999995310417943983338773250579833984375;s:1:\"c\";s:6:\"string\";}" | |
| object(extendName)#%d (3) { | |
| ["a"]=> | |
| int(10) | |
| @@ -52,7 +52,7 @@ object(extendName)#%d (3) { | |
| ["c"]=> | |
| string(6) "string" | |
| } | |
| -string(18) "s:10:"extendName";" | |
| +string(18) "s:10:\"extendName\";" | |
| string(10) "extendName" | |
| Done | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt | |
| index b2c7cd3dd8..b7d783a042 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_004.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt | |
| @@ -29,9 +29,9 @@ var_dump(serialize(array($x, $x))); | |
| echo "Done"; | |
| ?> | |
| --EXPECT-- | |
| -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" | |
| +string(37) "a:2:{i:0;O:8:\"stdClass\":0:{}i:1;r:2;}" | |
| string(22) "a:2:{i:0;i:1;i:1;i:1;}" | |
| -string(30) "a:2:{i:0;s:1:"a";i:1;s:1:"a";}" | |
| +string(30) "a:2:{i:0;s:1:\"a\";i:1;s:1:\"a\";}" | |
| string(22) "a:2:{i:0;b:1;i:1;b:1;}" | |
| string(18) "a:2:{i:0;N;i:1;N;}" | |
| string(26) "a:2:{i:0;a:0:{}i:1;a:0:{}}" | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt | |
| index 5fbcedd7ec..e748c87787 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_011.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_011.phpt | |
| @@ -79,7 +79,7 @@ object(A)#%d (3) { | |
| string(6) "A.APub" | |
| } | |
| Serialized form: | |
| -string(98) "O:1:"A":3:{s:8:"\0A\0APriv";s:7:"A.APriv";s:8:"\0*\0AProt";s:7:"A.AProt";s:4:"APub";s:6:"A.APub";}" | |
| +string(98) "O:1:\"A\":3:{s:8:\"\\0A\\0APriv\";s:7:\"A.APriv\";s:8:\"\\0*\\0AProt\";s:7:\"A.AProt\";s:4:\"APub\";s:6:\"A.APub\";}" | |
| Unserialized: | |
| object(A)#%d (3) { | |
| ["APriv":"A":private]=> | |
| @@ -111,7 +111,7 @@ object(B)#%d (6) { | |
| string(6) "B.BPub" | |
| } | |
| Serialized form: | |
| -string(184) "O:1:"B":6:{s:8:"\0A\0APriv";s:7:"A.APriv";s:8:"\0*\0AProt";s:7:"A.AProt";s:4:"APub";s:6:"A.APub";s:8:"\0B\0BPriv";s:7:"B.BPriv";s:8:"\0*\0BProt";s:7:"B.BProt";s:4:"BPub";s:6:"B.BPub";}" | |
| +string(184) "O:1:\"B\":6:{s:8:\"\\0A\\0APriv\";s:7:\"A.APriv\";s:8:\"\\0*\\0AProt\";s:7:\"A.AProt\";s:4:\"APub\";s:6:\"A.APub\";s:8:\"\\0B\\0BPriv\";s:7:\"B.BPriv\";s:8:\"\\0*\\0BProt\";s:7:\"B.BProt\";s:4:\"BPub\";s:6:\"B.BPub\";}" | |
| Unserialized: | |
| object(B)#%d (6) { | |
| ["APriv":"A":private]=> | |
| @@ -157,7 +157,7 @@ object(C)#%d (10) { | |
| string(6) "C.CPub" | |
| } | |
| Serialized form: | |
| -string(302) "O:1:"C":10:{s:8:"\0A\0APriv";s:7:"A.APriv";s:8:"\0*\0AProt";s:7:"C.AProt";s:4:"APub";s:6:"C.APub";s:8:"\0B\0BPriv";s:7:"B.BPriv";s:8:"\0*\0BProt";s:7:"B.BProt";s:4:"BPub";s:6:"B.BPub";s:8:"\0C\0APriv";s:7:"C.APriv";s:8:"\0C\0CPriv";s:7:"C.CPriv";s:8:"\0*\0CProt";s:7:"C.BProt";s:4:"CPub";s:6:"C.CPub";}" | |
| +string(302) "O:1:\"C\":10:{s:8:\"\\0A\\0APriv\";s:7:\"A.APriv\";s:8:\"\\0*\\0AProt\";s:7:\"C.AProt\";s:4:\"APub\";s:6:\"C.APub\";s:8:\"\\0B\\0BPriv\";s:7:\"B.BPriv\";s:8:\"\\0*\\0BProt\";s:7:\"B.BProt\";s:4:\"BPub\";s:6:\"B.BPub\";s:8:\"\\0C\\0APriv\";s:7:\"C.APriv\";s:8:\"\\0C\\0CPriv\";s:7:\"C.CPriv\";s:8:\"\\0*\\0CProt\";s:7:\"C.BProt\";s:4:\"CPub\";s:6:\"C.CPub\";}" | |
| Unserialized: | |
| object(C)#%d (10) { | |
| ["APriv":"A":private]=> | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt | |
| index 9887e9f4db..c22d1f41f2 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_012.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt | |
| @@ -82,7 +82,7 @@ array(2) { | |
| object(stdClass)#%d (0) { | |
| } | |
| } | |
| -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" | |
| +string(37) "a:2:{i:0;O:8:\"stdClass\":0:{}i:1;r:2;}" | |
| array(2) { | |
| [0]=> | |
| object(stdClass)#%d (0) { | |
| @@ -123,7 +123,7 @@ array(2) { | |
| &object(stdClass)#%d (0) { | |
| } | |
| } | |
| -string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;R:2;}" | |
| +string(37) "a:2:{i:0;O:8:\"stdClass\":0:{}i:1;R:2;}" | |
| array(2) { | |
| [0]=> | |
| &object(stdClass)#%d (0) { | |
| @@ -160,7 +160,7 @@ Object containing same object twice:object(stdClass)#%d (2) { | |
| object(stdClass)#%d (0) { | |
| } | |
| } | |
| -string(58) "O:8:"stdClass":2:{s:1:"a";O:8:"stdClass":0:{}s:1:"b";r:2;}" | |
| +string(58) "O:8:\"stdClass\":2:{s:1:\"a\";O:8:\"stdClass\":0:{}s:1:\"b\";r:2;}" | |
| object(stdClass)#%d (2) { | |
| ["a"]=> | |
| object(stdClass)#%d (0) { | |
| @@ -201,7 +201,7 @@ object(stdClass)#%d (2) { | |
| &object(stdClass)#%d (0) { | |
| } | |
| } | |
| -string(58) "O:8:"stdClass":2:{s:1:"a";O:8:"stdClass":0:{}s:1:"b";R:2;}" | |
| +string(58) "O:8:\"stdClass\":2:{s:1:\"a\";O:8:\"stdClass\":0:{}s:1:\"b\";R:2;}" | |
| object(stdClass)#%d (2) { | |
| ["a"]=> | |
| &object(stdClass)#%d (0) { | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt | |
| index 6e8a3c3a9a..8fe1802e5e 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_013.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt | |
| @@ -92,7 +92,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"b";i:1;s:1:"a";R:2;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"b\";i:1;s:1:\"a\";R:2;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["b"]=> | |
| &int(1) | |
| @@ -136,7 +136,7 @@ object(stdClass)#%d (3) { | |
| ["b"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"c";i:1;s:1:"a";R:2;s:1:"b";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"c\";i:1;s:1:\"a\";R:2;s:1:\"b\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| @@ -180,7 +180,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";R:2;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";R:2;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| &int(1) | |
| @@ -224,7 +224,7 @@ object(stdClass)#%d (3) { | |
| ["b"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"c";i:1;s:1:"b";R:3;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"c\";i:1;s:1:\"b\";R:3;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| int(1) | |
| @@ -268,7 +268,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";i:1;s:1:"c";R:2;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";i:1;s:1:\"c\";R:2;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| &int(1) | |
| @@ -312,7 +312,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";i:1;s:1:"c";R:3;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";i:1;s:1:\"c\";R:3;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| int(1) | |
| @@ -356,7 +356,7 @@ object(stdClass)#%d (3) { | |
| ["b"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"c";i:1;s:1:"a";R:2;s:1:"b";R:2;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"c\";i:1;s:1:\"a\";R:2;s:1:\"b\";R:2;}" | |
| object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| @@ -400,7 +400,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"b";i:1;s:1:"a";R:2;s:1:"c";R:2;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"b\";i:1;s:1:\"a\";R:2;s:1:\"c\";R:2;}" | |
| object(stdClass)#%d (3) { | |
| ["b"]=> | |
| &int(1) | |
| @@ -444,7 +444,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";R:2;s:1:"c";R:2;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";R:2;s:1:\"c\";R:2;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| &int(1) | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt | |
| index f8833120a2..6b231c8133 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_014.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt | |
| @@ -69,7 +69,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";i:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";i:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| int(1) | |
| @@ -113,7 +113,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";i:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";i:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| int(1) | |
| @@ -157,7 +157,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";i:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";i:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| int(1) | |
| @@ -201,7 +201,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";R:2;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";R:2;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| &int(1) | |
| @@ -245,7 +245,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| &int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";i:1;s:1:"b";R:2;s:1:"c";R:2;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";i:1;s:1:\"b\";R:2;s:1:\"c\";R:2;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| &int(1) | |
| diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt | |
| index 522450bfc1..a2fc96985d 100644 | |
| --- a/ext/standard/tests/serialize/serialization_objects_015.phpt | |
| +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt | |
| @@ -78,7 +78,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";i:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";R:1;s:1:\"b\";i:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| @@ -122,7 +122,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";i:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";r:1;s:1:\"b\";i:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| @@ -166,7 +166,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";R:1;s:1:\"b\";R:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| @@ -210,7 +210,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| int(1) | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";i:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";r:1;s:1:\"b\";r:1;s:1:\"c\";i:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| @@ -254,7 +254,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| *RECURSION* | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";R:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";R:1;s:1:\"b\";R:1;s:1:\"c\";R:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| @@ -298,7 +298,7 @@ object(stdClass)#%d (3) { | |
| ["c"]=> | |
| *RECURSION* | |
| } | |
| -string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";r:1;}" | |
| +string(55) "O:8:\"stdClass\":3:{s:1:\"a\";r:1;s:1:\"b\";r:1;s:1:\"c\";r:1;}" | |
| object(stdClass)#%d (3) { | |
| ["a"]=> | |
| *RECURSION* | |
| diff --git a/ext/standard/tests/serialize/sleep_deref.phpt b/ext/standard/tests/serialize/sleep_deref.phpt | |
| index 36777db0a3..6d378005be 100644 | |
| --- a/ext/standard/tests/serialize/sleep_deref.phpt | |
| +++ b/ext/standard/tests/serialize/sleep_deref.phpt | |
| @@ -15,4 +15,4 @@ var_dump(serialize(new Test)); | |
| ?> | |
| --EXPECT-- | |
| -string(28) "O:4:"Test":1:{s:1:"x";i:42;}" | |
| +string(28) "O:4:\"Test\":1:{s:1:\"x\";i:42;}" | |
| diff --git a/ext/standard/tests/serialize/sleep_mangled_name_clash.phpt b/ext/standard/tests/serialize/sleep_mangled_name_clash.phpt | |
| index ac0c835a45..8c9a589093 100644 | |
| --- a/ext/standard/tests/serialize/sleep_mangled_name_clash.phpt | |
| +++ b/ext/standard/tests/serialize/sleep_mangled_name_clash.phpt | |
| @@ -13,4 +13,4 @@ var_dump(str_replace("\0", '\0', $s)); | |
| ?> | |
| --EXPECTF-- | |
| Notice: serialize(): "priv" is returned from __sleep() multiple times in %s on line %d | |
| -string(37) "O:4:"Test":1:{s:10:"\0Test\0priv";N;}" | |
| +string(37) "O:4:\"Test\":1:{s:10:\"\\0Test\\0priv\";N;}" | |
| diff --git a/ext/standard/tests/serialize/sleep_undefined_declared_properties.phpt b/ext/standard/tests/serialize/sleep_undefined_declared_properties.phpt | |
| index 3c7f802e67..13fe5556b8 100644 | |
| --- a/ext/standard/tests/serialize/sleep_undefined_declared_properties.phpt | |
| +++ b/ext/standard/tests/serialize/sleep_undefined_declared_properties.phpt | |
| @@ -26,4 +26,4 @@ Warning: serialize(): "pub" returned as member variable from __sleep() but does | |
| Warning: serialize(): "prot" returned as member variable from __sleep() but does not exist in %s on line %d | |
| Warning: serialize(): "priv" returned as member variable from __sleep() but does not exist in %s on line %d | |
| -string(15) "O:4:"Test":0:{}" | |
| +string(15) "O:4:\"Test\":0:{}" | |
| diff --git a/ext/standard/tests/serialize/sleep_uninitialized_typed_prop.phpt b/ext/standard/tests/serialize/sleep_uninitialized_typed_prop.phpt | |
| index ebef92ca18..5206501531 100644 | |
| --- a/ext/standard/tests/serialize/sleep_uninitialized_typed_prop.phpt | |
| +++ b/ext/standard/tests/serialize/sleep_uninitialized_typed_prop.phpt | |
| @@ -33,7 +33,7 @@ var_dump(unserialize(serialize($t)) == $t); | |
| var_dump($t); | |
| ?> | |
| --EXPECT-- | |
| -string(15) "O:4:"Test":0:{}" | |
| +string(15) "O:4:\"Test\":0:{}" | |
| bool(true) | |
| bool(true) | |
| bool(true) | |
| diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt | |
| index 27b1f977c5..065b867919 100644 | |
| --- a/ext/standard/tests/strings/addcslashes_001.phpt | |
| +++ b/ext/standard/tests/strings/addcslashes_001.phpt | |
| @@ -40,34 +40,34 @@ echo "Done\n"; | |
| --EXPECT-- | |
| *** Testing addcslashes() for basic operations *** | |
| -- Iteration 1 -- | |
| -string(37) "goodyear1\2345NULL\0truefalse\a \b | |
| +string(37) "goodyear1\\2345NULL\0truefalse\\a \\b | |
| " | |
| -- Iteration 2 -- | |
| addcslashes(): Argument #2 ($characters) must be of type string, array given | |
| -- Iteration 3 -- | |
| -string(39) "goodye\ar12345NULL\0truef\alse\\a \b | |
| +string(39) "goodye\\ar12345NULL\0truef\\alse\\\\a \\b | |
| " | |
| -- Iteration 4 -- | |
| -string(39) "goodyear12345NULL\000truefalse\a \b | |
| +string(39) "goodyear12345NULL\\000truefalse\\a \\b | |
| " | |
| -- Iteration 5 -- | |
| -string(37) "goodyear12345NULL\0truefalse\a \b\n | |
| " | |
| +string(37) "goodyear12345NULL\0truefalse\\a \\b\\n | |
| " | |
| -- Iteration 6 -- | |
| -string(37) "goodyear12345NULL\0truefalse\a \b | |
| -\r " | |
| +string(37) "goodyear12345NULL\0truefalse\\a \\b | |
| +\\r " | |
| -- Iteration 7 -- | |
| -string(37) "goodyear12345NULL\0truefalse\a \b | |
| - | |
| \t" | |
| +string(37) "goodyear12345NULL\0truefalse\\a \\b | |
| + | |
| \\t" | |
| -- Iteration 8 -- | |
| -string(41) "goodye\ar12345NULL\0truef\alse\\\a \\b | |
| +string(41) "goodye\\ar12345NULL\0truef\\alse\\\\\\a \\\\b | |
| " | |
| -- Iteration 9 -- | |
| -string(37) "goodyear12345NULL\0truefalse\a\v \b | |
| +string(37) "goodyear12345NULL\0truefalse\\a\\v \\b | |
| " | |
| -- Iteration 10 -- | |
| -string(39) "goodyear12345NULL\0truefalse\\a \\\b | |
| +string(39) "goodyear12345NULL\0truefalse\\\\a \\\\\\b | |
| " | |
| -- Iteration 11 -- | |
| -string(37) "goodyear12345NULL\0truefalse\a \f\b | |
| +string(37) "goodyear12345NULL\0truefalse\\a \\f\\b | |
| " | |
| Done | |
| diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt | |
| index 256d39f11a..f3016d665f 100644 | |
| --- a/ext/standard/tests/strings/addcslashes_002.phpt | |
| +++ b/ext/standard/tests/strings/addcslashes_002.phpt | |
| @@ -26,8 +26,8 @@ echo "Done\n"; | |
| ?> | |
| --EXPECT-- | |
| *** Testing addcslashes() with ASCII code between 0 and 31 *** | |
| -string(44) "goodyear12345NULL\000truefalse\a\v\f\b\n\r\t" | |
| +string(44) "goodyear12345NULL\\000truefalse\\a\\v\\f\\b\\n\\r\\t" | |
| *** Testing addcslashes() with objects *** | |
| -string(7) "O\bject" | |
| +string(7) "O\\bject" | |
| Done | |
| diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt | |
| index 0c7f1ecdc9..d2be401eff 100644 | |
| --- a/ext/standard/tests/strings/addcslashes_003.phpt | |
| +++ b/ext/standard/tests/strings/addcslashes_003.phpt | |
| @@ -29,14 +29,14 @@ echo "Done\n"; | |
| string(0) "" | |
| string(0) "" | |
| string(11) "kaboemkara!" | |
| -string(14) "foo\b\a\r\b\az" | |
| -string(11) "\f\o\o\[ \]" | |
| -string(10) "\zoo['\.']" | |
| -string(40) "\abcd\e\f\g\h\i\j\k\l\m\n\o\pqrstuvwxy\z" | |
| -string(6) "\1\2\3" | |
| -string(2) "\0" | |
| +string(14) "foo\\b\\a\\r\\b\\az" | |
| +string(11) "\\f\\o\\o\\[ \\]" | |
| +string(10) "\\zoo[\'\\.\']" | |
| +string(40) "\\abcd\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\pqrstuvwxy\\z" | |
| +string(6) "\\1\\2\\3" | |
| +string(2) "\\0" | |
| string(1) "\0" | |
| -string(10) "-1.2\34578" | |
| -string(2) "\ " | |
| -string(22) "string\000with\000NULL" | |
| +string(10) "-1.2\\34578" | |
| +string(2) "\\ " | |
| +string(22) "string\\000with\\000NULL" | |
| Done | |
| diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt | |
| index 41bb25ca71..2091775462 100644 | |
| --- a/ext/standard/tests/strings/addslashes_basic.phpt | |
| +++ b/ext/standard/tests/strings/addslashes_basic.phpt | |
| @@ -25,8 +25,8 @@ echo "Done\n"; | |
| ?> | |
| --EXPECT-- | |
| *** Testing addslashes() : basic functionality *** | |
| -string(16) "How\'s everybody" | |
| -string(17) "Are you \"JOHN\"?" | |
| -string(19) "c:\\php\\addslashes" | |
| -string(12) "hello\0world" | |
| +string(16) "How\\\'s everybody" | |
| +string(17) "Are you \\\"JOHN\\\"?" | |
| +string(19) "c:\\\\php\\\\addslashes" | |
| +string(12) "hello\\0world" | |
| Done | |
| diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt | |
| index e5cb60a45a..361dd479fc 100644 | |
| --- a/ext/standard/tests/strings/addslashes_variation2.phpt | |
| +++ b/ext/standard/tests/strings/addslashes_variation2.phpt | |
| @@ -81,108 +81,108 @@ foreach( $str_array as $str ) { | |
| echo "Done\n"; | |
| ?> | |
| ---EXPECTF-- | |
| +--EXPECT-- | |
| *** Testing addslashes() : with various strings containing characters to be backslashed *** | |
| -- Iteration 1 -- | |
| string(11) "Hello world" | |
| -- Iteration 2 -- | |
| -string(18) "how\'re you doing?" | |
| +string(18) "how\\\'re you doing?" | |
| -- Iteration 3 -- | |
| -string(30) "don\'t disturb u\'r neighbours" | |
| +string(30) "don\\\'t disturb u\\\'r neighbours" | |
| -- Iteration 4 -- | |
| -string(34) "don\'t disturb u\'r neighbours\'\'" | |
| +string(34) "don\\\'t disturb u\\\'r neighbours\\\'\\\'" | |
| -- Iteration 5 -- | |
| string(0) "" | |
| -- Iteration 6 -- | |
| -string(2) "\'" | |
| +string(2) "\\\'" | |
| -- Iteration 7 -- | |
| -string(2) "\'" | |
| +string(2) "\\\'" | |
| -- Iteration 8 -- | |
| -string(32) "he said, \"he will be on leave\"" | |
| +string(32) "he said, \\\"he will be on leave\\\"" | |
| -- Iteration 9 -- | |
| -string(34) "he said, \"\"he will be on leave\"" | |
| +string(34) "he said, \\\"\\\"he will be on leave\\\"" | |
| -- Iteration 10 -- | |
| -string(15) "\"\"\"PHP\"\"\"" | |
| +string(15) "\\\"\\\"\\\"PHP\\\"\\\"\\\"" | |
| -- Iteration 11 -- | |
| string(0) "" | |
| -- Iteration 12 -- | |
| -string(2) "\"" | |
| +string(2) "\\\"" | |
| -- Iteration 13 -- | |
| -string(2) "\"" | |
| +string(2) "\\\"" | |
| -- Iteration 14 -- | |
| -string(7) "hello\"" | |
| +string(7) "hello\\\"" | |
| -- Iteration 15 -- | |
| -string(26) "Is your name Ram\\Krishna?" | |
| +string(26) "Is your name Ram\\\\Krishna?" | |
| -- Iteration 16 -- | |
| -string(9) "\\0.0.0.0" | |
| +string(9) "\\\\0.0.0.0" | |
| -- Iteration 17 -- | |
| -string(29) "c:\\php\\testcase\\addslashes" | |
| +string(29) "c:\\\\php\\\\testcase\\\\addslashes" | |
| -- Iteration 18 -- | |
| -string(2) "\\" | |
| +string(2) "\\\\" | |
| -- Iteration 19 -- | |
| -string(12) "hello\0world" | |
| +string(12) "hello\\0world" | |
| -- Iteration 20 -- | |
| -string(9) "\0hello\0" | |
| +string(9) "\\0hello\\0" | |
| -- Iteration 21 -- | |
| -string(9) "\0\0hello" | |
| +string(9) "\\0\\0hello" | |
| -- Iteration 22 -- | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| -- Iteration 23 -- | |
| -string(13) "\'\\0.0.0.0\'" | |
| +string(13) "\\\'\\\\0.0.0.0\\\'" | |
| -- Iteration 24 -- | |
| -string(15) "\'\\0.0.0.0\'\0" | |
| +string(15) "\\\'\\\\0.0.0.0\\\'\\0" | |
| -- Iteration 25 -- | |
| -string(15) "\0\'c:\\php\\\'" | |
| +string(15) "\\0\\\'c:\\\\php\\\\\\\'" | |
| -- Iteration 26 -- | |
| -string(13) "\"\\0.0.0.0\"" | |
| +string(13) "\\\"\\\\0.0.0.0\\\"" | |
| -- Iteration 27 -- | |
| -string(17) "\"c:\\php\\\"\0\'" | |
| +string(17) "\\\"c:\\\\php\\\\\\\"\\0\\\'" | |
| -- Iteration 28 -- | |
| -string(22) "\"hello\"\'world\'\0//" | |
| +string(22) "\\\"hello\\\"\\\'world\\\'\\0//" | |
| -- Iteration 29 -- | |
| string(18) "0xABCDEF0123456789" | |
| -- Iteration 30 -- | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| -- Iteration 31 -- | |
| string(18) "!@#$%&*@$%#&/;:,<>" | |
| -- Iteration 32 -- | |
| -string(12) "hello\0world" | |
| +string(12) "hello\\0world" | |
| -- Iteration 33 -- | |
| -string(7%d) "This is line 1 of \'heredoc\' string | |
| -This is line 2 of \"heredoc\" string" | |
| +string(73) "This is line 1 of \\\'heredoc\\\' string | |
| +This is line 2 of \\\"heredoc\\\" string" | |
| -- Iteration 34 -- | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/bug37244.phpt b/ext/standard/tests/strings/bug37244.phpt | |
| index bd9628e877..72cdc63194 100644 | |
| --- a/ext/standard/tests/strings/bug37244.phpt | |
| +++ b/ext/standard/tests/strings/bug37244.phpt | |
| @@ -14,4 +14,4 @@ foreach($strings as $string) { | |
| --EXPECT-- | |
| string(93) "Implementations MUST reject the encoding if it contains characters outside the base alphabet." | |
| bool(false) | |
| -string(92) "Implemem][ÛÈUTÕ ZXÝ H[ÛÙ[ÈY]ÛÛZ[ÈÚ\XÝ\ÈÝ] ÚYH H\ÙH[ X] " | |
| +string(92) "Implemem][ÛÈUTÕ ZXÝ H[ÛÙ[ÈY]ÛÛZ[ÈÚ\\XÝ\\ÈÝ] ÚYH H\\ÙH[ X] " | |
| diff --git a/ext/standard/tests/strings/bug40704.phpt b/ext/standard/tests/strings/bug40704.phpt | |
| index b2f6cf89cc..5d975c537d 100644 | |
| --- a/ext/standard/tests/strings/bug40704.phpt | |
| +++ b/ext/standard/tests/strings/bug40704.phpt | |
| @@ -9,5 +9,5 @@ var_dump(strip_tags($html)); | |
| echo "Done\n"; | |
| ?> | |
| --EXPECT-- | |
| -string(26) "Bug ' Trigger Missing Text" | |
| +string(26) "Bug \' Trigger Missing Text" | |
| Done | |
| diff --git a/ext/standard/tests/strings/bug40915.phpt b/ext/standard/tests/strings/bug40915.phpt | |
| index c9651b0b0c..77db76abb2 100644 | |
| --- a/ext/standard/tests/strings/bug40915.phpt | |
| +++ b/ext/standard/tests/strings/bug40915.phpt | |
| @@ -13,8 +13,8 @@ var_dump(addcslashes($str, "z")); | |
| echo "Done\n"; | |
| ?> | |
| --EXPECT-- | |
| -string(4) "a\0z" | |
| +string(4) "a\\0z" | |
| string(3) "a\0z" | |
| -string(7) "a\000\z" | |
| -string(4) "a\0\z" | |
| +string(7) "a\\000\\z" | |
| +string(4) "a\0\\z" | |
| Done | |
| diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt | |
| index 8cbff1504f..846bc0d306 100644 | |
| --- a/ext/standard/tests/strings/bug44703.phpt | |
| +++ b/ext/standard/tests/strings/bug44703.phpt | |
| @@ -23,17 +23,17 @@ var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100))); | |
| ?> | |
| --EXPECTF-- | |
| Warning: htmlspecialchars(): Charset "1" is not supported, assuming UTF-8 in %s on line %d | |
| -string(35) "<a href='test'>Test</a>" | |
| +string(35) "<a href=\'test\'>Test</a>" | |
| Warning: htmlspecialchars(): Charset "12" is not supported, assuming UTF-8 in %s on line %d | |
| -string(35) "<a href='test'>Test</a>" | |
| +string(35) "<a href=\'test\'>Test</a>" | |
| Warning: htmlspecialchars(): Charset "125" is not supported, assuming UTF-8 in %s on line %d | |
| -string(35) "<a href='test'>Test</a>" | |
| -string(35) "<a href='test'>Test</a>" | |
| +string(35) "<a href=\'test\'>Test</a>" | |
| +string(35) "<a href=\'test\'>Test</a>" | |
| Warning: htmlspecialchars(): Charset "12526" is not supported, assuming UTF-8 in %s on line %d | |
| -string(35) "<a href='test'>Test</a>" | |
| +string(35) "<a href=\'test\'>Test</a>" | |
| string(8) "<>" | |
| Warning: htmlspecialchars(): Charset "8666" is not supported, assuming UTF-8 in %s on line %d | |
| diff --git a/ext/standard/tests/strings/bug50847.phpt b/ext/standard/tests/strings/bug50847.phpt | |
| index 1f7081930e..adce8935d9 100644 | |
| --- a/ext/standard/tests/strings/bug50847.phpt | |
| +++ b/ext/standard/tests/strings/bug50847.phpt | |
| @@ -6,5 +6,5 @@ $var = '<param value="' . str_repeat("a", 2048) . '" />'; | |
| var_dump(strip_tags($var, "<param>"), strip_tags($var)); | |
| ?> | |
| --EXPECT-- | |
| -string(2066) "<param value="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />" | |
| +string(2066) "<param value=\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" />" | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/bug53319.phpt b/ext/standard/tests/strings/bug53319.phpt | |
| index bae7e88b9e..f8bfc49e4d 100644 | |
| --- a/ext/standard/tests/strings/bug53319.phpt | |
| +++ b/ext/standard/tests/strings/bug53319.phpt | |
| @@ -11,7 +11,7 @@ var_dump(strip_tags('<a/b>', '<a>')); | |
| ?> | |
| --EXPECT-- | |
| -string(47) "USD<input type="text"/>CDN<input type="text" />" | |
| +string(47) "USD<input type=\"text\"/>CDN<input type=\"text\" />" | |
| bool(true) | |
| string(6) "USDCDN" | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt | |
| index 56e216c601..c1efdce7e9 100644 | |
| --- a/ext/standard/tests/strings/chop_variation4.phpt | |
| +++ b/ext/standard/tests/strings/chop_variation4.phpt | |
| @@ -57,13 +57,13 @@ string(13) "\0\0hello world" | |
| string(15) "\0\0hello world\0\0" | |
| --- Iteration 5 --- | |
| -string(9) "\0hello\0" | |
| -string(9) "\0hello\0" | |
| -string(7) "\0hello" | |
| +string(9) "\\0hello\\0" | |
| +string(9) "\\0hello\\0" | |
| +string(7) "\\0hello" | |
| --- Iteration 6 --- | |
| -string(9) "hello\0\0" | |
| -string(9) "hello\0\0" | |
| +string(9) "hello\\0\\0" | |
| +string(9) "hello\\0\\0" | |
| string(5) "hello" | |
| --- Iteration 7 --- | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt | |
| index d40d713f1d..b47bbf7a44 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation10.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt | |
| @@ -48,33 +48,33 @@ echo "Done" | |
| --EXPECT-- | |
| *** Testing chunk_split() : different single quoted strings as 'ending' *** | |
| -- Iteration 0 -- | |
| -string(73) "This is to test chunk_split() with various 'single quoted' ending string." | |
| +string(73) "This is to test chunk_split() with various \'single quoted\' ending string." | |
| -- Iteration 1 -- | |
| -string(82) "This is t o test ch unk_split () with v arious 's ingle quo ted' endi ng string . " | |
| +string(82) "This is t o test ch unk_split () with v arious \'s ingle quo ted\' endi ng string . " | |
| -- Iteration 2 -- | |
| -string(82) "This is tao test chaunk_splita() with vaarious 'saingle quoated' endiang stringa.a" | |
| +string(82) "This is tao test chaunk_splita() with vaarious \'saingle quoated\' endiang stringa.a" | |
| -- Iteration 3 -- | |
| -string(127) "This is tENDINGo test chENDINGunk_splitENDING() with vENDINGarious 'sENDINGingle quoENDINGted' endiENDINGng stringENDING.ENDING" | |
| +string(127) "This is tENDINGo test chENDINGunk_splitENDING() with vENDINGarious \'sENDINGingle quoENDINGted\' endiENDINGng stringENDING.ENDING" | |
| -- Iteration 4 -- | |
| -string(118) "This is t@#$%^o test ch@#$%^unk_split@#$%^() with v@#$%^arious 's@#$%^ingle quo@#$%^ted' endi@#$%^ng string@#$%^.@#$%^" | |
| +string(118) "This is t@#$%^o test ch@#$%^unk_split@#$%^() with v@#$%^arious \'s@#$%^ingle quo@#$%^ted\' endi@#$%^ng string@#$%^.@#$%^" | |
| -- Iteration 5 -- | |
| -string(91) "This is t\to test ch\tunk_split\t() with v\tarious 's\tingle quo\tted' endi\tng string\t.\t" | |
| +string(91) "This is t\\to test ch\\tunk_split\\t() with v\\tarious \'s\\tingle quo\\tted\' endi\\tng string\\t.\\t" | |
| -- Iteration 6 -- | |
| -string(91) "This is t\no test ch\nunk_split\n() with v\narious 's\ningle quo\nted' endi\nng string\n.\n" | |
| +string(91) "This is t\\no test ch\\nunk_split\\n() with v\\narious \'s\\ningle quo\\nted\' endi\\nng string\\n.\\n" | |
| -- Iteration 7 -- | |
| -string(91) "This is t\ro test ch\runk_split\r() with v\rarious 's\ringle quo\rted' endi\rng string\r.\r" | |
| +string(91) "This is t\\ro test ch\\runk_split\\r() with v\\rarious \'s\\ringle quo\\rted\' endi\\rng string\\r.\\r" | |
| -- Iteration 8 -- | |
| -string(109) "This is t\r\no test ch\r\nunk_split\r\n() with v\r\narious 's\r\ningle quo\r\nted' endi\r\nng string\r\n.\r\n" | |
| +string(109) "This is t\\r\\no test ch\\r\\nunk_split\\r\\n() with v\\r\\narious \'s\\r\\ningle quo\\r\\nted\' endi\\r\\nng string\\r\\n.\\r\\n" | |
| -- Iteration 9 -- | |
| -string(91) "This is t\0o test ch\0unk_split\0() with v\0arious 's\0ingle quo\0ted' endi\0ng string\0.\0" | |
| +string(91) "This is t\\0o test ch\\0unk_split\\0() with v\\0arious \'s\\0ingle quo\\0ted\' endi\\0ng string\\0.\\0" | |
| -- Iteration 10 -- | |
| -string(100) "This is t123o test ch123unk_split123() with v123arious 's123ingle quo123ted' endi123ng string123.123" | |
| +string(100) "This is t123o test ch123unk_split123() with v123arious \'s123ingle quo123ted\' endi123ng string123.123" | |
| -- Iteration 11 -- | |
| -string(118) "This is t(MSG)o test ch(MSG)unk_split(MSG)() with v(MSG)arious 's(MSG)ingle quo(MSG)ted' endi(MSG)ng string(MSG).(MSG)" | |
| +string(118) "This is t(MSG)o test ch(MSG)unk_split(MSG)() with v(MSG)arious \'s(MSG)ingle quo(MSG)ted\' endi(MSG)ng string(MSG).(MSG)" | |
| -- Iteration 12 -- | |
| -string(226) "This is t) ending string (o test ch) ending string (unk_split) ending string (() with v) ending string (arious 's) ending string (ingle quo) ending string (ted' endi) ending string (ng string) ending string (.) ending string (" | |
| +string(226) "This is t) ending string (o test ch) ending string (unk_split) ending string (() with v) ending string (arious \'s) ending string (ingle quo) ending string (ted\' endi) ending string (ng string) ending string (.) ending string (" | |
| -- Iteration 13 -- | |
| -string(217) "This is t) numbers 1234 (o test ch) numbers 1234 (unk_split) numbers 1234 (() with v) numbers 1234 (arious 's) numbers 1234 (ingle quo) numbers 1234 (ted' endi) numbers 1234 (ng string) numbers 1234 (.) numbers 1234 (" | |
| +string(217) "This is t) numbers 1234 (o test ch) numbers 1234 (unk_split) numbers 1234 (() with v) numbers 1234 (arious \'s) numbers 1234 (ingle quo) numbers 1234 (ted\' endi) numbers 1234 (ng string) numbers 1234 (.) numbers 1234 (" | |
| -- Iteration 14 -- | |
| -string(226) "This is t) speci@! ch@r$ (o test ch) speci@! ch@r$ (unk_split) speci@! ch@r$ (() with v) speci@! ch@r$ (arious 's) speci@! ch@r$ (ingle quo) speci@! ch@r$ (ted' endi) speci@! ch@r$ (ng string) speci@! ch@r$ (.) speci@! ch@r$ (" | |
| +string(226) "This is t) speci@! ch@r$ (o test ch) speci@! ch@r$ (unk_split) speci@! ch@r$ (() with v) speci@! ch@r$ (arious \'s) speci@! ch@r$ (ingle quo) speci@! ch@r$ (ted\' endi) speci@! ch@r$ (ng string) speci@! ch@r$ (.) speci@! ch@r$ (" | |
| Done | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt | |
| index dff371ceaf..6264242d60 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation11.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt | |
| @@ -42,19 +42,19 @@ echo "Done" | |
| -- Iteration 1 -- | |
| string(113) "This is heredoc string with and | |
| .It also contains | |
| -sPeci@! ch@r$ :) & numbers 222.This is \k wrong escape char." | |
| +sPeci@! ch@r$ :) & numbers 222.This is \\k wrong escape char." | |
| -- Iteration 2 -- | |
| string(132) "This i s here doc st ring w ith and | |
| . It als o cont ains | |
| -s Peci@! ch@r$ :) & number s 222. This i s \k w rong e scape char. " | |
| +s Peci@! ch@r$ :) & number s 222. This i s \\k w rong e scape char. " | |
| -- Iteration 3 -- | |
| string(132) "This ias hereadoc staring waith aand | |
| .aIt alsao contaains | |
| -saPeci@!a ch@r$a :) & anumberas 222.aThis ias \k warong eascape achar.a" | |
| +saPeci@!a ch@r$a :) & anumberas 222.aThis ias \\k warong eascape achar.a" | |
| -- Iteration 4 -- | |
| string(227) "This iENDINGs hereENDINGdoc stENDINGring wENDINGith ENDINGand | |
| .ENDINGIt alsENDINGo contENDINGains | |
| -sENDINGPeci@!ENDING ch@r$ENDING :) & ENDINGnumberENDINGs 222.ENDINGThis iENDINGs \k wENDINGrong eENDINGscape ENDINGchar.ENDING" | |
| +sENDINGPeci@!ENDING ch@r$ENDING :) & ENDINGnumberENDINGs 222.ENDINGThis iENDINGs \\k wENDINGrong eENDINGscape ENDINGchar.ENDING" | |
| -- Iteration 5 -- | |
| string(151) "This i | |
| s here | |
| @@ -73,7 +73,7 @@ Peci@! | |
| number | |
| s 222. | |
| This i | |
| -s \k w | |
| +s \\k w | |
| rong e | |
| scape | |
| char. | |
| @@ -81,9 +81,9 @@ char. | |
| -- Iteration 6 -- | |
| string(170) "This i123s here123doc st123ring w123ith 123and | |
| .123It als123o cont123ains | |
| -s123Peci@!123 ch@r$123 :) & 123number123s 222.123This i123s \k w123rong e123scape 123char.123" | |
| +s123Peci@!123 ch@r$123 :) & 123number123s 222.123This i123s \\k w123rong e123scape 123char.123" | |
| -- Iteration 7 -- | |
| string(398) "This i)speci@! ch@r$(s here)speci@! ch@r$(doc st)speci@! ch@r$(ring w)speci@! ch@r$(ith )speci@! ch@r$(and | |
| .)speci@! ch@r$(It als)speci@! ch@r$(o cont)speci@! ch@r$(ains | |
| -s)speci@! ch@r$(Peci@!)speci@! ch@r$( ch@r$)speci@! ch@r$( :) & )speci@! ch@r$(number)speci@! ch@r$(s 222.)speci@! ch@r$(This i)speci@! ch@r$(s \k w)speci@! ch@r$(rong e)speci@! ch@r$(scape )speci@! ch@r$(char.)speci@! ch@r$(" | |
| +s)speci@! ch@r$(Peci@!)speci@! ch@r$( ch@r$)speci@! ch@r$( :) & )speci@! ch@r$(number)speci@! ch@r$(s 222.)speci@! ch@r$(This i)speci@! ch@r$(s \\k w)speci@! ch@r$(rong e)speci@! ch@r$(scape )speci@! ch@r$(char.)speci@! ch@r$(" | |
| Done | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt | |
| index 8478cf7440..cd36113b6e 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation12.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt | |
| @@ -81,16 +81,16 @@ echo "Done" | |
| *** Testing chunk_split() : different heredoc strings for 'ending' argument *** | |
| -- Iteration 1 -- | |
| string(102) "This is str to check with heredoc ending.This contains, | |
| -speci@! ch@r$ __with wrong \k escape char 222." | |
| +speci@! ch@r$ __with wrong \\k escape char 222." | |
| -- Iteration 2 -- | |
| string(102) "This is str to check with heredoc ending.This contains, | |
| -speci@! ch@r$ __with wrong \k escape char 222." | |
| +speci@! ch@r$ __with wrong \\k escape char 222." | |
| -- Iteration 3 -- | |
| string(113) "This is star to checka with hereadoc endinga.This contaains, | |
| -specai@! ch@r$ a__with wroang \k escaape char 22a2.a" | |
| +specai@! ch@r$ a__with wroang \\k escaape char 22a2.a" | |
| -- Iteration 4 -- | |
| string(421) "This is stThis is simple heredoc stringr to checkThis is simple heredoc string with hereThis is simple heredoc stringdoc endingThis is simple heredoc string.This contThis is simple heredoc stringains, | |
| -specThis is simple heredoc stringi@! ch@r$ This is simple heredoc string__with wroThis is simple heredoc stringng \k escaThis is simple heredoc stringpe char 22This is simple heredoc string2.This is simple heredoc string" | |
| +specThis is simple heredoc stringi@! ch@r$ This is simple heredoc string__with wroThis is simple heredoc stringng \\k escaThis is simple heredoc stringpe char 22This is simple heredoc string2.This is simple heredoc string" | |
| -- Iteration 5 -- | |
| string(762) "This is stThis is to check chunk_split | |
| function with multiline | |
| @@ -109,7 +109,7 @@ heredoci@! ch@r$ This is to check chunk_split | |
| function with multiline | |
| heredoc__with wroThis is to check chunk_split | |
| function with multiline | |
| -heredocng \k escaThis is to check chunk_split | |
| +heredocng \\k escaThis is to check chunk_split | |
| function with multiline | |
| heredocpe char 22This is to check chunk_split | |
| function with multiline | |
| @@ -118,7 +118,7 @@ function with multiline | |
| heredoc" | |
| -- Iteration 6 -- | |
| string(443) "This is stThis checks with $, %, &, charsr to checkThis checks with $, %, &, chars with hereThis checks with $, %, &, charsdoc endingThis checks with $, %, &, chars.This contThis checks with $, %, &, charsains, | |
| -specThis checks with $, %, &, charsi@! ch@r$ This checks with $, %, &, chars__with wroThis checks with $, %, &, charsng \k escaThis checks with $, %, &, charspe char 22This checks with $, %, &, chars2.This checks with $, %, &, chars" | |
| +specThis checks with $, %, &, charsi@! ch@r$ This checks with $, %, &, chars__with wroThis checks with $, %, &, charsng \\k escaThis checks with $, %, &, charspe char 22This checks with $, %, &, chars2.This checks with $, %, &, chars" | |
| -- Iteration 7 -- | |
| string(487) "This is stThis checks and | |
| white space charsr to checkThis checks and | |
| @@ -129,11 +129,11 @@ white space charsains, | |
| specThis checks and | |
| white space charsi@! ch@r$ This checks and | |
| white space chars__with wroThis checks and | |
| -white space charsng \k escaThis checks and | |
| +white space charsng \\k escaThis checks and | |
| white space charspe char 22This checks and | |
| white space chars2.This checks and | |
| white space chars" | |
| -- Iteration 8 -- | |
| -string(597) "This is st"To check " in heredoc".I'm sure it'll \work!r to check"To check " in heredoc".I'm sure it'll \work! with here"To check " in heredoc".I'm sure it'll \work!doc ending"To check " in heredoc".I'm sure it'll \work!.This cont"To check " in heredoc".I'm sure it'll \work!ains, | |
| -spec"To check " in heredoc".I'm sure it'll \work!i@! ch@r$ "To check " in heredoc".I'm sure it'll \work!__with wro"To check " in heredoc".I'm sure it'll \work!ng \k esca"To check " in heredoc".I'm sure it'll \work!pe char 22"To check " in heredoc".I'm sure it'll \work!2."To check " in heredoc".I'm sure it'll \work!" | |
| +string(597) "This is st\"To check \" in heredoc\".I\'m sure it\'ll \\work!r to check\"To check \" in heredoc\".I\'m sure it\'ll \\work! with here\"To check \" in heredoc\".I\'m sure it\'ll \\work!doc ending\"To check \" in heredoc\".I\'m sure it\'ll \\work!.This cont\"To check \" in heredoc\".I\'m sure it\'ll \\work!ains, | |
| +spec\"To check \" in heredoc\".I\'m sure it\'ll \\work!i@! ch@r$ \"To check \" in heredoc\".I\'m sure it\'ll \\work!__with wro\"To check \" in heredoc\".I\'m sure it\'ll \\work!ng \\k esca\"To check \" in heredoc\".I\'m sure it\'ll \\work!pe char 22\"To check \" in heredoc\".I\'m sure it\'ll \\work!2.\"To check \" in heredoc\".I\'m sure it\'ll \\work!" | |
| Done | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt | |
| index b4945abd03..98b2611cf2 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation4.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt | |
| @@ -144,21 +144,21 @@ e | |
| ch | |
| ars | |
| " | |
| -- Iteration 8 -- | |
| -string(117) ""To | |
| +string(117) "\"To | |
| chec | |
| -k " | |
| +k \" | |
| in h | |
| ered | |
| -oc" | |
| +oc\" | |
| -I'm | |
| +I\'m | |
| sure | |
| - it' | |
| + it\' | |
| ll w | |
| ork | |
| also | |
| wit | |
| -h \ | |
| +h \\ | |
| whic | |
| h is | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt | |
| index 489c1f2e71..f833726281 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation6.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt | |
| @@ -48,15 +48,15 @@ string(4) " ):(" | |
| -- Iteration 2 -- | |
| string(30) "This is):( simple):( string):(" | |
| -- Iteration 3 -- | |
| -string(35) "It's st):(ring wi):(th quot):(es):(" | |
| +string(35) "It\'s st):(ring wi):(th quot):(es):(" | |
| -- Iteration 4 -- | |
| string(46) "This co):(ntains ):(@ # $ %):( ^ & ch):(ars):(" | |
| -- Iteration 5 -- | |
| -string(59) "This st):(ring\tc):(ontains):(\rwhite):( space\):(nchars):(" | |
| +string(59) "This st):(ring\\tc):(ontains):(\\rwhite):( space\\):(nchars):(" | |
| -- Iteration 6 -- | |
| string(47) "This is):( string):( with 1):(234 num):(bers):(" | |
| -- Iteration 7 -- | |
| -string(68) "This is):( string):( with \):(0 and "):(.chr(0)):(."null ):(chars):(" | |
| +string(68) "This is):( string):( with \\):(0 and \"):(.chr(0)):(.\"null ):(chars):(" | |
| -- Iteration 8 -- | |
| string(74) "This is):( string):( with ):( multi):(ple ):( sp):(ace cha):(r):(" | |
| -- Iteration 9 -- | |
| @@ -64,7 +64,7 @@ string(46) "This is):( to che):(ck stri):(ng with):( ()):(" | |
| -- Iteration 10 -- | |
| string(59) " Te):(sting w):(ith ):(multipl):(e space):(s ):(" | |
| -- Iteration 11 -- | |
| -string(55) "Testing):( invali):(d \k an):(d \m es):(cape ch):(ar):(" | |
| +string(55) "Testing):( invali):(d \\k an):(d \\m es):(cape ch):(ar):(" | |
| -- Iteration 12 -- | |
| -string(46) "This is):( to che):(ck with):( \n and):( \t):(" | |
| +string(46) "This is):( to che):(ck with):( \\n and):( \\t):(" | |
| Done | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt | |
| index dd7ce0bc18..cb92311d88 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation7.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation7.phpt | |
| @@ -46,7 +46,7 @@ string(5) " ????" | |
| -- Iteration 3 -- | |
| string(41) "This ????is si????mple ????strin????g????" | |
| -- Iteration 4 -- | |
| -string(43) "It's ????strin????g wit????h quo????tes????" | |
| +string(43) "It\'s ????strin????g wit????h quo????tes????" | |
| -- Iteration 5 -- | |
| string(59) "This ????conta????ins @???? # $ ????% ^ &???? char????s????" | |
| -- Iteration 6 -- | |
| @@ -59,7 +59,7 @@ string(69) "This ????is st????ring ????with ????\0 and???? \0nul????l cha????rs? | |
| -- Iteration 9 -- | |
| string(90) "This ????is st????ring ????with ???? mu????ltipl????e ???? ????space???? char????" | |
| -- Iteration 10 -- | |
| -string(69) "Testi????ng in????valid???? \k a????nd \m???? esca????pe ch????ar????" | |
| +string(69) "Testi????ng in????valid???? \\k a????nd \\m???? esca????pe ch????ar????" | |
| -- Iteration 11 -- | |
| -string(59) "This ????is to???? chec????k wit????h \n ????and \????t????" | |
| +string(59) "This ????is to???? chec????k wit????h \\n ????and \\????t????" | |
| Done | |
| diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt | |
| index b0c889494e..96f18d29cf 100644 | |
| --- a/ext/standard/tests/strings/chunk_split_variation8.phpt | |
| +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt | |
| @@ -55,26 +55,26 @@ for($count = 0; $count < count($values); $count++) { | |
| -- Iteration 1 -- | |
| chunk_split(): Argument #2 ($length) must be greater than 0 | |
| -- Iteration 2 -- | |
| -string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:::r:::i:::n:::g::: :::w:::i:::t:::h::: ::: ::: :::a:::n:::d::: ::: | |
| +string(504) "T:::h:::i:::s:::\':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:::r:::i:::n:::g::: :::w:::i:::t:::h::: ::: ::: :::a:::n:::d::: ::: | |
| ::: :::w:::h:::i:::t:::e::: :::s:::p:::a:::c:::e::: :::c:::h:::a:::r:::.::: | |
| -:::I:::t::: :::h:::a:::s::: :::_:::s:::p:::e:::c:::i:::@:::l::: :::c:::h:::@:::r:::$::: :::2:::2:::2:::2::: :::!:::!:::!:::N:::o:::w::: :::\:::k::: :::a:::s::: :::e:::s:::c:::a:::p:::e::: :::c:::h:::a:::r::: :::t:::o::: :::t:::e:::s:::t::: | |
| +:::I:::t::: :::h:::a:::s::: :::_:::s:::p:::e:::c:::i:::@:::l::: :::c:::h:::@:::r:::$::: :::2:::2:::2:::2::: :::!:::!:::!:::N:::o:::w::: :::\\:::k::: :::a:::s::: :::e:::s:::c:::a:::p:::e::: :::c:::h:::a:::r::: :::t:::o::: :::t:::e:::s:::t::: | |
| :::c:::h:::u:::n:::k:::_:::s:::p:::l:::i:::t:::(:::):::" | |
| -- Iteration 3 -- | |
| chunk_split(): Argument #2 ($length) must be greater than 0 | |
| -- Iteration 4 -- | |
| -string(129) "This's heredoc string with and | |
| +string(129) "This\'s heredoc string with and | |
| white space char. | |
| -It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test | |
| +It has _speci@l ch@r$ 2222 !!!Now \\k as escape char to test | |
| chunk_split():::" | |
| -- Iteration 5 -- | |
| -string(141) "This's heredoc string with::: and | |
| +string(141) "This\'s heredoc string with::: and | |
| white space char.::: | |
| -It has _speci@l ch@r$ 222:::2 !!!Now \k as escape char::: to test | |
| +It has _speci@l ch@r$ 222:::2 !!!Now \\k as escape char::: to test | |
| chunk_split():::" | |
| -- Iteration 6 -- | |
| -string(129) "This's heredoc string with and | |
| +string(129) "This\'s heredoc string with and | |
| white space char. | |
| -It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test | |
| +It has _speci@l ch@r$ 2222 !!!Now \\k as escape char to test | |
| chunk_split():::" | |
| -- Iteration 7 -- | |
| chunk_split(): Argument #2 ($length) must be of type int, float given | |
| diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt | |
| index af665ef769..d23915e1b0 100644 | |
| --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt | |
| +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt | |
| @@ -34,7 +34,7 @@ foreach($strings as $string) { | |
| ?> | |
| ---EXPECTF-- | |
| +--EXPECT-- | |
| *** Testing convert_uuencode() : basic functionality *** | |
| -- Iteration 1 -- | |
| string(8) "#,3(S | |
| @@ -49,12 +49,12 @@ string(12) "&,6$R8C-C | |
| ` | |
| " | |
| -- Iteration 4 -- | |
| -string(82) "M2&5R92!I<R!A('-I;7!L92!S=')I;F<@=&\@=&5S="!C;VYV97)T7W5U96YC | |
| +string(82) "M2&5R92!I<R!A(\'-I;7!L92!S=\')I;F<@=&\\@=&5S=\"!C;VYV97)T7W5U96YC | |
| *;V1E+V1E8V]D90`` | |
| ` | |
| " | |
| -- Iteration 5 -- | |
| -string(74) "M"2!4:&ES(%-T<FEN9R!C;VYT86EN<R`)"2!S;VUE(&-O;G1R;VP@8VAA<F%C | |
| +string(74) "M\"2!4:&ES(%-T<FEN9R!C;VYT86EN<R`)\"2!S;VUE(&-O;G1R;VP@8VAA<F%C | |
| &=&5R<PT* | |
| ` | |
| " | |
| @@ -75,7 +75,7 @@ string(12) "&,6$R8C-C | |
| ` | |
| " | |
| -- Iteration 10 -- | |
| -string(82) "M7'0@5&AI<R!3=')I;F<@8V]N=&%I;G,@7'1<="!S;VUE(&-O;G1R;VP@8VAA | |
| +string(82) "M7\'0@5&AI<R!3=\')I;F<@8V]N=&%I;G,@7\'1<=\"!S;VUE(&-O;G1R;VP@8VAA | |
| +<F%C=&5R<UQR7&X` | |
| ` | |
| " | |
| diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt | |
| index a15290f29f..f5bdff6bfc 100644 | |
| --- a/ext/standard/tests/strings/explode1.phpt | |
| +++ b/ext/standard/tests/strings/explode1.phpt | |
| @@ -452,7 +452,7 @@ array(4) { | |
| [2]=> | |
| string(5) "05678" | |
| [3]=> | |
| - string(12) "00efgh\xijkl" | |
| + string(12) "00efgh\\xijkl" | |
| } | |
| array(7) { | |
| [0]=> | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt | |
| index 4f4920c7ac..479ae67d46 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt | |
| @@ -411,7 +411,7 @@ array(252) { | |
| string(6) "∝" | |
| ["Ï"]=> | |
| string(5) "ψ" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| ["â"]=> | |
| string(6) "⇒" | |
| @@ -538,7 +538,7 @@ array(4) { | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| Done | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt | |
| index df61096aae..dea50f8cd4 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt | |
| @@ -424,7 +424,7 @@ array(252) { | |
| string(6) "∝" | |
| ["Ï"]=> | |
| string(5) "ψ" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| ["â"]=> | |
| string(6) "⇒" | |
| @@ -545,7 +545,7 @@ array(252) { | |
| } | |
| -- with table = HTML_ENTITIES & quote_style = ENT_QUOTES -- | |
| array(253) { | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| ["Ã"]=> | |
| string(7) "Æ" | |
| @@ -933,7 +933,7 @@ array(253) { | |
| string(6) "∝" | |
| ["Ï"]=> | |
| string(5) "ψ" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| ["â"]=> | |
| string(6) "⇒" | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt | |
| index 0927bd44c0..b43db08c55 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt | |
| @@ -38,12 +38,12 @@ array(4) { | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS & quote_style = ENT_QUOTES -- | |
| array(5) { | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| ["&"]=> | |
| string(5) "&" | |
| @@ -51,7 +51,7 @@ array(5) { | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS & quote_style = ENT_NOQUOTES -- | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt | |
| index 136c9df6a1..e5dd0f4168 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt | |
| @@ -220,7 +220,7 @@ array(125) { | |
| string(8) "±" | |
| ["£"]=> | |
| string(7) "£" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| ["»"]=> | |
| string(7) "»" | |
| @@ -281,7 +281,7 @@ array(4) { | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| Done | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt | |
| index 86f19f3a66..ed82bbb8f2 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt | |
| @@ -1578,13 +1578,13 @@ Array | |
| array(5) { | |
| ["&"]=> | |
| string(5) "&" | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| [">"]=> | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS, ENT_NOQUOTES -- | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt | |
| index 1715b0852b..8ca903e1c4 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt | |
| @@ -226,11 +226,11 @@ Array | |
| ) | |
| -- with table = HTML_SPECIALCHARS, ENT_QUOTES -- | |
| array(5) { | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| ["&"]=> | |
| string(5) "&" | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| ["<"]=> | |
| string(4) "<" | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt | |
| index 0f7a896e9f..30f3263826 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt | |
| @@ -321,13 +321,13 @@ Array | |
| array(5) { | |
| ["&"]=> | |
| string(5) "&" | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| [">"]=> | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS, ENT_NOQUOTES -- | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt | |
| index a3813262f7..cfbecda7d4 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt | |
| @@ -72,13 +72,13 @@ Array | |
| array(5) { | |
| ["&"]=> | |
| string(5) "&" | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| [">"]=> | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS, ENT_NOQUOTES -- | |
| diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt | |
| index 595d8fd944..1bea9bb300 100644 | |
| --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt | |
| +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt | |
| @@ -74,13 +74,13 @@ Array | |
| array(5) { | |
| ["&"]=> | |
| string(5) "&" | |
| - ["'"]=> | |
| + ["\'"]=> | |
| string(6) "'" | |
| [">"]=> | |
| string(4) ">" | |
| ["<"]=> | |
| string(4) "<" | |
| - ["""]=> | |
| + ["\""]=> | |
| string(6) """ | |
| } | |
| -- with table = HTML_SPECIALCHARS, ENT_NOQUOTES -- | |
| diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt | |
| index 8754257d7f..60db088ea7 100644 | |
| --- a/ext/standard/tests/strings/htmlentities24.phpt | |
| +++ b/ext/standard/tests/strings/htmlentities24.phpt | |
| @@ -308,6 +308,6 @@ string(42) "<html> This is a test! </html>" | |
| *** Testing htmlentites() on a quote *** | |
| string(46) "A 'quote' is <b>bold</b>" | |
| string(46) "A 'quote' is <b>bold</b>" | |
| -string(36) "A 'quote' is <b>bold</b>" | |
| -string(36) "A 'quote' is <b>bold</b>" | |
| +string(36) "A \'quote\' is <b>bold</b>" | |
| +string(36) "A \'quote\' is <b>bold</b>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt | |
| index 775cb2f4d4..8da3789d6f 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars.phpt | |
| @@ -304,6 +304,6 @@ string(46) "<br>Testing<p>New file.</p> " | |
| *** Testing htmlspecialchars() on a quote... | |
| string(46) "A 'quote' is <b>bold</b>" | |
| string(46) "A 'quote' is <b>bold</b>" | |
| -string(36) "A 'quote' is <b>bold</b>" | |
| -string(36) "A 'quote' is <b>bold</b>" | |
| +string(36) "A \'quote\' is <b>bold</b>" | |
| +string(36) "A \'quote\' is <b>bold</b>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt | |
| index ad9df68f05..b657c5b506 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt | |
| @@ -26,12 +26,12 @@ echo "Done"; | |
| ?> | |
| --EXPECT-- | |
| *** Testing htmlspecialchars_decode() : basic functionality *** | |
| -string(82) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| -string(82) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| -string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| -string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| +string(82) "Roy\'s height > Sam\'s height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| +string(82) "Roy\'s height > Sam\'s height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| +string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| +string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| string(102) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| string(102) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| -string(82) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| -string(82) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" | |
| +string(82) "Roy\'s height > Sam\'s height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| +string(82) "Roy\'s height > Sam\'s height. 13 < 25. 1111 & 0000 = 0000. \" double quoted string \"" | |
| Done | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt | |
| index 98d4684d63..9516aaf591 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt | |
| @@ -73,22 +73,22 @@ string(0) "" | |
| -- Iteration 2 -- | |
| string(0) "" | |
| -- Iteration 3 -- | |
| -string(93) "<html>Roy's height > Sam's height | |
| +string(93) "<html>Roy\'s height > Sam\'s height | |
| 13 < 25 | |
| 1111 & 0000 = 0000 | |
| -"This is a double quoted string"" | |
| +\"This is a double quoted string\"" | |
| -- Iteration 4 -- | |
| -string(120) "<html>Roy's height | |
| > Sam 's height | |
| +string(120) "<html>Roy\'s height | |
| > Sam \'s height | |
| 1111 & 0000 = 0000 | |
| -" heredoc | |
| -double quoted string. with different white spaces"" | |
| +\" heredoc | |
| +double quoted string. with different white spaces\"" | |
| -- Iteration 5 -- | |
| string(62) "<html>11 < 12. 123 string 4567 | |
| -"string" 1111 & 0000 = 0000 | |
| +\"string\" 1111 & 0000 = 0000 | |
| ;" | |
| -- Iteration 6 -- | |
| -string(143) "<html>< This's a string with quotes: | |
| -"strings in double quote" & | |
| -'strings in single quote' " | |
| -this\line is 'single quoted' /with\slashes </html>" | |
| +string(143) "<html>< This\'s a string with quotes: | |
| +\"strings in double quote\" & | |
| +\'strings in single quote\' \" | |
| +this\\line is \'single quoted\' /with\\slashes </html>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt | |
| index 00d4e9a143..1b05f59bfa 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt | |
| @@ -33,28 +33,28 @@ echo "Done"; | |
| --EXPECT-- | |
| *** Testing htmlspecialchars_decode() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(85) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| -string(90) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| -string(100) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| -string(85) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| +string(85) "Roy's height > Sam\'s \\$height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| +string(90) "Roy's height > Sam's \\$height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| +string(100) "Roy's height > Sam's \\$height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| +string(85) "Roy's height > Sam\'s \\$height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| -- Iteration 2 -- | |
| -string(78) "Roy's height > Sam's height... \t\t 13 < 15...\n\r " double quote\f\v string "" | |
| -string(88) "Roy's height > Sam's height... \t\t 13 < 15...\n\r " double quote\f\v string "" | |
| -string(98) "Roy's height > Sam's height... \t\t 13 < 15...\n\r " double quote\f\v string "" | |
| -string(78) "Roy's height > Sam's height... \t\t 13 < 15...\n\r " double quote\f\v string "" | |
| +string(78) "Roy\'s height > Sam\'s height... \\t\\t 13 < 15...\\n\\r \" double quote\\f\\v string \"" | |
| +string(88) "Roy's height > Sam's height... \\t\\t 13 < 15...\\n\\r \" double quote\\f\\v string \"" | |
| +string(98) "Roy's height > Sam's height... \\t\\t 13 < 15...\\n\\r " double quote\\f\\v string "" | |
| +string(78) "Roy\'s height > Sam\'s height... \\t\\t 13 < 15...\\n\\r \" double quote\\f\\v string \"" | |
| -- Iteration 3 -- | |
| -string(38) "\nRoy's height >\t; Sam's\v height\f" | |
| -string(48) "\nRoy's height >\t; Sam's\v height\f" | |
| -string(48) "\nRoy's height >\t; Sam's\v height\f" | |
| -string(38) "\nRoy's height >\t; Sam's\v height\f" | |
| +string(38) "\\nRoy\'s height >\\t; Sam\'s\\v height\\f" | |
| +string(48) "\\nRoy's height >\\t; Sam's\\v height\\f" | |
| +string(48) "\\nRoy's height >\\t; Sam's\\v height\\f" | |
| +string(38) "\\nRoy\'s height >\\t; Sam\'s\\v height\\f" | |
| -- Iteration 4 -- | |
| -string(38) "\r\tRoy's height >\r; Sam\t's height" | |
| -string(48) "\r\tRoy's height >\r; Sam\t's height" | |
| -string(48) "\r\tRoy's height >\r; Sam\t's height" | |
| -string(38) "\r\tRoy's height >\r; Sam\t's height" | |
| +string(38) "\\r\\tRoy\'s height >\\r; Sam\\t\'s height" | |
| +string(48) "\\r\\tRoy's height >\\r; Sam\\t's height" | |
| +string(48) "\\r\\tRoy's height >\\r; Sam\\t's height" | |
| +string(38) "\\r\\tRoy\'s height >\\r; Sam\\t\'s height" | |
| -- Iteration 5 -- | |
| -string(34) "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12" | |
| -string(34) "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12" | |
| -string(34) "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12" | |
| -string(34) "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12" | |
| +string(34) "\\n 1\\t3 &\\tgt; 11 but 11 &\\tlt; 12" | |
| +string(34) "\\n 1\\t3 &\\tgt; 11 but 11 &\\tlt; 12" | |
| +string(34) "\\n 1\\t3 &\\tgt; 11 but 11 &\\tlt; 12" | |
| +string(34) "\\n 1\\t3 &\\tgt; 11 but 11 &\\tlt; 12" | |
| Done | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt | |
| index 3f235944eb..ea674b8b7f 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt | |
| @@ -32,33 +32,33 @@ echo "Done"; | |
| --EXPECT-- | |
| *** Testing htmlspecialchars_decode() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(84) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| -string(89) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| +string(84) "Roy's height > Sam\'s $height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| +string(89) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| string(99) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| -string(84) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" | |
| +string(84) "Roy's height > Sam\'s $height... 1111 ≈ 0000 = 0000... \" double quote string \"" | |
| -- Iteration 2 -- | |
| -string(72) "Roy's height > Sam's height... 13 < 15... | |
| - | |
| " double quote string "" | |
| +string(72) "Roy\'s height > Sam\'s height... 13 < 15... | |
| + | |
| \" double quote string \"" | |
| string(82) "Roy's height > Sam's height... 13 < 15... | |
| - | |
| " double quote string "" | |
| + | |
| \" double quote string \"" | |
| string(92) "Roy's height > Sam's height... 13 < 15... | |
| " double quote string "" | |
| -string(72) "Roy's height > Sam's height... 13 < 15... | |
| - | |
| " double quote string "" | |
| +string(72) "Roy\'s height > Sam\'s height... 13 < 15... | |
| + | |
| \" double quote string \"" | |
| -- Iteration 3 -- | |
| string(34) " | |
| -Roy's height > ; Sam's height " | |
| +Roy\'s height > ; Sam\'s height " | |
| string(44) " | |
| Roy's height > ; Sam's height " | |
| string(44) " | |
| Roy's height > ; Sam's height " | |
| string(34) " | |
| -Roy's height > ; Sam's height " | |
| +Roy\'s height > ; Sam\'s height " | |
| -- Iteration 4 -- | |
| -string(34) " | |
| Roy's height > | |
| ; Sam 's height" | |
| +string(34) " | |
| Roy\'s height > | |
| ; Sam \'s height" | |
| string(44) " | |
| Roy's height > | |
| ; Sam 's height" | |
| string(44) " | |
| Roy's height > | |
| ; Sam 's height" | |
| -string(34) " | |
| Roy's height > | |
| ; Sam 's height" | |
| +string(34) " | |
| Roy\'s height > | |
| ; Sam \'s height" | |
| -- Iteration 5 -- | |
| string(30) " | |
| 1 3 & gt; 11 but 11 & lt; 12" | |
| diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt | |
| index 86c4725ea9..dd813d3404 100644 | |
| --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt | |
| +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt | |
| @@ -34,10 +34,10 @@ echo "Done"; | |
| --EXPECT-- | |
| *** Testing htmlspecialchars_decode() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(65) " Hello $world \0\&!)The big brown fox jumped over the lazy dog | |
| +string(65) " Hello $world \0\\&!)The big brown fox jumped over the lazy dog | |
| " | |
| -- Iteration 2 -- | |
| -string(42) " Hello "world" \0 This is a valid string" | |
| +string(42) " Hello \"world\" \0 This is a valid string" | |
| -- Iteration 3 -- | |
| string(51) "This converts decimal to $string1000001Hello world" | |
| -- Iteration 4 -- | |
| diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt | |
| index 7e9cc5ba66..7945e8cb31 100644 | |
| --- a/ext/standard/tests/strings/implode1.phpt | |
| +++ b/ext/standard/tests/strings/implode1.phpt | |
| @@ -233,7 +233,7 @@ string(139) "2string\0between0string\0between-639string\0between1string\0between | |
| -- Iteration 8 -- | |
| string(35) "2000-639010PHP000 0string\0with\0...\0" | |
| -- Iteration 9 -- | |
| -string(43) "2\00\0-639\01\0PHP\0\0\0 \0string\0with\0...\0" | |
| +string(43) "2\\00\\0-639\\01\\0PHP\\0\\0\\0 \\0string\0with\0...\0" | |
| *** Testing implode() on empty string *** | |
| implode(): Argument #1 ($pieces) must be of type array, string given | |
| diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt | |
| index 507f3ae8e0..908ae22007 100644 | |
| --- a/ext/standard/tests/strings/join_variation4.phpt | |
| +++ b/ext/standard/tests/strings/join_variation4.phpt | |
| @@ -69,5 +69,5 @@ string(117) "2-1.56660-1.5666-639-1.5666-1.3444-1.56661-1.5666PHP-1.5666-1.5666- | |
| -- Iteration 9 -- | |
| string(57) "2000-6390-1.3444010PHP000 06999.999999990string\0with\0...\0" | |
| -- Iteration 10 -- | |
| -string(67) "2\00\0-639\0-1.3444\01\0PHP\0\0\0 \06999.99999999\0string\0with\0...\0" | |
| +string(67) "2\\00\\0-639\\0-1.3444\\01\\0PHP\\0\\0\\0 \\06999.99999999\\0string\0with\0...\0" | |
| Done | |
| diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt | |
| index 57849bb362..900966b1e9 100644 | |
| --- a/ext/standard/tests/strings/lcfirst.phpt | |
| +++ b/ext/standard/tests/strings/lcfirst.phpt | |
| @@ -157,7 +157,7 @@ string(5) "fALSE" | |
| string(1) " " | |
| string(5) " " | |
| string(1) "b" | |
| -string(2) "\t" | |
| +string(2) "\\t" | |
| string(1) " " | |
| string(2) "12" | |
| string(8) "12twelve" | |
| @@ -186,7 +186,7 @@ string(0) "" | |
| --- Testing simple and complex syntax strings --- | |
| string(5) "world" | |
| -string(7) "world'S" | |
| +string(7) "world\'S" | |
| Warning: Undefined variable $strS in %s on line %d | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/nl2br_variation2.phpt b/ext/standard/tests/strings/nl2br_variation2.phpt | |
| index 88e9769325..03180b043f 100644 | |
| --- a/ext/standard/tests/strings/nl2br_variation2.phpt | |
| +++ b/ext/standard/tests/strings/nl2br_variation2.phpt | |
| @@ -41,17 +41,17 @@ echo "Done"; | |
| --EXPECT-- | |
| *** Testing nl2br() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(2) "\n" | |
| +string(2) "\\n" | |
| -- Iteration 2 -- | |
| -string(2) "\r" | |
| +string(2) "\\r" | |
| -- Iteration 3 -- | |
| -string(4) "\r\n" | |
| +string(4) "\\r\\n" | |
| -- Iteration 4 -- | |
| -string(12) "Hello\nWorld" | |
| +string(12) "Hello\\nWorld" | |
| -- Iteration 5 -- | |
| -string(12) "Hello\rWorld" | |
| +string(12) "Hello\\rWorld" | |
| -- Iteration 6 -- | |
| -string(14) "Hello\r\nWorld" | |
| +string(14) "Hello\\r\\nWorld" | |
| -- Iteration 7 -- | |
| string(7) "<br /> | |
| " | |
| diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt | |
| index d174e24291..1971b0113d 100644 | |
| --- a/ext/standard/tests/strings/parse_str_basic3.phpt | |
| +++ b/ext/standard/tests/strings/parse_str_basic3.phpt | |
| @@ -135,21 +135,21 @@ array(2) { | |
| ["firstname"]=> | |
| string(4) "Bill" | |
| ["surname"]=> | |
| - string(8) "O'Reilly" | |
| + string(8) "O\'Reilly" | |
| } | |
| Test string with backslash characters | |
| NULL | |
| array(1) { | |
| ["sum"]=> | |
| - string(6) "10\2=5" | |
| + string(6) "10\\2=5" | |
| } | |
| Test string with double quotes data | |
| NULL | |
| array(1) { | |
| ["str"]=> | |
| - string(30) "A string with "quoted" strings" | |
| + string(30) "A string with \"quoted\" strings" | |
| } | |
| Test string with nulls | |
| diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt | |
| index 5ea93e6913..a2ce348f5c 100644 | |
| --- a/ext/standard/tests/strings/quotemeta_basic.phpt | |
| +++ b/ext/standard/tests/strings/quotemeta_basic.phpt | |
| @@ -11,6 +11,6 @@ var_dump(quotemeta("\+*?[^]($)")); | |
| ?> | |
| --EXPECT-- | |
| *** Testing quotemeta() : basic functionality *** | |
| -string(20) "Hello how are you \?" | |
| -string(19) "\(100 \+ 50\) \* 10" | |
| -string(20) "\\\+\*\?\[\^\]\(\$\)" | |
| +string(20) "Hello how are you \\?" | |
| +string(19) "\\(100 \\+ 50\\) \\* 10" | |
| +string(20) "\\\\\\+\\*\\?\\[\\^\\]\\(\\$\\)" | |
| diff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt | |
| index cc7bf47620..a4f634bda0 100644 | |
| --- a/ext/standard/tests/strings/rtrim.phpt | |
| +++ b/ext/standard/tests/strings/rtrim.phpt | |
| @@ -56,7 +56,7 @@ string(10) "rtrim test" | |
| string(4) "Obje" | |
| *** String with embedded NULL *** | |
| -string(22) "234\005678\000efgh\xijkl" | |
| +string(22) "234\005678\000efgh\\xijkl" | |
| *** Using heredoc string *** | |
| string(18) "us | |
| diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt | |
| index ca26ef29c9..3bc4c07492 100644 | |
| --- a/ext/standard/tests/strings/show_source_variation2.phpt | |
| +++ b/ext/standard/tests/strings/show_source_variation2.phpt | |
| @@ -21,7 +21,7 @@ var_dump($source); | |
| ?> | |
| --EXPECT-- | |
| *** Test by calling method or function with its expected arguments and output to variable *** | |
| -string(1975) "<code><span style="color: #000000"> | |
| -<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> | |
| +string(1975) "<code><span style=\"color: #000000\"> | |
| +<span style=\"color: #0000BB\"><?php<br /></span><span style=\"color: #007700\">echo </span><span style=\"color: #DD0000\">\"*** Test by calling method or function with its expected arguments and output to variable ***\\n\"</span><span style=\"color: #007700\">;<br /></span><span style=\"color: #0000BB\">$foo </span><span style=\"color: #007700\">= </span><span style=\"color: #DD0000\">\'bar\'</span><span style=\"color: #007700\">;<br /></span><span style=\"color: #0000BB\">$baz </span><span style=\"color: #007700\">= </span><span style=\"color: #DD0000\">\"something \"</span><span style=\"color: #007700\">.</span><span style=\"color: #0000BB\">$foo</span><span style=\"color: #007700\">.</span><span style=\"color: #DD0000\">\"\\n\"</span><span style=\"color: #007700\">;<br /><br />if ( </span><span style=\"color: #0000BB\">$foo </span><span style=\"color: #007700\">== </span><span style=\"color: #DD0000\">\'bar\' </span><span style=\"color: #007700\">)<br />{<br /> </span><span style=\"color: #0000BB\">$baz </span><span style=\"color: #007700\">= </span><span style=\"color: #DD0000\">\"baz\\n\"</span><span style=\"color: #007700\">;<br />}<br /><br /> </span><span style=\"color: #FF8000\">/* some code here */<br /></span><span style=\"color: #0000BB\">$source </span><span style=\"color: #007700\">= </span><span style=\"color: #0000BB\">show_source</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">__FILE__</span><span style=\"color: #007700\">, </span><span style=\"color: #0000BB\">true</span><span style=\"color: #007700\">);<br /><br /></span><span style=\"color: #0000BB\">var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">$source</span><span style=\"color: #007700\">);<br /></span><span style=\"color: #0000BB\">?><br /></span> | |
| </span> | |
| </code>" | |
| diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt | |
| index 194fc84ccb..4930c42d29 100644 | |
| --- a/ext/standard/tests/strings/sprintf_variation15.phpt | |
| +++ b/ext/standard/tests/strings/sprintf_variation15.phpt | |
| @@ -204,26 +204,26 @@ string(4) " \0" | |
| string(30) " \0" | |
| -- Iteration 13 -- | |
| -string(2) "\0" | |
| -string(2) "\0" | |
| -string(3) " \0" | |
| -string(3) "\0 " | |
| -string(3) " \0" | |
| +string(2) "\\0" | |
| +string(2) "\\0" | |
| +string(3) " \\0" | |
| +string(3) "\\0 " | |
| +string(3) " \\0" | |
| string(3) " | |
| -\0" | |
| -string(4) " \0" | |
| -string(30) " \0" | |
| +\\0" | |
| +string(4) " \\0" | |
| +string(30) " \\0" | |
| -- Iteration 14 -- | |
| -string(4) "\060" | |
| -string(4) "\060" | |
| -string(5) " \060" | |
| -string(5) "\060 " | |
| -string(5) " \060" | |
| +string(4) "\\060" | |
| +string(4) "\\060" | |
| +string(5) " \\060" | |
| +string(5) "\\060 " | |
| +string(5) " \\060" | |
| string(5) " | |
| -\060" | |
| -string(4) "\060" | |
| -string(30) " \060" | |
| +\\060" | |
| +string(4) "\\060" | |
| +string(30) " \\060" | |
| -- Iteration 15 -- | |
| string(1) "8" | |
| diff --git a/ext/standard/tests/strings/str_getcsv_001.phpt b/ext/standard/tests/strings/str_getcsv_001.phpt | |
| index 8bad30b2be..5fce6f51e9 100644 | |
| --- a/ext/standard/tests/strings/str_getcsv_001.phpt | |
| +++ b/ext/standard/tests/strings/str_getcsv_001.phpt | |
| @@ -98,7 +98,7 @@ array(2) { | |
| ----- | |
| array(1) { | |
| [0]=> | |
| - string(3) " " " | |
| + string(3) " \" " | |
| } | |
| ----- | |
| array(1) { | |
| diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt | |
| index 278db455f8..89ee30e34b 100644 | |
| --- a/ext/standard/tests/strings/str_pad.phpt | |
| +++ b/ext/standard/tests/strings/str_pad.phpt | |
| @@ -294,10 +294,10 @@ string(16) "variation " | |
| string(16) " variation" | |
| string(16) "variation " | |
| string(16) " variation " | |
| -string(16) "variation\t\t\t\" | |
| -string(16) "\t\t\t\variation" | |
| -string(16) "variation\t\t\t\" | |
| -string(16) "\t\variation\t\t" | |
| +string(16) "variation\\t\\t\\t\\" | |
| +string(16) "\\t\\t\\t\\variation" | |
| +string(16) "variation\\t\\t\\t\\" | |
| +string(16) "\\t\\variation\\t\\t" | |
| #### error conditions #### | |
| diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt | |
| index 1d55c003a8..61fbe0d747 100644 | |
| --- a/ext/standard/tests/strings/str_replace_variation2.phpt | |
| +++ b/ext/standard/tests/strings/str_replace_variation2.phpt | |
| @@ -66,231 +66,231 @@ for( $i = 0; $i < count($search_str); $i++ ) { | |
| --- Iteration 0 --- | |
| -- String after replacing the search value is => -- | |
| string(181) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!FOUND | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!FOUND | |
| ?FOUND chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '2' times | |
| --- Iteration 1 --- | |
| -- String after replacing the search value is => -- | |
| string(181) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!FOUND | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!FOUND | |
| ?FOUND chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '2' times | |
| --- Iteration 2 --- | |
| -- String after replacing the search value is => -- | |
| string(186) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: FOUND | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: FOUND | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 3 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 4 --- | |
| -- String after replacing the search value is => -- | |
| string(186) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $FOUND: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $FOUND: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 5 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 6 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 7 --- | |
| -- String after replacing the search value is => -- | |
| string(193) "Hello, world,0120333.3445FOUND67 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 8 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 9 --- | |
| -- String after replacing the search value is => -- | |
| string(197) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0FOUND \xXYZ FOUND $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0FOUND \\xXYZ FOUND $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '2' times | |
| --- Iteration 10 --- | |
| -- String after replacing the search value is => -- | |
| string(197) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xFOUND abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xFOUND abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 11 --- | |
| -- String after replacing the search value is => -- | |
| string(196) "Hello, world,0120333.3445-1.234567 FOUND TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 12 --- | |
| -- String after replacing the search value is => -- | |
| string(211) "Hello, world,FOUND12FOUND333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \0FOUNDZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \0FOUNDZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(FOUND).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '4' times | |
| --- Iteration 13 --- | |
| -- String after replacing the search value is => -- | |
| string(211) "Hello, world,FOUND12FOUND333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \0FOUNDZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \0FOUNDZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(FOUND).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '4' times | |
| --- Iteration 14 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 15 --- | |
| -- String after replacing the search value is => -- | |
| string(335) "Hello,FOUNDworld,0120333.3445-1.234567FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDNULLFOUNDTRUEFOUNDFALSE\0 | |
| -FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND\00ZCD\0abcdFOUND\xXYZ abcdFOUND$$@#%^&*!~,.:;?:FOUND!!Hello,FOUNDWorld | |
| +FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND\00ZCD\0abcdFOUND\\xXYZ abcdFOUND$$@#%^&*!~,.:;?:FOUND!!Hello,FOUNDWorld | |
| FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND?Hello,FOUNDWorldFOUNDchr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '35' times | |
| --- Iteration 16 --- | |
| -- String after replacing the search value is => -- | |
| string(207) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSEFOUND | |
| - FOUND0ZCDFOUNDabcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + FOUND0ZCDFOUNDabcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '3' times | |
| --- Iteration 17 --- | |
| -- String after replacing the search value is => -- | |
| string(198) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - FOUNDZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + FOUNDZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 18 --- | |
| -- String after replacing the search value is => -- | |
| string(198) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00FOUNDD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00FOUNDD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 19 --- | |
| -- String after replacing the search value is => -- | |
| string(198) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - FOUNDZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + FOUNDZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 20 --- | |
| -- String after replacing the search value is => -- | |
| string(198) "Hello, world,0120333FOUND445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 21 --- | |
| -- String after replacing the search value is => -- | |
| string(207) "Hello, world,0FOUND20333.3445-FOUND.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(FOUND28).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '3' times | |
| --- Iteration 22 --- | |
| -- String after replacing the search value is => -- | |
| string(196) "Hello, world,0120333.3445-1.234567 NULL FOUND FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 23 --- | |
| -- String after replacing the search value is => -- | |
| string(207) "Hello, world,0FOUND20333.3445-FOUND.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(FOUND28).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '3' times | |
| --- Iteration 24 --- | |
| -- String after replacing the search value is => -- | |
| string(207) "Hello, world,0FOUND20333.3445-FOUND.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(FOUND28).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '3' times | |
| --- Iteration 25 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 26 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FOUND\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 27 --- | |
| -- String after replacing the search value is => -- | |
| string(335) "Hello,FOUNDworld,0120333.3445-1.234567FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDNULLFOUNDTRUEFOUNDFALSE\0 | |
| -FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND\00ZCD\0abcdFOUND\xXYZ abcdFOUND$$@#%^&*!~,.:;?:FOUND!!Hello,FOUNDWorld | |
| +FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND\00ZCD\0abcdFOUND\\xXYZ abcdFOUND$$@#%^&*!~,.:;?:FOUND!!Hello,FOUNDWorld | |
| FOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUNDFOUND?Hello,FOUNDWorldFOUNDchr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '35' times | |
| --- Iteration 28 --- | |
| -- String after replacing the search value is => -- | |
| string(190) "Hello, world,0120333.3445-1.234567FOUNDNULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 29 --- | |
| -- String after replacing the search value is => -- | |
| string(203) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0aFOUNDcd \xXYZ aFOUNDcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0aFOUNDcd \\xXYZ aFOUNDcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '2' times | |
| --- Iteration 30 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| --- Iteration 31 --- | |
| -- String after replacing the search value is => -- | |
| string(199) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZFOUNDabcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZFOUNDabcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '1' times | |
| --- Iteration 32 --- | |
| -- String after replacing the search value is => -- | |
| string(195) "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\0 | |
| - \00ZCD\0abcd \xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| + \00ZCD\0abcd \\xXYZ abcd $$@#%^&*!~,.:;?: !!Hello, World | |
| ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)" | |
| -- search string has found '0' times | |
| diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt | |
| index 6110b11558..7dab31077c 100644 | |
| --- a/ext/standard/tests/strings/str_split_variation3.phpt | |
| +++ b/ext/standard/tests/strings/str_split_variation3.phpt | |
| @@ -63,7 +63,7 @@ array(2) { | |
| -- Iteration 5 -- | |
| array(4) { | |
| [0]=> | |
| - string(7) "It's st" | |
| + string(7) "It\'s st" | |
| [1]=> | |
| string(7) "ring wi" | |
| [2]=> | |
| @@ -136,9 +136,9 @@ array(6) { | |
| [1]=> | |
| string(7) " invali" | |
| [2]=> | |
| - string(7) "d \k an" | |
| + string(7) "d \\k an" | |
| [3]=> | |
| - string(7) "d \m es" | |
| + string(7) "d \\m es" | |
| [4]=> | |
| string(7) "cape ch" | |
| [5]=> | |
| @@ -151,8 +151,8 @@ array(4) { | |
| [1]=> | |
| string(7) "k with " | |
| [2]=> | |
| - string(7) "\n and " | |
| + string(7) "\\n and " | |
| [3]=> | |
| - string(2) "\t" | |
| + string(2) "\\t" | |
| } | |
| Done | |
| diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt | |
| index b10fd0c7d9..6d3b841c32 100644 | |
| --- a/ext/standard/tests/strings/str_split_variation4.phpt | |
| +++ b/ext/standard/tests/strings/str_split_variation4.phpt | |
| @@ -64,7 +64,7 @@ array(3) { | |
| -- Iteration 5 -- | |
| array(5) { | |
| [0]=> | |
| - string(5) "It's " | |
| + string(5) "It\'s " | |
| [1]=> | |
| string(5) "strin" | |
| [2]=> | |
| @@ -79,15 +79,15 @@ array(8) { | |
| [0]=> | |
| string(5) "strin" | |
| [1]=> | |
| - string(5) "g\tco" | |
| + string(5) "g\\tco" | |
| [2]=> | |
| string(5) "ntain" | |
| [3]=> | |
| - string(5) "s\rwh" | |
| + string(5) "s\\rwh" | |
| [4]=> | |
| string(5) "ite s" | |
| [5]=> | |
| - string(5) "pace\" | |
| + string(5) "pace\\" | |
| [6]=> | |
| string(5) "nchar" | |
| [7]=> | |
| @@ -124,13 +124,13 @@ array(7) { | |
| [0]=> | |
| string(5) "with " | |
| [1]=> | |
| - string(5) "\0 an" | |
| + string(5) "\\0 an" | |
| [2]=> | |
| - string(5) "d ".c" | |
| + string(5) "d \".c" | |
| [3]=> | |
| string(5) "hr(0)" | |
| [4]=> | |
| - string(5) "."nul" | |
| + string(5) ".\"nul" | |
| [5]=> | |
| string(5) "l cha" | |
| [6]=> | |
| @@ -162,9 +162,9 @@ array(8) { | |
| [2]=> | |
| string(5) "valid" | |
| [3]=> | |
| - string(5) " \k a" | |
| + string(5) " \\k a" | |
| [4]=> | |
| - string(5) "nd \m" | |
| + string(5) "nd \\m" | |
| [5]=> | |
| string(5) " esca" | |
| [6]=> | |
| @@ -179,10 +179,10 @@ array(5) { | |
| [1]=> | |
| string(5) "eck w" | |
| [2]=> | |
| - string(5) "ith \" | |
| + string(5) "ith \\" | |
| [3]=> | |
| string(5) "n and" | |
| [4]=> | |
| - string(3) " \t" | |
| + string(3) " \\t" | |
| } | |
| Done | |
| diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt | |
| index 02c7d61eb1..1ba9fc7b8f 100644 | |
| --- a/ext/standard/tests/strings/str_split_variation5.phpt | |
| +++ b/ext/standard/tests/strings/str_split_variation5.phpt | |
| @@ -147,18 +147,18 @@ Escap" | |
| -- Iteration 8 -- | |
| array(8) { | |
| [0]=> | |
| - string(10) ""To check " | |
| + string(10) "\"To check " | |
| [1]=> | |
| - string(10) "" in hered" | |
| + string(10) "\" in hered" | |
| [2]=> | |
| - string(10) "oc" | |
| -I'm su" | |
| + string(10) "oc\" | |
| +I\'m su" | |
| [3]=> | |
| - string(10) "re it'll w" | |
| + string(10) "re it\'ll w" | |
| [4]=> | |
| string(10) "ork also w" | |
| [5]=> | |
| - string(10) "ith \ | |
| + string(10) "ith \\ | |
| whic" | |
| [6]=> | |
| string(10) "h is singl" | |
| diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt | |
| index a8c1bbf1a9..e7cd0aa064 100644 | |
| --- a/ext/standard/tests/strings/str_split_variation6.phpt | |
| +++ b/ext/standard/tests/strings/str_split_variation6.phpt | |
| @@ -119,7 +119,7 @@ array(42) { | |
| [39]=> | |
| string(1) " " | |
| [40]=> | |
| - string(1) "\" | |
| + string(1) "\\" | |
| [41]=> | |
| string(1) "t" | |
| } | |
| @@ -128,19 +128,19 @@ str_split(): Argument #2 ($length) must be greater than 0 | |
| -- Iteration 4 -- | |
| array(1) { | |
| [0]=> | |
| - string(42) "This is a string with 123 & escape char \t" | |
| + string(42) "This is a string with 123 & escape char \\t" | |
| } | |
| -- Iteration 5 -- | |
| array(2) { | |
| [0]=> | |
| string(26) "This is a string with 123 " | |
| [1]=> | |
| - string(16) "& escape char \t" | |
| + string(16) "& escape char \\t" | |
| } | |
| -- Iteration 6 -- | |
| array(1) { | |
| [0]=> | |
| - string(42) "This is a string with 123 & escape char \t" | |
| + string(42) "This is a string with 123 & escape char \\t" | |
| } | |
| -- Iteration 7 -- | |
| str_split(): Argument #2 ($length) must be greater than 0 | |
| diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt | |
| index a8c2af9255..43983f9c6a 100644 | |
| --- a/ext/standard/tests/strings/str_word_count.phpt | |
| +++ b/ext/standard/tests/strings/str_word_count.phpt | |
| @@ -64,7 +64,7 @@ array(6) { | |
| [1]=> | |
| string(6) "friend" | |
| [2]=> | |
| - string(6) "you're" | |
| + string(6) "you\'re" | |
| [3]=> | |
| string(7) "looking" | |
| [4]=> | |
| @@ -78,7 +78,7 @@ array(6) { | |
| [6]=> | |
| string(6) "friend" | |
| [14]=> | |
| - string(6) "you're" | |
| + string(6) "you\'re" | |
| [25]=> | |
| string(7) "looking" | |
| [42]=> | |
| @@ -91,7 +91,7 @@ str_word_count(): Argument #2 ($format) must be a valid format value | |
| str_word_count(): Argument #2 ($format) must be a valid format value | |
| str_word_count(): Argument #2 ($format) must be a valid format value | |
| str_word_count(): Argument #2 ($format) must be a valid format value | |
| -string(53) "Hello friend, you're | |
| +string(53) "Hello friend, you\'re | |
| looking good today!" | |
| int(5) | |
| int(6) | |
| @@ -207,17 +207,17 @@ array(7) { | |
| } | |
| array(2) { | |
| [0]=> | |
| - string(5) "foo'0" | |
| + string(5) "foo\'0" | |
| [6]=> | |
| string(8) "bar-0var" | |
| } | |
| array(1) { | |
| [1]=> | |
| - string(4) "foo'" | |
| + string(4) "foo\'" | |
| } | |
| array(1) { | |
| [0]=> | |
| - string(5) "'foo'" | |
| + string(5) "\'foo\'" | |
| } | |
| array(1) { | |
| [1]=> | |
| diff --git a/ext/standard/tests/strings/strip_tags_array.phpt b/ext/standard/tests/strings/strip_tags_array.phpt | |
| index 5c2e6118e6..86e4967b20 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_array.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_array.phpt | |
| @@ -20,11 +20,11 @@ echo "Done"; | |
| ?> | |
| --EXPECT-- | |
| string(14) "foo bar foobar" | |
| -string(30) "foo bar <a href="#">foobar</a>" | |
| -string(37) "<p>foo bar <a href="#">foobar</a></p>" | |
| +string(30) "foo bar <a href=\"#\">foobar</a>" | |
| +string(37) "<p>foo bar <a href=\"#\">foobar</a></p>" | |
| string(14) "foo bar foobar" | |
| string(14) "foo bar foobar" | |
| -string(30) "foo bar <a href="#">foobar</a>" | |
| +string(30) "foo bar <a href=\"#\">foobar</a>" | |
| string(14) "foo bar foobar" | |
| string(14) "foo bar foobar" | |
| string(14) "foo bar foobar" | |
| diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt | |
| index 6d961bc133..416611b0f5 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_basic2.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt | |
| @@ -42,13 +42,13 @@ string(27) "<p>hello</p>worldOther text" | |
| -- Iteration 4 -- | |
| string(27) "<p>hello</p>worldOther text" | |
| -- Iteration 5 -- | |
| -string(44) "helloworld<a href="#fragment">Other text</a>" | |
| +string(44) "helloworld<a href=\"#fragment\">Other text</a>" | |
| -- Iteration 6 -- | |
| -string(44) "helloworld<a href="#fragment">Other text</a>" | |
| +string(44) "helloworld<a href=\"#fragment\">Other text</a>" | |
| -- Iteration 7 -- | |
| string(20) "helloworldOther text" | |
| -- Iteration 8 -- | |
| string(20) "helloworldOther text" | |
| -- Iteration 9 -- | |
| -string(64) "<html><p>hello</p>world<a href="#fragment">Other text</a></html>" | |
| +string(64) "<html><p>hello</p>world<a href=\"#fragment\">Other text</a></html>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt | |
| index 73e775a13e..e546aaf8a2 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_variation10.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt | |
| @@ -34,9 +34,9 @@ echo "Done"; | |
| --EXPECT-- | |
| *** Testing strip_tags() : usage variations *** | |
| -- Iteration 1 -- | |
| -string(51) "<html> \$ -> This represents the dollar sign</html>" | |
| +string(51) "<html> \\$ -> This represents the dollar sign</html>" | |
| -- Iteration 2 -- | |
| -string(63) "<html>\t\r\v The quick brown fo\fx jumped over the lazy dog</p>" | |
| +string(63) "<html>\\t\\r\\v The quick brown fo\\fx jumped over the lazy dog</p>" | |
| -- Iteration 3 -- | |
| string(31) "<a>This is a hyper text tag</a>" | |
| -- Iteration 4 -- | |
| @@ -44,5 +44,5 @@ string(0) "" | |
| -- Iteration 5 -- | |
| string(26) "<p>This is a paragraph</p>" | |
| -- Iteration 6 -- | |
| -string(65) "<b>This is \ta text in bold letters\r\s\malong with slashes\n</b>" | |
| +string(65) "<b>This is \\ta text in bold letters\\r\\s\\malong with slashes\\n</b>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt | |
| index f82be502a1..0eba3b903f 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_variation4.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt | |
| @@ -43,7 +43,7 @@ echo "Done"; | |
| -- Iteration 1 -- | |
| string(32) "hello world... strip_tags_test" | |
| -- Iteration 2 -- | |
| -string(34) "hello \t\tworld... strip_tags_test" | |
| +string(34) "hello \\t\\tworld... strip_tags_test" | |
| -- Iteration 3 -- | |
| string(0) "" | |
| -- Iteration 4 -- | |
| @@ -61,7 +61,7 @@ string(26) "I am not a valid html text" | |
| -- Iteration 10 -- | |
| string(26) "I am not a valid html text" | |
| -- Iteration 11 -- | |
| -string(62) "I am a quoted (") string with special chars like $,\!,\@,\%,\&" | |
| +string(62) "I am a quoted (\") string with special chars like $,\\!,\\@,\\%,\\&" | |
| -- Iteration 12 -- | |
| -string(64) "I am a quoted (\") string with special chars like \$,\!,\@,\%,\&" | |
| +string(64) "I am a quoted (\\\") string with special chars like \\$,\\!,\\@,\\%,\\&" | |
| Done | |
| diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt | |
| index 71406c289e..4f456f3fe0 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_variation5.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt | |
| @@ -89,8 +89,8 @@ string(56) "<html>11 < 12. 123 >22</html> | |
| string 1111 0000 = 0000 | |
| " | |
| -- Iteration 6 -- | |
| -string(150) "<html>This's a string with quotes:</html> | |
| -"strings in double quote"; | |
| -'strings in single quote'; | |
| -<html>this\line is single quoted /with\slashes </html>" | |
| +string(150) "<html>This\'s a string with quotes:</html> | |
| +\"strings in double quote\"; | |
| +\'strings in single quote\'; | |
| +<html>this\\line is single quoted /with\\slashes </html>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt | |
| index 0c00a6c14c..d700fc6c51 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_variation7.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt | |
| @@ -41,7 +41,7 @@ echo "Done"; | |
| -- Iteration 1 -- | |
| string(43) "<abc>hello</abc> world... strip_tags_test" | |
| -- Iteration 2 -- | |
| -string(45) "<abc>hello</abc> \t\tworld... strip_tags_test" | |
| +string(45) "<abc>hello</abc> \\t\\tworld... strip_tags_test" | |
| -- Iteration 3 -- | |
| string(0) "" | |
| -- Iteration 4 -- | |
| @@ -59,7 +59,7 @@ string(37) "<nnn>I am not a valid html text</nnn>" | |
| -- Iteration 10 -- | |
| string(37) "<nnn>I am not a valid html text</nnn>" | |
| -- Iteration 11 -- | |
| -string(73) "<nnn>I am a quoted (") string with special chars like $,\!,\@,\%,\&</nnn>" | |
| +string(73) "<nnn>I am a quoted (\") string with special chars like $,\\!,\\@,\\%,\\&</nnn>" | |
| -- Iteration 12 -- | |
| -string(75) "<nnn>I am a quoted (\") string with special chars like \$,\!,\@,\%,\&</nnn>" | |
| +string(75) "<nnn>I am a quoted (\\\") string with special chars like \\$,\\!,\\@,\\%,\\&</nnn>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt | |
| index 8603890374..100e056da3 100644 | |
| --- a/ext/standard/tests/strings/strip_tags_variation9.phpt | |
| +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt | |
| @@ -43,6 +43,6 @@ string(0) "" | |
| -- Iteration 5 -- | |
| string(26) "<p>This is a paragraph</p>" | |
| -- Iteration 6 -- | |
| -string(62) "<b>This is a text in bold letters | |
| \s\malong with slashes | |
| +string(62) "<b>This is a text in bold letters | |
| \\s\\malong with slashes | |
| </b>" | |
| Done | |
| diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt | |
| index fecef85c42..f34314addf 100644 | |
| --- a/ext/standard/tests/strings/stripcslashes_basic.phpt | |
| +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt | |
| @@ -21,7 +21,7 @@ var_dump(bin2hex(stripcslashes('\\v'))); | |
| string(11) "Hello World" | |
| string(13) "Hello World | |
| " | |
| -string(12) "\Hello World" | |
| +string(12) "\\Hello World" | |
| string(11) "Hello World" | |
| string(11) "Hello World" | |
| string(2) "07" | |
| diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt | |
| index 6386dea70f..d5baee0c22 100644 | |
| --- a/ext/standard/tests/strings/stripslashes_basic.phpt | |
| +++ b/ext/standard/tests/strings/stripslashes_basic.phpt | |
| @@ -31,23 +31,23 @@ echo "Done\n"; | |
| --EXPECT-- | |
| *** Testing stripslashes() : basic functionality *** | |
| string(31) "The string after addslashes is:" | |
| -string(16) "How\'s everybody" | |
| +string(16) "How\\\'s everybody" | |
| string(33) "The string after stripslashes is:" | |
| -string(15) "How's everybody" | |
| +string(15) "How\'s everybody" | |
| string(31) "The string after addslashes is:" | |
| -string(17) "Are you \"JOHN\"?" | |
| +string(17) "Are you \\\"JOHN\\\"?" | |
| string(33) "The string after stripslashes is:" | |
| -string(15) "Are you "JOHN"?" | |
| +string(15) "Are you \"JOHN\"?" | |
| string(31) "The string after addslashes is:" | |
| -string(21) "c:\\php\\stripslashes" | |
| +string(21) "c:\\\\php\\\\stripslashes" | |
| string(33) "The string after stripslashes is:" | |
| -string(19) "c:\php\stripslashes" | |
| +string(19) "c:\\php\\stripslashes" | |
| string(31) "The string after addslashes is:" | |
| -string(21) "c:\\php\\stripslashes" | |
| +string(21) "c:\\\\php\\\\stripslashes" | |
| string(33) "The string after stripslashes is:" | |
| -string(19) "c:\php\stripslashes" | |
| +string(19) "c:\\php\\stripslashes" | |
| string(31) "The string after addslashes is:" | |
| -string(12) "hello\0world" | |
| +string(12) "hello\\0world" | |
| string(33) "The string after stripslashes is:" | |
| string(11) "hello\0world" | |
| Done | |
| diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt | |
| index 4ed6d367ab..92ddd5ec29 100644 | |
| --- a/ext/standard/tests/strings/stripslashes_variation2.phpt | |
| +++ b/ext/standard/tests/strings/stripslashes_variation2.phpt | |
| @@ -110,21 +110,21 @@ string(11) "Hello world" | |
| -- Iteration 2 -- | |
| string(31) "The string after addslashes is:" | |
| -string(18) "how\'re you doing?" | |
| +string(18) "how\\\'re you doing?" | |
| string(33) "The string after stripslashes is:" | |
| -string(17) "how're you doing?" | |
| +string(17) "how\'re you doing?" | |
| -- Iteration 3 -- | |
| string(31) "The string after addslashes is:" | |
| -string(30) "don\'t disturb u\'r neighbours" | |
| +string(30) "don\\\'t disturb u\\\'r neighbours" | |
| string(33) "The string after stripslashes is:" | |
| -string(28) "don't disturb u'r neighbours" | |
| +string(28) "don\'t disturb u\'r neighbours" | |
| -- Iteration 4 -- | |
| string(31) "The string after addslashes is:" | |
| -string(34) "don\'t disturb u\'r neighbours\'\'" | |
| +string(34) "don\\\'t disturb u\\\'r neighbours\\\'\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(30) "don't disturb u'r neighbours''" | |
| +string(30) "don\'t disturb u\'r neighbours\'\'" | |
| -- Iteration 5 -- | |
| string(31) "The string after addslashes is:" | |
| @@ -134,39 +134,39 @@ string(0) "" | |
| -- Iteration 6 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\'" | |
| +string(2) "\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) "'" | |
| +string(1) "\'" | |
| -- Iteration 7 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\'" | |
| +string(2) "\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) "'" | |
| +string(1) "\'" | |
| -- Iteration 8 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\'" | |
| +string(2) "\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) "'" | |
| +string(1) "\'" | |
| -- Iteration 9 -- | |
| string(31) "The string after addslashes is:" | |
| -string(32) "he said, \"he will be on leave\"" | |
| +string(32) "he said, \\\"he will be on leave\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(30) "he said, "he will be on leave"" | |
| +string(30) "he said, \"he will be on leave\"" | |
| -- Iteration 10 -- | |
| string(31) "The string after addslashes is:" | |
| -string(34) "he said, \"\"he will be on leave\"" | |
| +string(34) "he said, \\\"\\\"he will be on leave\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(31) "he said, ""he will be on leave"" | |
| +string(31) "he said, \"\"he will be on leave\"" | |
| -- Iteration 11 -- | |
| string(31) "The string after addslashes is:" | |
| -string(15) "\"\"\"PHP\"\"\"" | |
| +string(15) "\\\"\\\"\\\"PHP\\\"\\\"\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(9) """"PHP"""" | |
| +string(9) "\"\"\"PHP\"\"\"" | |
| -- Iteration 12 -- | |
| string(31) "The string after addslashes is:" | |
| @@ -176,117 +176,117 @@ string(0) "" | |
| -- Iteration 13 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\"" | |
| +string(2) "\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) """ | |
| +string(1) "\"" | |
| -- Iteration 14 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\"" | |
| +string(2) "\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) """ | |
| +string(1) "\"" | |
| -- Iteration 15 -- | |
| string(31) "The string after addslashes is:" | |
| -string(7) "hello\"" | |
| +string(7) "hello\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(6) "hello"" | |
| +string(6) "hello\"" | |
| -- Iteration 16 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\"" | |
| +string(2) "\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) """ | |
| +string(1) "\"" | |
| -- Iteration 17 -- | |
| string(31) "The string after addslashes is:" | |
| -string(26) "Is your name Ram\\Krishna?" | |
| +string(26) "Is your name Ram\\\\Krishna?" | |
| string(33) "The string after stripslashes is:" | |
| -string(25) "Is your name Ram\Krishna?" | |
| +string(25) "Is your name Ram\\Krishna?" | |
| -- Iteration 18 -- | |
| string(31) "The string after addslashes is:" | |
| -string(9) "\\0.0.0.0" | |
| +string(9) "\\\\0.0.0.0" | |
| string(33) "The string after stripslashes is:" | |
| -string(8) "\0.0.0.0" | |
| +string(8) "\\0.0.0.0" | |
| -- Iteration 19 -- | |
| string(31) "The string after addslashes is:" | |
| -string(31) "c:\\php\\testcase\\stripslashes" | |
| +string(31) "c:\\\\php\\\\testcase\\\\stripslashes" | |
| string(33) "The string after stripslashes is:" | |
| -string(28) "c:\php\testcase\stripslashes" | |
| +string(28) "c:\\php\\testcase\\stripslashes" | |
| -- Iteration 20 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\\" | |
| +string(2) "\\\\" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) "\" | |
| +string(1) "\\" | |
| -- Iteration 21 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\\" | |
| +string(2) "\\\\" | |
| string(33) "The string after stripslashes is:" | |
| -string(1) "\" | |
| +string(1) "\\" | |
| -- Iteration 22 -- | |
| string(31) "The string after addslashes is:" | |
| -string(12) "hello\0world" | |
| +string(12) "hello\\0world" | |
| string(33) "The string after stripslashes is:" | |
| string(11) "hello\0world" | |
| -- Iteration 23 -- | |
| string(31) "The string after addslashes is:" | |
| -string(9) "\0hello\0" | |
| +string(9) "\\0hello\\0" | |
| string(33) "The string after stripslashes is:" | |
| string(7) "\0hello\0" | |
| -- Iteration 24 -- | |
| string(31) "The string after addslashes is:" | |
| -string(9) "\0\0hello" | |
| +string(9) "\\0\\0hello" | |
| string(33) "The string after stripslashes is:" | |
| string(7) "\0\0hello" | |
| -- Iteration 25 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| string(33) "The string after stripslashes is:" | |
| string(1) "\0" | |
| -- Iteration 26 -- | |
| string(31) "The string after addslashes is:" | |
| -string(13) "\'\\0.0.0.0\'" | |
| +string(13) "\\\'\\\\0.0.0.0\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(10) "'\0.0.0.0'" | |
| +string(10) "\'\\0.0.0.0\'" | |
| -- Iteration 27 -- | |
| string(31) "The string after addslashes is:" | |
| -string(15) "\'\\0.0.0.0\'\0" | |
| +string(15) "\\\'\\\\0.0.0.0\\\'\\0" | |
| string(33) "The string after stripslashes is:" | |
| -string(11) "'\0.0.0.0'\0" | |
| +string(11) "\'\\0.0.0.0\'\0" | |
| -- Iteration 28 -- | |
| string(31) "The string after addslashes is:" | |
| -string(15) "\0\'c:\\php\\\'" | |
| +string(15) "\\0\\\'c:\\\\php\\\\\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(10) "\0'c:\php\'" | |
| +string(10) "\0\'c:\\php\\\'" | |
| -- Iteration 29 -- | |
| string(31) "The string after addslashes is:" | |
| -string(13) "\"\\0.0.0.0\"" | |
| +string(13) "\\\"\\\\0.0.0.0\\\"" | |
| string(33) "The string after stripslashes is:" | |
| -string(10) ""\0.0.0.0"" | |
| +string(10) "\"\\0.0.0.0\"" | |
| -- Iteration 30 -- | |
| string(31) "The string after addslashes is:" | |
| -string(17) "\"c:\\php\\\"\0\'" | |
| +string(17) "\\\"c:\\\\php\\\\\\\"\\0\\\'" | |
| string(33) "The string after stripslashes is:" | |
| -string(11) ""c:\php\"\0'" | |
| +string(11) "\"c:\\php\\\"\0\'" | |
| -- Iteration 31 -- | |
| string(31) "The string after addslashes is:" | |
| -string(22) "\"hello\"\'world\'\0//" | |
| +string(22) "\\\"hello\\\"\\\'world\\\'\\0//" | |
| string(33) "The string after stripslashes is:" | |
| -string(17) ""hello"'world'\0//" | |
| +string(17) "\"hello\"\'world\'\0//" | |
| -- Iteration 32 -- | |
| string(31) "The string after addslashes is:" | |
| @@ -296,7 +296,7 @@ string(18) "0xABCDEF0123456789" | |
| -- Iteration 33 -- | |
| string(31) "The string after addslashes is:" | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| string(33) "The string after stripslashes is:" | |
| string(1) "\0" | |
| @@ -308,17 +308,17 @@ string(18) "!@#$%&*@$%#&/;:,<>" | |
| -- Iteration 35 -- | |
| string(31) "The string after addslashes is:" | |
| -string(12) "hello\0world" | |
| +string(12) "hello\\0world" | |
| string(33) "The string after stripslashes is:" | |
| string(11) "hello\0world" | |
| -- Iteration 36 -- | |
| string(31) "The string after addslashes is:" | |
| -string(73) "This is line 1 of \'heredoc\' string | |
| -This is line 2 of \"heredoc\" string" | |
| +string(73) "This is line 1 of \\\'heredoc\\\' string | |
| +This is line 2 of \\\"heredoc\\\" string" | |
| string(33) "The string after stripslashes is:" | |
| -string(69) "This is line 1 of 'heredoc' string | |
| -This is line 2 of "heredoc" string" | |
| +string(69) "This is line 1 of \'heredoc\' string | |
| +This is line 2 of \"heredoc\" string" | |
| -- Iteration 37 -- | |
| string(31) "The string after addslashes is:" | |
| diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt | |
| index a2e909b230..5e1803faa3 100644 | |
| --- a/ext/standard/tests/strings/stripslashes_variation3.phpt | |
| +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt | |
| @@ -85,9 +85,9 @@ string(12) "Hello nworld" | |
| -- Iteration 9 -- | |
| string(71) "This is line 1 | |
| -of 'heredoc' string | |
| +of \'heredoc\' string | |
| This is line 2 | |
| -of "heredoc" string" | |
| +of \"heredoc\" string" | |
| -- Iteration 10 -- | |
| string(1) " " | |
| @@ -114,6 +114,6 @@ string(12) "Hello tworld" | |
| string(12) "Hello tworld" | |
| -- Iteration 18 -- | |
| -string(71) "This is line 1 of 'heredoc' string | |
| -This is line 2 of "heredoc" string" | |
| +string(71) "This is line 1 of \'heredoc\' string | |
| +This is line 2 of \"heredoc\" string" | |
| Done | |
| diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt | |
| index 8eca3f2352..a45fd7c39d 100644 | |
| --- a/ext/standard/tests/strings/stripslashes_variation4.phpt | |
| +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt | |
| @@ -59,24 +59,24 @@ array(2) { | |
| -- Iteration 3 -- | |
| array(3) { | |
| [0]=> | |
| - string(4) "f'oo" | |
| + string(4) "f\'oo" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(2) { | |
| [0]=> | |
| - string(4) "fo'o" | |
| + string(4) "fo\'o" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| } | |
| } | |
| -- Iteration 4 -- | |
| array(3) { | |
| [0]=> | |
| - string(4) "f'oo" | |
| + string(4) "f\'oo" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(1) { | |
| [0]=> | |
| @@ -87,15 +87,15 @@ array(3) { | |
| -- Iteration 5 -- | |
| array(3) { | |
| [0]=> | |
| - string(4) "f'oo" | |
| + string(4) "f\'oo" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(3) { | |
| [0]=> | |
| - string(4) "fo'o" | |
| + string(4) "fo\'o" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(1) { | |
| [0]=> | |
| @@ -107,21 +107,21 @@ array(3) { | |
| -- Iteration 6 -- | |
| array(3) { | |
| [0]=> | |
| - string(4) "f'oo" | |
| + string(4) "f\'oo" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(3) { | |
| [0]=> | |
| - string(4) "fo'o" | |
| + string(4) "fo\'o" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| [2]=> | |
| array(2) { | |
| [0]=> | |
| - string(4) "fo'o" | |
| + string(4) "fo\'o" | |
| [1]=> | |
| - string(4) "b'ar" | |
| + string(4) "b\'ar" | |
| } | |
| } | |
| } | |
| diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt | |
| index a8ec99ff7d..873d5a22a5 100644 | |
| --- a/ext/standard/tests/strings/strrchr_variation1.phpt | |
| +++ b/ext/standard/tests/strings/strrchr_variation1.phpt | |
| @@ -86,7 +86,7 @@ bool(false) | |
| -- Iteration 3 -- | |
| string(53) "Hello, | |
| \0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 4 -- | |
| string(8) "he #4 A " | |
| @@ -94,63 +94,63 @@ string(8) "he #4 A " | |
| -- Iteration 5 -- | |
| string(47) " | |
| \0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 6 -- | |
| -string(36) "\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(36) "\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 7 -- | |
| string(47) " | |
| \0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 8 -- | |
| string(44) " | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 9 -- | |
| -string(36) "\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(36) "\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 10 -- | |
| string(44) " | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 11 -- | |
| string(45) "\0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 12 -- | |
| string(45) "\0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 13 -- | |
| string(45) "\0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 14 -- | |
| string(45) "\0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 15 -- | |
| string(1) " " | |
| -- Iteration 16 -- | |
| -string(41) "$&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(41) "$&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 17 -- | |
| string(1) " " | |
| -- Iteration 18 -- | |
| -string(40) "&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(40) "&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 19 -- | |
| -string(39) "!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(39) "!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 20 -- | |
| -string(37) "%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(37) "%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 21 -- | |
| -string(36) "\o,()*+-./:;<=>?@hello123456he #4 A " | |
| +string(36) "\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| -- Iteration 22 -- | |
| string(33) "()*+-./:;<=>?@hello123456he #4 A " | |
| @@ -218,5 +218,5 @@ string(4) "4 A " | |
| -- Iteration 43 -- | |
| string(53) "Hello, | |
| \0 | |
| - $&!#%\o,()*+-./:;<=>?@hello123456he #4 A " | |
| + $&!#%\\o,()*+-./:;<=>?@hello123456he #4 A " | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt | |
| index 646f13a702..c7cd79bccb 100644 | |
| --- a/ext/standard/tests/strings/strrchr_variation2.phpt | |
| +++ b/ext/standard/tests/strings/strrchr_variation2.phpt | |
| @@ -77,37 +77,37 @@ echo "*** Done ***"; | |
| --EXPECT-- | |
| *** Testing strrchr() function: with various single quoted strings *** | |
| -- Iteration 1 -- | |
| -string(22) "lo123456he \x234 \101 " | |
| +string(22) "lo123456he \\x234 \\101 " | |
| -- Iteration 2 -- | |
| bool(false) | |
| -- Iteration 3 -- | |
| -string(63) "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(63) "Hello,\\t\\n\\0\\n $&!#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 4 -- | |
| -string(14) "he \x234 \101 " | |
| +string(14) "he \\x234 \\101 " | |
| -- Iteration 5 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 6 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 7 -- | |
| string(1) " " | |
| -- Iteration 8 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 9 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 10 -- | |
| bool(false) | |
| -- Iteration 11 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 12 -- | |
| bool(false) | |
| @@ -122,86 +122,86 @@ bool(false) | |
| string(1) " " | |
| -- Iteration 16 -- | |
| -string(47) "$&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(47) "$&!#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 17 -- | |
| string(1) " " | |
| -- Iteration 18 -- | |
| -string(46) "&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(46) "&!#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 19 -- | |
| -string(45) "!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(45) "!#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 20 -- | |
| -string(43) "%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(43) "%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 21 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 22 -- | |
| -string(39) "()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(39) "()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 23 -- | |
| -string(37) "*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(37) "*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 24 -- | |
| -string(36) "+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(36) "+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 25 -- | |
| -string(35) "-./:;<=>?@hello123456he \x234 \101 " | |
| +string(35) "-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 26 -- | |
| -string(34) "./:;<=>?@hello123456he \x234 \101 " | |
| +string(34) "./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 27 -- | |
| -string(34) "./:;<=>?@hello123456he \x234 \101 " | |
| +string(34) "./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 28 -- | |
| -string(32) ":;<=>?@hello123456he \x234 \101 " | |
| +string(32) ":;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 29 -- | |
| -string(31) ";<=>?@hello123456he \x234 \101 " | |
| +string(31) ";<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 30 -- | |
| -string(30) "<=>?@hello123456he \x234 \101 " | |
| +string(30) "<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 31 -- | |
| -string(28) ">?@hello123456he \x234 \101 " | |
| +string(28) ">?@hello123456he \\x234 \\101 " | |
| -- Iteration 32 -- | |
| -string(29) "=>?@hello123456he \x234 \101 " | |
| +string(29) "=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 33 -- | |
| -string(27) "?@hello123456he \x234 \101 " | |
| +string(27) "?@hello123456he \\x234 \\101 " | |
| -- Iteration 34 -- | |
| -string(26) "@hello123456he \x234 \101 " | |
| +string(26) "@hello123456he \\x234 \\101 " | |
| -- Iteration 35 -- | |
| -string(26) "@hello123456he \x234 \101 " | |
| +string(26) "@hello123456he \\x234 \\101 " | |
| -- Iteration 36 -- | |
| string(2) "1 " | |
| -- Iteration 37 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 38 -- | |
| -string(44) "#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(44) "#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| -- Iteration 39 -- | |
| -string(5) "\101 " | |
| +string(5) "\\101 " | |
| -- Iteration 40 -- | |
| bool(false) | |
| -- Iteration 41 -- | |
| -string(7) "4 \101 " | |
| +string(7) "4 \\101 " | |
| -- Iteration 42 -- | |
| -string(7) "4 \101 " | |
| +string(7) "4 \\101 " | |
| -- Iteration 43 -- | |
| -string(63) "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " | |
| +string(63) "Hello,\\t\\n\\0\\n $&!#%\\o,()*+-./:;<=>?@hello123456he \\x234 \\101 " | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt | |
| index dfec9f8233..208c5050cf 100644 | |
| --- a/ext/standard/tests/strings/strrchr_variation4.phpt | |
| +++ b/ext/standard/tests/strings/strrchr_variation4.phpt | |
| @@ -37,7 +37,7 @@ echo "*** Done ***"; | |
| *** Testing strrchr() function: with heredoc strings *** | |
| string(24) "!$#$^^&*(special) | |
| chars." | |
| -string(31) "_")!#@@!$#$^^&*(special) | |
| +string(31) "_\")!#@@!$#$^^&*(special) | |
| chars." | |
| string(16) "(special) | |
| chars." | |
| @@ -48,6 +48,6 @@ chars." | |
| string(19) "^&*(special) | |
| chars." | |
| string(76) "Example of heredoc string contains | |
| -$#%^*&*_("_")!#@@!$#$^^&*(special) | |
| +$#%^*&*_(\"_\")!#@@!$#$^^&*(special) | |
| chars." | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt | |
| index 0d67fda06d..25b30277ac 100644 | |
| --- a/ext/standard/tests/strings/strrchr_variation5.phpt | |
| +++ b/ext/standard/tests/strings/strrchr_variation5.phpt | |
| @@ -35,16 +35,16 @@ echo "*** Done ***"; | |
| --EXPECT-- | |
| *** Testing strrchr() function: with heredoc strings *** | |
| string(32) " st | |
| ch | |
| using | |
| -scape \seque | |
| +scape \\seque | |
| ce" | |
| -string(9) "\seque | |
| +string(9) "\\seque | |
| ce" | |
| string(24) " | |
| using | |
| -scape \seque | |
| +scape \\seque | |
| ce" | |
| -string(9) "\seque | |
| +string(9) "\\seque | |
| ce" | |
| string(32) " st | |
| ch | |
| using | |
| -scape \seque | |
| +scape \\seque | |
| ce" | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrchr_variation6.phpt b/ext/standard/tests/strings/strrchr_variation6.phpt | |
| index cec657c6d4..92fd057a69 100644 | |
| --- a/ext/standard/tests/strings/strrchr_variation6.phpt | |
| +++ b/ext/standard/tests/strings/strrchr_variation6.phpt | |
| @@ -29,12 +29,12 @@ echo "*** Done ***"; | |
| ?> | |
| --EXPECT-- | |
| *** Testing strrchr() function: with heredoc strings *** | |
| -string(3) "te'" | |
| -string(32) "" | |
| -'things' 'in' 'single' 'quote'" | |
| +string(3) "te\'" | |
| +string(32) "\" | |
| +\'things\' \'in\' \'single\' \'quote\'" | |
| bool(false) | |
| -string(14) "ingle' 'quote'" | |
| -string(6) "quote'" | |
| -string(32) "" | |
| -'things' 'in' 'single' 'quote'" | |
| +string(14) "ingle\' \'quote\'" | |
| +string(6) "quote\'" | |
| +string(32) "\" | |
| +\'things\' \'in\' \'single\' \'quote\'" | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt | |
| index 357ae5140f..40f22c22fe 100644 | |
| --- a/ext/standard/tests/strings/strrev_basic.phpt | |
| +++ b/ext/standard/tests/strings/strrev_basic.phpt | |
| @@ -37,6 +37,6 @@ string(6) "HHHHHH" | |
| string(6) "HhhhhH" | |
| string(13) " | |
| dlroW ,olleH" | |
| -string(14) "n\dlroW ,olleH" | |
| +string(14) "n\\dlroW ,olleH" | |
| string(12) "dlrow ,olleH" | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt | |
| index 93ea7a7ab0..f6a971a889 100644 | |
| --- a/ext/standard/tests/strings/strrev_variation1.phpt | |
| +++ b/ext/standard/tests/strings/strrev_variation1.phpt | |
| @@ -65,7 +65,7 @@ echo "*** Done ***"; | |
| *** Testing strrev() : with various double quoted strings *** | |
| -- Iteration 1 -- | |
| -string(11) "dlrow\olleh" | |
| +string(11) "dlrow\\olleh" | |
| -- Iteration 2 -- | |
| string(11) "dlrow$olleh" | |
| @@ -133,10 +133,10 @@ string(15) " h " | |
| string(15) " o l l e h" | |
| -- Iteration 22 -- | |
| -string(13) "dlrow'\olleh\" | |
| +string(13) "dlrow\'\\olleh\\" | |
| -- Iteration 23 -- | |
| -string(11) "dlrow"olleh" | |
| +string(11) "dlrow\"olleh" | |
| -- Iteration 24 -- | |
| string(42) "tset- tset+ tset* tset& tset^ tset% %$#@@t" | |
| @@ -145,7 +145,7 @@ string(42) "tset- tset+ tset* tset& tset^ tset% %$#@@t" | |
| string(40) "moc.tset@tset@ =tset= `tset` tset~ tset!" | |
| -- Iteration 26 -- | |
| -string(26) "/uu/ u\ verrts\tse r/tset/" | |
| +string(26) "/uu/ u\\ verrts\\tse r/tset/" | |
| -- Iteration 27 -- | |
| string(16) "~`-=+_)(*&^%$#@!" | |
| diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt | |
| index 8a04758e00..74d65008da 100644 | |
| --- a/ext/standard/tests/strings/strrev_variation2.phpt | |
| +++ b/ext/standard/tests/strings/strrev_variation2.phpt | |
| @@ -65,25 +65,25 @@ echo "*** Done ***"; | |
| *** Testing strrev() : with various single quoted strings *** | |
| -- Iteration 1 -- | |
| -string(11) "dlrow\olleh" | |
| +string(11) "dlrow\\olleh" | |
| -- Iteration 2 -- | |
| -string(12) "dlrow$\olleh" | |
| +string(12) "dlrow$\\olleh" | |
| -- Iteration 3 -- | |
| -string(26) "verrtst\gnitsett\gnitsett\" | |
| +string(26) "verrtst\\gnitsett\\gnitsett\\" | |
| -- Iteration 4 -- | |
| -string(30) "verrts gnitset verrtsr\gnitset" | |
| +string(30) "verrts gnitset verrtsr\\gnitset" | |
| -- Iteration 5 -- | |
| -string(35) "verrtsn\ gnitset f\ verrtsf\gnitset" | |
| +string(35) "verrtsn\\ gnitset f\\ verrtsf\\gnitset" | |
| -- Iteration 6 -- | |
| -string(37) "verrts n\ gnitset n\verrtsn\gnitsetn\" | |
| +string(37) "verrts n\\ gnitset n\\verrtsn\\gnitsetn\\" | |
| -- Iteration 7 -- | |
| -string(20) "batv\lacitrevv\gnisu" | |
| +string(20) "batv\\lacitrevv\\gnisu" | |
| -- Iteration 8 -- | |
| string(10) "HelloolleH" | |
| @@ -128,10 +128,10 @@ string(15) " h " | |
| string(15) " o l l e h" | |
| -- Iteration 22 -- | |
| -string(12) "dlrow'olleh\" | |
| +string(12) "dlrow\'olleh\\" | |
| -- Iteration 23 -- | |
| -string(12) "dlrow"\olleh" | |
| +string(12) "dlrow\"\\olleh" | |
| -- Iteration 24 -- | |
| string(42) "tset- tset+ tset* tset& tset^ tset% %$#@@t" | |
| @@ -140,7 +140,7 @@ string(42) "tset- tset+ tset* tset& tset^ tset% %$#@@t" | |
| string(40) "moc.tset@tset@ =tset= `tset` tset~ tset!" | |
| -- Iteration 26 -- | |
| -string(28) "/uu/ u\t\verrts\tset\r/tset/" | |
| +string(28) "/uu/ u\\t\\verrts\\tset\\r/tset/" | |
| -- Iteration 27 -- | |
| string(16) "~`-=+_)(*&^%$#@!" | |
| diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt | |
| index 3752e9fc71..386e4925e2 100644 | |
| --- a/ext/standard/tests/strings/strrev_variation3.phpt | |
| +++ b/ext/standard/tests/strings/strrev_variation3.phpt | |
| @@ -64,8 +64,8 @@ gnirts fo elpmaxE" | |
| -- Iteration 2 -- | |
| string(72) ".srahc | |
| -)laiceps(*&^^$#$!@@#!)"_"(_*&*^%#$ | |
| -sniatnoc ,g'ts cod'h fo elp'xE" | |
| +)laiceps(*&^^$#$!@@#!)\"_\"(_*&*^%#$ | |
| +sniatnoc ,g\'ts cod\'h fo elp\'xE" | |
| -- Iteration 3 -- | |
| string(25) "dlroW\0olleH | |
| @@ -73,10 +73,10 @@ string(25) "dlroW\0olleH | |
| dlroW ,olleH" | |
| -- Iteration 4 -- | |
| -string(94) "shsals\htiw/ si enil\siht | |
| -'etouq elgnis ni sgniht' | |
| -"etouq elbuod ni sgniht" | |
| -edis'o thgirb s'ti" | |
| +string(94) "shsals\\htiw/ si enil\\siht | |
| +\'etouq elgnis ni sgniht\' | |
| +\"etouq elbuod ni sgniht\" | |
| +edis\'o thgirb s\'ti" | |
| -- Iteration 5 -- | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt | |
| index 3875c748d7..b7c423af67 100644 | |
| --- a/ext/standard/tests/strings/strstr.phpt | |
| +++ b/ext/standard/tests/strings/strstr.phpt | |
| @@ -151,7 +151,7 @@ bool(false) | |
| *** Testing strstr() with various needles *** | |
| -- Iteration 0 -- | |
| -string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -159,12 +159,12 @@ abcd$:Hello world" | |
| bool(false) | |
| -- Iteration 2 -- | |
| -string(39) "\0 abcd\xxyz \00 octal | |
| +string(39) "\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 3 -- | |
| -string(39) "\0 abcd\xxyz \00 octal | |
| +string(39) "\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -174,7 +174,7 @@ string(27) "\00 octal | |
| abcd$:Hello world" | |
| -- Iteration 5 -- | |
| -string(37) "abcd\xxyz \00 octal | |
| +string(37) "abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -189,82 +189,82 @@ string(24) "octal | |
| abcd$:Hello world" | |
| -- Iteration 8 -- | |
| -string(66) "-3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(66) "-3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 9 -- | |
| -string(66) "-3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(66) "-3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 10 -- | |
| -string(66) "-3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(66) "-3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 11 -- | |
| -string(66) "-3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(66) "-3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 12 -- | |
| -string(54) "NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(54) "NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 13 -- | |
| -string(73) "012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(73) "012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 14 -- | |
| -string(73) "012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(73) "012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 15 -- | |
| -string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 16 -- | |
| -string(49) "TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(49) "TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 17 -- | |
| -string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 18 -- | |
| -string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 19 -- | |
| -string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 20 -- | |
| -string(44) "FALSE\0 abcd\xxyz \00 octal | |
| +string(44) "FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 21 -- | |
| -string(80) " world,012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(80) " world,012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 22 -- | |
| -string(59) " NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(59) " NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| -- Iteration 23 -- | |
| -string(36) "bcd\xxyz \00 octal | |
| +string(36) "bcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -277,7 +277,7 @@ string(19) " | |
| abcd$:Hello world" | |
| -- Iteration 26 -- | |
| -string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(72) "12033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -285,7 +285,7 @@ abcd$:Hello world" | |
| bool(false) | |
| -- Iteration 28 -- | |
| -string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \00 octal | |
| +string(85) "Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\\xxyz \00 octal | |
| abcd$:Hello world" | |
| @@ -335,7 +335,7 @@ bool(false) | |
| -- simple and complex syntax strings -- | |
| string(5) "world" | |
| -string(7) "world'S" | |
| +string(7) "world\'S" | |
| Warning: Undefined variable $needleS in %s on line %d | |
| string(13) "Hello, worldS" | |
| diff --git a/ext/standard/tests/strings/strtok_variation4.phpt b/ext/standard/tests/strings/strtok_variation4.phpt | |
| index 6309049709..14fb3e6107 100644 | |
| --- a/ext/standard/tests/strings/strtok_variation4.phpt | |
| +++ b/ext/standard/tests/strings/strtok_variation4.phpt | |
| @@ -48,7 +48,7 @@ bool(false) | |
| bool(false) | |
| --- Iteration 2 --- | |
| -string(2) "\0" | |
| +string(2) "\\0" | |
| bool(false) | |
| bool(false) | |
| bool(false) | |
| @@ -88,15 +88,15 @@ bool(false) | |
| bool(false) | |
| --- Iteration 7 --- | |
| -string(4) "\0he" | |
| -string(5) "llo\0" | |
| +string(4) "\\0he" | |
| +string(5) "llo\\0" | |
| bool(false) | |
| bool(false) | |
| bool(false) | |
| bool(false) | |
| --- Iteration 8 --- | |
| -string(9) "hello\0\0" | |
| +string(9) "hello\\0\\0" | |
| bool(false) | |
| bool(false) | |
| bool(false) | |
| diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt | |
| index 9b3f1d244d..6684b091c5 100644 | |
| --- a/ext/standard/tests/strings/strtok_variation6.phpt | |
| +++ b/ext/standard/tests/strings/strtok_variation6.phpt | |
| @@ -73,19 +73,19 @@ bool(false) | |
| --- Iteration 2 --- | |
| -string(1) "\" | |
| -string(6) "hello\" | |
| -string(7) " world\" | |
| +string(1) "\\" | |
| +string(6) "hello\\" | |
| +string(7) " world\\" | |
| bool(false) | |
| -string(9) "\khello\k" | |
| -string(7) "world\k" | |
| +string(9) "\\khello\\k" | |
| +string(7) "world\\k" | |
| bool(false) | |
| bool(false) | |
| -string(1) "\" | |
| -string(6) "hello\" | |
| -string(7) " world\" | |
| +string(1) "\\" | |
| +string(6) "hello\\" | |
| +string(7) " world\\" | |
| bool(false) | |
| string(5) "hello" | |
| @@ -101,16 +101,16 @@ bool(false) | |
| --- Iteration 3 --- | |
| string(1) "/" | |
| -string(6) "hello\" | |
| +string(6) "hello\\" | |
| string(7) " world/" | |
| bool(false) | |
| -string(8) "khello\k" | |
| +string(8) "khello\\k" | |
| string(5) "world" | |
| string(1) "k" | |
| bool(false) | |
| -string(6) "hello\" | |
| +string(6) "hello\\" | |
| string(6) " world" | |
| bool(false) | |
| bool(false) | |
| diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt | |
| index 012baf9a36..ebf50b4721 100644 | |
| --- a/ext/standard/tests/strings/strtr_variation3.phpt | |
| +++ b/ext/standard/tests/strings/strtr_variation3.phpt | |
| @@ -63,10 +63,10 @@ echo "*** Done ***"; | |
| *** Testing strtr() : string containing escape sequences for 'str' arg *** | |
| -- Iteration 1 -- | |
| string(9) "SesSTsttE" | |
| -string(9) " es \stt | |
| " | |
| +string(9) " es \\stt | |
| " | |
| -- Iteration 2 -- | |
| string(12) "TtestTTstrtr" | |
| -string(12) "\test\\strtr" | |
| +string(12) "\\test\\\\strtr" | |
| -- Iteration 3 -- | |
| string(12) "TtestETstrtr" | |
| string(11) "ttestTstrtr" | |
| @@ -74,24 +74,24 @@ string(11) "ttestTstrtr" | |
| string(9) "$variable" | |
| string(9) "$variable" | |
| -- Iteration 5 -- | |
| -string(7) ""quotes" | |
| -string(7) ""quotes" | |
| +string(7) "\"quotes" | |
| +string(7) "\"quotes" | |
| -- Iteration 6 -- | |
| string(12) "TtesTtTsttTr" | |
| -string(12) "\tes\t\stt\r" | |
| +string(12) "\\tes\\t\\stt\\r" | |
| -- Iteration 7 -- | |
| string(12) "TtestTTstrtr" | |
| -string(12) "\test\\strtr" | |
| +string(12) "\\test\\\\strtr" | |
| -- Iteration 8 -- | |
| string(15) "TntestTrTnstrtr" | |
| -string(15) "\ntest\r\nstrtr" | |
| +string(15) "\\ntest\\r\\nstrtr" | |
| -- Iteration 9 -- | |
| string(10) "T$variable" | |
| -string(10) "\$variable" | |
| +string(10) "\\$variable" | |
| -- Iteration 10 -- | |
| -string(8) "T"quotes" | |
| -string(8) "\"quotes" | |
| +string(8) "T\"quotes" | |
| +string(8) "\\\"quotes" | |
| -- Iteration 11 -- | |
| -string(54) "SesSTsttETTtestTTstrtrTTtestETstrtrT$variableTT"quotes" | |
| -string(52) " es \sttT\test\\strtrtttestTstrtrt$variablet\"quotes" | |
| +string(54) "SesSTsttETTtestTTstrtrTTtestETstrtrT$variableTT\"quotes" | |
| +string(52) " es \\sttT\\test\\\\strtrtttestTstrtrt$variablet\\\"quotes" | |
| *** Done *** | |
| diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt | |
| index 71131c2637..f2bcad6316 100644 | |
| --- a/ext/standard/tests/strings/strval_basic.phpt | |
| +++ b/ext/standard/tests/strings/strval_basic.phpt | |
| @@ -58,7 +58,7 @@ characters | |
| " | |
| -- Iteration 4 -- | |
| -string(20) "String with "quotes"" | |
| +string(20) "String with \"quotes\"" | |
| -- Iteration 5 -- | |
| string(6) "123456" | |
| diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt | |
| index fd9f7a36d0..a70933656c 100644 | |
| --- a/ext/standard/tests/strings/trim1.phpt | |
| +++ b/ext/standard/tests/strings/trim1.phpt | |
| @@ -52,7 +52,7 @@ string(15) " testing trim " | |
| string(4) "bjec" | |
| *** Testing with String with embedded NULL *** | |
| -string(22) "234\005678\000efgh\xijkl" | |
| +string(22) "234\005678\000efgh\\xijkl" | |
| *** Testing with heredoc string *** | |
| string(12) " heredoc str" | |
| diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt | |
| index 149fcfd583..f5e6a35f79 100644 | |
| --- a/ext/standard/tests/strings/ucfirst.phpt | |
| +++ b/ext/standard/tests/strings/ucfirst.phpt | |
| @@ -128,7 +128,7 @@ string(5) "FALSE" | |
| string(1) " " | |
| string(5) " " | |
| string(1) "B" | |
| -string(2) "\t" | |
| +string(2) "\\t" | |
| string(1) " " | |
| string(2) "12" | |
| string(8) "12twelve" | |
| @@ -154,7 +154,7 @@ string(0) "" | |
| --- Testing simple and complex syntax strings --- | |
| string(5) "World" | |
| -string(7) "World'S" | |
| +string(7) "World\'S" | |
| Warning: Undefined variable $strS in %s on line %d | |
| string(0) "" | |
| diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt | |
| index 63b8eaa3b8..774b960c80 100644 | |
| --- a/ext/standard/tests/strings/ucwords_basic.phpt | |
| +++ b/ext/standard/tests/strings/ucwords_basic.phpt | |
| @@ -43,18 +43,18 @@ string(15) "Testing Ucwords" | |
| -- Iteration 2 -- | |
| string(15) "Testing Ucwords" | |
| -- Iteration 3 -- | |
| -string(16) "Testing\tucwords" | |
| +string(16) "Testing\\tucwords" | |
| -- Iteration 4 -- | |
| string(15) "Testing Ucwords" | |
| -- Iteration 5 -- | |
| string(15) "Testing | |
| Ucwords" | |
| -- Iteration 6 -- | |
| -string(16) "Testing\nucwords" | |
| +string(16) "Testing\\nucwords" | |
| -- Iteration 7 -- | |
| string(15) "Testing Ucwords" | |
| -- Iteration 8 -- | |
| -string(16) "Testing\vucwords" | |
| +string(16) "Testing\\vucwords" | |
| -- Iteration 9 -- | |
| string(7) "Testing" | |
| -- Iteration 10 -- | |
| @@ -68,11 +68,11 @@ string(16) "Testing Ucwords" | |
| -- Iteration 14 -- | |
| string(16) "Testing Ucwords" | |
| -- Iteration 15 -- | |
| -string(16) "Testing\rucwords" | |
| +string(16) "Testing\\rucwords" | |
| -- Iteration 16 -- | |
| string(15) "Testing | |
| Ucwords" | |
| -- Iteration 17 -- | |
| -string(16) "Testing\fucwords" | |
| +string(16) "Testing\\fucwords" | |
| -- Iteration 18 -- | |
| string(15) "Testing Ucwords" | |
| Done | |
| diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt | |
| index 8e2e3a6f8b..1967f37131 100644 | |
| --- a/ext/standard/tests/strings/ucwords_variation2.phpt | |
| +++ b/ext/standard/tests/strings/ucwords_variation2.phpt | |
| @@ -84,8 +84,8 @@ string(53) "12sting 123string 4567 | |
| String 123string | |
| 12 Test | |
| 5test" | |
| -- Iteration 6 -- | |
| -string(108) "It's Bright,but I Cann't See It. | |
| -"things In Double Quote" | |
| -'things In Single Quote' | |
| -This\line Is /with\slashs" | |
| +string(108) "It\'s Bright,but I Cann\'t See It. | |
| +\"things In Double Quote\" | |
| +\'things In Single Quote\' | |
| +This\\line Is /with\\slashs" | |
| Done | |
| diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt | |
| index 8e69364720..b0844f3ca1 100644 | |
| --- a/ext/standard/tests/strings/ucwords_variation3.phpt | |
| +++ b/ext/standard/tests/strings/ucwords_variation3.phpt | |
| @@ -66,27 +66,27 @@ string(3) "(t)" | |
| -- Iteration 6 -- | |
| string(7) " ( T )t" | |
| -- Iteration 7 -- | |
| -string(23) ""testing",ucword,"test"" | |
| +string(23) "\"testing\",ucword,\"test\"" | |
| -- Iteration 8 -- | |
| -string(14) ""t""t",test, T" | |
| +string(14) "\"t\"\"t\",test, T" | |
| -- Iteration 9 -- | |
| -string(11) "'t 't',test" | |
| +string(11) "\'t \'t\',test" | |
| -- Iteration 10 -- | |
| -string(27) "\ttesting\ttesting\tucwords" | |
| +string(27) "\\ttesting\\ttesting\\tucwords" | |
| -- Iteration 11 -- | |
| -string(32) "Testing\rucwords Testing Ucwords" | |
| +string(32) "Testing\\rucwords Testing Ucwords" | |
| -- Iteration 12 -- | |
| -string(37) "Testing\fucwords \f Testing \nucwords" | |
| +string(37) "Testing\\fucwords \\f Testing \\nucwords" | |
| -- Iteration 13 -- | |
| -string(39) "\ntesting\nucwords\n Testing \n Ucwords" | |
| +string(39) "\\ntesting\\nucwords\\n Testing \\n Ucwords" | |
| -- Iteration 14 -- | |
| -string(20) "Using\vvertical\vtab" | |
| +string(20) "Using\\vvertical\\vtab" | |
| -- Iteration 15 -- | |
| string(42) "T@@#$% %test ^test &test *test +test -test" | |
| -- Iteration 16 -- | |
| string(40) "!test ~test `test` =test= @test@test.com" | |
| -- Iteration 17 -- | |
| -string(40) "/test/r\test\ucwords\t\y\y\u\3 \yy\ /uu/" | |
| +string(40) "/test/r\\test\\ucwords\\t\\y\\y\\u\\3 \\yy\\ /uu/" | |
| -- Iteration 18 -- | |
| string(16) "!@#$%^&*()_+=-`~" | |
| Done | |
| diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt | |
| index 70dbe46695..5ba5ee184a 100644 | |
| --- a/ext/standard/tests/strings/ucwords_variation4.phpt | |
| +++ b/ext/standard/tests/strings/ucwords_variation4.phpt | |
| @@ -73,28 +73,28 @@ string(3) "(t)" | |
| -- Iteration 6 -- | |
| string(7) " ( T )t" | |
| -- Iteration 7 -- | |
| -string(24) ""testing",ucwords,"test"" | |
| +string(24) "\"testing\",ucwords,\"test\"" | |
| -- Iteration 8 -- | |
| -string(14) ""t""t",test, T" | |
| +string(14) "\"t\"\"t\",test, T" | |
| -- Iteration 9 -- | |
| -string(14) "\'t \'t\',test" | |
| +string(14) "\\\'t \\\'t\\\',test" | |
| -- Iteration 10 -- | |
| -string(10) "Jack's Pen" | |
| +string(10) "Jack\'s Pen" | |
| -- Iteration 11 -- | |
| -string(14) "P't'y 't It's " | |
| +string(14) "P\'t\'y \'t It\'s " | |
| -- Iteration 12 -- | |
| string(24) " Testing Testing Ucwords" | |
| -- Iteration 13 -- | |
| -string(26) "\ttesting\ttesting Ucwords" | |
| +string(26) "\\ttesting\\ttesting Ucwords" | |
| -- Iteration 14 -- | |
| string(31) "Testing | |
| Ucwords Testing Ucwords" | |
| -- Iteration 15 -- | |
| -string(32) "Testing\rucwords Testing Ucwords" | |
| +string(32) "Testing\\rucwords Testing Ucwords" | |
| -- Iteration 16 -- | |
| string(34) "Testing Ucwords Testing | |
| Ucwords" | |
| -- Iteration 17 -- | |
| -string(36) "Testing\fucwords \f Testing | |
| +string(36) "Testing\\fucwords \\f Testing | |
| Ucwords" | |
| -- Iteration 18 -- | |
| string(35) " | |
| @@ -103,17 +103,17 @@ Ucwords | |
| Testing | |
| Ucwords" | |
| -- Iteration 19 -- | |
| -string(39) "\ntesting\nucwords\n Testing \n Ucwords" | |
| +string(39) "\\ntesting\\nucwords\\n Testing \\n Ucwords" | |
| -- Iteration 20 -- | |
| string(18) "Using Vertical Tab" | |
| -- Iteration 21 -- | |
| -string(20) "Using\vvertical\vtab" | |
| +string(20) "Using\\vvertical\\vtab" | |
| -- Iteration 22 -- | |
| string(42) "T@@#$% %test ^test &test *test +test -test" | |
| -- Iteration 23 -- | |
| string(40) "!test ~test `test` =test= @test@test.com" | |
| -- Iteration 24 -- | |
| -string(37) "/test/r Est\ucwords \y\y\u \yy\ /uu/" | |
| +string(37) "/test/r Est\\ucwords \\y\\y\\u \\yy\\ /uu/" | |
| -- Iteration 25 -- | |
| string(16) "!@#$%^&*()_+=-`~" | |
| Done | |
| diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt | |
| index d03c2b1bf0..2fe8a24917 100644 | |
| --- a/ext/standard/tests/strings/uuencode.phpt | |
| +++ b/ext/standard/tests/strings/uuencode.phpt | |
| @@ -19,12 +19,12 @@ echo "Done\n"; | |
| string(2) "` | |
| " | |
| string(0) "" | |
| -string(60) "J?B%`(R0E7B8J*"E??7M03TE5651215=145-$1D=(2DM,.CQ-3D)60UA: | |
| +string(60) "J?B%`(R0E7B8J*\"E??7M03TE5651215=145-$1D=(2DM,.CQ-3D)60UA: | |
| ` | |
| " | |
| string(1) "%s" | |
| string(42) "~!@#$%^&*()_}{POIUYTREWQQSDFGHJKL:<MNBVCXZ" | |
| -string(36) "6;F]T('9E<GD@<V]P:&ES=&EC871E9``` | |
| +string(36) "6;F]T(\'9E<GD@<V]P:&ES=&EC871E9``` | |
| ` | |
| " | |
| string(22) "not very sophisticated" | |
| diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt | |
| index ec40e96f80..3a543666a8 100644 | |
| --- a/ext/standard/tests/strings/wordwrap_basic.phpt | |
| +++ b/ext/standard/tests/strings/wordwrap_basic.phpt | |
| @@ -36,7 +36,7 @@ string(96) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzz | |
| doooooooooooooooooooooog." | |
| string(96) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy | |
| doooooooooooooooooooooog." | |
| -string(103) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy<br />\ndoooooooooooooooooooooog." | |
| -string(178) "The quick<br />\nbrown<br />\nfooooooooo<br />\nox<br />\njummmmmmmm<br />\nmmmmped<br />\nover the<br />\nlazzzzzzzz<br />\nzzzy<br />\ndooooooooo<br />\noooooooooo<br />\nooog." | |
| -string(138) "The quick<br />\nbrown<br />\nfoooooooooox<br />\njummmmmmmmmmmmped<br />\nover the<br />\nlazzzzzzzzzzzy<br />\ndoooooooooooooooooooooog." | |
| +string(103) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy<br />\\ndoooooooooooooooooooooog." | |
| +string(178) "The quick<br />\\nbrown<br />\\nfooooooooo<br />\\nox<br />\\njummmmmmmm<br />\\nmmmmped<br />\\nover the<br />\\nlazzzzzzzz<br />\\nzzzy<br />\\ndooooooooo<br />\\noooooooooo<br />\\nooog." | |
| +string(138) "The quick<br />\\nbrown<br />\\nfoooooooooox<br />\\njummmmmmmmmmmmped<br />\\nover the<br />\\nlazzzzzzzzzzzy<br />\\ndoooooooooooooooooooooog." | |
| Done | |
| diff --git a/ext/standard/tests/strings/wordwrap_error.phpt b/ext/standard/tests/strings/wordwrap_error.phpt | |
| index b93bb80565..b7336010f0 100644 | |
| --- a/ext/standard/tests/strings/wordwrap_error.phpt | |
| +++ b/ext/standard/tests/strings/wordwrap_error.phpt | |
| @@ -45,10 +45,10 @@ var_dump( wordwrap($str, $width, $break, $cut) ); | |
| -- Testing wordwrap() function with negative/zero value for width argument -- | |
| -- width = 0 & cut = false -- | |
| -string(39) "testing<br />\nwordwrap<br />\nfunction" | |
| +string(39) "testing<br />\\nwordwrap<br />\\nfunction" | |
| -- width = 0 & cut = true -- | |
| wordwrap(): Argument #4 ($cut_long_words) cannot be true when argument #2 ($width) is 0 | |
| -- width = -10 & cut = false -- | |
| -string(39) "testing<br />\nwordwrap<br />\nfunction" | |
| +string(39) "testing<br />\\nwordwrap<br />\\nfunction" | |
| -- width = -10 & cut = true -- | |
| -string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn" | |
| +string(223) "<br />\\nt<br />\\ne<br />\\ns<br />\\nt<br />\\ni<br />\\nn<br />\\ng<br />\\n<br />\\nw<br />\\no<br />\\nr<br />\\nd<br />\\nw<br />\\nr<br />\\na<br />\\np<br />\\n<br />\\nf<br />\\nu<br />\\nn<br />\\nc<br />\\nt<br />\\ni<br />\\no<br />\\nn" | |
| diff --git a/ext/standard/tests/url/bug52327.phpt b/ext/standard/tests/url/bug52327.phpt | |
| index 3450abcc4b..8c3e6bb015 100644 | |
| --- a/ext/standard/tests/url/bug52327.phpt | |
| +++ b/ext/standard/tests/url/bug52327.phpt | |
| @@ -8,5 +8,5 @@ var_dump( | |
| ); | |
| ?> | |
| --EXPECT-- | |
| -string(51) "The '=' symbols aren't allowed where i put them o.O" | |
| +string(51) "The \'=\' symbols aren\'t allowed where i put them o.O" | |
| bool(false) | |
| diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt | |
| index f3abd703b2..385dab7809 100644 | |
| --- a/ext/standard/tests/url/parse_url_basic_001.phpt | |
| +++ b/ext/standard/tests/url/parse_url_basic_001.phpt | |
| @@ -865,7 +865,7 @@ echo "Done"; | |
| ["path"]=> | |
| string(11) "/rest/Users" | |
| ["query"]=> | |
| - string(19) "filter={"id":"123"}" | |
| + string(19) "filter={\"id\":\"123\"}" | |
| } | |
| --> %:x: array(1) { | |
| diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt | |
| index 9080523f50..46496be5f6 100644 | |
| --- a/ext/standard/tests/url/parse_url_basic_008.phpt | |
| +++ b/ext/standard/tests/url/parse_url_basic_008.phpt | |
| @@ -104,7 +104,7 @@ echo "Done"; | |
| --> http://[x:80]/ : NULL | |
| --> : NULL | |
| --> / : NULL | |
| ---> /rest/Users?filter={"id":"123"} : string(19) "filter={"id":"123"}" | |
| +--> /rest/Users?filter={"id":"123"} : string(19) "filter={\"id\":\"123\"}" | |
| --> %:x : NULL | |
| --> https://example.com:0/ : NULL | |
| --> http:///blah.com : bool(false) | |
| diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt | |
| index 7c9150a513..08493f00f9 100644 | |
| --- a/ext/standard/tests/url/parse_url_unterminated.phpt | |
| +++ b/ext/standard/tests/url/parse_url_unterminated.phpt | |
| @@ -873,7 +873,7 @@ echo "Done"; | |
| ["path"]=> | |
| string(11) "/rest/Users" | |
| ["query"]=> | |
| - string(19) "filter={"id":"123"}" | |
| + string(19) "filter={\"id\":\"123\"}" | |
| } | |
| --> %:x: array(1) { | |
| diff --git a/ext/standard/var.c b/ext/standard/var.c | |
| index c725be0583..f14edcdc9f 100644 | |
| --- a/ext/standard/var.c | |
| +++ b/ext/standard/var.c | |
| @@ -37,8 +37,12 @@ struct php_serialize_data { | |
| #define COMMON (is_ref ? "&" : "") | |
| static void php_print_escaped(zend_string *str) { | |
| + zend_string *escaped = php_addslashes(str); | |
| + PHPWRITE(ZSTR_VAL(escaped), ZSTR_LEN(escaped)); | |
| + zend_string_release_ex(escaped, 0); | |
| /* Escape null bytes in strings. | |
| * This does not use php_addcslashes(), because that function formats null bytes as \000. */ | |
| +#if 0 | |
| const char *p = ZSTR_VAL(str); | |
| const char *e = p + ZSTR_LEN(str); | |
| while (p < e) { | |
| @@ -49,6 +53,7 @@ static void php_print_escaped(zend_string *str) { | |
| PHPWRITE("\\0", 2); | |
| p = p2 + 1; | |
| } | |
| +#endif | |
| } | |
| static void php_array_element_dump(zval *zv, zend_ulong index, zend_string *key, int level) /* {{{ */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment