Skip to content

ReflectionType improvements #2068

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 5 commits into from
Closed

ReflectionType improvements #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16cde30
ReflectionType improvements
trowski Aug 9, 2016
fbd63ab
Update tests for reflection type changes
trowski Aug 9, 2016
a9d62a6
Extract getting type name into function
trowski Aug 9, 2016
6271c20
Add test for ReflectionNamedType
trowski Aug 9, 2016
82aaff1
Move null byte as well
trowski Aug 9, 2016
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
75 changes: 58 additions & 17 deletions ext/reflection/php_reflection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ PHPAPI zend_class_entry *reflection_function_ptr;
PHPAPI zend_class_entry *reflection_generator_ptr;
PHPAPI zend_class_entry *reflection_parameter_ptr;
PHPAPI zend_class_entry *reflection_type_ptr;
PHPAPI zend_class_entry *reflection_named_type_ptr;
PHPAPI zend_class_entry *reflection_class_ptr;
PHPAPI zend_class_entry *reflection_object_ptr;
PHPAPI zend_class_entry *reflection_method_ptr;
Expand Down Expand Up @@ -1276,7 +1277,7 @@ static void reflection_type_factory(zend_function *fptr, zval *closure_object, s
reflection_object *intern;
type_reference *reference;

reflection_instantiate(reflection_type_ptr, object);
reflection_instantiate(reflection_named_type_ptr, object);
intern = Z_REFLECTION_P(object);
reference = (type_reference*) emalloc(sizeof(type_reference));
reference->arg_info = arg_info;
Expand Down Expand Up @@ -2999,35 +3000,66 @@ ZEND_METHOD(reflection_type, isBuiltin)
}
/* }}} */

/* {{{ reflection_type_name */
static zend_string *reflection_type_name(type_reference *param) {
switch (param->arg_info->type_hint) {
case IS_ARRAY: return zend_string_init("array", sizeof("array") - 1, 0);
case IS_CALLABLE: return zend_string_init("callable", sizeof("callable") - 1, 0);
case IS_OBJECT:
if (param->fptr->type == ZEND_INTERNAL_FUNCTION &&
!(param->fptr->common.fn_flags & ZEND_ACC_USER_ARG_INFO)) {
return zend_string_init(((zend_internal_arg_info*)param->arg_info)->class_name, strlen(((zend_internal_arg_info*)param->arg_info)->class_name), 0);
}
return zend_string_copy(param->arg_info->class_name);
case IS_STRING: return zend_string_init("string", sizeof("string") - 1, 0);
case _IS_BOOL: return zend_string_init("bool", sizeof("bool") - 1, 0);
case IS_LONG: return zend_string_init("int", sizeof("int") - 1, 0);
case IS_DOUBLE: return zend_string_init("float", sizeof("float") - 1, 0);
case IS_VOID: return zend_string_init("void", sizeof("void") - 1, 0);
case IS_ITERABLE: return zend_string_init("iterable", sizeof("iterable") - 1, 0);
EMPTY_SWITCH_DEFAULT_CASE()
}
}
/* }}} */

/* {{{ proto public string ReflectionType::__toString()
Return the text of the type hint */
ZEND_METHOD(reflection_type, __toString)
{
reflection_object *intern;
type_reference *param;
zend_string *str;

if (zend_parse_parameters_none() == FAILURE) {
return;
}
GET_REFLECTION_OBJECT_PTR(param);

str = reflection_type_name(param);

if (param->arg_info->allow_null) {
str = zend_string_extend(str, ZSTR_LEN(str) + 1, 0);
memmove(ZSTR_VAL(str) + 1, ZSTR_VAL(str), ZSTR_LEN(str) + 1);
ZSTR_VAL(str)[0] = '?';
}

RETURN_STR(str);
}
/* }}} */

switch (param->arg_info->type_hint) {
case IS_ARRAY: RETURN_STRINGL("array", sizeof("array") - 1);
case IS_CALLABLE: RETURN_STRINGL("callable", sizeof("callable") - 1);
case IS_OBJECT:
if (param->fptr->type == ZEND_INTERNAL_FUNCTION &&
!(param->fptr->common.fn_flags & ZEND_ACC_USER_ARG_INFO)) {
RETURN_STRING(((zend_internal_arg_info*)param->arg_info)->class_name);
}
RETURN_STR_COPY(param->arg_info->class_name);
case IS_STRING: RETURN_STRINGL("string", sizeof("string") - 1);
case _IS_BOOL: RETURN_STRINGL("bool", sizeof("bool") - 1);
case IS_LONG: RETURN_STRINGL("int", sizeof("int") - 1);
case IS_DOUBLE: RETURN_STRINGL("float", sizeof("float") - 1);
case IS_VOID: RETURN_STRINGL("void", sizeof("void") - 1);
case IS_ITERABLE: RETURN_STRINGL("iterable", sizeof("iterable") - 1);
EMPTY_SWITCH_DEFAULT_CASE()
/* {{{ proto public string ReflectionNamedType::getName()
Return the text of the type hint */
ZEND_METHOD(reflection_named_type, getName)
{
reflection_object *intern;
type_reference *param;

if (zend_parse_parameters_none() == FAILURE) {
return;
}
GET_REFLECTION_OBJECT_PTR(param);

RETURN_STR(reflection_type_name(param));
}
/* }}} */

Expand Down Expand Up @@ -6688,6 +6720,11 @@ static const zend_function_entry reflection_type_functions[] = {
PHP_FE_END
};

static const zend_function_entry reflection_named_type_functions[] = {
ZEND_ME(reflection_named_type, getName, arginfo_reflection__void, 0)
PHP_FE_END
};

ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_extension_export, 0, 0, 1)
ZEND_ARG_INFO(0, name)
ZEND_ARG_INFO(0, return)
Expand Down Expand Up @@ -6804,6 +6841,10 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionType", reflection_type_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_type_ptr = zend_register_internal_class(&_reflection_entry);

INIT_CLASS_ENTRY(_reflection_entry, "ReflectionNamedType", reflection_named_type_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_named_type_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_type_ptr);

INIT_CLASS_ENTRY(_reflection_entry, "ReflectionMethod", reflection_method_functions);
_reflection_entry.create_object = reflection_objects_new;
Expand Down
1 change: 1 addition & 0 deletions ext/reflection/php_reflection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ extern PHPAPI zend_class_entry *reflection_function_abstract_ptr;
extern PHPAPI zend_class_entry *reflection_function_ptr;
extern PHPAPI zend_class_entry *reflection_parameter_ptr;
extern PHPAPI zend_class_entry *reflection_type_ptr;
extern PHPAPI zend_class_entry *reflection_named_type_ptr;
extern PHPAPI zend_class_entry *reflection_class_ptr;
extern PHPAPI zend_class_entry *reflection_object_ptr;
extern PHPAPI zend_class_entry *reflection_method_ptr;
Expand Down
21 changes: 13 additions & 8 deletions ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var_dump($ext->getClasses());
?>
==DONE==
--EXPECT--
array(15) {
array(16) {
["ReflectionException"]=>
object(ReflectionClass)#2 (1) {
["name"]=>
Expand Down Expand Up @@ -50,38 +50,43 @@ array(15) {
["name"]=>
string(14) "ReflectionType"
}
["ReflectionMethod"]=>
["ReflectionNamedType"]=>
object(ReflectionClass)#10 (1) {
["name"]=>
string(19) "ReflectionNamedType"
}
["ReflectionMethod"]=>
object(ReflectionClass)#11 (1) {
["name"]=>
string(16) "ReflectionMethod"
}
["ReflectionClass"]=>
object(ReflectionClass)#11 (1) {
object(ReflectionClass)#12 (1) {
["name"]=>
string(15) "ReflectionClass"
}
["ReflectionObject"]=>
object(ReflectionClass)#12 (1) {
object(ReflectionClass)#13 (1) {
["name"]=>
string(16) "ReflectionObject"
}
["ReflectionProperty"]=>
object(ReflectionClass)#13 (1) {
object(ReflectionClass)#14 (1) {
["name"]=>
string(18) "ReflectionProperty"
}
["ReflectionClassConstant"]=>
object(ReflectionClass)#14 (1) {
object(ReflectionClass)#15 (1) {
["name"]=>
string(23) "ReflectionClassConstant"
}
["ReflectionExtension"]=>
object(ReflectionClass)#15 (1) {
object(ReflectionClass)#16 (1) {
["name"]=>
string(19) "ReflectionExtension"
}
["ReflectionZendExtension"]=>
object(ReflectionClass)#16 (1) {
object(ReflectionClass)#17 (1) {
["name"]=>
string(23) "ReflectionZendExtension"
}
Expand Down
41 changes: 41 additions & 0 deletions ext/reflection/tests/ReflectionNamedType.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
--TEST--
ReflectionNamedType::getName() and ReflectionNamedType::__toString()
--FILE--
<?php

function testInternalTypes(?Traversable $traversable): ?string {
return 'test';
}

function testUserDefinedTypes(?Test $traversable): ?Test {
return new Test;
}

$function = new ReflectionFunction('testInternalTypes');
$type = $function->getParameters()[0]->getType();
$return = $function->getReturnType();

var_dump($type->getName());
var_dump((string) $type);
var_dump($return->getName());
var_dump((string) $return);

$function = new ReflectionFunction('testUserDefinedTypes');
$type = $function->getParameters()[0]->getType();
$return = $function->getReturnType();

var_dump($type->getName());
var_dump((string) $type);
var_dump($return->getName());
var_dump((string) $return);

?>
--EXPECTF--
string(11) "Traversable"
string(12) "?Traversable"
string(6) "string"
string(7) "?string"
string(4) "Test"
string(5) "?Test"
string(4) "Test"
string(5) "?Test"
2 changes: 1 addition & 1 deletion ext/reflection/tests/ReflectionType_001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ string(8) "callable"
bool(true)
bool(true)
bool(false)
string(8) "stdClass"
string(9) "?stdClass"
** Function 0 - Parameter 4
bool(false)
** Function 0 - Parameter 5
Expand Down