Skip to content

Commit 06aeefb

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [HttpKernel] Adjust tests to new "class not found" error message format. Don't call createMock with an array of interfaces. [FrameworkBundle] Fix Tests on PHPUnit 9.3. [WebProfilerBundle] Fix Tests on PHPUnit 9.3. esmtp error not being thrown properly [Yaml Parser] fixed Parser to skip comments when inlining sequences [DI] fix generating preload file when cache_dir is outside project_dir Fix CacheCollectorPass with decorated cache pools [PhpUnitBridge] CoverageListenerTrait update for PHPUnit 8.5/9.x Remove invalid instantiation declaration [PropertyInfo] Fix typed collections in PHP 7.4
2 parents 702f439 + 9114720 commit 06aeefb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/Controller/ControllerResolverTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ public function getUndefinedControllers()
170170
$controller = new ControllerTest();
171171

172172
return [
173-
['foo', \Error::class, 'Class \'foo\' not found'],
174-
['oof::bar', \Error::class, 'Class \'oof\' not found'],
175-
[['oof', 'bar'], \Error::class, 'Class \'oof\' not found'],
173+
['foo', \Error::class, \PHP_VERSION_ID < 80000 ? 'Class \'foo\' not found' : 'Class "foo" not found'],
174+
['oof::bar', \Error::class, \PHP_VERSION_ID < 80000 ? 'Class \'oof\' not found' : 'Class "oof" not found'],
175+
[['oof', 'bar'], \Error::class, \PHP_VERSION_ID < 80000 ? 'Class \'oof\' not found' : 'Class "oof" not found'],
176176
['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable: Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'],
177177
['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable: Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
178178
['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable: Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],

0 commit comments

Comments
 (0)