From: Christopher Jones <sixd@php.net>
Date: Wed, 15 Jul 2020 04:35:14 +0000 (+1000)
Subject: Bump OCI8 version to 3.0 so a PHP 8 PECL release can be made
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80587762954fea1854ad54adaf5be6790ba2798c;p=php

Bump OCI8 version to 3.0 so a PHP 8 PECL release can be made
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index e5aeafc7fe..6cd21d966c 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -41,6 +41,9 @@
 #elif PHP_MAJOR_VERSION < 7
 /* PHP 7 is the minimum supported version for OCI8 2.1 */
 #error Use PHP OCI8 2.0 for your version of PHP
+#elif PHP_MAJOR_VERSION < 8
+/* PHP 8 is the minimum supported version for OCI8 3.0 */
+#error Use PHP OCI8 2.2 for your version of PHP
 #endif
 
 #include "php_oci8.h"
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index b9366a1775..7d6c28501b 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -8,18 +8,19 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <summary>Extension for Oracle Database</summary>
 
  <description>
-Use the OCI8 extension to access Oracle Database.  Use 'pecl install
-oci8' 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 12, 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.
+The OCI8 extension let you access Oracle Database.
+
+Use 'pecl install oci8' to install for PHP 8.
+
+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 installation, or in the free Oracle Instant Client from https://www.oracle.com/database/technologies/instant-client.html.
+
+Oracle's standard cross-version connectivity applies.  For example, PHP OCI8 linked with Instant Client 19c can connect to Oracle Database 11.2 onward.  See Oracle's note "Oracle Client / Server Interoperability Support" (ID 207303.1) for details.
  </description>
  <lead>
   <name>Christopher Jones</name>
@@ -31,7 +32,7 @@ Interoperability Support" (ID 207303.1) for details.
   <name>Tianfang Yang</name>
   <user>tianfyan</user>
   <email>tianfyan@php.net</email>
-  <active>yes</active>
+  <active>no</active>
  </lead>
  <lead>
   <name>Antony Dovgal</name>
@@ -52,12 +53,12 @@ Interoperability Support" (ID 207303.1) for details.
   <active>no</active>
  </lead>
 
- <date>2018-12-11</date>
+ <date>2020-07-15</date>
  <time>12:00:00</time>
 
   <version>
-   <release>2.2.0</release>
-   <api>2.2.0</api>
+   <release>3.0.0</release>
+   <api>3.0.0</api>
   </version>
   <stability>
    <release>stable</release>
@@ -65,12 +66,13 @@ Interoperability Support" (ID 207303.1) for details.
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes>
-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 PHP 7.3.
-Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
+    This version is for PHP 8 only.
+
+    Deprecated old OCI8 function aliases. (Jens de Nies)
+
+    Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
+
+    Generate arginfo from function stubs. (Jens de Nies)
   </notes>
  <contents>
   <dir name="/">
@@ -187,11 +189,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="coll_003_func.phpt" role="test" />
     <file name="coll_004.phpt" role="test" />
     <file name="coll_004_func.phpt" role="test" />
-    <file name="coll_005.phpt" role="test" />
-    <file name="coll_006.phpt" role="test" />
-    <file name="coll_006_func.phpt" role="test" />
-    <file name="coll_007.phpt" role="test" />
-    <file name="coll_008.phpt" role="test" />
     <file name="coll_009.phpt" role="test" />
     <file name="coll_009_func.phpt" role="test" />
     <file name="coll_010.phpt" role="test" />
@@ -214,7 +211,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="coll_019.phpt" role="test" />
     <file name="commit_001.phpt" role="test" />
     <file name="commit_002.phpt" role="test" />
-    <file name="commit_old.phpt" role="test" />
     <file name="conn_attr.inc" role="test" />
     <file name="conn_attr_1.phpt" role="test" />
     <file name="conn_attr_2.phpt" role="test" />
@@ -224,8 +220,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="connect.inc" role="test" />
     <file name="connect.phpt" role="test" />
     <file name="connect_1.phpt" role="test" />
-    <file name="connect_1_old.phpt" role="test" />
-    <file name="connect_old.phpt" role="test" />
     <file name="connect_scope1.phpt" role="test" />
     <file name="connect_scope2.phpt" role="test" />
     <file name="connect_scope_try1.phpt" role="test" />
@@ -237,18 +231,14 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="connect_with_charset_001.phpt" role="test" />
     <file name="connect_without_oracle_home.phpt" role="test" />
     <file name="connect_without_oracle_home_11.phpt" role="test" />
-    <file name="connect_without_oracle_home_old.phpt" role="test" />
-    <file name="connect_without_oracle_home_old_11.phpt" role="test" />
     <file name="create_table.inc" role="test" />
     <file name="create_type.inc" role="test" />
     <file name="cursor_bind.phpt" role="test" />
     <file name="cursor_bind_err.phpt" role="test" />
     <file name="cursors.phpt" role="test" />
-    <file name="cursors_old.phpt" role="test" />
     <file name="db_op_1.phpt" role="test" />
     <file name="db_op_2.phpt" role="test" />
     <file name="dbmsoutput.phpt" role="test" />
-    <file name="debug.phpt" role="test" />
     <file name="default_prefetch0.phpt" role="test" />
     <file name="default_prefetch1.phpt" role="test" />
     <file name="default_prefetch2.phpt" role="test" />
@@ -260,7 +250,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="define4.phpt" role="test" />
     <file name="define5.phpt" role="test" />
     <file name="define6.phpt" role="test" />
-    <file name="define_old.phpt" role="test" />
     <file name="descriptors.phpt" role="test" />
     <file name="details.inc" role="test" />
     <file name="drcp_cclass1.phpt" role="test" />
@@ -293,11 +282,11 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="error_bind.phpt" role="test" />
     <file name="error_bind_2.phpt" role="test" />
     <file name="error_bind_3.phpt" role="test" />
-    <file name="error_old.phpt" role="test" />
     <file name="error_parse.phpt" role="test" />
     <file name="error_set.phpt" role="test" />
     <file name="exec_fetch.phpt" role="test" />
     <file name="execute_mode.phpt" role="test" />
+    <file name="existence_aliases.phpt" role="test" />
     <file name="extauth_01.phpt" role="test" />
     <file name="extauth_02.phpt" role="test" />
     <file name="extauth_03.phpt" role="test" />
@@ -310,9 +299,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="fetch_all5.phpt" role="test" />
     <file name="fetch_array.phpt" role="test" />
     <file name="fetch_assoc.phpt" role="test" />
-    <file name="fetch_into.phpt" role="test" />
-    <file name="fetch_into1.phpt" role="test" />
-    <file name="fetch_into2.phpt" role="test" />
     <file name="fetch_object.phpt" role="test" />
     <file name="fetch_object_1.phpt" role="test" />
     <file name="fetch_object_2.phpt" role="test" />
@@ -321,8 +307,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="field_funcs1.phpt" role="test" />
     <file name="field_funcs2.phpt" role="test" />
     <file name="field_funcs3.phpt" role="test" />
-    <file name="field_funcs_old.phpt" role="test" />
-    <file name="function_aliases.phpt" role="test" />
     <file name="imp_res_1.phpt" role="test" />
     <file name="imp_res_2.phpt" role="test" />
     <file name="imp_res_3.phpt" role="test" />
@@ -370,7 +354,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="lob_012.phpt" role="test" />
     <file name="lob_013.phpt" role="test" />
     <file name="lob_014.phpt" role="test" />
-    <file name="lob_015.phpt" role="test" />
     <file name="lob_016.phpt" role="test" />
     <file name="lob_017.phpt" role="test" />
     <file name="lob_018.phpt" role="test" />
@@ -416,7 +399,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="password.phpt" role="test" />
     <file name="password_2.phpt" role="test" />
     <file name="password_new.phpt" role="test" />
-    <file name="password_old.phpt" role="test" />
     <file name="pecl_bug10194.phpt" role="test" />
     <file name="pecl_bug10194_blob.phpt" role="test" />
     <file name="pecl_bug10194_blob_64.phpt" role="test" />
@@ -426,21 +408,17 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
     <file name="pecl_bug8816.phpt" role="test" />
     <file name="persistent.phpt" role="test" />
     <file name="prefetch.phpt" role="test" />
-    <file name="prefetch_old.phpt" role="test" />
     <file name="privileged_connect.phpt" role="test" />
     <file name="privileged_connect1.phpt" role="test" />
     <file name="refcur_prefetch_1.phpt" role="test" />
     <file name="refcur_prefetch_2.phpt" role="test" />
     <file name="refcur_prefetch_3.phpt" role="test" />
     <file name="refcur_prefetch_4.phpt" role="test" />
-    <file name="reflection1.phpt" role="test" />
-    <file name="reflection2.phpt" role="test" />
     <file name="select_null.phpt" role="test" />
     <file name="serverversion.phpt" role="test" />
     <file name="skipif.inc" role="test" />
     <file name="statement_cache.phpt" role="test" />
     <file name="statement_type.phpt" role="test" />
-    <file name="statement_type_old.phpt" role="test" />
     <file name="test.gif" role="test" />
     <file name="test.txt" role="test" />
     <file name="testping.phpt" role="test" />
@@ -461,6 +439,8 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
    <file name="oci8_failover.c" role="src" />
    <file name="php_oci8.h" role="src" />
    <file name="php_oci8_int.h" role="src" />
+   <file name="oci8.stub.php" role="src" />
+   <file name="oci8_arginfo.h" role="src" />
    <file name="README.md" role="doc" />
   </dir> <!-- / -->
  </contents>
@@ -480,6 +460,26 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
  </extsrcrelease>
  <changelog>
 
+<release>
+  <version>
+   <release>2.2.0</release>
+   <api>2.2.0</api>
+  </version>
+  <stability>
+   <release>stable</release>
+   <api>stable</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes>
+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 PHP 7.3.
+Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
+  </notes>
+</release>
+
 <release>
   <version>
    <release>2.1.8</release>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 4eb3ebeb47..d9be44ce87 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -41,7 +41,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.2.0"
+#define PHP_OCI8_VERSION "3.0.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 c9d1181ef6..006f7abfa4 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.2.0
+The value of DRIVER_NAME is PHP OCI8 : 3.0.0
 
 ***Test 1.2 - Get the values from different connections **************
 Testing with oci_pconnect()
-The value of DRIVER_NAME is PHP OCI8 : 2.2.0
+The value of DRIVER_NAME is PHP OCI8 : 3.0.0
 Testing with oci_new_connect()
-The value of DRIVER_NAME is PHP OCI8 : 2.2.0
+The value of DRIVER_NAME is PHP OCI8 : 3.0.0
 Done