com php-src: Prepare for a PECL release: ext/oci8/oci8.c ext/oci8/package.xml

Commit: 8f7e98ac4aefb73e22485e5d2813a782b1ace2e9 Author: Christopher Jones <christopher.jones@oracle.com> Sat, 12 Dec 2015 16:06:08 +1100 Parents: 57eecd4e299946ed5fe0ba2527235187030f7503 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f7e98ac4aefb73e22485e5d2813a782b1ace2e9 Log: Prepare for a PECL release Changed paths: M ext/oci8/oci8.c M ext/oci8/package.xml Diff: diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index f5a3ee1..0887684 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -40,6 +40,8 @@ /* PHP 5.2 is the minimum supported version for OCI8 2.0 */ #if PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 1) #error Use PHP OCI8 1.4 for your version of PHP +#elif PHP_MAJOR_VERSION >= 7 +#error Use PHP OCI8 2.1 for your version of PHP #endif #include "php_oci8.h" diff --git a/ext/oci8/package..xml b/ext/oci8/package.xml index 58d3f70..56872f4 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -8,17 +8,18 @@ http://pear.php.net/dtd/package-2.0.xsd"> <summary>Extension for Oracle Database</summary> <description> -Use the OCI8 extension to access Oracle Database. The extension can -be linked with Oracle client libraries from Oracle Database 10.2, 11, -or 12.1. These libraries are found in the database installation, or -in the free Oracle Instant Client available from Oracle. Oracle's -standard cross-version connectivity applies. For example, PHP OCI8 -linked with Instant Client 11.2 can connect to Oracle Database 9.2 -onward. See Oracle's note "Oracle Client / Server Interoperability -Support" (ID 207303.1) for details. PHP OCI8 2.0 can be built with -PHP 5.2 onward. Use the older PHP OCI8 1.4.10 when using PHP 4.3.9 -through to PHP 5.1.x, or when only Oracle Database 9.2 client -libraries are available. +Use the OCI8 extension to access Oracle Database. PHP OCI8 2.1 builds +with PHP 7. Use 'pecl install oci8-2.0.10' to install OCI8 for PHP +5.2 - PHP 5.6. Use 'pecl install oci8-1.4.10' to install PHP OCI8 1.4 +for PHP 4.3.9 - PHP 5.1. The OCI8 extension can be linked with Oracle +client libraries from Oracle Database 12.1, 11, or 10.2. These +libraries are found in your database installation, or in the free +Oracle Instant Client from +http://www.oracle.com/technetwork/database/features/instant-client/. +Oracle's standard cross-version connectivity applies. For example, +PHP OCI8 linked with Instant Client 11.2 can connect to Oracle +Database 9.2 onward. See Oracle's note "Oracle Client / Server +Interoperability Support" (ID 207303.1) for details. </description> <lead> <name>Christopher Jones</name> @@ -45,7 +46,7 @@ libraries are available. <active>no</active> </lead> - <date>2015-11-06</date> + <date>2015-12-12</date> <time>12:00:00</time> <version> @@ -450,6 +451,7 @@ Fixed bug #68298 (OCI int overflow) <required> <php> <min>5.2.0</min> + <max>5.6.99</max> </php> <pearinstaller> <min>1.4.0b1</min>