php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Bump OCI8 version to make a PECL release for 8.2
This commit is contained in:
Christopher Jones
2023-04-20 18:04:46 +10:00
parent 4af95b7c58 05467b93c7
commit b06a6b82d6
5 changed files with 76 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/oci8/README.md
View File

@@ -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

2
ext/oci8/oci8.c
View File

@@ -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"

112
ext/oci8/package.xml
View File

@@ -10,16 +10,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
<description>
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
<active>no</active>
</lead>
<date>2021-12-12</date>
<date>2023-04-22</date>
<time>12:00:00</time>
<version>
<release>3.2.1</release>
<api>3.2.1</api>
<release>3.3.0</release>
<api>3.3.0</api>
</version>
<stability>
<release>stable</release>
@@ -68,7 +66,7 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
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.
</notes>
@@ -91,14 +89,14 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="array_bind_014.phpt" role="test" />
<file name="array_bind_bdouble.phpt" role="test" />
<file name="array_bind_bfloat.phpt" role="test" />
<file name="array_bind_date.phpt" role="test" />
<file name="array_bind_date1.phpt" role="test" />
<file name="array_bind_float.phpt" role="test" />
<file name="array_bind_date.phpt" role="test" />
<file name="array_bind_float1.phpt" role="test" />
<file name="array_bind_int.phpt" role="test" />
<file name="array_bind_float.phpt" role="test" />
<file name="array_bind_int1.phpt" role="test" />
<file name="array_bind_str.phpt" role="test" />
<file name="array_bind_int.phpt" role="test" />
<file name="array_bind_str1.phpt" role="test" />
<file name="array_bind_str.phpt" role="test" />
<file name="array_bind_uin.phpt" role="test" />
<file name="b47243_1.phpt" role="test" />
<file name="b47243_2.phpt" role="test" />
@@ -111,12 +109,12 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="bind_empty.phpt" role="test" />
<file name="bind_long.phpt" role="test" />
<file name="bind_long_raw.phpt" role="test" />
<file name="bind_misccoltypes.phpt" role="test" />
<file name="bind_misccoltypes_errs.phpt" role="test" />
<file name="bind_misccoltypes.phpt" role="test" />
<file name="bind_number.phpt" role="test" />
<file name="bind_query.phpt" role="test" />
<file name="bind_raw.phpt" role="test" />
<file name="bind_raw_2.phpt" role="test" />
<file name="bind_raw.phpt" role="test" />
<file name="bind_rowid.phpt" role="test" />
<file name="bind_sqltafc.phpt" role="test" />
<file name="bind_sqltchr_1.phpt" role="test" />
@@ -148,8 +146,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="bug42496_1.phpt" role="test" />
<file name="bug42496_2.phpt" role="test" />
<file name="bug42841.phpt" role="test" />
<file name="bug43492.phpt" role="test" />
<file name="bug43492_2.phpt" role="test" />
<file name="bug43492.phpt" role="test" />
<file name="bug43497.phpt" role="test" />
<file name="bug44008.phpt" role="test" />
<file name="bug44113.phpt" role="test" />
@@ -173,43 +171,44 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="clientversion.phpt" role="test" />
<file name="close.phpt" role="test" />
<file name="coll_001.phpt" role="test" />
<file name="coll_002.phpt" role="test" />
<file name="coll_002_func.phpt" role="test" />
<file name="coll_003.phpt" role="test" />
<file name="coll_002.phpt" role="test" />
<file name="coll_003_func.phpt" role="test" />
<file name="coll_004.phpt" role="test" />
<file name="coll_003.phpt" role="test" />
<file name="coll_004_func.phpt" role="test" />
<file name="coll_009.phpt" role="test" />
<file name="coll_004.phpt" role="test" />
<file name="coll_009_func.phpt" role="test" />
<file name="coll_010.phpt" role="test" />
<file name="coll_009.phpt" role="test" />
<file name="coll_010_func.phpt" role="test" />
<file name="coll_011.phpt" role="test" />
<file name="coll_010.phpt" role="test" />
<file name="coll_011_func.phpt" role="test" />
<file name="coll_012.phpt" role="test" />
<file name="coll_011.phpt" role="test" />
<file name="coll_012_func.phpt" role="test" />
<file name="coll_013.phpt" role="test" />
<file name="coll_012.phpt" role="test" />
<file name="coll_013_func.phpt" role="test" />
<file name="coll_014.phpt" role="test" />
<file name="coll_013.phpt" role="test" />
<file name="coll_014_func.phpt" role="test" />
<file name="coll_015.phpt" role="test" />
<file name="coll_014.phpt" role="test" />
<file name="coll_015_func.phpt" role="test" />
<file name="coll_016.phpt" role="test" />
<file name="coll_015.phpt" role="test" />
<file name="coll_016_func.phpt" role="test" />
<file name="coll_017.phpt" role="test" />
<file name="coll_016.phpt" role="test" />
<file name="coll_017_func.phpt" role="test" />
<file name="coll_017.phpt" role="test" />
<file name="coll_018.phpt" role="test" />
<file name="coll_019.phpt" role="test" />
<file name="commit_001.phpt" role="test" />
<file name="commit_002.phpt" role="test" />
<file name="conn_attr.inc" role="test" />
<file name="CONFLICTS" role="test" />
<file name="conn_attr_1.phpt" role="test" />
<file name="conn_attr_2.phpt" role="test" />
<file name="conn_attr_3.phpt" role="test" />
<file name="conn_attr_4.phpt" role="test" />
<file name="conn_attr_5.phpt" role="test" />
<file name="conn_attr.inc" role="test" />
<file name="connect_1.phpt" role="test" />
<file name="connect.inc" role="test" />
<file name="connect.phpt" role="test" />
<file name="connect_1.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" />
@@ -219,20 +218,19 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="connect_scope_try5.phpt" role="test" />
<file name="connect_scope_try6.phpt" role="test" />
<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.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="cursor_bind.phpt" role="test" />
<file name="cursors.phpt" role="test" />
<file name="dbmsoutput.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="default_prefetch0.phpt" role="test" />
<file name="default_prefetch1.phpt" role="test" />
<file name="default_prefetch2.phpt" role="test" />
<file name="define.phpt" role="test" />
<file name="define0.phpt" role="test" />
<file name="define1.phpt" role="test" />
<file name="define2.phpt" role="test" />
@@ -240,6 +238,7 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="define4.phpt" role="test" />
<file name="define5.phpt" role="test" />
<file name="define6.phpt" role="test" />
<file name="define.phpt" role="test" />
<file name="descriptors.phpt" role="test" />
<file name="details.inc" role="test" />
<file name="drcp_cclass1.phpt" role="test" />
@@ -258,21 +257,21 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="drcp_scope3.phpt" role="test" />
<file name="drcp_scope4.phpt" role="test" />
<file name="drcp_scope5.phpt" role="test" />
<file name="driver_name.phpt" role="test" />
<file name="driver_name_11gR2.phpt" role="test" />
<file name="driver_name.phpt" role="test" />
<file name="drop_table.inc" role="test" />
<file name="drop_type.inc" role="test" />
<file name="dupcolnames.phpt" role="test" />
<file name="edition_1.phpt" role="test" />
<file name="edition_2.phpt" role="test" />
<file name="error.phpt" role="test" />
<file name="error1.phpt" role="test" />
<file name="error2.phpt" role="test" />
<file name="error3.phpt" role="test" />
<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_bind.phpt" role="test" />
<file name="error_parse.phpt" role="test" />
<file name="error.phpt" role="test" />
<file name="error_set.phpt" role="test" />
<file name="exec_fetch.phpt" role="test" />
<file name="execute_mode.phpt" role="test" />
@@ -281,7 +280,6 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="extauth_02.phpt" role="test" />
<file name="extauth_03.phpt" role="test" />
<file name="extauth_04.phpt" role="test" />
<file name="fetch.phpt" role="test" />
<file name="fetch_all1.phpt" role="test" />
<file name="fetch_all2.phpt" role="test" />
<file name="fetch_all3.phpt" role="test" />
@@ -289,14 +287,15 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="fetch_all5.phpt" role="test" />
<file name="fetch_array.phpt" role="test" />
<file name="fetch_assoc.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" />
<file name="fetch_object.phpt" role="test" />
<file name="fetch.phpt" role="test" />
<file name="fetch_row.phpt" role="test" />
<file name="field_funcs.phpt" role="test" />
<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.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" />
@@ -375,33 +374,33 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="lob_044.phpt" role="test" />
<file name="lob_aliases.phpt" role="test" />
<file name="lob_null.phpt" role="test" />
<file name="lob_prefetch.phpt" role="test" />
<file name="lob_prefetch_ini.phpt" role="test" />
<file name="lob_temp.phpt" role="test" />
<file name="lob_prefetch.phpt" role="test" />
<file name="lob_temp1.phpt" role="test" />
<file name="lob_temp2.phpt" role="test" />
<file name="lob_temp.phpt" role="test" />
<file name="minfo.phpt" role="test" />
<file name="null_byte_1.phpt" role="test" />
<file name="null_byte_2.phpt" role="test" />
<file name="null_byte_3.phpt" role="test" />
<file name="num.phpt" role="test" />
<file name="oci_execute_segfault.phpt" role="test" />
<file name="old_oci_close.phpt" role="test" />
<file name="old_oci_close1.phpt" role="test" />
<file name="password.phpt" role="test" />
<file name="old_oci_close.phpt" role="test" />
<file name="password_2.phpt" role="test" />
<file name="password_new.phpt" role="test" />
<file name="pecl_bug10194.phpt" role="test" />
<file name="pecl_bug10194_blob.phpt" role="test" />
<file name="password.phpt" role="test" />
<file name="pecl_bug10194_blob_64.phpt" role="test" />
<file name="pecl_bug10194_blob.phpt" role="test" />
<file name="pecl_bug10194.phpt" role="test" />
<file name="pecl_bug16035.phpt" role="test" />
<file name="pecl_bug16842.phpt" role="test" />
<file name="pecl_bug6109.phpt" role="test" />
<file name="pecl_bug8816.phpt" role="test" />
<file name="persistent.phpt" role="test" />
<file name="prefetch.phpt" role="test" />
<file name="privileged_connect.phpt" role="test" />
<file name="privileged_connect1.phpt" role="test" />
<file name="privileged_connect.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" />
@@ -412,8 +411,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
<file name="statement_cache.phpt" role="test" />
<file name="statement_type.phpt" role="test" />
<file name="test.gif" role="test" />
<file name="test.txt" role="test" />
<file name="testping.phpt" role="test" />
<file name="test.txt" role="test" />
<file name="uncommitted.phpt" role="test" />
<file name="xmltype_01.phpt" role="test" />
<file name="xmltype_02.phpt" role="test" />
@@ -452,6 +451,23 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
</extsrcrelease>
<changelog>
<release>
<version>
<release>3.2.1</release>
<api>3.2.1</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 8.1 only.
Requires Oracle Client libraries from 11.2 or later.
</notes>
</release>
<release>
<version>
<release>3.2.0</release>

2
ext/oci8/php_oci8.h
View File

@@ -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

6
ext/oci8/tests/driver_name.phpt
View File

@@ -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