com php-src: Revert "Append \ to class name returned from ReflectionType::__toString()": ext/reflection /php_reflection.c
ext/reflection/tests/ReflectionNamedTyp e.phpt ext/reflection/tests/ReflectionType_001.ph pt ext/reflection/tests/ReflectionType_002.phpt e
xt/reflection/tests/ReflectionType_possible_types.phpt

From: Date: Fri, 19 Aug 2016 18:36:49 +0000
Subject: com php-src: Revert "Append \ to class name returned from ReflectionType::__toString()": ext/reflection /php_reflection.c
ext/reflection/tests/ReflectionNamedTyp e.phpt ext/reflection/tests/ReflectionType_001.ph pt ext/reflection/tests/ReflectionType_002.phpt e
xt/reflection/tests/ReflectionType_possible_types.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94244@lists.php.net to get a copy of this message
Commit: 6e6e81c4026ba67c2d7e84b4cf89f09ac19a7cb0 Author: Stanislav Malyshev <stas@php.net> Fri, 19 Aug 2016 11:36:49 -0700 Parents: ae92977191d5656f2ba303e9bbfcd0b2716b4244 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e6e81c4026ba67c2d7e84b4cf89f09ac19a7cb0 Log: Revert "Append \ to class name returned from ReflectionType::__toString()" This reverts commit 20fdd47921f423728b409fd0ae0106dab9c34573. Changed paths: M ext/reflection/php_reflection.c M ext/reflection/tests/ReflectionNamedType.phpt M ext/reflection/tests/ReflectionType_001.phpt M ext/reflection/tests/ReflectionType_002.phpt M ext/reflection/tests/ReflectionType_possible_types.phpt Diff: diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index df15efd..82d7645 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3037,14 +3037,6 @@ ZEND_METHOD(reflection_type, __toString) str = reflection_type_name(param); - if (param->arg_info->type_hint == IS_OBJECT - && !zend_string_equals_literal_ci(param->arg_info->class_name, "self") - && !zend_string_equals_literal_ci(param->arg_info->class_name, "parent")) { - 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] = '\\'; - } - 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); diff --git a/ext/reflection/tests/ReflectionNamedType.phpt b/ext/reflection/tests/ReflectionNamedType.phpt index 1ce1222..1e8f55a 100644 --- a/ext/reflection/tests/ReflectionNamedType.phpt +++ b/ext/reflection/tests/ReflectionNamedType.phpt @@ -32,10 +32,10 @@ var_dump((string) $return); ?> --EXPECTF-- string(11) "Traversable" -string(13) "?\Traversable" +string(12) "?Traversable" string(6) "string" string(7) "?string" string(4) "Test" -string(6) "?\Test" +string(5) "?Test" string(4) "Test" -string(6) "?\Test" \ No newline at end of file +string(5) "?Test" diff --git a/ext/reflection/tests/ReflectionType_001.phpt b/ext/reflection/tests/ReflectionType_001.phpt index c0ae244..a317566 100644 --- a/ext/reflection/tests/ReflectionType_001.phpt +++ b/ext/reflection/tests/ReflectionType_001.phpt @@ -79,7 +79,7 @@ foreach ([ bool(true) bool(false) bool(false) -string(9) "\stdClass" +string(8) "stdClass" ** Function 0 - Parameter 1 bool(true) bool(false) @@ -94,7 +94,7 @@ string(8) "callable" bool(true) bool(true) bool(false) -string(10) "?\stdClass" +string(9) "?stdClass" ** Function 0 - Parameter 4 bool(false) ** Function 0 - Parameter 5 @@ -121,19 +121,19 @@ string(5) "float" bool(true) bool(false) bool(false) -string(12) "\NotExisting" +string(11) "NotExisting" ** Function 1 - Parameter 0 bool(true) bool(false) bool(false) -string(5) "\Test" +string(4) "Test" *** methods ** Method 0 - parameter 0 bool(true) bool(false) bool(false) -string(11) "\SplSubject" +string(10) "SplSubject" ** Method 1 - parameter 0 bool(true) bool(false) @@ -148,7 +148,7 @@ string(6) "parent" bool(true) bool(false) bool(false) -string(5) "\Test" +string(4) "Test" *** return types ** Function/method return type 0 @@ -157,7 +157,7 @@ bool(false) bool(true) bool(false) bool(false) -string(9) "\stdClass" +string(8) "stdClass" ** Function/method return type 2 bool(true) bool(false) @@ -177,9 +177,9 @@ string(6) "parent" bool(true) bool(false) bool(false) -string(5) "\Test" +string(4) "Test" ** Function/method return type 6 bool(true) bool(false) bool(false) -string(5) "\Test" +string(4) "Test" diff --git a/ext/reflection/tests/ReflectionType_002.phpt b/ext/reflection/tests/ReflectionType_002.phpt index 9c9c77b..8313862 100644 --- a/ext/reflection/tests/ReflectionType_002.phpt +++ b/ext/reflection/tests/ReflectionType_002.phpt @@ -12,6 +12,6 @@ unset($rm, $rp); var_dump((string) $rt, (string) $rrt); --EXPECT-- -string(5) "\Test" -string(6) "\Test2" +string(4) "Test" +string(5) "Test2" diff --git a/ext/reflection/tests/ReflectionType_possible_types.phpt b/ext/reflection/tests/ReflectionType_possible_types.phpt index 0db5b7c..81e0855 100644 --- a/ext/reflection/tests/ReflectionType_possible_types.phpt +++ b/ext/reflection/tests/ReflectionType_possible_types.phpt @@ -28,4 +28,4 @@ string(6) "string" string(4) "bool" string(5) "array" string(8) "callable" -string(9) "\StdClass" +string(8) "StdClass"

« previous php.cvs (#94244) next »