mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-19 23:11:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fix bug #78697: inaccurate error message
This commit is contained in:
Joe Watkins 2019-10-21 09:24:57 +02:00
commit 174ab25fd4
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
4 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -58,6 +58,10 @@ PHP NEWS
(krakjoe)
. Fixed bug #77805 (phpdbg build fails when readline is shared). (krakjoe)
- Reflection:
. Fixed bug #78697 (ReflectionClass::implementsInterface - inaccurate error
message with traits). (villfa)
- Session:
. Fixed bug #78624 (session_gc return value for user defined session
handlers). (bshaffer)

2
ext/reflection/php_reflection.c
View File

@ -4990,7 +4990,7 @@ ZEND_METHOD(reflection_class, implementsInterface)
if (!(interface_ce->ce_flags & ZEND_ACC_INTERFACE)) {
zend_throw_exception_ex(reflection_exception_ptr, 0,
"Interface %s is a Class", ZSTR_VAL(interface_ce->name));
"%s is not an interface", ZSTR_VAL(interface_ce->name));
return;
}
RETURN_BOOL(instanceof_function(ce, interface_ce));

60
ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
View File

@ -67,14 +67,14 @@ try {
?>
--EXPECTF--
Does A implement A?
- Using object argument: Interface A is a Class
- Using string argument: Interface A is a Class
- Using object argument: A is not an interface
- Using string argument: A is not an interface
Does A implement B?
- Using object argument: Interface B is a Class
- Using string argument: Interface B is a Class
- Using object argument: B is not an interface
- Using string argument: B is not an interface
Does A implement C?
- Using object argument: Interface C is a Class
- Using string argument: Interface C is a Class
- Using object argument: C is not an interface
- Using string argument: C is not an interface
Does A implement I1?
- Using object argument: bool(true)
- Using string argument: bool(true)
@ -82,14 +82,14 @@ Does A implement I2?
- Using object argument: bool(false)
- Using string argument: bool(false)
Does B implement A?
- Using object argument: Interface A is a Class
- Using string argument: Interface A is a Class
- Using object argument: A is not an interface
- Using string argument: A is not an interface
Does B implement B?
- Using object argument: Interface B is a Class
- Using string argument: Interface B is a Class
- Using object argument: B is not an interface
- Using string argument: B is not an interface
Does B implement C?
- Using object argument: Interface C is a Class
- Using string argument: Interface C is a Class
- Using object argument: C is not an interface
- Using string argument: C is not an interface
Does B implement I1?
- Using object argument: bool(true)
- Using string argument: bool(true)
@ -97,14 +97,14 @@ Does B implement I2?
- Using object argument: bool(false)
- Using string argument: bool(false)
Does C implement A?
- Using object argument: Interface A is a Class
- Using string argument: Interface A is a Class
- Using object argument: A is not an interface
- Using string argument: A is not an interface
Does C implement B?
- Using object argument: Interface B is a Class
- Using string argument: Interface B is a Class
- Using object argument: B is not an interface
- Using string argument: B is not an interface
Does C implement C?
- Using object argument: Interface C is a Class
- Using string argument: Interface C is a Class
- Using object argument: C is not an interface
- Using string argument: C is not an interface
Does C implement I1?
- Using object argument: bool(true)
- Using string argument: bool(true)
@ -112,14 +112,14 @@ Does C implement I2?
- Using object argument: bool(true)
- Using string argument: bool(true)
Does I1 implement A?
- Using object argument: Interface A is a Class
- Using string argument: Interface A is a Class
- Using object argument: A is not an interface
- Using string argument: A is not an interface
Does I1 implement B?
- Using object argument: Interface B is a Class
- Using string argument: Interface B is a Class
- Using object argument: B is not an interface
- Using string argument: B is not an interface
Does I1 implement C?
- Using object argument: Interface C is a Class
- Using string argument: Interface C is a Class
- Using object argument: C is not an interface
- Using string argument: C is not an interface
Does I1 implement I1?
- Using object argument: bool(true)
- Using string argument: bool(true)
@ -127,14 +127,14 @@ Does I1 implement I2?
- Using object argument: bool(false)
- Using string argument: bool(false)
Does I2 implement A?
- Using object argument: Interface A is a Class
- Using string argument: Interface A is a Class
- Using object argument: A is not an interface
- Using string argument: A is not an interface
Does I2 implement B?
- Using object argument: Interface B is a Class
- Using string argument: Interface B is a Class
- Using object argument: B is not an interface
- Using string argument: B is not an interface
Does I2 implement C?
- Using object argument: Interface C is a Class
- Using string argument: Interface C is a Class
- Using object argument: C is not an interface
- Using string argument: C is not an interface
Does I2 implement I1?
- Using object argument: bool(true)
- Using string argument: bool(true)

14
ext/reflection/tests/bug78697.phpt Normal file
View File

@ -0,0 +1,14 @@
--TEST--
Bug #78697: ReflectionClass::implementsInterface - inaccurate error message with traits
--FILE--
<?php
trait T {}
try {
(new ReflectionClass(new stdClass))->implementsInterface(T::class);
} catch (ReflectionException $e) {
echo $e->getMessage();
}
?>
--EXPECT--
T is not an interface