diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2018-12-10 21:54:23 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2018-12-10 21:54:23 +1100 |
| commit | 6f6a15e1ae6da67f892e5116ccaf94401ed7386c (patch) | |
| tree | 02ec41f522fe80b884dbcc880a0f823fe7bb48c1 | |
| parent | 5b72f49c9ef1610f30077ab08216ad6d997cfbd9 (diff) | |
| parent | 3aee9ca571df9acd67de4a646cb4e557cda16c5c (diff) | |
| download | php-git-6f6a15e1ae6da67f892e5116ccaf94401ed7386c.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/oci8/package.xml | 8 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 | ||||
| -rw-r--r-- | ext/oci8/tests/driver_name.phpt | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 59812c0c98..6278b5748e 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -52,12 +52,12 @@ Interoperability Support" (ID 207303.1) for details. <active>no</active> </lead> - <date>2017-08-15</date> + <date>2018-12-11</date> <time>12:00:00</time> <version> - <release>2.10.0</release> - <api>2.10.0</api> + <release>2.2.0</release> + <api>2.2.0</api> </version> <stability> <release>stable</release> @@ -69,7 +69,7 @@ This version is for PHP 7 only. Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later) Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later) Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind) -Fixed installation on 7.3. +Fixed installation on PHP 7.3. Internal change: Convert some parameter parsing to the Fast Parameter Parsing API. </notes> <contents> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 308f887114..13b7ebca5c 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -43,7 +43,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "2.10.0" +#define PHP_OCI8_VERSION "2.2.0" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry diff --git a/ext/oci8/tests/driver_name.phpt b/ext/oci8/tests/driver_name.phpt index 5d05c9d046..8cbbf9648a 100644 --- a/ext/oci8/tests/driver_name.phpt +++ b/ext/oci8/tests/driver_name.phpt @@ -57,11 +57,11 @@ function get_attr($conn) ?> --EXPECT-- **Test 1.1 - Default values for the attribute ************** -The value of DRIVER_NAME is PHP OCI8 : 2.10.0 +The value of DRIVER_NAME is PHP OCI8 : 2.2.0 ***Test 1.2 - Get the values from different connections ************** Testing with oci_pconnect() -The value of DRIVER_NAME is PHP OCI8 : 2.10.0 +The value of DRIVER_NAME is PHP OCI8 : 2.2.0 Testing with oci_new_connect() -The value of DRIVER_NAME is PHP OCI8 : 2.10.0 +The value of DRIVER_NAME is PHP OCI8 : 2.2.0 Done |