Skip to content

Commit fc693f5

Browse files
committed
Use canonical spelling and preserve user-given case in error messages
The __debugInfo() fatal error printed the lowercased method name (__debuginfo()), and ReflectionClass::getProperty() lowercased the class part of a "Class::property" argument before printing it in the "Class ... does not exist" exception. Print the canonical __debugInfo() spelling and pass the class name to zend_lookup_class() as given, which also forwards the original case to autoloaders, matching ReflectionMethod and ReflectionProperty.
1 parent a7f40d1 commit fc693f5

14 files changed

Lines changed: 14 additions & 16 deletions

Zend/tests/debug_info/debug_info-error-0.0.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(0.0);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-0.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(0);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-1.0.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(1.0);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(1);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-empty_str.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C("");
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-false.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(false);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-object.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(new stdClass);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-resource.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ $c = new C(fopen("data:text/plain,Foo", 'r'));
1919
var_dump($c);
2020
?>
2121
--EXPECTF--
22-
Fatal error: __debuginfo() must return an array in %s on line %d
22+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-str.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C("foo");
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

Zend/tests/debug_info/debug_info-error-true.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ $c = new C(true);
1717
var_dump($c);
1818
?>
1919
--EXPECTF--
20-
Fatal error: __debuginfo() must return an array in %s on line %d
20+
Fatal error: __debugInfo() must return an array in %s on line %d

0 commit comments

Comments
 (0)