diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
| commit | d679f02295ea079338f029b7f5f4cb65b37f190c (patch) | |
| tree | 53c519e1f829913a54d9dcea004721a3714cea26 /Zend/tests/grammar | |
| parent | e84662c35cffaa95ead4322bfe9d61815c185722 (diff) | |
| download | php-git-d679f02295ea079338f029b7f5f4cb65b37f190c.tar.gz | |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'Zend/tests/grammar')
20 files changed, 1 insertions, 26 deletions
diff --git a/Zend/tests/grammar/regression_001.phpt b/Zend/tests/grammar/regression_001.phpt index 727e11cc45..657b36b853 100644 --- a/Zend/tests/grammar/regression_001.phpt +++ b/Zend/tests/grammar/regression_001.phpt @@ -22,9 +22,7 @@ Foo:: ); echo "\nDone\n"; - --EXPECT-- - Foo::function Foo::function Foo::function diff --git a/Zend/tests/grammar/regression_002.phpt b/Zend/tests/grammar/regression_002.phpt index 06bce25d70..52ca62d6ba 100644 --- a/Zend/tests/grammar/regression_002.phpt +++ b/Zend/tests/grammar/regression_002.phpt @@ -14,7 +14,6 @@ var_dump(Foo:: CLASS); var_dump(Foo:: CLASS); - --EXPECT-- string(3) "Foo" string(3) "Foo" diff --git a/Zend/tests/grammar/regression_004.phpt b/Zend/tests/grammar/regression_004.phpt index edb32032ea..f032fc882d 100644 --- a/Zend/tests/grammar/regression_004.phpt +++ b/Zend/tests/grammar/regression_004.phpt @@ -10,6 +10,5 @@ class Obj } function echo(){} // not valid - --EXPECTF-- Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting %s in %s on line 9 diff --git a/Zend/tests/grammar/regression_005.phpt b/Zend/tests/grammar/regression_005.phpt index 7704375d6e..ad83ee717d 100644 --- a/Zend/tests/grammar/regression_005.phpt +++ b/Zend/tests/grammar/regression_005.phpt @@ -9,6 +9,5 @@ class Obj } const return = 'nope'; - --EXPECTF-- Parse error: syntax error, unexpected 'return' (T_RETURN), expecting identifier (T_STRING) in %s on line 8 diff --git a/Zend/tests/grammar/regression_006.phpt b/Zend/tests/grammar/regression_006.phpt index 036ffa7445..072148ca56 100644 --- a/Zend/tests/grammar/regression_006.phpt +++ b/Zend/tests/grammar/regression_006.phpt @@ -19,7 +19,6 @@ echo Obj:: USE, PHP_EOL; echo "\nDone\n"; - --EXPECT-- declare return diff --git a/Zend/tests/grammar/regression_007.phpt b/Zend/tests/grammar/regression_007.phpt index d75670c7ec..b691ccaef9 100644 --- a/Zend/tests/grammar/regression_007.phpt +++ b/Zend/tests/grammar/regression_007.phpt @@ -28,7 +28,6 @@ Foo::{'new'}(); var_dump(Foo::use); echo "\nDone\n"; - --EXPECT-- Foo::new Foo::new diff --git a/Zend/tests/grammar/regression_008.phpt b/Zend/tests/grammar/regression_008.phpt index e4259649eb..57ae510722 100644 --- a/Zend/tests/grammar/regression_008.phpt +++ b/Zend/tests/grammar/regression_008.phpt @@ -12,10 +12,7 @@ $friday = new Friday; echo "$friday->require ($friday->require) {$friday->require}", PHP_EOL; echo "\nDone\n"; - - --EXPECT-- - fun (fun) fun Done diff --git a/Zend/tests/grammar/regression_009.phpt b/Zend/tests/grammar/regression_009.phpt index 6b14c33081..45fc81bcb8 100644 --- a/Zend/tests/grammar/regression_009.phpt +++ b/Zend/tests/grammar/regression_009.phpt @@ -12,7 +12,5 @@ class Foo } echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- - Done diff --git a/Zend/tests/grammar/regression_010.phpt b/Zend/tests/grammar/regression_010.phpt index 90b864f79b..e5e65e3a85 100644 --- a/Zend/tests/grammar/regression_010.phpt +++ b/Zend/tests/grammar/regression_010.phpt @@ -8,7 +8,5 @@ interface A{} class B implements\A {} echo "Done", PHP_EOL; - --EXPECT-- - Done diff --git a/Zend/tests/grammar/regression_012.phpt b/Zend/tests/grammar/regression_012.phpt index 3b4925afa6..817f337a5c 100644 --- a/Zend/tests/grammar/regression_012.phpt +++ b/Zend/tests/grammar/regression_012.phpt @@ -9,5 +9,4 @@ class A { ?> --EXPECTF-- - Parse error: syntax error, unexpected 'FOREACH' (T_FOREACH), expecting ']' in %s on line %d diff --git a/Zend/tests/grammar/regression_013.phpt b/Zend/tests/grammar/regression_013.phpt index 0379dd26e3..9f5b3e16f1 100644 --- a/Zend/tests/grammar/regression_013.phpt +++ b/Zend/tests/grammar/regression_013.phpt @@ -9,5 +9,4 @@ echo "Done", PHP_EOL; ?> --EXPECT-- - Done diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt index 3abb3a2507..68b35d3f22 100644 --- a/Zend/tests/grammar/semi_reserved_001.phpt +++ b/Zend/tests/grammar/semi_reserved_001.phpt @@ -161,7 +161,6 @@ $obj->__DIR__(); $obj->__NAMESPACE__(); echo "\nDone\n"; - --EXPECT-- Obj::empty Obj::callable diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt index 6a7dc79b74..4aa0f27e5e 100644 --- a/Zend/tests/grammar/semi_reserved_002.phpt +++ b/Zend/tests/grammar/semi_reserved_002.phpt @@ -159,7 +159,6 @@ Obj::__DIR__(); Obj::__NAMESPACE__(); echo "\nDone\n"; - --EXPECT-- Obj::empty Obj::callable diff --git a/Zend/tests/grammar/semi_reserved_004.phpt b/Zend/tests/grammar/semi_reserved_004.phpt index b3889b0bae..5a625a608b 100644 --- a/Zend/tests/grammar/semi_reserved_004.phpt +++ b/Zend/tests/grammar/semi_reserved_004.phpt @@ -161,7 +161,6 @@ echo Obj::$__NAMESPACE__, PHP_EOL; echo Obj::$__halt_compiler, PHP_EOL; echo "\nDone\n"; - --EXPECT-- empty callable diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt index 5330828633..2cf7709b15 100644 --- a/Zend/tests/grammar/semi_reserved_005.phpt +++ b/Zend/tests/grammar/semi_reserved_005.phpt @@ -157,7 +157,6 @@ echo Obj::__DIR__, PHP_EOL; echo Obj::__NAMESPACE__, PHP_EOL; echo "\nDone\n"; - --EXPECT-- empty callable diff --git a/Zend/tests/grammar/semi_reserved_006.phpt b/Zend/tests/grammar/semi_reserved_006.phpt index 8205435a5f..634ba51285 100644 --- a/Zend/tests/grammar/semi_reserved_006.phpt +++ b/Zend/tests/grammar/semi_reserved_006.phpt @@ -58,7 +58,6 @@ Foo::byebye(); Foo::farewell(); echo "\nDone\n"; - --EXPECT-- TraitA::catch TraitA::list diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt index b1d6daeb9d..64e55a8e2a 100644 --- a/Zend/tests/grammar/semi_reserved_007.phpt +++ b/Zend/tests/grammar/semi_reserved_007.phpt @@ -25,7 +25,6 @@ class Bar extends Foo { new Bar; echo "\nDone\n"; - --EXPECT-- From Foo::__construct: self @@ -34,4 +33,4 @@ From Bar::__construct: self parent -Done
\ No newline at end of file +Done diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt index c10f96b6de..fe478323f8 100644 --- a/Zend/tests/grammar/semi_reserved_008.phpt +++ b/Zend/tests/grammar/semi_reserved_008.phpt @@ -61,7 +61,6 @@ Foo /**/ attempt(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitB::try diff --git a/Zend/tests/grammar/semi_reserved_009.phpt b/Zend/tests/grammar/semi_reserved_009.phpt index 05830f80ed..98ff4ee8f0 100644 --- a/Zend/tests/grammar/semi_reserved_009.phpt +++ b/Zend/tests/grammar/semi_reserved_009.phpt @@ -18,7 +18,6 @@ class Foo Foo::try(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitA::as diff --git a/Zend/tests/grammar/semi_reserved_010.phpt b/Zend/tests/grammar/semi_reserved_010.phpt index ad92fcfddc..951db73b85 100644 --- a/Zend/tests/grammar/semi_reserved_010.phpt +++ b/Zend/tests/grammar/semi_reserved_010.phpt @@ -24,7 +24,6 @@ class Foo Foo::insteadof(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitB::insteadof |
