archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

OCI8 classes were already renamed in 8; this now follows the new-new standard

Browse source
This commit is contained in:
Christopher Jones 2020-08-21 17:46:16 +10:00
parent 8095a0ef7f
commit ff66e4945e
46 changed files with 237 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

3
UPGRADING
View file

@ -381,6 +381,9 @@ PHP 8.0 UPGRADE NOTES
removed.
- OCI8:
. The OCI-Lob class is now called OCILob, and the OCI-Collection class is now
called OCICollection for name compliance enforced by PHP 8 arginfo
type annotation tooling.
. Several alias functions have been marked as deprecated.
. oci_internal_debug() and its alias ociinternaldebug() have been removed.

4
ext/oci8/oci8.c
View file

@ -291,8 +291,8 @@ PHP_MINIT_FUNCTION(oci)
le_descriptor = zend_register_list_destructors_ex(php_oci_descriptor_list_dtor, NULL, "oci8 descriptor", module_number);
le_collection = zend_register_list_destructors_ex(php_oci_collection_list_dtor, NULL, "oci8 collection", module_number);
INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI_Lob", class_OCI_Lob_methods);
INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI_Collection", class_OCI_Collection_methods);
INIT_CLASS_ENTRY(oci_lob_class_entry, "OCILob", class_OCILob_methods);
INIT_CLASS_ENTRY(oci_coll_class_entry, "OCICollection", class_OCICollection_methods);
oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry);
oci_coll_class_entry_ptr = zend_register_internal_class(&oci_coll_class_entry);

96
ext/oci8/oci8.stub.php
View file

@ -36,87 +36,87 @@ function ocibindbyname($statement_resource, string $column_name, &$variable, int
*/
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 {}
function oci_free_descriptor(OCI_Lob $lob_descriptor): bool {}
function oci_free_descriptor(OCILob $lob_descriptor): bool {}
/**
* @alias oci_free_descriptor
* @deprecated
*/
function ocifreedesc(OCI_Lob $lob_descriptor): bool {}
function ocifreedesc(OCILob $lob_descriptor): bool {}
function oci_lob_save(OCI_Lob $lob_descriptor, string $data, int $offset = 0): bool {}
function oci_lob_save(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
/**
* @alias oci_lob_save
* @deprecated
*/
function ocisavelob(OCI_Lob $lob_descriptor, string $data, int $offset = 0): bool {}
function ocisavelob(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
function oci_lob_import(OCI_Lob $lob_descriptor, string $filename): bool {}
function oci_lob_import(OCILob $lob_descriptor, string $filename): bool {}
/**
* @alias oci_lob_import
* @deprecated
*/
function ocisavelobfile(OCI_Lob $lob_descriptor, string $filename): bool {}
function ocisavelobfile(OCILob $lob_descriptor, string $filename): bool {}
function oci_lob_load(OCI_Lob $lob_descriptor): string|false {}
function oci_lob_load(OCILob $lob_descriptor): string|false {}
/**
* @alias oci_lob_load
* @deprecated
*/
function ociloadlob(OCI_Lob $lob_descriptor): string|false {}
function ociloadlob(OCILob $lob_descriptor): string|false {}
function oci_lob_read(OCI_Lob $lob_descriptor, int $length): string|false {}
function oci_lob_read(OCILob $lob_descriptor, int $length): string|false {}
function oci_lob_eof(OCI_Lob $lob_descriptor): bool {}
function oci_lob_eof(OCILob $lob_descriptor): bool {}
function oci_lob_tell(OCI_Lob $lob_descriptor): int|false {}
function oci_lob_tell(OCILob $lob_descriptor): int|false {}
function oci_lob_rewind(OCI_Lob $lob_descriptor): bool {}
function oci_lob_rewind(OCILob $lob_descriptor): bool {}
function oci_lob_seek(OCI_Lob $lob_descriptor, int $offset, int $whence = OCI_SEEK_SET): bool {}
function oci_lob_seek(OCILob $lob_descriptor, int $offset, int $whence = OCI_SEEK_SET): bool {}
function oci_lob_size(OCI_Lob $lob_descriptor): int|false {}
function oci_lob_size(OCILob $lob_descriptor): int|false {}
function oci_lob_write(OCI_Lob $lob_descriptor, string $string, int $length = UNKNOWN): int|false {}
function oci_lob_write(OCILob $lob_descriptor, string $string, int $length = UNKNOWN): int|false {}
function oci_lob_append(OCI_Lob $lob_descriptor_to, OCI_Lob $lob_descriptor_from): bool {}
function oci_lob_append(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from): bool {}
function oci_lob_truncate(OCI_Lob $lob_descriptor, int $length = 0): bool {}
function oci_lob_truncate(OCILob $lob_descriptor, int $length = 0): bool {}
function oci_lob_erase(OCI_Lob $lob_descriptor, int $offset = UNKNOWN, int $length = UNKNOWN): int|false {}
function oci_lob_erase(OCILob $lob_descriptor, int $offset = UNKNOWN, int $length = UNKNOWN): int|false {}
function oci_lob_flush(OCI_Lob $lob_descriptor, int $flag = 0): bool {}
function oci_lob_flush(OCILob $lob_descriptor, int $flag = 0): bool {}
function ocisetbufferinglob(OCI_Lob $lob_descriptor, bool $mode): bool {}
function ocisetbufferinglob(OCILob $lob_descriptor, bool $mode): bool {}
function ocigetbufferinglob(OCI_Lob $lob_descriptor): bool {}
function ocigetbufferinglob(OCILob $lob_descriptor): bool {}
function oci_lob_copy(OCI_Lob $lob_descriptor_to, OCI_Lob $lob_descriptor_from, int $length = UNKNOWN): bool {}
function oci_lob_copy(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from, int $length = UNKNOWN): bool {}
function oci_lob_is_equal(OCI_Lob $lob_descriptor_first, OCI_Lob $lob_descriptor_second): bool {}
function oci_lob_is_equal(OCILob $lob_descriptor_first, OCILob $lob_descriptor_second): bool {}
function oci_lob_export(OCI_Lob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
function oci_lob_export(OCILob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
/**
* @alias oci_lob_export
* @deprecated
*/
function ociwritelobtofile(OCI_Lob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
function ociwritelobtofile(OCILob $lob_descriptor, string $path, int $start = UNKNOWN, int $length = UNKNOWN): bool {}
/**
* @param resource $connection_resource
*/
function oci_new_descriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCI_Lob {}
function oci_new_descriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
/**
* @param resource $connection_resource
* @alias oci_new_descriptor
* @deprecated
*/
function ocinewdescriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCI_Lob {}
function ocinewdescriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
/**
* @param resource $connection_resource
@ -542,75 +542,75 @@ function oci_num_rows($statement_resource): int|false {}
*/
function ocirowcount($statement_resource): int|false {}
function oci_free_collection(OCI_Collection $collection): bool {}
function oci_free_collection(OCICollection $collection): bool {}
/**
* @alias oci_free_collection
* @deprecated
*/
function ocifreecollection(OCI_Collection $collection): bool {}
function ocifreecollection(OCICollection $collection): bool {}
function oci_collection_append(OCI_Collection $collection, string $value): bool {}
function oci_collection_append(OCICollection $collection, string $value): bool {}
/**
* @alias oci_collection_append
* @deprecated
*/
function ocicollappend(OCI_Collection $collection, string $value): bool {}
function ocicollappend(OCICollection $collection, string $value): bool {}
function oci_collection_element_get(OCI_Collection $collection, int $index): string|float|null|false {}
function oci_collection_element_get(OCICollection $collection, int $index): string|float|null|false {}
/**
* @alias oci_collection_element_get
* @deprecated
*/
function ocicollgetelem(OCI_Collection $collection, int $index): string|float|null|false {}
function ocicollgetelem(OCICollection $collection, int $index): string|float|null|false {}
function oci_collection_assign(OCI_Collection $collection_to, OCI_Collection $collection_from): bool {}
function oci_collection_assign(OCICollection $collection_to, OCICollection $collection_from): bool {}
function oci_collection_element_assign(OCI_Collection $collection, int $index, string $value): bool {}
function oci_collection_element_assign(OCICollection $collection, int $index, string $value): bool {}
/**
* @alias oci_collection_element_assign
* @deprecated
*/
function ocicollassignelem(OCI_Collection $collection, int $index, string $value): bool {}
function ocicollassignelem(OCICollection $collection, int $index, string $value): bool {}
function oci_collection_size(OCI_Collection $collection): int|false {}
function oci_collection_size(OCICollection $collection): int|false {}
/**
* @alias oci_collection_size
* @deprecated
*/
function ocicollsize(OCI_Collection $collection): int|false {}
function ocicollsize(OCICollection $collection): int|false {}
function oci_collection_max(OCI_Collection $collection): int|false {}
function oci_collection_max(OCICollection $collection): int|false {}
/**
* @alias oci_collection_max
* @deprecated
*/
function ocicollmax(OCI_Collection $collection): int|false {}
function ocicollmax(OCICollection $collection): int|false {}
function oci_collection_trim(OCI_Collection $collection, int $number): bool {}
function oci_collection_trim(OCICollection $collection, int $number): bool {}
/**
* @alias oci_collection_trim
* @deprecated
*/
function ocicolltrim(OCI_Collection $collection, int $number): bool {}
function ocicolltrim(OCICollection $collection, int $number): bool {}
/**
* @param resource $connection_resource
*/
function oci_new_collection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCI_Collection|false {}
function oci_new_collection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCICollection|false {}
/**
* @param resource $connection_resource
* @alias oci_new_collection
* @deprecated
*/
function ocinewcollection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCI_Collection|false {}
function ocinewcollection($connection_resource, string $type_name, string $schema_name = UNKNOWN): OCICollection|false {}
/**
* @param resource $connection_resource
@ -622,7 +622,7 @@ function oci_register_taf_callback($connection_resource, ?callable $function_nam
*/
function oci_unregister_taf_callback($connection_resource): bool {}
class OCI_Lob {
class OCILob {
/**
* @alias oci_lob_save
* @return bool
@ -693,7 +693,7 @@ class OCI_Lob {
* @alias oci_lob_append
* @return bool
*/
public function append(OCI_Lob $lob_descriptor_from) {}
public function append(OCILob $lob_descriptor_from) {}
/**
* @alias oci_lob_truncate
@ -756,7 +756,7 @@ class OCI_Lob {
public function free() {}
}
class OCI_Collection {
class OCICollection {
/**
* @alias oci_free_collection
* @return bool
@ -779,7 +779,7 @@ class OCI_Collection {
* @alias oci_collection_assign
* @return bool
*/
public function assign(OCI_Collection $collection_from) {}
public function assign(OCICollection $collection_from) {}
/**
* @alias oci_collection_element_assign

188
ext/oci8/oci8_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 4a4e86dc175542bbf0bc29c9a957c5dfec834f93 */
* Stub hash: 1c1a73f6a4de5fa2ca9595125822d65bc4f5fc55 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
ZEND_ARG_INFO(0, statement_resource)
@ -30,13 +30,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_bind_array_by_name, 0, 4, _I
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_free_descriptor, 0, 1, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocifreedesc arginfo_oci_free_descriptor
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_save, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
@ -44,33 +44,33 @@ ZEND_END_ARG_INFO()
#define arginfo_ocisavelob arginfo_oci_lob_save
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_import, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocisavelobfile arginfo_oci_lob_import
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_load, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_END_ARG_INFO()
#define arginfo_ociloadlob arginfo_oci_lob_load
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_read, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
#define arginfo_oci_lob_eof arginfo_oci_free_descriptor
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_tell, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_END_ARG_INFO()
#define arginfo_oci_lob_rewind arginfo_oci_free_descriptor
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_seek, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whence, IS_LONG, 0, "OCI_SEEK_SET")
ZEND_END_ARG_INFO()
@ -78,52 +78,52 @@ ZEND_END_ARG_INFO()
#define arginfo_oci_lob_size arginfo_oci_lob_tell
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_write, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_append, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCILob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_truncate, 0, 1, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_erase, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_flush, 0, 1, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flag, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ocisetbufferinglob, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocigetbufferinglob arginfo_oci_free_descriptor
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_copy, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCILob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_is_equal, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_first, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_second, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_first, OCILob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_second, OCILob, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_export, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCI_Lob, 0)
ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
@ -131,7 +131,7 @@ ZEND_END_ARG_INFO()
#define arginfo_ociwritelobtofile arginfo_oci_lob_export
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_oci_new_descriptor, 0, 1, OCI_Lob, 1)
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_oci_new_descriptor, 0, 1, OCILob, 1)
ZEND_ARG_INFO(0, connection_resource)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "OCI_DTYPE_LOB")
ZEND_END_ARG_INFO()
@ -374,32 +374,32 @@ ZEND_END_ARG_INFO()
#define arginfo_ocirowcount arginfo_oci_num_rows
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_free_collection, 0, 1, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocifreecollection arginfo_oci_free_collection
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_append, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocicollappend arginfo_oci_collection_append
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_collection_element_get, 0, 2, MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_NULL|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocicollgetelem arginfo_oci_collection_element_get
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_assign, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, collection_to, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection_from, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection_to, OCICollection, 0)
ZEND_ARG_OBJ_INFO(0, collection_from, OCICollection, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_element_assign, 0, 3, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
ZEND_END_ARG_INFO()
@ -407,7 +407,7 @@ ZEND_END_ARG_INFO()
#define arginfo_ocicollassignelem arginfo_oci_collection_element_assign
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_collection_size, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocicollsize arginfo_oci_collection_size
@ -417,13 +417,13 @@ ZEND_END_ARG_INFO()
#define arginfo_ocicollmax arginfo_oci_collection_size
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_trim, 0, 2, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCI_Collection, 0)
ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0)
ZEND_END_ARG_INFO()
#define arginfo_ocicolltrim arginfo_oci_collection_trim
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_new_collection, 0, 2, OCI_Collection, MAY_BE_FALSE)
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_new_collection, 0, 2, OCICollection, MAY_BE_FALSE)
ZEND_ARG_INFO(0, connection_resource)
ZEND_ARG_TYPE_INFO(0, type_name, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, schema_name, IS_STRING, 0)
@ -438,106 +438,106 @@ ZEND_END_ARG_INFO()
#define arginfo_oci_unregister_taf_callback arginfo_oci_rollback
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_save, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_save, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_import, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_import, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_savefile arginfo_class_OCI_Lob_import
#define arginfo_class_OCILob_savefile arginfo_class_OCILob_import
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_load, 0, 0, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_load, 0, 0, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_read, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_read, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_eof arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_eof arginfo_class_OCILob_load
#define arginfo_class_OCI_Lob_tell arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_tell arginfo_class_OCILob_load
#define arginfo_class_OCI_Lob_rewind arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_rewind arginfo_class_OCILob_load
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_seek, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_seek, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whence, IS_LONG, 0, "OCI_SEEK_SET")
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_size arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_size arginfo_class_OCILob_load
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_write, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_write, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_append, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCI_Lob, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_append, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_truncate, 0, 0, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_truncate, 0, 0, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_erase, 0, 0, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_erase, 0, 0, 0)
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_OCI_Lob_flush, 0, 0, _IS_BOOL, 0)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_OCILob_flush, 0, 0, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flag, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_setbuffering, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_setbuffering, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_getbuffering arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_getbuffering arginfo_class_OCILob_load
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_writetofile, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_writetofile, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_export arginfo_class_OCI_Lob_writetofile
#define arginfo_class_OCILob_export arginfo_class_OCILob_writetofile
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Lob_writetemporary, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_writetemporary, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "OCI_TEMP_CLOB")
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Lob_close arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_close arginfo_class_OCILob_load
#define arginfo_class_OCI_Lob_free arginfo_class_OCI_Lob_load
#define arginfo_class_OCILob_free arginfo_class_OCILob_load
#define arginfo_class_OCI_Collection_free arginfo_class_OCI_Lob_load
#define arginfo_class_OCICollection_free arginfo_class_OCILob_load
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Collection_append, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_append, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Collection_getElem, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_getElem, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Collection_assign, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, collection_from, OCI_Collection, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_assign, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, collection_from, OCICollection, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Collection_assignelem, 0, 0, 2)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_assignelem, 0, 0, 2)
ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
ZEND_END_ARG_INFO()
#define arginfo_class_OCI_Collection_size arginfo_class_OCI_Lob_load
#define arginfo_class_OCICollection_size arginfo_class_OCILob_load
#define arginfo_class_OCI_Collection_max arginfo_class_OCI_Lob_load
#define arginfo_class_OCICollection_max arginfo_class_OCILob_load
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCI_Collection_trim, 0, 0, 1)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_trim, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0)
ZEND_END_ARG_INFO()
@ -751,41 +751,41 @@ static const zend_function_entry ext_functions[] = {
};
static const zend_function_entry class_OCI_Lob_methods[] = {
ZEND_ME_MAPPING(save, oci_lob_save, arginfo_class_OCI_Lob_save, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(import, oci_lob_import, arginfo_class_OCI_Lob_import, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(savefile, oci_lob_import, arginfo_class_OCI_Lob_savefile, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(load, oci_lob_load, arginfo_class_OCI_Lob_load, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(read, oci_lob_read, arginfo_class_OCI_Lob_read, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(eof, oci_lob_eof, arginfo_class_OCI_Lob_eof, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(tell, oci_lob_tell, arginfo_class_OCI_Lob_tell, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(rewind, oci_lob_rewind, arginfo_class_OCI_Lob_rewind, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(seek, oci_lob_seek, arginfo_class_OCI_Lob_seek, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(size, oci_lob_size, arginfo_class_OCI_Lob_size, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(write, oci_lob_write, arginfo_class_OCI_Lob_write, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(append, oci_lob_append, arginfo_class_OCI_Lob_append, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(truncate, oci_lob_truncate, arginfo_class_OCI_Lob_truncate, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(erase, oci_lob_erase, arginfo_class_OCI_Lob_erase, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(flush, oci_lob_flush, arginfo_class_OCI_Lob_flush, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(setbuffering, ocisetbufferinglob, arginfo_class_OCI_Lob_setbuffering, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(getbuffering, ocigetbufferinglob, arginfo_class_OCI_Lob_getbuffering, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(writetofile, oci_lob_export, arginfo_class_OCI_Lob_writetofile, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(export, oci_lob_export, arginfo_class_OCI_Lob_export, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(writetemporary, oci_lob_write_temporary, arginfo_class_OCI_Lob_writetemporary, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(close, oci_lob_close, arginfo_class_OCI_Lob_close, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(free, oci_free_descriptor, arginfo_class_OCI_Lob_free, ZEND_ACC_PUBLIC)
static const zend_function_entry class_OCILob_methods[] = {
ZEND_ME_MAPPING(save, oci_lob_save, arginfo_class_OCILob_save, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(import, oci_lob_import, arginfo_class_OCILob_import, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(savefile, oci_lob_import, arginfo_class_OCILob_savefile, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(load, oci_lob_load, arginfo_class_OCILob_load, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(read, oci_lob_read, arginfo_class_OCILob_read, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(eof, oci_lob_eof, arginfo_class_OCILob_eof, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(tell, oci_lob_tell, arginfo_class_OCILob_tell, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(rewind, oci_lob_rewind, arginfo_class_OCILob_rewind, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(seek, oci_lob_seek, arginfo_class_OCILob_seek, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(size, oci_lob_size, arginfo_class_OCILob_size, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(write, oci_lob_write, arginfo_class_OCILob_write, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(append, oci_lob_append, arginfo_class_OCILob_append, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(truncate, oci_lob_truncate, arginfo_class_OCILob_truncate, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(erase, oci_lob_erase, arginfo_class_OCILob_erase, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(flush, oci_lob_flush, arginfo_class_OCILob_flush, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(setbuffering, ocisetbufferinglob, arginfo_class_OCILob_setbuffering, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(getbuffering, ocigetbufferinglob, arginfo_class_OCILob_getbuffering, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(writetofile, oci_lob_export, arginfo_class_OCILob_writetofile, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(export, oci_lob_export, arginfo_class_OCILob_export, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(writetemporary, oci_lob_write_temporary, arginfo_class_OCILob_writetemporary, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(close, oci_lob_close, arginfo_class_OCILob_close, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(free, oci_free_descriptor, arginfo_class_OCILob_free, ZEND_ACC_PUBLIC)
ZEND_FE_END
};
static const zend_function_entry class_OCI_Collection_methods[] = {
ZEND_ME_MAPPING(free, oci_free_collection, arginfo_class_OCI_Collection_free, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(append, oci_collection_append, arginfo_class_OCI_Collection_append, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(getElem, oci_collection_element_get, arginfo_class_OCI_Collection_getElem, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(assign, oci_collection_assign, arginfo_class_OCI_Collection_assign, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(assignelem, oci_collection_element_assign, arginfo_class_OCI_Collection_assignelem, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(size, oci_collection_size, arginfo_class_OCI_Collection_size, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(max, oci_collection_max, arginfo_class_OCI_Collection_max, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(trim, oci_collection_trim, arginfo_class_OCI_Collection_trim, ZEND_ACC_PUBLIC)
static const zend_function_entry class_OCICollection_methods[] = {
ZEND_ME_MAPPING(free, oci_free_collection, arginfo_class_OCICollection_free, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(append, oci_collection_append, arginfo_class_OCICollection_append, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(getElem, oci_collection_element_get, arginfo_class_OCICollection_getElem, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(assign, oci_collection_assign, arginfo_class_OCICollection_assign, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(assignelem, oci_collection_element_assign, arginfo_class_OCICollection_assignelem, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(size, oci_collection_size, arginfo_class_OCICollection_size, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(max, oci_collection_max, arginfo_class_OCICollection_max, ZEND_ACC_PUBLIC)
ZEND_ME_MAPPING(trim, oci_collection_trim, arginfo_class_OCICollection_trim, ZEND_ACC_PUBLIC)
ZEND_FE_END
};

4
ext/oci8/package.xml
View file

@ -72,9 +72,9 @@ Oracle's standard cross-version connectivity applies. For example, PHP OCI8 lin
Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
The OCI-Lob class is now called OCI_Lob.
The OCI-Lob class is now called OCILob for standards compliance.
The OCI-Collection calls is now called OCI_Collection.
The OCI-Collection class is now called OCICollection for standards compliance.
Generate arginfo from function stubs. (Jens de Nies)
</notes>

2
ext/oci8/tests/bug35973.phpt
View file

@ -36,7 +36,7 @@ echo "Done\n";
--EXPECTF--
array(1) {
["NC"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/bug44008.phpt
View file

@ -1,5 +1,5 @@
--TEST--
Bug #44008 (Incorrect usage of OCI_Lob->close crashes PHP)
Bug #44008 (Incorrect usage of OCILob->close crashes PHP)
--SKIPIF--
<?php
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
@ -30,7 +30,7 @@ $r = $textLob->load();
echo "$r\n";
// Incorrectly closing the lob doesn't cause a crash.
// OCI-LOB->close() is documented for use only with OCI_Lob->writeTemporary()
// OCI-LOB->close() is documented for use only with OCILob->writeTemporary()
$textLob->close();
// Cleanup

2
ext/oci8/tests/coll_001.phpt
View file

@ -20,7 +20,7 @@ require __DIR__."/drop_type.inc";
?>
--EXPECTF--
object(OCI_Collection)#%d (1) {
object(OCICollection)#%d (1) {
["collection"]=>
resource(%d) of type (oci8 collection)
}

4
ext/oci8/tests/coll_002.phpt
View file

@ -28,12 +28,12 @@ require __DIR__."/drop_type.inc";
?>
--EXPECTF--
object(OCI_Collection)#%d (1) {
object(OCICollection)#%d (1) {
["collection"]=>
resource(%d) of type (oci8 collection)
}
bool(true)
string(%d) "OCI_Collection::size(): supplied resource is not a valid oci8 collection resource"
string(%d) "OCICollection::size(): supplied resource is not a valid oci8 collection resource"
Warning: oci_new_collection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
bool(false)

2
ext/oci8/tests/coll_002_func.phpt
View file

@ -27,7 +27,7 @@ require __DIR__."/drop_type.inc";
?>
--EXPECTF--
object(OCI_Collection)#%d (1) {
object(OCICollection)#%d (1) {
["collection"]=>
resource(%d) of type (oci8 collection)
}

2
ext/oci8/tests/coll_003.phpt
View file

@ -29,7 +29,7 @@ require __DIR__."/drop_type.inc";
int(0)
int(0)
Warning: OCI_Collection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
Warning: OCICollection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
bool(false)
bool(true)
float(1)

2
ext/oci8/tests/coll_009.phpt
View file

@ -38,7 +38,7 @@ require __DIR__."/drop_type.inc";
?>
--EXPECTF--
Warning: OCI_Collection::append(): OCI-01861: literal does not match format string in %s on line %d
Warning: OCICollection::append(): OCI-01861: literal does not match format string in %s on line %d
bool(false)
bool(true)
bool(false)

4
ext/oci8/tests/coll_016.phpt
View file

@ -40,10 +40,10 @@ require __DIR__."/drop_type.inc";
--EXPECTF--
bool(true)
Warning: OCI_Collection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
bool(false)
Warning: OCI_Collection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
bool(false)
bool(false)
bool(false)

14
ext/oci8/tests/coll_019.phpt
View file

@ -75,33 +75,33 @@ echo "Done\n";
--EXPECTF--
Test 0
Notice: OCI_Collection::append(): Unknown or unsupported type of element: 113 in %s on line %d
Notice: OCICollection::append(): Unknown or unsupported type of element: 113 in %s on line %d
bool(false)
Notice: OCI_Collection::assignelem(): Unknown or unsupported type of element: 113 in %s on line %d
Notice: OCICollection::assignelem(): Unknown or unsupported type of element: 113 in %s on line %d
bool(false)
bool(false)
Test 1
Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
bool(false)
bool(false)
Test 2
Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
bool(false)
bool(false)
Test 3
Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
bool(false)
bool(false)
Test 4
Warning: OCI_Collection::append(): OCI-01840: input value not long enough for date format in %s on line %d
Warning: OCICollection::append(): OCI-01840: input value not long enough for date format in %s on line %d
bool(false)
Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
Warning: OCICollection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
bool(false)
bool(false)
Done

4
ext/oci8/tests/define3.phpt
View file

@ -89,12 +89,12 @@ string(32) "614fcbba1effb7caa27ef0ef25c27fcf"
string(32) "06d4f219d946c74d748d43932cd9dcb2"
Test 1
bool(true)
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
file md5:614fcbba1effb7caa27ef0ef25c27fcf
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

2
ext/oci8/tests/descriptors.phpt
View file

@ -44,7 +44,7 @@ echo "Done\n";
--EXPECTF--
array(1) {
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

6
ext/oci8/tests/fetch_object_2.phpt
View file

@ -69,7 +69,7 @@ object(stdClass)#%d (3) {
["COL1"]=>
string(3) "123"
["COL2"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -80,7 +80,7 @@ object(stdClass)#%d (3) {
["COL1"]=>
string(3) "456"
["COL2"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -91,7 +91,7 @@ object(stdClass)#%d (3) {
["COL1"]=>
string(3) "789"
["COL2"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

BIN
ext/oci8/tests/lob_001.phpt
View file

Binary file not shown.

2
ext/oci8/tests/lob_002.phpt
View file

@ -52,7 +52,7 @@ oci8_test_sql_execute($c, $stmtarray);
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

BIN
ext/oci8/tests/lob_003.phpt
View file

Binary file not shown.

6
ext/oci8/tests/lob_004.phpt
View file

@ -57,7 +57,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -67,12 +67,12 @@ int(3)
bool(true)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/lob_005.phpt
View file

@ -41,12 +41,12 @@ echo "Done\n";
--EXPECTF--
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

BIN
ext/oci8/tests/lob_006.phpt
View file

Binary file not shown.

6
ext/oci8/tests/lob_007.phpt
View file

@ -45,7 +45,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -54,12 +54,12 @@ int(7000)
int(7000)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

6
ext/oci8/tests/lob_008.phpt
View file

@ -47,19 +47,19 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
int(7000)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

6
ext/oci8/tests/lob_009.phpt
View file

@ -44,7 +44,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -52,12 +52,12 @@ bool(true)
bool(true)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/lob_016.phpt
View file

@ -55,12 +55,12 @@ echo "Done\n";
--EXPECTF--
array(2) {
["LOB_1"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["LOB_2"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/lob_017.phpt
View file

@ -57,12 +57,12 @@ echo "Done\n";
--EXPECTF--
array(2) {
["LOB_1"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["LOB_2"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

BIN
ext/oci8/tests/lob_019.phpt
View file

Binary file not shown.

BIN
ext/oci8/tests/lob_020.phpt
View file

Binary file not shown.

2
ext/oci8/tests/lob_021.phpt
View file

@ -62,7 +62,7 @@ int(4)
bool(true)
int(4)
bool(true)
string(%d) "OCI_Lob::write(): %s is not a valid oci8 descriptor resource"
string(%d) "OCILob::write(): %s is not a valid oci8 descriptor resource"
string(%d) "oci_free_descriptor(): %s is not a valid oci8 descriptor resource"
Warning: oci_free_descriptor(): Unable to find descriptor property in %s on line %d

2
ext/oci8/tests/lob_022.phpt
View file

@ -67,7 +67,7 @@ echo "Done\n";
?>
--EXPECTF--
Warning: OCI_Lob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d
Warning: OCILob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d
string(4) "data"
string(9) "long data"
string(9) "long data"

6
ext/oci8/tests/lob_023.phpt
View file

@ -47,7 +47,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -59,12 +59,12 @@ Warning: oci_lob_import(): Unable to find descriptor property in %s on line %d
bool(false)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

6
ext/oci8/tests/lob_024.phpt
View file

@ -47,7 +47,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -56,12 +56,12 @@ int(7000)
int(7000)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/lob_025.phpt
View file

@ -52,12 +52,12 @@ int(7000)
int(7000)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

6
ext/oci8/tests/lob_026.phpt
View file

@ -56,7 +56,7 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -66,12 +66,12 @@ int(3)
bool(true)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

10
ext/oci8/tests/lob_027.phpt
View file

@ -67,19 +67,19 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
int(72)
array(2) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
["BLOB"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -96,11 +96,11 @@ string(10) "this is a "
bool(true)
string(0) ""
Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
Warning: OCILob::truncate(): Length must be greater than or equal to zero in %s on line %d
bool(false)
string(0) ""
Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
Warning: OCILob::truncate(): Length must be greater than or equal to zero in %s on line %d
bool(false)
bool(true)
Done

12
ext/oci8/tests/lob_028.phpt
View file

@ -48,27 +48,27 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

2
ext/oci8/tests/lob_032.phpt
View file

@ -32,5 +32,5 @@ echo "Done\n";
?>
--EXPECTF--
Warning: OCI_Lob::write(): ORA-22990: %s in %s on line 19
Warning: OCILob::write(): ORA-22990: %s in %s on line 19
Done

2
ext/oci8/tests/lob_033.phpt
View file

@ -35,7 +35,7 @@ echo "Done\n";
?>
--EXPECTF--
Warning: OCI_Lob::save(): OCI_INVALID_HANDLE in %s on line %d
Warning: OCILob::save(): OCI_INVALID_HANDLE in %s on line %d
bool(true)
bool(true)
Done

2
ext/oci8/tests/lob_034.phpt
View file

@ -48,6 +48,6 @@ bool(true)
bool(true)
bool(true)
Warning: OCI_Lob::flush(): Invalid flag value: -1 in %s on line %d
Warning: OCILob::flush(): Invalid flag value: -1 in %s on line %d
bool(false)
Done

12
ext/oci8/tests/lob_038.phpt
View file

@ -125,7 +125,7 @@ Test 1b
bool(true)
array(1) {
["CLOB"]=>
object(OCI_Lob)#2 (1) {
object(OCILob)#2 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -133,7 +133,7 @@ array(1) {
string(11) "clob test 1"
array(1) {
["CLOB"]=>
object(OCI_Lob)#3 (1) {
object(OCILob)#3 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -141,7 +141,7 @@ array(1) {
string(11) "clob test 2"
array(1) {
["CLOB"]=>
object(OCI_Lob)#2 (1) {
object(OCILob)#2 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -167,7 +167,7 @@ Test 2b
bool(true)
array(1) {
["BLOB"]=>
object(OCI_Lob)#3 (1) {
object(OCILob)#3 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -175,7 +175,7 @@ array(1) {
string(11) "blob test 1"
array(1) {
["BLOB"]=>
object(OCI_Lob)#4 (1) {
object(OCILob)#4 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
@ -183,7 +183,7 @@ array(1) {
string(11) "blob test 2"
array(1) {
["BLOB"]=>
object(OCI_Lob)#3 (1) {
object(OCILob)#3 (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

4
ext/oci8/tests/lob_041.phpt
View file

@ -69,7 +69,7 @@ test data
Test 2 - implicit statement close
test data
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (Unknown)
}
@ -78,7 +78,7 @@ Test 3 - no preallocated descriptor
test data
array(1) {
["C1"]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}

14
ext/oci8/tests/lob_042.phpt
View file

@ -44,29 +44,29 @@ echo "Done\n";
?>
--EXPECTF--
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}
Warning: OCI_Lob::writetemporary(): Invalid temporary lob type: %d in %s on line %d
Warning: OCILob::writetemporary(): Invalid temporary lob type: %d in %s on line %d
bool(false)
int(6)
bool(true)
bool(true)
Warning: OCI_Lob::truncate(): Size must be less than or equal to the current LOB size in %s on line %d
Warning: OCILob::truncate(): Size must be less than or equal to the current LOB size in %s on line %d
bool(false)
Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
Warning: OCILob::truncate(): Length must be greater than or equal to zero in %s on line %d
bool(false)
Warning: OCI_Lob::read(): Offset must be less than size of the LOB in %s on line %d
Warning: OCILob::read(): Offset must be less than size of the LOB in %s on line %d
bool(false)
Warning: OCI_Lob::import(): Can't open file %s in %s on line %d
Warning: OCILob::import(): Can't open file %s in %s on line %d
bool(false)
Warning: OCI_Lob::savefile(): Can't open file %s in %s on line %d
Warning: OCILob::savefile(): Can't open file %s in %s on line %d
bool(false)
Done

4
ext/oci8/tests/null_byte_1.phpt
View file

@ -35,9 +35,9 @@ var_dump($r);
--EXPECTF--
Test 1: Import
Warning: OCI_Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
Warning: OCILob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
NULL
Test 2: Export
Warning: OCI_Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
Warning: OCILob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
NULL

2
ext/oci8/tests/xmltype_02.phpt
View file

@ -111,7 +111,7 @@ oci8_test_sql_execute($c, $stmtarray);
Test 1 Insert new XML data using a temporary CLOB
array(1) {
[0]=>
object(OCI_Lob)#%d (1) {
object(OCILob)#%d (1) {
["descriptor"]=>
resource(%d) of type (oci8 descriptor)
}