Skip to content

Commit ff66e49

Browse files
author
Christopher Jones
committed
OCI8 classes were already renamed in 8; this now follows the new-new standard
1 parent 8095a0e commit ff66e49

Some content is hidden

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

46 files changed

+237
-234
lines changed

‎UPGRADING‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@ PHP 8.0 UPGRADE NOTES
381381
removed.
382382

383383
- OCI8:
384+
. The OCI-Lob class is now called OCILob, and the OCI-Collection class is now
385+
called OCICollection for name compliance enforced by PHP 8 arginfo
386+
type annotation tooling.
384387
. Several alias functions have been marked as deprecated.
385388
. oci_internal_debug() and its alias ociinternaldebug() have been removed.
386389

‎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, "OCILob", class_OCILob_methods);
295+
INIT_CLASS_ENTRY(oci_coll_class_entry, "OCICollection", class_OCICollection_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/oci8.stub.php‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,87 +36,87 @@ function ocibindbyname($statement_resource, string $column_name, &$variable, int
3636
*/
3737
function oci_bind_array_by_name($statement_resource, string $column_name, &$variable, int $maximum_array_length, int $maximum_item_length = -1, int $type = SQLT_AFC): bool {}
3838

39-
function oci_free_descriptor(OCI_Lob $lob_descriptor): bool {}
39+
function oci_free_descriptor(OCILob $lob_descriptor): bool {}
4040

4141
/**
4242
* @alias oci_free_descriptor
4343
* @deprecated
4444
*/
45-
function ocifreedesc(OCI_Lob $lob_descriptor): bool {}
45+
function ocifreedesc(OCILob $lob_descriptor): bool {}
4646

47-
function oci_lob_save(OCI_Lob $lob_descriptor, string $data, int $offset = 0): bool {}
47+
function oci_lob_save(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
4848

4949
/**
5050
* @alias oci_lob_save
5151
* @deprecated
5252
*/
53-
function ocisavelob(OCI_Lob $lob_descriptor, string $data, int $offset = 0): bool {}
53+
function ocisavelob(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
5454

55-
function oci_lob_import(OCI_Lob $lob_descriptor, string $filename): bool {}
55+
function oci_lob_import(OCILob $lob_descriptor, string $filename): bool {}
5656

5757
/**
5858
* @alias oci_lob_import
5959
* @deprecated
6060
*/
61-
function ocisavelobfile(OCI_Lob $lob_descriptor, string $filename): bool {}
61+
function ocisavelobfile(OCILob $lob_descriptor, string $filename): bool {}
6262

63-
function oci_lob_load(OCI_Lob $lob_descriptor): string|false {}
63+
function oci_lob_load(OCILob $lob_descriptor): string|false {}
6464

6565
/**
6666
* @alias oci_lob_load
6767
* @deprecated
6868
*/
69-
function ociloadlob(OCI_Lob $lob_descriptor): string|false {}
69+
function ociloadlob(OCILob $lob_descriptor): string|false {}
7070

71-
function oci_lob_read(OCI_Lob $lob_descriptor, int $length): string|false {}
71+
function oci_lob_read(OCILob $lob_descriptor, int $length): string|false {}
7272

73-
function oci_lob_eof(OCI_Lob $lob_descriptor): bool {}
73+
function oci_lob_eof(OCILob $lob_descriptor): bool {}
7474

75-
function oci_lob_tell(OCI_Lob $lob_descriptor): int|false {}
75+
function oci_lob_tell(OCILob $lob_descriptor): int|false {}
7676

77-
function oci_lob_rewind(OCI_Lob $lob_descriptor): bool {}
77+
function oci_lob_rewind(OCILob $lob_descriptor): bool {}
7878

79-
function oci_lob_seek(OCI_Lob $lob_descriptor, int $offset, int $whence = OCI_SEEK_SET): bool {}
79+
function oci_lob_seek(OCILob $lob_descriptor, int $offset, int $whence = OCI_SEEK_SET): bool {}
8080

81-
function oci_lob_size(OCI_Lob $lob_descriptor): int|false {}
81+
function oci_lob_size(OCILob $lob_descriptor): int|false {}
8282

83-
function oci_lob_write(OCI_Lob $lob_descriptor, string $string, int $length = UNKNOWN): int|false {}
83+
function oci_lob_write(OCILob $lob_descriptor, string $string, int $length = UNKNOWN): int|false {}
8484

85-
function oci_lob_append(OCI_Lob $lob_descriptor_to, OCI_Lob $lob_descriptor_from): bool {}
85+
function oci_lob_append(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from): bool {}
8686

87-
function oci_lob_truncate(OCI_Lob $lob_descriptor, int $length = 0): bool {}
87+
function oci_lob_truncate(OCILob $lob_descriptor, int $length = 0): bool {}
8888

89-
function oci_lob_erase(OCI_Lob $lob_descriptor, int $offset = UNKNOWN, int $length = UNKNOWN): int|false {}
89+
function oci_lob_erase(OCILob $lob_descriptor, int $offset = UNKNOWN, int $length = UNKNOWN): int|false {}
9090

91-
function oci_lob_flush(OCI_Lob $lob_descriptor, int $flag = 0): bool {}
91+
function oci_lob_flush(OCILob $lob_descriptor, int $flag = 0): bool {}
9292

93-
function ocisetbufferinglob(OCI_Lob $lob_descriptor, bool $mode): bool {}
93+
function ocisetbufferinglob(OCILob $lob_descriptor, bool $mode): bool {}
9494

95-
function ocigetbufferinglob(OCI_Lob $lob_descriptor): bool {}
95+
function ocigetbufferinglob(OCILob $lob_descriptor): bool {}
9696

97-
function oci_lob_copy(OCI_Lob $lob_descriptor_to, OCI_Lob $lob_descriptor_from, int $length = UNKNOWN): bool {}
97+
function oci_lob_copy(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from, int $length = UNKNOWN): bool {}
9898

99-
function oci_lob_is_equal(OCI_Lob $lob_descriptor_first, OCI_Lob $lob_descriptor_second): bool {}
99+
function oci_lob_is_equal(OCILob $lob_descriptor_first, OCILob $lob_descriptor_second): bool {}
100100

101-
function oci_lob_export(OCI_Lob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
101+
function oci_lob_export(OCILob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
102102

103103
/**
104104
* @alias oci_lob_export
105105
* @deprecated
106106
*/
107-
function ociwritelobtofile(OCI_Lob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
107+
function ociwritelobtofile(OCILob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
108108

109109
/**
110110
* @param resource $connection_resource
111111
*/
112-
function oci_new_descriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCI_Lob {}
112+
function oci_new_descriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
113113

114114
/**
115115
* @param resource $connection_resource
116116
* @alias oci_new_descriptor
117117
* @deprecated
118118
*/
119-
function ocinewdescriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCI_Lob {}
119+
function ocinewdescriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
120120

121121
/**
122122
* @param resource $connection_resource
@@ -542,75 +542,75 @@ function oci_num_rows($statement_resource): int|false {}
542542
*/
543543
function ocirowcount($statement_resource): int|false {}
544544

545-
function oci_free_collection(OCI_Collection $collection): bool {}
545+
function oci_free_collection(OCICollection $collection): bool {}
546546

547547
/**
548548
* @alias oci_free_collection
549549
* @deprecated
550550
*/
551-
function ocifreecollection(OCI_Collection $collection): bool {}
551+
function ocifreecollection(OCICollection $collection): bool {}
552552

553-
function oci_collection_append(OCI_Collection $collection, string $value): bool {}
553+
function oci_collection_append(OCICollection $collection, string $value): bool {}
554554

555555
/**
556556
* @alias oci_collection_append
557557
* @deprecated
558558
*/
559-
function ocicollappend(OCI_Collection $collection, string $value): bool {}
559+
function ocicollappend(OCICollection $collection, string $value): bool {}
560560

561-
function oci_collection_element_get(OCI_Collection $collection, int $index): string|float|null|false {}
561+
function oci_collection_element_get(OCICollection $collection, int $index): string|float|null|false {}
562562

563563
/**
564564
* @alias oci_collection_element_get
565565
* @deprecated
566566
*/
567-
function ocicollgetelem(OCI_Collection $collection, int $index): string|float|null|false {}
567+
function ocicollgetelem(OCICollection $collection, int $index): string|float|null|false {}
568568

569-
function oci_collection_assign(OCI_Collection $collection_to, OCI_Collection $collection_from): bool {}
569+
function oci_collection_assign(OCICollection $collection_to, OCICollection $collection_from): bool {}
570570

571-
function oci_collection_element_assign(OCI_Collection $collection, int $index, string $value): bool {}
571+
function oci_collection_element_assign(OCICollection $collection, int $index, string $value): bool {}
572572

573573
/**
574574
* @alias oci_collection_element_assign
575575
* @deprecated
576576
*/
577-
function ocicollassignelem(OCI_Collection $collection, int $index, string $value): bool {}
577+
function ocicollassignelem(OCICollection $collection, int $index, string $value): bool {}
578578

579-
function oci_collection_size(OCI_Collection $collection): int|false {}
579+
function oci_collection_size(OCICollection $collection): int|false {}
580580

581581
/**
582582
* @alias oci_collection_size
583583
* @deprecated
584584
*/
585-
function ocicollsize(OCI_Collection $collection): int|false {}
585+
function ocicollsize(OCICollection $collection): int|false {}
586586

587-
function oci_collection_max(OCI_Collection $collection): int|false {}
587+
function oci_collection_max(OCICollection $collection): int|false {}
588588

589589
/**
590590
* @alias oci_collection_max
591591
* @deprecated
592592
*/
593-
function ocicollmax(OCI_Collection $collection): int|false {}
593+
function ocicollmax(OCICollection $collection): int|false {}
594594

595-
function oci_collection_trim(OCI_Collection $collection, int $number): bool {}
595+
function oci_collection_trim(OCICollection $collection, int $number): bool {}
596596

597597
/**
598598
* @alias oci_collection_trim
599599
* @deprecated
600600
*/
601-
function ocicolltrim(OCI_Collection $collection, int $number): bool {}
601+
function ocicolltrim(OCICollection $collection, int $number): bool {}
602602

603603
/**
604604
* @param resource $connection_resource
605605
*/
606-
function oci_new_collection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCI_Collection|false {}
606+
function oci_new_collection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCICollection|false {}
607607

608608
/**
609609
* @param resource $connection_resource
610610
* @alias oci_new_collection
611611
* @deprecated
612612
*/
613-
function ocinewcollection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCI_Collection|false {}
613+
function ocinewcollection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCICollection|false {}
614614

615615
/**
616616
* @param resource $connection_resource
@@ -622,7 +622,7 @@ function oci_register_taf_callback($connection_resource, ?callable $function_nam
622622
*/
623623
function oci_unregister_taf_callback($connection_resource): bool {}
624624

625-
class OCI_Lob {
625+
class OCILob {
626626
/**
627627
* @alias oci_lob_save
628628
* @return bool
@@ -693,7 +693,7 @@ public function write(string $string, int $length = UNKNOWN) {}
693693
* @alias oci_lob_append
694694
* @return bool
695695
*/
696-
public function append(OCI_Lob $lob_descriptor_from) {}
696+
public function append(OCILob $lob_descriptor_from) {}
697697

698698
/**
699699
* @alias oci_lob_truncate
@@ -756,7 +756,7 @@ public function close() {}
756756
public function free() {}
757757
}
758758

759-
class OCI_Collection {
759+
class OCICollection {
760760
/**
761761
* @alias oci_free_collection
762762
* @return bool
@@ -779,7 +779,7 @@ public function getElem(int $index) {}
779779
* @alias oci_collection_assign
780780
* @return bool
781781
*/
782-
public function assign(OCI_Collection $collection_from) {}
782+
public function assign(OCICollection $collection_from) {}
783783

784784
/**
785785
* @alias oci_collection_element_assign

0 commit comments

Comments
 (0)