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 /ext/pdo_oci | |
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 'ext/pdo_oci')
-rw-r--r-- | ext/pdo_oci/tests/bug60994.phpt | 3 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug_33707.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_stream_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_templob_1.phpt | 1 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pecl_bug_11345.phpt | 3 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pecl_bug_6364.phpt | 1 |
8 files changed, 4 insertions, 11 deletions
diff --git a/ext/pdo_oci/tests/bug60994.phpt b/ext/pdo_oci/tests/bug60994.phpt index a238f4a4d3..890ecb47c7 100644 --- a/ext/pdo_oci/tests/bug60994.phpt +++ b/ext/pdo_oci/tests/bug60994.phpt @@ -92,11 +92,9 @@ echo 'size of string4 is ', strlen($string4), ' bytes, ', mb_strlen($string4), ' echo 'size of stream4 is ', strlen($stream4), ' bytes, ', mb_strlen($stream4), ' chars.', PHP_EOL; echo 'beg of stream4 is ', $start4, PHP_EOL; echo 'end of stream4 is ', $ending4, PHP_EOL; - --XFAIL-- Fails due to Bug 60994 --EXPECT-- - Test 1: j size of string1 is 1000006 bytes, 1000006 chars. size of stream1 is 1000006 bytes, 1000006 chars. @@ -120,4 +118,3 @@ size of string4 is 24567 bytes, 8193 chars. size of stream4 is 24567 bytes, 8193 chars. beg of stream4 is abcののののののの end of stream4 is のののののののxyz - diff --git a/ext/pdo_oci/tests/bug_33707.phpt b/ext/pdo_oci/tests/bug_33707.phpt index 1ac9fa45cb..0692a08bdf 100644 --- a/ext/pdo_oci/tests/bug_33707.phpt +++ b/ext/pdo_oci/tests/bug_33707.phpt @@ -15,7 +15,6 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT); $rs = $db->query('select blah from a_table_that_doesnt_exist'); var_dump($rs); var_dump($db->errorInfo()); - --EXPECTF-- bool(false) array(3) { diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt index 298d59ed0d..0c02a01e53 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt @@ -61,4 +61,4 @@ Change setting back to true - PDO::ATTR_AUTOCOMMIT: bool(true) Insert data Second connection should be able to see committed data Data is: some data -Done
\ No newline at end of file +Done diff --git a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt index b9c4612b8f..7c104b20ba 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt @@ -58,4 +58,4 @@ NULL PDO::ATTR_ORACLE_NULLS: PDO::NULL_TO_STRING: int(2) string(0) "" string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt index 9f17e9f61b..68bec157eb 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt @@ -110,4 +110,4 @@ Read jjjxyz Read 0 Read 0 Read 0 -Read jjjxyz
\ No newline at end of file +Read jjjxyz diff --git a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt index d79b6b72ce..0dddd4f7e5 100644 --- a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt @@ -82,4 +82,3 @@ else ?> --EXPECT-- Success! All the temporary LOB in previously closed statements are properly cleaned. - diff --git a/ext/pdo_oci/tests/pecl_bug_11345.phpt b/ext/pdo_oci/tests/pecl_bug_11345.phpt index 8a633f547c..31f691d7ef 100644 --- a/ext/pdo_oci/tests/pecl_bug_11345.phpt +++ b/ext/pdo_oci/tests/pecl_bug_11345.phpt @@ -24,6 +24,5 @@ catch (PDOException $e) { echo "Done\n"; ?> - --EXPECTF-- -Connection failed: SQLSTATE[HY000]: OCINlsCharSetNameToId: unknown character set name (%s)
\ No newline at end of file +Connection failed: SQLSTATE[HY000]: OCINlsCharSetNameToId: unknown character set name (%s) diff --git a/ext/pdo_oci/tests/pecl_bug_6364.phpt b/ext/pdo_oci/tests/pecl_bug_6364.phpt index 925665e42b..e8ed6ee62d 100644 --- a/ext/pdo_oci/tests/pecl_bug_6364.phpt +++ b/ext/pdo_oci/tests/pecl_bug_6364.phpt @@ -42,7 +42,6 @@ $dbh->exec ("drop procedure bug_6364_sp"); $dbh->exec ("drop table bug_6364_t"); ?> - --EXPECT-- string(4) "val4" string(4) "val5" |