Skip to content

Commit 74ca2a3

Browse files
cjbjcjbj
committed
Rename OCI8 classes to use standard names so arg stub parsing works
1 parent 8058776 commit 74ca2a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+118
-113
lines changed

‎ext/oci8/oci8.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ PHP_MINIT_FUNCTION(oci)
291291
le_descriptor = zend_register_list_destructors_ex(php_oci_descriptor_list_dtor, NULL, "oci8 descriptor", module_number);
292292
le_collection = zend_register_list_destructors_ex(php_oci_collection_list_dtor, NULL, "oci8 collection", module_number);
293293

294-
INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", class_OCI_Lob_methods);
295-
INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI-Collection", class_OCI_Collection_methods);
294+
INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI_Lob", class_OCI_Lob_methods);
295+
INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI_Collection", class_OCI_Collection_methods);
296296

297297
oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry);
298298
oci_coll_class_entry_ptr = zend_register_internal_class(&oci_coll_class_entry);

‎ext/oci8/package.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
7272

7373
Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
7474

75+
The OCI-Lob class is now called OCI_Lob.
76+
77+
The OCI-Collection calls is now called OCI_Collection.
78+
7579
Generate arginfo from function stubs. (Jens de Nies)
7680
</notes>
7781
<contents>

‎ext/oci8/tests/bug35973.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ echo "Done\n";
3636
--EXPECTF--
3737
array(1) {
3838
["NC"]=>
39-
object(OCI-Lob)#%d (1) {
39+
object(OCI_Lob)#%d (1) {
4040
["descriptor"]=>
4141
resource(%d) of type (oci8 descriptor)
4242
}

‎ext/oci8/tests/bug44008.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #44008 (Incorrect usage of OCI-Lob->close crashes PHP)
2+
Bug #44008 (Incorrect usage of OCI_Lob->close crashes PHP)
33
--SKIPIF--
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
@@ -30,7 +30,7 @@ $r = $textLob->load();
3030
echo "$r\n";
3131

3232
// Incorrectly closing the lob doesn't cause a crash.
33-
// OCI-LOB->close() is documented for use only with OCI-Lob->writeTemporary()
33+
// OCI-LOB->close() is documented for use only with OCI_Lob->writeTemporary()
3434
$textLob->close();
3535

3636
// Cleanup

‎ext/oci8/tests/coll_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require __DIR__."/drop_type.inc";
2020

2121
?>
2222
--EXPECTF--
23-
object(OCI-Collection)#%d (1) {
23+
object(OCI_Collection)#%d (1) {
2424
["collection"]=>
2525
resource(%d) of type (oci8 collection)
2626
}

‎ext/oci8/tests/coll_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ require __DIR__."/drop_type.inc";
2828

2929
?>
3030
--EXPECTF--
31-
object(OCI-Collection)#%d (1) {
31+
object(OCI_Collection)#%d (1) {
3232
["collection"]=>
3333
resource(%d) of type (oci8 collection)
3434
}
3535
bool(true)
36-
string(%d) "OCI-Collection::size(): supplied resource is not a valid oci8 collection resource"
36+
string(%d) "OCI_Collection::size(): supplied resource is not a valid oci8 collection resource"
3737

3838
Warning: oci_new_collection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
3939
bool(false)

‎ext/oci8/tests/coll_002_func.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require __DIR__."/drop_type.inc";
2727

2828
?>
2929
--EXPECTF--
30-
object(OCI-Collection)#%d (1) {
30+
object(OCI_Collection)#%d (1) {
3131
["collection"]=>
3232
resource(%d) of type (oci8 collection)
3333
}

‎ext/oci8/tests/coll_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require __DIR__."/drop_type.inc";
2929
int(0)
3030
int(0)
3131

32-
Warning: OCI-Collection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
32+
Warning: OCI_Collection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
3333
bool(false)
3434
bool(true)
3535
float(1)

‎ext/oci8/tests/coll_009.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require __DIR__."/drop_type.inc";
3838

3939
?>
4040
--EXPECTF--
41-
Warning: OCI-Collection::append(): OCI-01861: literal does not match format string in %s on line %d
41+
Warning: OCI_Collection::append(): OCI-01861: literal does not match format string in %s on line %d
4242
bool(false)
4343
bool(true)
4444
bool(false)

‎ext/oci8/tests/coll_016.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ require __DIR__."/drop_type.inc";
4040
--EXPECTF--
4141
bool(true)
4242

43-
Warning: OCI-Collection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
43+
Warning: OCI_Collection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
4444
bool(false)
4545

46-
Warning: OCI-Collection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
46+
Warning: OCI_Collection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
4747
bool(false)
4848
bool(false)
4949
bool(false)

0 commit comments

Comments
 (0)