[Debug] made order of suggestions predictable in error messages

fabpot · fabpot · commit 23acc24015de · 2014-02-03T11:14:18.000+01:00
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -80,6 +80,7 @@ public function handleError(array $error, FatalErrorException $exception)
         }
 
         if ($candidates) {
+            sort($candidates);
             $message .= ' Did you mean to call: '.implode(', ', array_map(function ($val) {
                 return '"'.$val.'"';
             }, $candidates)).'?';
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -45,6 +45,7 @@ public function handleError(array $error, FatalErrorException $exception)
         }
 
         if ($candidates) {
+            sort($candidates);
             $message .= sprintf(' Did you mean to call: "%s"?', implode('", "', $candidates));
         }
 
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -59,7 +59,7 @@ public function provideUndefinedMethodData()
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
                 ),
-                'Attempted to call method "offsetFet" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "offsetSet", "offsetUnset", "offsetGet"?',
+                'Attempted to call method "offsetFet" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "offsetGet", "offsetSet", "offsetUnset"?',
             ),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public function handleError(array $error, FatalErrorException $exception)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if ($candidates) {`
	`83`	`+ sort($candidates);`
`83`	`84`	`$message .= ' Did you mean to call: '.implode(', ', array_map(function ($val) {`
`84`	`85`	`return '"'.$val.'"';`
`85`	`86`	`}, $candidates)).'?';`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function handleError(array $error, FatalErrorException $exception)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if ($candidates) {`
	`48`	`+ sort($candidates);`
`48`	`49`	`$message .= sprintf(' Did you mean to call: "%s"?', implode('", "', $candidates));`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function provideUndefinedMethodData()`
`59`	`59`	`'file' => 'foo.php',`
`60`	`60`	`'message' => 'Call to undefined method SplObjectStorage::offsetFet()',`
`61`	`61`	`),`
`62`		`- 'Attempted to call method "offsetFet" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "offsetSet", "offsetUnset", "offsetGet"?',`
	`62`	`+ 'Attempted to call method "offsetFet" on class "SplObjectStorage" in foo.php line 12. Did you mean to call: "offsetGet", "offsetSet", "offsetUnset"?',`
`63`	`63`	`),`
`64`	`64`	`);`
`65`	`65`	`}`