diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
commit | b746e6988743b46ccb0542d5d568eef0608ee296 (patch) | |
tree | 2f5248149fec900b613e165f7dd050da0011743e /ext/pdo_pgsql | |
parent | 3599a2d82beff1ff3387a04c73fcdac9dd5336d4 (diff) | |
download | php-git-b746e6988743b46ccb0542d5d568eef0608ee296.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 'ext/pdo_pgsql')
-rw-r--r-- | ext/pdo_pgsql/tests/bug36727.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug48764.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug62479.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug68371.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug69344.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug69362.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug72294.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug75402.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug_33876.phpt | 3 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug_49985.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/copy_from.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/copy_to.phpt | 1 |
12 files changed, 1 insertions, 14 deletions
diff --git a/ext/pdo_pgsql/tests/bug36727.phpt b/ext/pdo_pgsql/tests/bug36727.phpt index 34d14db6cc..d5f8e49f96 100644 --- a/ext/pdo_pgsql/tests/bug36727.phpt +++ b/ext/pdo_pgsql/tests/bug36727.phpt @@ -21,4 +21,4 @@ echo "Done\n"; --EXPECTF-- Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %sbug36727.php on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/pdo_pgsql/tests/bug48764.phpt b/ext/pdo_pgsql/tests/bug48764.phpt index a40e453d8d..cfe29cd7c3 100644 --- a/ext/pdo_pgsql/tests/bug48764.phpt +++ b/ext/pdo_pgsql/tests/bug48764.phpt @@ -59,7 +59,6 @@ function bug($db, $options = array()) { echo $e->getCode()."\n"; } } - --EXPECT-- Test 1 42P18 diff --git a/ext/pdo_pgsql/tests/bug62479.phpt b/ext/pdo_pgsql/tests/bug62479.phpt index efe4ece4e6..389240f8e1 100644 --- a/ext/pdo_pgsql/tests/bug62479.phpt +++ b/ext/pdo_pgsql/tests/bug62479.phpt @@ -73,4 +73,3 @@ $pdo->query($dropUser); --EXPECT-- int(1) int(1) - diff --git a/ext/pdo_pgsql/tests/bug68371.phpt b/ext/pdo_pgsql/tests/bug68371.phpt index 636b22f52e..350708b97d 100644 --- a/ext/pdo_pgsql/tests/bug68371.phpt +++ b/ext/pdo_pgsql/tests/bug68371.phpt @@ -96,4 +96,3 @@ string(5) "pgsql" ERR ERR int(4) - diff --git a/ext/pdo_pgsql/tests/bug69344.phpt b/ext/pdo_pgsql/tests/bug69344.phpt index d274e0608c..d8e5d25b0a 100644 --- a/ext/pdo_pgsql/tests/bug69344.phpt +++ b/ext/pdo_pgsql/tests/bug69344.phpt @@ -41,4 +41,3 @@ $test(); --EXPECT-- SQLSTATE[HY093]: Invalid parameter number: parameter was not defined SQLSTATE[HY093]: Invalid parameter number: parameter was not defined - diff --git a/ext/pdo_pgsql/tests/bug69362.phpt b/ext/pdo_pgsql/tests/bug69362.phpt index e986af8578..3db58d5fcc 100644 --- a/ext/pdo_pgsql/tests/bug69362.phpt +++ b/ext/pdo_pgsql/tests/bug69362.phpt @@ -61,4 +61,3 @@ $pdo->query($dropUser); ?> --EXPECT-- int(1) - diff --git a/ext/pdo_pgsql/tests/bug72294.phpt b/ext/pdo_pgsql/tests/bug72294.phpt index 484a6f5765..46c462417b 100644 --- a/ext/pdo_pgsql/tests/bug72294.phpt +++ b/ext/pdo_pgsql/tests/bug72294.phpt @@ -146,4 +146,3 @@ $test->run( $result ); ==NOCRASH== --EXPECT-- ==NOCRASH== - diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt index bf79a1f775..2b6a05fef9 100644 --- a/ext/pdo_pgsql/tests/bug75402.phpt +++ b/ext/pdo_pgsql/tests/bug75402.phpt @@ -81,7 +81,6 @@ if ($db) { } var_dump($resp); - --EXPECT-- object(stdClass)#2 (1) { ["entries"]=> diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt index 15c4275d80..31a76c9a63 100644 --- a/ext/pdo_pgsql/tests/bug_33876.phpt +++ b/ext/pdo_pgsql/tests/bug_33876.phpt @@ -88,9 +88,6 @@ if (!$res->execute(array(false))) { } else { print_r($res->fetchAll(PDO::FETCH_ASSOC)); } - - - --EXPECT-- Array ( diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt index e1d7df82a0..be5a4297bd 100644 --- a/ext/pdo_pgsql/tests/bug_49985.phpt +++ b/ext/pdo_pgsql/tests/bug_49985.phpt @@ -32,4 +32,3 @@ for ($i = 0; $i < 3; $i++) { bool(true) SQLSTATE[23505]: %stest_pkey%s SQLSTATE[23505]: %stest_pkey%s - diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt index 552038069c..15eea01229 100644 --- a/ext/pdo_pgsql/tests/copy_from.phpt +++ b/ext/pdo_pgsql/tests/copy_from.phpt @@ -396,4 +396,3 @@ Testing pgsqlCopyFromFile() with error Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s Testing pgsqlCopyFromFile() with non existing file Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file - diff --git a/ext/pdo_pgsql/tests/copy_to.phpt b/ext/pdo_pgsql/tests/copy_to.phpt index 93aab16679..4ddce526bd 100644 --- a/ext/pdo_pgsql/tests/copy_to.phpt +++ b/ext/pdo_pgsql/tests/copy_to.phpt @@ -136,4 +136,3 @@ Testing pgsqlCopyToFile() with error Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s Testing pgsqlCopyToFile() to unwritable file Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file for writing - |