Commit Graph

991 Commits

Author SHA1 Message Date
Christopher Jones
e47025ffc5 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 10:16:27 +11:00
Christopher Jones
e4d894edb3 Improve test portability 2018-12-10 10:16:15 +11:00
Christopher Jones
56e2c0d7db Update for newer Oracle versions 2018-12-10 10:15:53 +11:00
Christopher Jones
1f84f2a766 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 20:55:21 +11:00
Christopher Jones
99f1f3dedf Add oci_set_call_timeout() and bump version to 2.10.0 2018-12-09 20:55:04 +11:00
Christopher Jones
31eeca8a19 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:38:53 +11:00
Christopher Jones
e2ecd60f2f Upgrade internal OCI call 2018-12-09 12:38:35 +11:00
Christopher Jones
3da368be2e Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:17:04 +11:00
Christopher Jones
4246702406 Enable Oracle Database DBOP tracing attribute 2018-12-09 12:16:47 +11:00
Christopher Jones
03f6b16de7 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 11:30:15 +11:00
Christopher Jones
465c149cd3 Update OCI8 README 2018-12-09 11:28:52 +11:00
Christopher Jones
216d6592e1 Convert some parameter parsing to the Fast Parameter Parsing API 2018-12-09 11:28:04 +11:00
Christopher Jones
6119d4c670 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Note that PECL install now works on PHP 7.3
  Don't skip with 18c DB
2018-12-08 20:13:57 +11:00
Christopher Jones
43adf3dc5e Note that PECL install now works on PHP 7.3 2018-12-08 20:13:40 +11:00
Christopher Jones
9a0ec35fa3 Don't skip with 18c DB 2018-12-08 20:12:43 +11:00
Christopher Jones
e355e55e01 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-08 19:24:59 +11:00
Christopher Jones
dd0a8091f4 Fix resource warning value 2018-12-08 19:24:32 +11:00
Christopher Jones
2d53040a6d Bump OCI8 version 2018-12-08 19:23:22 +11:00
Christopher Jones
18b25f0f65 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update NEWS
2018-12-08 19:13:12 +11:00
Christopher Jones
8ff6a30598 Update NEWS 2018-12-08 19:12:04 +11:00
Christopher Jones
de9f64f5dd Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  When releasing an oci8 connection always set the resource to null.
2018-12-08 18:51:13 +11:00
KoenigsKind
3c91851874 When releasing an oci8 connection always set the resource to null. 2018-12-08 18:49:12 +11:00
Christopher Jones
49944e4bcf Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:22:30 +11:00
Nikita Popov
e3946534a4 Drop unnecessary HASH_OF uses in ext/oci8
These only operate on arrays.
2018-12-07 23:21:32 +11:00
Christopher Jones
171389b435 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:20:27 +11:00
Christopher Jones
b797818e09 Simplify based on feedback from nikic 2018-12-07 23:07:37 +11:00
Christopher Jones
91776f7264 Sync with test files 2018-12-07 21:41:34 +11:00
Zeev Suraski
9afce019e0 Future-proof email addresses 2018-11-01 18:35:32 +02:00
Peter Kokot
b746e69887 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
2018-10-15 04:32:30 +02:00
Peter Kokot
f1d7e3ca0b 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
2018-10-15 04:31:31 +02:00
Peter Kokot
782352c54a Trim trailing whitespace in *.phpt 2018-10-14 19:45:12 +02:00
Peter Kokot
17ccbeec32 Trim trailing whitespace in *.phpt 2018-10-14 19:44:14 +02:00
Christopher Jones
1d67577f4d Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 20:53:31 +10:00
Christopher Jones
9e56a3373e Terminate smart string correctly
This is related to Zend VM regression bug #75881.  The regression was fixed in the VM, so there is no user visible change from the termination correction.
2018-09-24 20:52:58 +10:00
Christopher Jones
e6fae9e6f9 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 20:14:05 +10:00
Christopher Jones
91954c24da Make usable for PECL OCI8 release for PHP 7.x 2018-09-24 20:05:54 +10:00
Christopher Jones
3413e7d1d8 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 17:07:06 +10:00
Christopher Jones
57eb25b393 Backport master branch comment typo fix 2018-09-24 17:06:29 +10:00
Christopher Jones
28ecd4e1c7 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 17:02:36 +10:00
Christopher Jones
3d497f884f Make tests portable across PHP 7.x versions 2018-09-24 17:01:13 +10:00
Christopher Jones
338802b543 Remove $id from phpinfo as already done in PHP-7.3 2018-09-24 16:52:17 +10:00
Christopher Jones
d7b87cd995 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 16:41:35 +10:00
Christopher Jones
37652336c7 And strip trailing tabs too... 2018-09-24 16:38:39 +10:00
Christopher Jones
aae4ccb030 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 16:02:19 +10:00
Christopher Jones
bdd67d8175 Sync EXPECT usage with PHP-7.3 2018-09-24 15:59:52 +10:00
Christopher Jones
45ab3d3ad3 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 13:33:54 +10:00
Christopher Jones
a2c0f8722b Remove trailing whitespace to help keep branches in sync 2018-09-24 13:27:27 +10:00
Christopher Jones
826702417d Merge branch 'PHP-7.2' into PHP-7.3 2018-09-24 09:57:20 +10:00
Christopher Jones
eceb34073b Remove trailing whitespace to help keep branches in sycn 2018-09-24 09:37:46 +10:00
Peter Kokot
cf3b852109 Trim trailing whitespaces in build files
Some editors utilizing .editorconfig automatically trim whitespaces. For
convenience this patch removes whitespaces in certain build files:
- ext/*/config*.m4
- configure.ac
- acinclude.m4
2018-07-29 03:43:45 +02:00