archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify php_reflection.c, class name cannot start with backslash (#10536)

Browse source 
* fix comment typo

* (normalized) class name never start with backslash
This commit is contained in:
Michael Voříšek 2023-02-11 14:50:25 +01:00 • committed by GitHub
parent 1cb38e4fcb
commit a11e9c9d02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/reflection/php_reflection.c
View file

@ -3496,7 +3496,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, inNamespace)
zend_string *name = fptr->common.function_name; zend_string *name = fptr->common.function_name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
RETURN_BOOL(backslash && backslash > ZSTR_VAL(name)); RETURN_BOOL(backslash);
} }
/* }}} */ /* }}} */
@ -3514,7 +3514,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNamespaceName)
zend_string *name = fptr->common.function_name; zend_string *name = fptr->common.function_name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (backslash && backslash > ZSTR_VAL(name)) { if (backslash) {
RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name)); RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name));
} }
RETURN_EMPTY_STRING(); RETURN_EMPTY_STRING();
@ -3535,7 +3535,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getShortName)
zend_string *name = fptr->common.function_name; zend_string *name = fptr->common.function_name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (backslash && backslash > ZSTR_VAL(name)) { if (backslash) {
RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1)); RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
} }
RETURN_STR_COPY(name); RETURN_STR_COPY(name);
@ -5363,7 +5363,7 @@ ZEND_METHOD(ReflectionClass, inNamespace)
zend_string *name = ce->name; zend_string *name = ce->name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
RETURN_BOOL(backslash && backslash > ZSTR_VAL(name)); RETURN_BOOL(backslash);
} }
/* }}} */ /* }}} */
@ -5381,7 +5381,7 @@ ZEND_METHOD(ReflectionClass, getNamespaceName)
zend_string *name = ce->name; zend_string *name = ce->name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (backslash && backslash > ZSTR_VAL(name)) { if (backslash) {
RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name)); RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name));
} }
RETURN_EMPTY_STRING(); RETURN_EMPTY_STRING();
@ -5402,7 +5402,7 @@ ZEND_METHOD(ReflectionClass, getShortName)
zend_string *name = ce->name; zend_string *name = ce->name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name)); const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (backslash && backslash > ZSTR_VAL(name)) { if (backslash) {
RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1)); RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
} }
RETURN_STR_COPY(name); RETURN_STR_COPY(name);
@ -5667,7 +5667,7 @@ ZEND_METHOD(ReflectionProperty, setValue)
} }
/* }}} */ /* }}} */
/* {{{ Returns this property's value */ /* {{{ Returns true if property was initialized */
ZEND_METHOD(ReflectionProperty, isInitialized) ZEND_METHOD(ReflectionProperty, isInitialized)
{ {
reflection_object *intern; reflection_object *intern;
@ -6499,7 +6499,7 @@ ZEND_METHOD(ReflectionAttribute, __toString)
} }
/* }}} */ /* }}} */
/* {{{ * Returns the name of the attribute */ /* {{{ Returns the name of the attribute */
ZEND_METHOD(ReflectionAttribute, getName) ZEND_METHOD(ReflectionAttribute, getName)
{ {
reflection_object *intern; reflection_object *intern;
@ -6514,7 +6514,7 @@ ZEND_METHOD(ReflectionAttribute, getName)
} }
/* }}} */ /* }}} */
/* {{{ * Returns the target of the attribute */ /* {{{ Returns the target of the attribute */
ZEND_METHOD(ReflectionAttribute, getTarget) ZEND_METHOD(ReflectionAttribute, getTarget)
{ {
reflection_object *intern; reflection_object *intern;
@ -6529,7 +6529,7 @@ ZEND_METHOD(ReflectionAttribute, getTarget)
} }
/* }}} */ /* }}} */
/* {{{ * Returns true if the attribute is repeated */ /* {{{ Returns true if the attribute is repeated */
ZEND_METHOD(ReflectionAttribute, isRepeated) ZEND_METHOD(ReflectionAttribute, isRepeated)
{ {
reflection_object *intern; reflection_object *intern;
@ -6544,7 +6544,7 @@ ZEND_METHOD(ReflectionAttribute, isRepeated)
} }
/* }}} */ /* }}} */
/* {{{ * Returns the arguments passed to the attribute */ /* {{{ Returns the arguments passed to the attribute */
ZEND_METHOD(ReflectionAttribute, getArguments) ZEND_METHOD(ReflectionAttribute, getArguments)
{ {
reflection_object *intern; reflection_object *intern;
@ -6661,7 +6661,7 @@ static void attribute_ctor_cleanup(
} }
/* }}} */ /* }}} */
/* {{{ * Returns the attribute as an object */ /* {{{ Returns the attribute as an object */
ZEND_METHOD(ReflectionAttribute, newInstance) ZEND_METHOD(ReflectionAttribute, newInstance)
{ {
reflection_object *intern; reflection_object *intern;