Merge pull request #605 from deguif/review-controller-annotation-tests

Review annotations in controller tests

Author: goetas

Tests/Functional/AppKernel.php

@@ -32,9 +32,9 @@
 
 class AppKernel extends Kernel
 {
-    private $config;
+    private string|null $config;
 
-    private $fwConfig;
+    private string $fwConfig;
 
     public function __construct(string $fwConfig, ?string $config)
     {
@@ -75,6 +75,8 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         if ($this->config) {
             $loader->load($this->config);
         }
+
+        $loader->load($this->getProjectDir() . '/config/services.yaml');
     }
 
     public function getCacheDir(): string

Tests/Functional/Fixture/TestBundle/Controller/AppleController.php

@@ -4,31 +4,27 @@
 
 namespace JMS\TranslationBundle\Tests\Functional\Fixture\TestBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @author Johannes
- *
- * @Route("/apples")
  */
-class AppleController
+#[AsController()]
+#[Route('/apples')]
+class AppleController extends AbstractController
 {
-    /**
-     * @Route("/view")
-     * @Template("@Test/Apple/view.html.twig")
-     */
-    public function viewAction()
+    #[Route('/view')]
+    public function viewAction(): Response
     {
-        return ['nbApples' => 5];
+        return $this->render('@Test/Apple/view.html.twig', ['nbApples' => 5]);
     }
 
-    /**
-     * @Route("/view_sf5")
-     * @Template("@Test/Apple/view_sf5.html.twig")
-     */
-    public function viewsf5Action()
+    #[Route('/view_sf5')]
+    public function viewsf5Action(): Response
     {
-        return ['nbApples' => 5];
+        return $this->render('@Test/Apple/view_sf5.html.twig', ['nbApples' => 5]);
     }
 }

Tests/Functional/config/default.yml

@@ -6,10 +6,3 @@ imports:
 framework:
     templating:
         engines: [twig, php]
-
-parameters:
-    translation_output_dir: "%kernel.project_dir%/Fixture/TestBundle/Resources/translations"
-
-services:
-    logger:
-        class: Psr\Log\NullLogger

Tests/Functional/config/default_sf5.yml

@@ -1,10 +1,3 @@
 imports:
     - { resource: twig.yml }
     - { resource: bundle.yml }
-
-parameters:
-    translation_output_dir: "%kernel.project_dir%/Fixture/TestBundle/Resources/translations"
-
-services:
-    logger:
-        class: Psr\Log\NullLogger

Tests/Functional/config/framework.yml

@@ -13,4 +13,4 @@ framework:
     translator:
         enabled: true
     router:
-        resource: "%kernel.project_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing.yaml"

Tests/Functional/config/framework_sf6.yml

@@ -13,4 +13,4 @@ framework:
     translator:
         enabled: true
     router:
-        resource: "%kernel.project_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing_sf6.yaml"

Tests/Functional/config/routing.yaml

@@ -0,0 +1,8 @@
+JMSTranslationBundle_ui:
+    resource: '@JMSTranslationBundle/Controller/'
+    type: 'annotation'
+    prefix: /_trans
+
+TestBundle:
+    resource: '@TestBundle/Controller/'
+    type: 'annotation'

Tests/Functional/config/routing.yml

@@ -0,0 +1,8 @@
+JMSTranslationBundle_ui:
+    resource: '@JMSTranslationBundle/Controller/'
+    type: 'attribute'
+    prefix: /_trans
+
+TestBundle:
+    resource: '@TestBundle/Controller/'
+    type: 'attribute'

Tests/Functional/config/routing_sf6.yaml

@@ -0,0 +1,11 @@
+parameters:
+    translation_output_dir: '%kernel.project_dir%/Fixture/TestBundle/Resources/translations'
+
+services:
+    logger:
+        class: Psr\Log\NullLogger
+
+    JMS\TranslationBundle\Tests\Functional\Fixture\TestBundle\Controller\:
+        resource: '@TestBundle/Controller/'
+        autowire: true
+        autoconfigure: true