Skip to content

Commit b06a6b8

Browse files
cjbjcjbj
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Bump OCI8 version to make a PECL release for 8.2
2 parents 4af95b7 + 05467b9 commit b06a6b8

File tree

5 files changed

+75
-57
lines changed

5 files changed

+75
-57
lines changed

‎ext/oci8/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Use the OCI8 extension to access Oracle Database.
44

55
Documentation is at https://www.php.net/oci8
66

7-
Use `pecl install oci8` to install for PHP 8.
7+
Use `pecl install oci8` to install for PHP 8.2.
88

9-
Use `pecl install oci8-2.2.0` to install for PHP 7.
9+
Use `pecl install oci8-3.2.1` to install for PHP 8.1.
1010

11-
Use `pecl install oci8-2.0.12` to install for PHP 5.2 - PHP 5.6.
11+
Use `pecl install oci8-3.0.1` to install for PHP 8.0.
1212

13-
Use `pecl install oci8-1.4.10` to install for PHP 4.3.9 - PHP 5.1.
13+
Use `pecl install oci8-2.2.0` to install for PHP 7.
1414

1515
The OCI8 extension can be linked with Oracle client libraries from Oracle
16-
Database 10.2 or later. These libraries are found in your database
16+
Database 11.2 or later. These libraries are found in your database
1717
installation, or in the free Oracle Instant Client from
1818
https://www.oracle.com/database/technologies/instant-client.html
1919
Install the 'Basic' or 'Basic Light' Instant Client package. If building from

‎ext/oci8/oci8.c

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#error Use PHP OCI8 2.2 for your version of PHP
5252
#elif PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION < 1
5353
#error Use PHP OCI8 3.0 for your version of PHP
54+
#elif PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION < 2
55+
#error Use PHP OCI8 3.2 for your version of PHP
5456
#endif
5557

5658
#include "php_oci8.h"

‎ext/oci8/package.xml

+64-48
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
1010
<description>
1111
The OCI8 extension lets you access Oracle Database.
1212

13-
Use 'pecl install oci8' to install for PHP 8.1.
13+
Use 'pecl install oci8' to install for PHP 8.2.
14+
15+
Use 'pecl install oci8-3.2.1' to install for PHP 8.1.
1416

1517
Use 'pecl install oci8-3.0.1' to install for PHP 8.0.
1618

1719
Use 'pecl install oci8-2.2.0' to install for PHP 7.
1820

19-
Use 'pecl install oci8-2.0.12' to install for PHP 5.2 - PHP 5.6.
20-
21-
Use 'pecl install oci8-1.4.10' to install for PHP 4.3.9 - PHP 5.1.
22-
2321
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.
2422

2523
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,20 +53,20 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
5553
<active>no</active>
5654
</lead>
5755

58-
<date>2021-12-12</date>
56+
<date>2023-04-22</date>
5957
<time>12:00:00</time>
6058

6159
<version>
62-
<release>3.2.1</release>
63-
<api>3.2.1</api>
60+
<release>3.3.0</release>
61+
<api>3.3.0</api>
6462
</version>
6563
<stability>
6664
<release>stable</release>
6765
<api>stable</api>
6866
</stability>
6967
<license uri="http://www.php.net/license">PHP</license>
7068
<notes>
71-
This version is for PHP 8.1 only.
69+
This version is for PHP 8.2 only.
7270

7371
Requires Oracle Client libraries from 11.2 or later.
7472
</notes>
@@ -91,14 +89,14 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
9189
<file name="array_bind_014.phpt" role="test" />
9290
<file name="array_bind_bdouble.phpt" role="test" />
9391
<file name="array_bind_bfloat.phpt" role="test" />
94-
<file name="array_bind_date.phpt" role="test" />
9592
<file name="array_bind_date1.phpt" role="test" />
96-
<file name="array_bind_float.phpt" role="test" />
93+
<file name="array_bind_date.phpt" role="test" />
9794
<file name="array_bind_float1.phpt" role="test" />
98-
<file name="array_bind_int.phpt" role="test" />
95+
<file name="array_bind_float.phpt" role="test" />
9996
<file name="array_bind_int1.phpt" role="test" />
100-
<file name="array_bind_str.phpt" role="test" />
97+
<file name="array_bind_int.phpt" role="test" />
10198
<file name="array_bind_str1.phpt" role="test" />
99+
<file name="array_bind_str.phpt" role="test" />
102100
<file name="array_bind_uin.phpt" role="test" />
103101
<file name="b47243_1.phpt" role="test" />
104102
<file name="b47243_2.phpt" role="test" />
@@ -111,12 +109,12 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
111109
<file name="bind_empty.phpt" role="test" />
112110
<file name="bind_long.phpt" role="test" />
113111
<file name="bind_long_raw.phpt" role="test" />
114-
<file name="bind_misccoltypes.phpt" role="test" />
115112
<file name="bind_misccoltypes_errs.phpt" role="test" />
113+
<file name="bind_misccoltypes.phpt" role="test" />
116114
<file name="bind_number.phpt" role="test" />
117115
<file name="bind_query.phpt" role="test" />
118-
<file name="bind_raw.phpt" role="test" />
119116
<file name="bind_raw_2.phpt" role="test" />
117+
<file name="bind_raw.phpt" role="test" />
120118
<file name="bind_rowid.phpt" role="test" />
121119
<file name="bind_sqltafc.phpt" role="test" />
122120
<file name="bind_sqltchr_1.phpt" role="test" />
@@ -148,8 +146,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
148146
<file name="bug42496_1.phpt" role="test" />
149147
<file name="bug42496_2.phpt" role="test" />
150148
<file name="bug42841.phpt" role="test" />
151-
<file name="bug43492.phpt" role="test" />
152149
<file name="bug43492_2.phpt" role="test" />
150+
<file name="bug43492.phpt" role="test" />
153151
<file name="bug43497.phpt" role="test" />
154152
<file name="bug44008.phpt" role="test" />
155153
<file name="bug44113.phpt" role="test" />
@@ -173,43 +171,44 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
173171
<file name="clientversion.phpt" role="test" />
174172
<file name="close.phpt" role="test" />
175173
<file name="coll_001.phpt" role="test" />
176-
<file name="coll_002.phpt" role="test" />
177174
<file name="coll_002_func.phpt" role="test" />
178-
<file name="coll_003.phpt" role="test" />
175+
<file name="coll_002.phpt" role="test" />
179176
<file name="coll_003_func.phpt" role="test" />
180-
<file name="coll_004.phpt" role="test" />
177+
<file name="coll_003.phpt" role="test" />
181178
<file name="coll_004_func.phpt" role="test" />
182-
<file name="coll_009.phpt" role="test" />
179+
<file name="coll_004.phpt" role="test" />
183180
<file name="coll_009_func.phpt" role="test" />
184-
<file name="coll_010.phpt" role="test" />
181+
<file name="coll_009.phpt" role="test" />
185182
<file name="coll_010_func.phpt" role="test" />
186-
<file name="coll_011.phpt" role="test" />
183+
<file name="coll_010.phpt" role="test" />
187184
<file name="coll_011_func.phpt" role="test" />
188-
<file name="coll_012.phpt" role="test" />
185+
<file name="coll_011.phpt" role="test" />
189186
<file name="coll_012_func.phpt" role="test" />
190-
<file name="coll_013.phpt" role="test" />
187+
<file name="coll_012.phpt" role="test" />
191188
<file name="coll_013_func.phpt" role="test" />
192-
<file name="coll_014.phpt" role="test" />
189+
<file name="coll_013.phpt" role="test" />
193190
<file name="coll_014_func.phpt" role="test" />
194-
<file name="coll_015.phpt" role="test" />
191+
<file name="coll_014.phpt" role="test" />
195192
<file name="coll_015_func.phpt" role="test" />
196-
<file name="coll_016.phpt" role="test" />
193+
<file name="coll_015.phpt" role="test" />
197194
<file name="coll_016_func.phpt" role="test" />
198-
<file name="coll_017.phpt" role="test" />
195+
<file name="coll_016.phpt" role="test" />
199196
<file name="coll_017_func.phpt" role="test" />
197+
<file name="coll_017.phpt" role="test" />
200198
<file name="coll_018.phpt" role="test" />
201199
<file name="coll_019.phpt" role="test" />
202200
<file name="commit_001.phpt" role="test" />
203201
<file name="commit_002.phpt" role="test" />
204-
<file name="conn_attr.inc" role="test" />
202+
<file name="CONFLICTS" role="test" />
205203
<file name="conn_attr_1.phpt" role="test" />
206204
<file name="conn_attr_2.phpt" role="test" />
207205
<file name="conn_attr_3.phpt" role="test" />
208206
<file name="conn_attr_4.phpt" role="test" />
209207
<file name="conn_attr_5.phpt" role="test" />
208+
<file name="conn_attr.inc" role="test" />
209+
<file name="connect_1.phpt" role="test" />
210210
<file name="connect.inc" role="test" />
211211
<file name="connect.phpt" role="test" />
212-
<file name="connect_1.phpt" role="test" />
213212
<file name="connect_scope1.phpt" role="test" />
214213
<file name="connect_scope2.phpt" role="test" />
215214
<file name="connect_scope_try1.phpt" role="test" />
@@ -219,27 +218,27 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
219218
<file name="connect_scope_try5.phpt" role="test" />
220219
<file name="connect_scope_try6.phpt" role="test" />
221220
<file name="connect_with_charset_001.phpt" role="test" />
222-
<file name="connect_without_oracle_home.phpt" role="test" />
223221
<file name="connect_without_oracle_home_11.phpt" role="test" />
222+
<file name="connect_without_oracle_home.phpt" role="test" />
224223
<file name="create_table.inc" role="test" />
225224
<file name="create_type.inc" role="test" />
226-
<file name="cursor_bind.phpt" role="test" />
227225
<file name="cursor_bind_err.phpt" role="test" />
226+
<file name="cursor_bind.phpt" role="test" />
228227
<file name="cursors.phpt" role="test" />
228+
<file name="dbmsoutput.phpt" role="test" />
229229
<file name="db_op_1.phpt" role="test" />
230230
<file name="db_op_2.phpt" role="test" />
231-
<file name="dbmsoutput.phpt" role="test" />
232231
<file name="default_prefetch0.phpt" role="test" />
233232
<file name="default_prefetch1.phpt" role="test" />
234233
<file name="default_prefetch2.phpt" role="test" />
235-
<file name="define.phpt" role="test" />
236234
<file name="define0.phpt" role="test" />
237235
<file name="define1.phpt" role="test" />
238236
<file name="define2.phpt" role="test" />
239237
<file name="define3.phpt" role="test" />
240238
<file name="define4.phpt" role="test" />
241239
<file name="define5.phpt" role="test" />
242240
<file name="define6.phpt" role="test" />
241+
<file name="define.phpt" role="test" />
243242
<file name="descriptors.phpt" role="test" />
244243
<file name="details.inc" role="test" />
245244
<file name="drcp_cclass1.phpt" role="test" />
@@ -258,21 +257,21 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
258257
<file name="drcp_scope3.phpt" role="test" />
259258
<file name="drcp_scope4.phpt" role="test" />
260259
<file name="drcp_scope5.phpt" role="test" />
261-
<file name="driver_name.phpt" role="test" />
262260
<file name="driver_name_11gR2.phpt" role="test" />
261+
<file name="driver_name.phpt" role="test" />
263262
<file name="drop_table.inc" role="test" />
264263
<file name="drop_type.inc" role="test" />
265264
<file name="dupcolnames.phpt" role="test" />
266265
<file name="edition_1.phpt" role="test" />
267266
<file name="edition_2.phpt" role="test" />
268-
<file name="error.phpt" role="test" />
269267
<file name="error1.phpt" role="test" />
270268
<file name="error2.phpt" role="test" />
271269
<file name="error3.phpt" role="test" />
272-
<file name="error_bind.phpt" role="test" />
273270
<file name="error_bind_2.phpt" role="test" />
274271
<file name="error_bind_3.phpt" role="test" />
272+
<file name="error_bind.phpt" role="test" />
275273
<file name="error_parse.phpt" role="test" />
274+
<file name="error.phpt" role="test" />
276275
<file name="error_set.phpt" role="test" />
277276
<file name="exec_fetch.phpt" role="test" />
278277
<file name="execute_mode.phpt" role="test" />
@@ -281,22 +280,22 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
281280
<file name="extauth_02.phpt" role="test" />
282281
<file name="extauth_03.phpt" role="test" />
283282
<file name="extauth_04.phpt" role="test" />
284-
<file name="fetch.phpt" role="test" />
285283
<file name="fetch_all1.phpt" role="test" />
286284
<file name="fetch_all2.phpt" role="test" />
287285
<file name="fetch_all3.phpt" role="test" />
288286
<file name="fetch_all4.phpt" role="test" />
289287
<file name="fetch_all5.phpt" role="test" />
290288
<file name="fetch_array.phpt" role="test" />
291289
<file name="fetch_assoc.phpt" role="test" />
292-
<file name="fetch_object.phpt" role="test" />
293290
<file name="fetch_object_1.phpt" role="test" />
294291
<file name="fetch_object_2.phpt" role="test" />
292+
<file name="fetch_object.phpt" role="test" />
293+
<file name="fetch.phpt" role="test" />
295294
<file name="fetch_row.phpt" role="test" />
296-
<file name="field_funcs.phpt" role="test" />
297295
<file name="field_funcs1.phpt" role="test" />
298296
<file name="field_funcs2.phpt" role="test" />
299297
<file name="field_funcs3.phpt" role="test" />
298+
<file name="field_funcs.phpt" role="test" />
300299
<file name="imp_res_1.phpt" role="test" />
301300
<file name="imp_res_2.phpt" role="test" />
302301
<file name="imp_res_3.phpt" role="test" />
@@ -375,33 +374,33 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
375374
<file name="lob_044.phpt" role="test" />
376375
<file name="lob_aliases.phpt" role="test" />
377376
<file name="lob_null.phpt" role="test" />
378-
<file name="lob_prefetch.phpt" role="test" />
379377
<file name="lob_prefetch_ini.phpt" role="test" />
380-
<file name="lob_temp.phpt" role="test" />
378+
<file name="lob_prefetch.phpt" role="test" />
381379
<file name="lob_temp1.phpt" role="test" />
382380
<file name="lob_temp2.phpt" role="test" />
381+
<file name="lob_temp.phpt" role="test" />
383382
<file name="minfo.phpt" role="test" />
384383
<file name="null_byte_1.phpt" role="test" />
385384
<file name="null_byte_2.phpt" role="test" />
386385
<file name="null_byte_3.phpt" role="test" />
387386
<file name="num.phpt" role="test" />
388387
<file name="oci_execute_segfault.phpt" role="test" />
389-
<file name="old_oci_close.phpt" role="test" />
390388
<file name="old_oci_close1.phpt" role="test" />
391-
<file name="password.phpt" role="test" />
389+
<file name="old_oci_close.phpt" role="test" />
392390
<file name="password_2.phpt" role="test" />
393391
<file name="password_new.phpt" role="test" />
394-
<file name="pecl_bug10194.phpt" role="test" />
395-
<file name="pecl_bug10194_blob.phpt" role="test" />
392+
<file name="password.phpt" role="test" />
396393
<file name="pecl_bug10194_blob_64.phpt" role="test" />
394+
<file name="pecl_bug10194_blob.phpt" role="test" />
395+
<file name="pecl_bug10194.phpt" role="test" />
397396
<file name="pecl_bug16035.phpt" role="test" />
398397
<file name="pecl_bug16842.phpt" role="test" />
399398
<file name="pecl_bug6109.phpt" role="test" />
400399
<file name="pecl_bug8816.phpt" role="test" />
401400
<file name="persistent.phpt" role="test" />
402401
<file name="prefetch.phpt" role="test" />
403-
<file name="privileged_connect.phpt" role="test" />
404402
<file name="privileged_connect1.phpt" role="test" />
403+
<file name="privileged_connect.phpt" role="test" />
405404
<file name="refcur_prefetch_1.phpt" role="test" />
406405
<file name="refcur_prefetch_2.phpt" role="test" />
407406
<file name="refcur_prefetch_3.phpt" role="test" />
@@ -412,8 +411,8 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
412411
<file name="statement_cache.phpt" role="test" />
413412
<file name="statement_type.phpt" role="test" />
414413
<file name="test.gif" role="test" />
415-
<file name="test.txt" role="test" />
416414
<file name="testping.phpt" role="test" />
415+
<file name="test.txt" role="test" />
417416
<file name="uncommitted.phpt" role="test" />
418417
<file name="xmltype_01.phpt" role="test" />
419418
<file name="xmltype_02.phpt" role="test" />
@@ -452,6 +451,23 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
452451
</extsrcrelease>
453452
<changelog>
454453

454+
<release>
455+
<version>
456+
<release>3.2.1</release>
457+
<api>3.2.1</api>
458+
</version>
459+
<stability>
460+
<release>stable</release>
461+
<api>stable</api>
462+
</stability>
463+
<license uri="http://www.php.net/license">PHP</license>
464+
<notes>
465+
This version is for PHP 8.1 only.
466+
467+
Requires Oracle Client libraries from 11.2 or later.
468+
</notes>
469+
</release>
470+
455471
<release>
456472
<version>
457473
<release>3.2.0</release>

‎ext/oci8/php_oci8.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
#undef PHP_OCI8_VERSION
4242
#endif
43-
#define PHP_OCI8_VERSION "3.2.1"
43+
#define PHP_OCI8_VERSION "3.3.0"
4444

4545
extern zend_module_entry oci8_module_entry;
4646
#define phpext_oci8_ptr &oci8_module_entry

‎ext/oci8/tests/driver_name.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ function get_attr($conn)
5757
?>
5858
--EXPECT--
5959
**Test 1.1 - Default values for the attribute **************
60-
The value of DRIVER_NAME is PHP OCI8 : 3.2.1
60+
The value of DRIVER_NAME is PHP OCI8 : 3.3.0
6161

6262
***Test 1.2 - Get the values from different connections **************
6363
Testing with oci_pconnect()
64-
The value of DRIVER_NAME is PHP OCI8 : 3.2.1
64+
The value of DRIVER_NAME is PHP OCI8 : 3.3.0
6565
Testing with oci_new_connect()
66-
The value of DRIVER_NAME is PHP OCI8 : 3.2.1
66+
The value of DRIVER_NAME is PHP OCI8 : 3.3.0
6767
Done

0 commit comments

Comments
 (0)