Merge branch '6.4' into 7.0

* 6.4:
  fix typo
  remove the WriteConfig class
  DX: PHP CS Fixer - keep Annotation,NamedArgumentConstructor,Target annotations as single group
  do not install FrameworkBundle 6.4
  [Tests] Add `array` return type for provider methods
  [Tests] Move expectException closer to the place of the expectation to avoid false positives

Author: xabbuh

Tests/Controller/ProfilerControllerTest.php

@@ -34,13 +34,14 @@ class ProfilerControllerTest extends WebTestCase
 {
     public function testHomeActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->homeAction();
     }
 
@@ -110,13 +111,14 @@ public function testPanelActionWithValidPanelAndToken()
 
     public function testToolbarActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->toolbarAction(Request::create('/_wdt/foo-token'), null);
     }
 
@@ -202,13 +204,14 @@ public function testReturns404onTokenNotFound($withCsp)
 
     public function testSearchBarActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->searchBarAction(Request::create('/_profiler/search_bar'));
     }
 
@@ -296,13 +299,14 @@ public function testSearchResultsAction($withCsp)
 
     public function testSearchActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->searchBarAction(Request::create('/_profiler/search'));
     }
 
@@ -335,13 +339,14 @@ public function testSearchActionWithoutToken()
 
     public function testPhpinfoActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->phpinfoAction();
     }
 
@@ -357,26 +362,28 @@ public function testPhpinfoAction()
 
     public function testFontActionWithProfilerDisabled()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('The profiler must be enabled.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, null, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('The profiler must be enabled.');
+
         $controller->fontAction('JetBrainsMono');
     }
 
     public function testFontActionWithInvalidFontName()
     {
-        $this->expectException(NotFoundHttpException::class);
-        $this->expectExceptionMessage('Font file "InvalidFontName.woff2" not found.');
-
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $profiler = $this->createMock(Profiler::class);
         $twig = $this->createMock(Environment::class);
 
         $controller = new ProfilerController($urlGenerator, $profiler, $twig, []);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('Font file "InvalidFontName.woff2" not found.');
+
         $controller->fontAction('InvalidFontName');
     }