bug #40019 [ErrorHandler] Fix strpos error when trying to call a method without a name (Deuchnord)

nicolas-grekas · nicolas-grekas · commit 27fab22fa6fa · 2021-01-28T17:54:55.000+01:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [ErrorHandler] Fix strpos error when trying to call a method without a name | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | None (direct fix) | License | MIT | Doc PR | None  When running the following code: ```php class Foo { // Some code here } $str = ''; // this should not happen, but for some reason, it did. $foo->{$str}(); ``` a fatal error occurs because the method name to execute is empty, but Symfony's error enhancer fails to parse it: ![Error screenshot](https://user-images.githubusercontent.com/7600265/106108704-ec019b80-6148-11eb-82bc-f7801e30fea4.png) In this PR, I propose a fix with a more clear error to inform the developer about what happened. Commits ------- 66be87b [ErrorHandler] Fix strpos error when trying to call a method without a name
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -40,7 +40,7 @@ public function handleError(array $error, FatalErrorException $exception)
 
         $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
 
-        if (!class_exists($className) || null === $methods = get_class_methods($className)) {
+        if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
             // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
             return new UndefinedMethodException($message, $exception);
         }
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -48,6 +48,15 @@ public function provideUndefinedMethodData()
                 ],
                 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
             ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined method SplObjectStorage::()',
+                ],
+                'Attempted to call an undefined method named "" of class "SplObjectStorage".',
+            ],
             [
                 [
                     'type' => 1,
diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
@@ -39,7 +39,7 @@ public function enhance(\Throwable $error): ?\Throwable
 
         $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
 
-        if (!class_exists($className) || null === $methods = get_class_methods($className)) {
+        if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
             // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
             return new UndefinedMethodError($message, $error);
         }
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php
@@ -40,6 +40,10 @@ public function provideUndefinedMethodData()
                 'Call to undefined method SplObjectStorage::what()',
                 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
             ],
+            [
+                'Call to undefined method SplObjectStorage::()',
+                'Attempted to call an undefined method named "" of class "SplObjectStorage".',
+            ],
             [
                 'Call to undefined method SplObjectStorage::walid()',
                 "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function handleError(array $error, FatalErrorException $exception)`
`40`	`40`
`41`	`41`	`$message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);`
`42`	`42`
`43`		`- if (!class_exists($className) \|\| null === $methods = get_class_methods($className)) {`
	`43`	`+ if ('' === $methodName \|\| !class_exists($className) \|\| null === $methods = get_class_methods($className)) {`
`44`	`44`	`// failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)`
`45`	`45`	`return new UndefinedMethodException($message, $exception);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function enhance(\Throwable $error): ?\Throwable`
`39`	`39`
`40`	`40`	`$message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);`
`41`	`41`
`42`		`- if (!class_exists($className) \|\| null === $methods = get_class_methods($className)) {`
	`42`	`+ if ('' === $methodName \|\| !class_exists($className) \|\| null === $methods = get_class_methods($className)) {`
`43`	`43`	`// failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)`
`44`	`44`	`return new UndefinedMethodError($message, $error);`
`45`	`45`	`}`