diff --git a/ext/oci8/README.md b/ext/oci8/README.md index eb2149e21dd..d0c0c3be096 100644 --- a/ext/oci8/README.md +++ b/ext/oci8/README.md @@ -4,16 +4,16 @@ Use the OCI8 extension to access Oracle Database. Documentation is at https://www.php.net/oci8 -Use `pecl install oci8` to install for PHP 8. +Use `pecl install oci8` to install for PHP 8.2. + +Use `pecl install oci8-3.2.1` to install for PHP 8.1. + +Use `pecl install oci8-3.0.1` to install for PHP 8.0. Use `pecl install oci8-2.2.0` to install for PHP 7. -Use `pecl install oci8-2.0.12` to install for PHP 5.2 - PHP 5.6. - -Use `pecl install oci8-1.4.10` to install for PHP 4.3.9 - PHP 5.1. - The OCI8 extension can be linked with Oracle client libraries from Oracle -Database 10.2 or later. These libraries are found in your database +Database 11.2 or later. These libraries are found in your database installation, or in the free Oracle Instant Client from https://www.oracle.com/database/technologies/instant-client.html Install the 'Basic' or 'Basic Light' Instant Client package. If building from diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 98e1821568d..01cb1c8ad92 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -51,6 +51,8 @@ #error Use PHP OCI8 2.2 for your version of PHP #elif PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION < 1 #error Use PHP OCI8 3.0 for your version of PHP +#elif PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION < 2 +#error Use PHP OCI8 3.2 for your version of PHP #endif #include "php_oci8.h" diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index f5ba6005b61..63a02075062 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -10,16 +10,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> The OCI8 extension lets you access Oracle Database. -Use 'pecl install oci8' to install for PHP 8.1. +Use 'pecl install oci8' to install for PHP 8.2. + +Use 'pecl install oci8-3.2.1' to install for PHP 8.1. Use 'pecl install oci8-3.0.1' to install for PHP 8.0. Use 'pecl install oci8-2.2.0' to install for PHP 7. -Use 'pecl install oci8-2.0.12' to install for PHP 5.2 - PHP 5.6. - -Use 'pecl install oci8-1.4.10' to install for PHP 4.3.9 - PHP 5.1. - The current OCI8 extension can be linked with Oracle Client libraries from Oracle Database 11.2 or later. (OCI8 3.0 and earlier can be linked with 10g or later). The Oracle Client libraries are in the free Oracle Instant Client from https://www.oracle.com/database/technologies/instant-client.html. They are also included in your database installation. Oracle's standard cross-version connectivity applies. For example, PHP OCI8 linked with Oracle Client 19c can connect to Oracle Database 11.2 onward. See Oracle's note "Oracle Client / Server Interoperability Support" (ID 207303.1) for details. @@ -55,12 +53,12 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin no - 2021-12-12 + 2023-04-22 - 3.2.1 - 3.2.1 + 3.3.0 + 3.3.0 stable @@ -68,7 +66,7 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin PHP - This version is for PHP 8.1 only. + This version is for PHP 8.2 only. Requires Oracle Client libraries from 11.2 or later. @@ -91,14 +89,14 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - - + - + - + + @@ -111,12 +109,12 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + - + @@ -148,8 +146,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + @@ -173,43 +171,44 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - - + - + - + - + - + - + - + - + - + - + - + + - + + + - @@ -219,20 +218,19 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + - + + - - @@ -240,6 +238,7 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin + @@ -258,21 +257,21 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + - - + + @@ -281,7 +280,6 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - @@ -289,14 +287,15 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + + - + @@ -375,33 +374,33 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - - + + - - + - - + + + - + @@ -412,8 +411,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin - + @@ -452,6 +451,23 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin + + + 3.2.1 + 3.2.1 + + + stable + stable + + PHP + + This version is for PHP 8.1 only. + + Requires Oracle Client libraries from 11.2 or later. + + + 3.2.0 diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 5ed8c7bbe72..c87c2084d7f 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -40,7 +40,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "3.2.1" +#define PHP_OCI8_VERSION "3.3.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 80b4740bc14..32cb75a5dc0 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 : 3.2.1 +The value of DRIVER_NAME is PHP OCI8 : 3.3.0 ***Test 1.2 - Get the values from different connections ************** Testing with oci_pconnect() -The value of DRIVER_NAME is PHP OCI8 : 3.2.1 +The value of DRIVER_NAME is PHP OCI8 : 3.3.0 Testing with oci_new_connect() -The value of DRIVER_NAME is PHP OCI8 : 3.2.1 +The value of DRIVER_NAME is PHP OCI8 : 3.3.0 Done