Skip to content

Commit 8058776

Browse files
cjbjcjbj
committed
Bump OCI8 version to 3.0 so a PHP 8 PECL release can be made
1 parent 59536d5 commit 8058776

File tree

4 files changed

+54
-51
lines changed

4 files changed

+54
-51
lines changed

‎ext/oci8/oci8.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
#elif PHP_MAJOR_VERSION < 7
4242
/* PHP 7 is the minimum supported version for OCI8 2.1 */
4343
#error Use PHP OCI8 2.0 for your version of PHP
44+
#elif PHP_MAJOR_VERSION < 8
45+
/* PHP 8 is the minimum supported version for OCI8 3.0 */
46+
#error Use PHP OCI8 2.2 for your version of PHP
4447
#endif
4548

4649
#include "php_oci8.h"

‎ext/oci8/package.xml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ http://pear.php.net/dtd/package-2.0.xsd">
88
<summary>Extension for Oracle Database</summary>
99

1010
<description>
11-
Use the OCI8 extension to access Oracle Database. Use 'pecl install
12-
oci8' to install for PHP 7. Use 'pecl install oci8-2.0.12' to install
13-
for PHP 5.2 - PHP 5.6. Use 'pecl install oci8-1.4.10' to install for
14-
PHP 4.3.9 - PHP 5.1. The OCI8 extension can be linked with Oracle
15-
client libraries from Oracle Database 12, 11, or 10.2. These
16-
libraries are found in your database installation, or in the free
17-
Oracle Instant Client from
18-
http://www.oracle.com/technetwork/database/features/instant-client/.
19-
Oracle's standard cross-version connectivity applies. For example,
20-
PHP OCI8 linked with Instant Client 11.2 can connect to Oracle
21-
Database 9.2 onward. See Oracle's note "Oracle Client / Server
22-
Interoperability Support" (ID 207303.1) for details.
11+
The OCI8 extension let you access Oracle Database.
12+
13+
Use 'pecl install oci8' to install for PHP 8.
14+
15+
Use 'pecl install oci8-2.2.0' to install for PHP 7.
16+
17+
Use 'pecl install oci8-2.0.12' to install for PHP 5.2 - PHP 5.6.
18+
19+
Use 'pecl install oci8-1.4.10' to install for PHP 4.3.9 - PHP 5.1.
20+
21+
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.
22+
23+
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.
2324
</description>
2425
<lead>
2526
<name>Christopher Jones</name>
@@ -31,7 +32,7 @@ Interoperability Support" (ID 207303.1) for details.
3132
<name>Tianfang Yang</name>
3233
<user>tianfyan</user>
3334
<email>tianfyan@php.net</email>
34-
<active>yes</active>
35+
<active>no</active>
3536
</lead>
3637
<lead>
3738
<name>Antony Dovgal</name>
@@ -52,25 +53,26 @@ Interoperability Support" (ID 207303.1) for details.
5253
<active>no</active>
5354
</lead>
5455

55-
<date>2018-12-11</date>
56+
<date>2020-07-15</date>
5657
<time>12:00:00</time>
5758

5859
<version>
59-
<release>2.2.0</release>
60-
<api>2.2.0</api>
60+
<release>3.0.0</release>
61+
<api>3.0.0</api>
6162
</version>
6263
<stability>
6364
<release>stable</release>
6465
<api>stable</api>
6566
</stability>
6667
<license uri="http://www.php.net/license">PHP</license>
6768
<notes>
68-
This version is for PHP 7 only.
69-
Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later)
70-
Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later)
71-
Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
72-
Fixed installation on PHP 7.3.
73-
Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
69+
This version is for PHP 8 only.
70+
71+
Deprecated old OCI8 function aliases. (Jens de Nies)
72+
73+
Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
74+
75+
Generate arginfo from function stubs. (Jens de Nies)
7476
</notes>
7577
<contents>
7678
<dir name="/">
@@ -187,11 +189,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
187189
<file name="coll_003_func.phpt" role="test" />
188190
<file name="coll_004.phpt" role="test" />
189191
<file name="coll_004_func.phpt" role="test" />
190-
<file name="coll_005.phpt" role="test" />
191-
<file name="coll_006.phpt" role="test" />
192-
<file name="coll_006_func.phpt" role="test" />
193-
<file name="coll_007.phpt" role="test" />
194-
<file name="coll_008.phpt" role="test" />
195192
<file name="coll_009.phpt" role="test" />
196193
<file name="coll_009_func.phpt" role="test" />
197194
<file name="coll_010.phpt" role="test" />
@@ -214,7 +211,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
214211
<file name="coll_019.phpt" role="test" />
215212
<file name="commit_001.phpt" role="test" />
216213
<file name="commit_002.phpt" role="test" />
217-
<file name="commit_old.phpt" role="test" />
218214
<file name="conn_attr.inc" role="test" />
219215
<file name="conn_attr_1.phpt" role="test" />
220216
<file name="conn_attr_2.phpt" role="test" />
@@ -224,8 +220,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
224220
<file name="connect.inc" role="test" />
225221
<file name="connect.phpt" role="test" />
226222
<file name="connect_1.phpt" role="test" />
227-
<file name="connect_1_old.phpt" role="test" />
228-
<file name="connect_old.phpt" role="test" />
229223
<file name="connect_scope1.phpt" role="test" />
230224
<file name="connect_scope2.phpt" role="test" />
231225
<file name="connect_scope_try1.phpt" role="test" />
@@ -237,18 +231,14 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
237231
<file name="connect_with_charset_001.phpt" role="test" />
238232
<file name="connect_without_oracle_home.phpt" role="test" />
239233
<file name="connect_without_oracle_home_11.phpt" role="test" />
240-
<file name="connect_without_oracle_home_old.phpt" role="test" />
241-
<file name="connect_without_oracle_home_old_11.phpt" role="test" />
242234
<file name="create_table.inc" role="test" />
243235
<file name="create_type.inc" role="test" />
244236
<file name="cursor_bind.phpt" role="test" />
245237
<file name="cursor_bind_err.phpt" role="test" />
246238
<file name="cursors.phpt" role="test" />
247-
<file name="cursors_old.phpt" role="test" />
248239
<file name="db_op_1.phpt" role="test" />
249240
<file name="db_op_2.phpt" role="test" />
250241
<file name="dbmsoutput.phpt" role="test" />
251-
<file name="debug.phpt" role="test" />
252242
<file name="default_prefetch0.phpt" role="test" />
253243
<file name="default_prefetch1.phpt" role="test" />
254244
<file name="default_prefetch2.phpt" role="test" />
@@ -260,7 +250,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
260250
<file name="define4.phpt" role="test" />
261251
<file name="define5.phpt" role="test" />
262252
<file name="define6.phpt" role="test" />
263-
<file name="define_old.phpt" role="test" />
264253
<file name="descriptors.phpt" role="test" />
265254
<file name="details.inc" role="test" />
266255
<file name="drcp_cclass1.phpt" role="test" />
@@ -293,11 +282,11 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
293282
<file name="error_bind.phpt" role="test" />
294283
<file name="error_bind_2.phpt" role="test" />
295284
<file name="error_bind_3.phpt" role="test" />
296-
<file name="error_old.phpt" role="test" />
297285
<file name="error_parse.phpt" role="test" />
298286
<file name="error_set.phpt" role="test" />
299287
<file name="exec_fetch.phpt" role="test" />
300288
<file name="execute_mode.phpt" role="test" />
289+
<file name="existence_aliases.phpt" role="test" />
301290
<file name="extauth_01.phpt" role="test" />
302291
<file name="extauth_02.phpt" role="test" />
303292
<file name="extauth_03.phpt" role="test" />
@@ -310,9 +299,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
310299
<file name="fetch_all5.phpt" role="test" />
311300
<file name="fetch_array.phpt" role="test" />
312301
<file name="fetch_assoc.phpt" role="test" />
313-
<file name="fetch_into.phpt" role="test" />
314-
<file name="fetch_into1.phpt" role="test" />
315-
<file name="fetch_into2.phpt" role="test" />
316302
<file name="fetch_object.phpt" role="test" />
317303
<file name="fetch_object_1.phpt" role="test" />
318304
<file name="fetch_object_2.phpt" role="test" />
@@ -321,8 +307,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
321307
<file name="field_funcs1.phpt" role="test" />
322308
<file name="field_funcs2.phpt" role="test" />
323309
<file name="field_funcs3.phpt" role="test" />
324-
<file name="field_funcs_old.phpt" role="test" />
325-
<file name="function_aliases.phpt" role="test" />
326310
<file name="imp_res_1.phpt" role="test" />
327311
<file name="imp_res_2.phpt" role="test" />
328312
<file name="imp_res_3.phpt" role="test" />
@@ -370,7 +354,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
370354
<file name="lob_012.phpt" role="test" />
371355
<file name="lob_013.phpt" role="test" />
372356
<file name="lob_014.phpt" role="test" />
373-
<file name="lob_015.phpt" role="test" />
374357
<file name="lob_016.phpt" role="test" />
375358
<file name="lob_017.phpt" role="test" />
376359
<file name="lob_018.phpt" role="test" />
@@ -416,7 +399,6 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
416399
<file name="password.phpt" role="test" />
417400
<file name="password_2.phpt" role="test" />
418401
<file name="password_new.phpt" role="test" />
419-
<file name="password_old.phpt" role="test" />
420402
<file name="pecl_bug10194.phpt" role="test" />
421403
<file name="pecl_bug10194_blob.phpt" role="test" />
422404
<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
426408
<file name="pecl_bug8816.phpt" role="test" />
427409
<file name="persistent.phpt" role="test" />
428410
<file name="prefetch.phpt" role="test" />
429-
<file name="prefetch_old.phpt" role="test" />
430411
<file name="privileged_connect.phpt" role="test" />
431412
<file name="privileged_connect1.phpt" role="test" />
432413
<file name="refcur_prefetch_1.phpt" role="test" />
433414
<file name="refcur_prefetch_2.phpt" role="test" />
434415
<file name="refcur_prefetch_3.phpt" role="test" />
435416
<file name="refcur_prefetch_4.phpt" role="test" />
436-
<file name="reflection1.phpt" role="test" />
437-
<file name="reflection2.phpt" role="test" />
438417
<file name="select_null.phpt" role="test" />
439418
<file name="serverversion.phpt" role="test" />
440419
<file name="skipif.inc" role="test" />
441420
<file name="statement_cache.phpt" role="test" />
442421
<file name="statement_type.phpt" role="test" />
443-
<file name="statement_type_old.phpt" role="test" />
444422
<file name="test.gif" role="test" />
445423
<file name="test.txt" role="test" />
446424
<file name="testping.phpt" role="test" />
@@ -461,6 +439,8 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
461439
<file name="oci8_failover.c" role="src" />
462440
<file name="php_oci8.h" role="src" />
463441
<file name="php_oci8_int.h" role="src" />
442+
<file name="oci8.stub.php" role="src" />
443+
<file name="oci8_arginfo.h" role="src" />
464444
<file name="README.md" role="doc" />
465445
</dir> <!-- / -->
466446
</contents>
@@ -480,6 +460,26 @@ Internal change: Convert some parameter parsing to the Fast Parameter Parsing AP
480460
</extsrcrelease>
481461
<changelog>
482462

463+
<release>
464+
<version>
465+
<release>2.2.0</release>
466+
<api>2.2.0</api>
467+
</version>
468+
<stability>
469+
<release>stable</release>
470+
<api>stable</api>
471+
</stability>
472+
<license uri="http://www.php.net/license">PHP</license>
473+
<notes>
474+
This version is for PHP 7 only.
475+
Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later)
476+
Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later)
477+
Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
478+
Fixed installation on PHP 7.3.
479+
Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
480+
</notes>
481+
</release>
482+
483483
<release>
484484
<version>
485485
<release>2.1.8</release>

‎ext/oci8/php_oci8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
#undef PHP_OCI8_VERSION
4343
#endif
44-
#define PHP_OCI8_VERSION "2.2.0"
44+
#define PHP_OCI8_VERSION "3.0.0"
4545

4646
extern zend_module_entry oci8_module_entry;
4747
#define phpext_oci8_ptr &oci8_module_entry

‎ext/oci8/tests/driver_name.phpt

Lines changed: 3 additions & 3 deletions
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 : 2.2.0
60+
The value of DRIVER_NAME is PHP OCI8 : 3.0.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 : 2.2.0
64+
The value of DRIVER_NAME is PHP OCI8 : 3.0.0
6565
Testing with oci_new_connect()
66-
The value of DRIVER_NAME is PHP OCI8 : 2.2.0
66+
The value of DRIVER_NAME is PHP OCI8 : 3.0.0
6767
Done

0 commit comments

Comments
 (0)