minor symfony#25460 [FrameworkBundle] Move AbstractController::getParameter() from the trait to the class & use PSR-11 (nicolas-grekas)

This PR was merged into the 4.1-dev branch.

Discussion
----------

[FrameworkBundle] Move AbstractController::getParameter() from the trait to the class & use PSR-11

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Feels more specific this way to me. Ping @chalasr

Commits
-------

3051289 [FrameworkBundle] Move AbstractController::getParameter() from the trait to the class & use PSR-11

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php

@@ -13,7 +13,6 @@
 
 use Psr\Container\ContainerInterface;
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -53,6 +52,22 @@ public function setContainer(ContainerInterface $container)
         return $previous;
     }
 
+    /**
+     * Gets a container parameter by its name.
+     *
+     * @return mixed
+     *
+     * @final
+     */
+    protected function getParameter(string $name)
+    {
+        if (!$this->container->has('parameter_bag')) {
+            throw new \LogicException('The "parameter_bag" service is not available. Try running "composer require dependency-injection:^4.1"');
+        }
+
+        return $this->container->get('parameter_bag')->get($name);
+    }
+
     public static function getSubscribedServices()
     {
         return array(
@@ -68,7 +83,7 @@ public static function getSubscribedServices()
             'form.factory' => '?'.FormFactoryInterface::class,
             'security.token_storage' => '?'.TokenStorageInterface::class,
             'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
-            'parameter_bag' => '?'.ContainerBagInterface::class,
+            'parameter_bag' => '?'.ContainerInterface::class,
         );
     }
 }

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

@@ -377,20 +377,4 @@ protected function isCsrfTokenValid(string $id, string $token): bool
 
         return $this->container->get('security.csrf.token_manager')->isTokenValid(new CsrfToken($id, $token));
     }
-
-    /**
-     * Gets a container parameter by its name.
-     *
-     * @return mixed
-     *
-     * @final
-     */
-    protected function getParameter(string $name)
-    {
-        if (!$this->container->has('parameter_bag')) {
-            throw new \LogicException('The "parameter_bag" service is not available. Try running "composer require dependency-injection:^4.1"');
-        }
-
-        return $this->container->get('parameter_bag')->get($name);
-    }
 }

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

@@ -13,13 +13,33 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 class AbstractControllerTest extends ControllerTraitTest
 {
     protected function createController()
     {
         return new TestAbstractController();
     }
+
+    public function testGetParameter()
+    {
+        $container = new Container(new FrozenParameterBag(array('foo' => 'bar')));
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        if (!class_exists(ContainerBag::class)) {
+            $this->expectException(\LogicException::class);
+            $this->expectExceptionMessage('The "parameter_bag" service is not available. Try running "composer require dependency-injection:^4.1"');
+        } else {
+            $container->set('parameter_bag', new ContainerBag($container));
+        }
+
+        $this->assertSame('bar', $controller->getParameter('foo'));
+    }
 }
 
 class TestAbstractController extends AbstractController
@@ -57,6 +77,11 @@ public function setContainer(ContainerInterface $container)
         return parent::setContainer($container);
     }
 
+    public function getParameter(string $name)
+    {
+        return parent::getParameter($name);
+    }
+
     public function fooAction()
     {
     }

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

@@ -14,9 +14,6 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
-use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
-use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -531,23 +528,6 @@ public function testGetDoctrine()
 
         $this->assertEquals($doctrine, $controller->getDoctrine());
     }
-
-    public function testGetParameter()
-    {
-        $container = new Container(new FrozenParameterBag(array('foo' => 'bar')));
-
-        $controller = $this->createController();
-        $controller->setContainer($container);
-
-        if (!interface_exists(ContainerBagInterface::class)) {
-            $this->expectException(\LogicException::class);
-            $this->expectExceptionMessage('The "parameter_bag" service is not available. Try running "composer require dependency-injection:^4.1"');
-        } else {
-            $container->set('parameter_bag', new ContainerBag($container));
-        }
-
-        $this->assertSame('bar', $controller->getParameter('foo'));
-    }
 }
 
 trait TestControllerTrait
@@ -572,6 +552,5 @@ trait TestControllerTrait
         createForm as public;
         createFormBuilder as public;
         getDoctrine as public;
-        getParameter as public;
     }
 }