minor #10186 Made some HHVM-related fixes (fabpot)

fabpot · fabpot · commit bea15379646b · 2014-02-04T08:17:17.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- Made some HHVM-related fixes | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 1240758 [Routing] fixed CS e223395 [Debug] fixed case differences between PHP and HHVM (classes are case-insensitive anyway in PHP) 23acc24 [Debug] made order of suggestions predictable in error messages
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/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -254,7 +254,8 @@ public function testFatalErrorHandlers($error, $class, $translatedMessage)
         $m->invoke($handler, $exceptionHandler, $error);
 
         $this->assertInstanceof($class, $exceptionHandler->e);
-        $this->assertSame($translatedMessage, $exceptionHandler->e->getMessage());
+        // class names are case insensitive and PHP/HHVM do not return the same
+        $this->assertSame(strtolower($translatedMessage), strtolower($exceptionHandler->e->getMessage()));
         $this->assertSame($error['type'], $exceptionHandler->e->getSeverity());
         $this->assertSame($error['file'], $exceptionHandler->e->getFile());
         $this->assertSame($error['line'], $exceptionHandler->e->getLine());
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -25,7 +25,8 @@ public function testUndefinedFunction($error, $translatedMessage)
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
 
         $this->assertInstanceof('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
-        $this->assertSame($translatedMessage, $exception->getMessage());
+        // class names are case insensitive and PHP/HHVM do not return the same
+        $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
         $this->assertSame($error['type'], $exception->getSeverity());
         $this->assertSame($error['file'], $exception->getFile());
         $this->assertSame($error['line'], $exception->getLine());
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"?',
             ),
         );
     }
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -60,7 +60,7 @@ public function testDumpWithRoutes()
         $this->routeCollection->add('Test2', new Route('/testing2'));
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
-        include ($this->testTmpFilepath);
+        include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \ProjectUrlGenerator(new RequestContext('/app.php'));
 
@@ -81,7 +81,7 @@ public function testDumpWithRoutes()
     public function testDumpWithoutRoutes()
     {
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'WithoutRoutesUrlGenerator')));
-        include ($this->testTmpFilepath);
+        include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \WithoutRoutesUrlGenerator(new RequestContext('/app.php'));
 
@@ -96,7 +96,7 @@ public function testGenerateNonExistingRoute()
         $this->routeCollection->add('Test', new Route('/test'));
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'NonExistingRoutesUrlGenerator')));
-        include ($this->testTmpFilepath);
+        include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \NonExistingRoutesUrlGenerator(new RequestContext());
         $url = $projectUrlGenerator->generate('NonExisting', array());
@@ -107,7 +107,7 @@ public function testDumpForRouteWithDefaults()
         $this->routeCollection->add('Test', new Route('/testing/{foo}', array('foo' => 'bar')));
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'DefaultRoutesUrlGenerator')));
-        include ($this->testTmpFilepath);
+        include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \DefaultRoutesUrlGenerator(new RequestContext());
         $url = $projectUrlGenerator->generate('Test', array());
@@ -121,7 +121,7 @@ public function testDumpWithSchemeRequirement()
         $this->routeCollection->add('Test2', new Route('/testing_bc', array(), array('_scheme' => 'https'))); // BC
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'SchemeUrlGenerator')));
-        include ($this->testTmpFilepath);
+        include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php'));
 

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`	`}`