archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve a few parameter names in ext/spl

Browse source 
Use the same names which are used by zend functions.
This commit is contained in:
Máté Kocsis 2020-08-03 00:45:12 +02:00
parent 156c1806db
commit 6ba24e9615
No known key found for this signature in database
GPG key ID: FD055E41728BF310
5 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/spl/php_spl.stub.php
View file

@ -2,15 +2,18 @@
/** @generate-function-entries */ /** @generate-function-entries */
function class_implements($what, bool $autoload = true): array|false {} /** @param object|string $object_or_class */
function class_implements($object_or_class, bool $autoload = true): array|false {}
function class_parents($instance, bool $autoload = true): array|false {} /** @param object|string $object_or_class */
function class_parents($object_or_class, bool $autoload = true): array|false {}
function class_uses($what, bool $autoload = true): array|false {} /** @param object|string $object_or_class */
function class_uses($object_or_class, bool $autoload = true): array|false {}
function spl_autoload(string $class_name, ?string $file_extensions = null): void {} function spl_autoload(string $class, ?string $file_extensions = null): void {}
function spl_autoload_call(string $class_name): void {} function spl_autoload_call(string $class): void {}
function spl_autoload_extensions(?string $file_extensions = null): string {} function spl_autoload_extensions(?string $file_extensions = null): string {}
@ -22,9 +25,9 @@ function spl_autoload_unregister(callable $autoload_function): bool {}
function spl_classes(): array {} function spl_classes(): array {}
function spl_object_hash(object $obj): string {} function spl_object_hash(object $object): string {}
function spl_object_id(object $obj): int {} function spl_object_id(object $object): int {}
function iterator_apply(Traversable $iterator, callable $function, ?array $args = null): int {} function iterator_apply(Traversable $iterator, callable $function, ?array $args = null): int {}

17
ext/spl/php_spl_arginfo.h
View file

@ -1,25 +1,22 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: cc1dc8de91f503a88cc7bc47ad239957c2de8303 */ * Stub hash: 31d99979ea43e3d0d2592495977465976ca67760 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_implements, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_implements, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
ZEND_ARG_INFO(0, what) ZEND_ARG_INFO(0, object_or_class)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_parents, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) #define arginfo_class_parents arginfo_class_implements
ZEND_ARG_INFO(0, instance)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
ZEND_END_ARG_INFO()
#define arginfo_class_uses arginfo_class_implements #define arginfo_class_uses arginfo_class_implements
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload, 0, 1, IS_VOID, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload, 0, 1, IS_VOID, 0)
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, file_extensions, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, file_extensions, IS_STRING, 1, "null")
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_call, 0, 1, IS_VOID, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_call, 0, 1, IS_VOID, 0)
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_extensions, 0, 0, IS_STRING, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_extensions, 0, 0, IS_STRING, 0)
@ -42,11 +39,11 @@ ZEND_END_ARG_INFO()
#define arginfo_spl_classes arginfo_spl_autoload_functions #define arginfo_spl_classes arginfo_spl_autoload_functions
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_object_hash, 0, 1, IS_STRING, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_object_hash, 0, 1, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, obj, IS_OBJECT, 0) ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_object_id, 0, 1, IS_LONG, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_object_id, 0, 1, IS_LONG, 0)
ZEND_ARG_TYPE_INFO(0, obj, IS_OBJECT, 0) ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_iterator_apply, 0, 2, IS_LONG, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_iterator_apply, 0, 2, IS_LONG, 0)

2
ext/spl/tests/bug79432.phpt
View file

@ -11,4 +11,4 @@ try {
?> ?>
--EXPECT-- --EXPECT--
spl_autoload_call(): Argument #1 ($class_name) must be of type string, array given spl_autoload_call(): Argument #1 ($class) must be of type string, array given

44
ext/spl/tests/class_implements_variation1.phpt
View file

@ -113,61 +113,61 @@ fclose($res);
*** Testing class_implements() : variation *** *** Testing class_implements() : variation ***
--int 0-- --int 0--
class_implements(): Argument #1 ($what) must be of type object|string, int given class_implements(): Argument #1 ($object_or_class) must be of type object|string, int given
--int 1-- --int 1--
class_implements(): Argument #1 ($what) must be of type object|string, int given class_implements(): Argument #1 ($object_or_class) must be of type object|string, int given
--int 12345-- --int 12345--
class_implements(): Argument #1 ($what) must be of type object|string, int given class_implements(): Argument #1 ($object_or_class) must be of type object|string, int given
--int -12345-- --int -12345--
class_implements(): Argument #1 ($what) must be of type object|string, int given class_implements(): Argument #1 ($object_or_class) must be of type object|string, int given
--float 10.5-- --float 10.5--
class_implements(): Argument #1 ($what) must be of type object|string, float given class_implements(): Argument #1 ($object_or_class) must be of type object|string, float given
--float -10.5-- --float -10.5--
class_implements(): Argument #1 ($what) must be of type object|string, float given class_implements(): Argument #1 ($object_or_class) must be of type object|string, float given
--float 12.3456789000e10-- --float 12.3456789000e10--
class_implements(): Argument #1 ($what) must be of type object|string, float given class_implements(): Argument #1 ($object_or_class) must be of type object|string, float given
--float -12.3456789000e10-- --float -12.3456789000e10--
class_implements(): Argument #1 ($what) must be of type object|string, float given class_implements(): Argument #1 ($object_or_class) must be of type object|string, float given
--float .5-- --float .5--
class_implements(): Argument #1 ($what) must be of type object|string, float given class_implements(): Argument #1 ($object_or_class) must be of type object|string, float given
--empty array-- --empty array--
class_implements(): Argument #1 ($what) must be of type object|string, array given class_implements(): Argument #1 ($object_or_class) must be of type object|string, array given
--int indexed array-- --int indexed array--
class_implements(): Argument #1 ($what) must be of type object|string, array given class_implements(): Argument #1 ($object_or_class) must be of type object|string, array given
--associative array-- --associative array--
class_implements(): Argument #1 ($what) must be of type object|string, array given class_implements(): Argument #1 ($object_or_class) must be of type object|string, array given
--nested arrays-- --nested arrays--
class_implements(): Argument #1 ($what) must be of type object|string, array given class_implements(): Argument #1 ($object_or_class) must be of type object|string, array given
--uppercase NULL-- --uppercase NULL--
class_implements(): Argument #1 ($what) must be of type object|string, null given class_implements(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase null-- --lowercase null--
class_implements(): Argument #1 ($what) must be of type object|string, null given class_implements(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase true-- --lowercase true--
class_implements(): Argument #1 ($what) must be of type object|string, bool given class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
--lowercase false-- --lowercase false--
class_implements(): Argument #1 ($what) must be of type object|string, bool given class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
--uppercase TRUE-- --uppercase TRUE--
class_implements(): Argument #1 ($what) must be of type object|string, bool given class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
--uppercase FALSE-- --uppercase FALSE--
class_implements(): Argument #1 ($what) must be of type object|string, bool given class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
--empty string DQ-- --empty string DQ--
Error: 2 - class_implements(): Class does not exist and could not be loaded, %s(%d) Error: 2 - class_implements(): Class does not exist and could not be loaded, %s(%d)
@ -188,10 +188,10 @@ array(0) {
} }
--undefined var-- --undefined var--
class_implements(): Argument #1 ($what) must be of type object|string, null given class_implements(): Argument #1 ($object_or_class) must be of type object|string, null given
--unset var-- --unset var--
class_implements(): Argument #1 ($what) must be of type object|string, null given class_implements(): Argument #1 ($object_or_class) must be of type object|string, null given
--resource-- --resource--
class_implements(): Argument #1 ($what) must be of type object|string, resource given class_implements(): Argument #1 ($object_or_class) must be of type object|string, resource given

44
ext/spl/tests/class_uses_variation1.phpt
View file

@ -113,61 +113,61 @@ fclose($res);
*** Testing class_uses() : variation *** *** Testing class_uses() : variation ***
--int 0-- --int 0--
class_uses(): Argument #1 ($what) must be of type object|string, int given class_uses(): Argument #1 ($object_or_class) must be of type object|string, int given
--int 1-- --int 1--
class_uses(): Argument #1 ($what) must be of type object|string, int given class_uses(): Argument #1 ($object_or_class) must be of type object|string, int given
--int 12345-- --int 12345--
class_uses(): Argument #1 ($what) must be of type object|string, int given class_uses(): Argument #1 ($object_or_class) must be of type object|string, int given
--int -12345-- --int -12345--
class_uses(): Argument #1 ($what) must be of type object|string, int given class_uses(): Argument #1 ($object_or_class) must be of type object|string, int given
--float 10.5-- --float 10.5--
class_uses(): Argument #1 ($what) must be of type object|string, float given class_uses(): Argument #1 ($object_or_class) must be of type object|string, float given
--float -10.5-- --float -10.5--
class_uses(): Argument #1 ($what) must be of type object|string, float given class_uses(): Argument #1 ($object_or_class) must be of type object|string, float given
--float 12.3456789000e10-- --float 12.3456789000e10--
class_uses(): Argument #1 ($what) must be of type object|string, float given class_uses(): Argument #1 ($object_or_class) must be of type object|string, float given
--float -12.3456789000e10-- --float -12.3456789000e10--
class_uses(): Argument #1 ($what) must be of type object|string, float given class_uses(): Argument #1 ($object_or_class) must be of type object|string, float given
--float .5-- --float .5--
class_uses(): Argument #1 ($what) must be of type object|string, float given class_uses(): Argument #1 ($object_or_class) must be of type object|string, float given
--empty array-- --empty array--
class_uses(): Argument #1 ($what) must be of type object|string, array given class_uses(): Argument #1 ($object_or_class) must be of type object|string, array given
--int indexed array-- --int indexed array--
class_uses(): Argument #1 ($what) must be of type object|string, array given class_uses(): Argument #1 ($object_or_class) must be of type object|string, array given
--associative array-- --associative array--
class_uses(): Argument #1 ($what) must be of type object|string, array given class_uses(): Argument #1 ($object_or_class) must be of type object|string, array given
--nested arrays-- --nested arrays--
class_uses(): Argument #1 ($what) must be of type object|string, array given class_uses(): Argument #1 ($object_or_class) must be of type object|string, array given
--uppercase NULL-- --uppercase NULL--
class_uses(): Argument #1 ($what) must be of type object|string, null given class_uses(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase null-- --lowercase null--
class_uses(): Argument #1 ($what) must be of type object|string, null given class_uses(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase true-- --lowercase true--
class_uses(): Argument #1 ($what) must be of type object|string, bool given class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
--lowercase false-- --lowercase false--
class_uses(): Argument #1 ($what) must be of type object|string, bool given class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
--uppercase TRUE-- --uppercase TRUE--
class_uses(): Argument #1 ($what) must be of type object|string, bool given class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
--uppercase FALSE-- --uppercase FALSE--
class_uses(): Argument #1 ($what) must be of type object|string, bool given class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
--empty string DQ-- --empty string DQ--
Error: 2 - class_uses(): Class does not exist and could not be loaded, %s(%d) Error: 2 - class_uses(): Class does not exist and could not be loaded, %s(%d)
@ -186,10 +186,10 @@ array(0) {
} }
--undefined var-- --undefined var--
class_uses(): Argument #1 ($what) must be of type object|string, null given class_uses(): Argument #1 ($object_or_class) must be of type object|string, null given
--unset var-- --unset var--
class_uses(): Argument #1 ($what) must be of type object|string, null given class_uses(): Argument #1 ($object_or_class) must be of type object|string, null given
--resource-- --resource--
class_uses(): Argument #1 ($what) must be of type object|string, resource given class_uses(): Argument #1 ($object_or_class) must be of type object|string, resource given