[SecurityBundle] Deprecate public services to private

Author: fancyweb

Tests/Functional/Bundle/TestBundle/Controller/SecurityController.php

@@ -11,16 +11,32 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
-class SecurityController implements ContainerAwareInterface
+class SecurityController implements ServiceSubscriberInterface
 {
-    use ContainerAwareTrait;
+    private $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
 
     public function profileAction()
     {
         return new Response('Welcome '.$this->container->get('security.token_storage')->getToken()->getUserIdentifier().'!');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedServices(): array
+    {
+        return [
+            'security.token_storage' => TokenStorageInterface::class,
+        ];
+    }
 }

Tests/Functional/app/Security/config.yml

@@ -1,6 +1,12 @@
 imports:
     - { resource: ./../config/default.yml }
 
+services:
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SecurityController:
+        public: true
+        tags:
+            - container.service_subscriber
+
 security:
     providers:
         main: