Skip to content

Improve parameter names in ext/oci8 #6267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Improve parameter names in ext/oci8 #6267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbcd4d3
Improve parameter names in ext/oci8
kocsismate Oct 3, 2020
8f4d8a5
Review fixes
kocsismate Oct 6, 2020
261f6d8
Retain max_length
kocsismate Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/oci8/oci8.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
/** @generate-function-entries */

/** @param resource $statement */
function oci_define_by_name($statement, string $column, mixed &$result, int $type = 0): bool {}
function oci_define_by_name($statement, string $column, mixed &$var, int $type = 0): bool {}

/**
* @param resource $statement
* @alias oci_define_by_name
* @deprecated
*/
function ocidefinebyname($statement, string $column, mixed &$result, int $type = 0): bool {}
function ocidefinebyname($statement, string $column, mixed &$var, int $type = 0): bool {}

/** @param resource $statement */
function oci_bind_by_name($statement, string $param, mixed &$var, int $max_length = -1, int $type = 0): bool {}
function oci_bind_by_name($statement, string $param, mixed &$var, int $length = -1, int $type = 0): bool {}

/**
* @param resource $statement
* @alias oci_bind_by_name
* @deprecated
*/
function ocibindbyname($statement, string $param, mixed &$var, int $max_length = -1, int $type = 0): bool {}
function ocibindbyname($statement, string $param, mixed &$var, int $length = -1, int $type = 0): bool {}

/** @param resource $statement */
function oci_bind_array_by_name($statement, string $param, mixed &$var, int $max_array_length, int $max_item_length = -1, int $type = SQLT_AFC): bool {}
Expand Down Expand Up @@ -69,7 +69,7 @@ function oci_lob_seek(OCILob $lob, int $offset, int $whence = OCI_SEEK_SET): boo

function oci_lob_size(OCILob $lob): int|false {}

function oci_lob_write(OCILob $lob, string $data, ?int $max_length = null): int|false {}
function oci_lob_write(OCILob $lob, string $data, ?int $length = null): int|false {}

function oci_lob_append(OCILob $to, OCILob $from): bool {}

Expand Down Expand Up @@ -604,7 +604,7 @@ public function size() {}
* @alias oci_lob_write
* @return int|false
*/
public function write(string $string, ?int $max_length = null) {}
public function write(string $string, ?int $length = null) {}

/**
* @alias oci_lob_append
Expand Down
10 changes: 5 additions & 5 deletions ext/oci8/oci8_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 2dc6af892f7f1126cc9b3dcea73913c2f1fd31f9 */
* Stub hash: 8de68946926a25db7260251243f3c103a8c1f1cf */

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
ZEND_ARG_INFO(0, statement)
ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(1, result, IS_MIXED, 0)
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()

Expand All @@ -14,7 +14,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_bind_by_name, 0, 3, _IS_BOOL
ZEND_ARG_INFO(0, statement)
ZEND_ARG_TYPE_INFO(0, param, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 0, "-1")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "-1")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()

Expand Down Expand Up @@ -80,7 +80,7 @@ ZEND_END_ARG_INFO()
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, OCILob, 0)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_append, 0, 2, _IS_BOOL, 0)
Expand Down Expand Up @@ -471,7 +471,7 @@ ZEND_END_ARG_INFO()

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_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_append, 0, 0, 1)
Expand Down