Remove deprecations, fix code merged from 1.5

Author: dkarlovi

Command/CreateClientCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the FOSOAuthServerBundle package.
  *
@@ -11,11 +13,11 @@
 
 namespace FOS\OAuthServerBundle\Command;
 
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 class CreateClientCommand extends ContainerAwareCommand
 {

Form/Handler/AuthorizeFormHandler.php

@@ -53,15 +53,6 @@ public function __construct(FormInterface $form, $requestStack = null)
         $this->requestStack = $requestStack;
     }
 
-    public function __get($name)
-    {
-        if ($name === 'request') {
-            @trigger_error(sprintf('%s::$request is deprecated since 1.4 and will be removed in 2.0.', __CLASS__), E_USER_DEPRECATED);
-
-            return $this->getCurrentRequest();
-        }
-    }
-
     /**
      * Sets the container.
      *

Security/Firewall/OAuthListener.php

@@ -33,7 +33,7 @@ class OAuthListener implements ListenerInterface
     /**
      * @var TokenStorageInterface
      */
-    protected $securityContext;
+    protected $tokenStorage;
 
     /**
      * @var AuthenticationManagerInterface
@@ -49,17 +49,10 @@ class OAuthListener implements ListenerInterface
      * @param TokenStorageInterface          $tokenStorage          the token storage
      * @param AuthenticationManagerInterface $authenticationManager the authentication manager
      * @param OAuth2                         $serverService
-     * @param mixed                          $securityContext
      */
-    public function __construct($securityContext, AuthenticationManagerInterface $authenticationManager, OAuth2 $serverService)
+    public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, OAuth2 $serverService)
     {
-        if (!$securityContext instanceof TokenStorageInterface) {
-            throw new \InvalidArgumentException('Wrong type for OAuthListener, it has to implement TokenStorageInterface');
-        }
-        if ($securityContext instanceof SecurityContextInterface) {
-            @trigger_error(sprintf('Injecting SecurityContextInterface into %1$s::__construct is deprecated since 1.6 and will be removed in 2.0.', __CLASS__), E_USER_DEPRECATED);
-        }
-        $this->securityContext = $securityContext;
+        $this->tokenStorage = $tokenStorage;
         $this->authenticationManager = $authenticationManager;
         $this->serverService = $serverService;
     }
@@ -80,7 +73,7 @@ public function handle(GetResponseEvent $event)
             $returnValue = $this->authenticationManager->authenticate($token);
 
             if ($returnValue instanceof TokenInterface) {
-                return $this->securityContext->setToken($returnValue);
+                return $this->tokenStorage->setToken($returnValue);
             }
 
             if ($returnValue instanceof Response) {

Tests/Command/CreateClientCommandTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the FOSOAuthServerBundle package.
  *
@@ -48,7 +50,9 @@ protected function setUp()
     /**
      * @dataProvider classProvider
      *
-     * @param string $class A fully qualified class name.
+     * @param string $class         a fully qualified class name
+     * @param mixed  $clientManager
+     * @param mixed  $client
      */
     public function testItShouldCreateClient($clientManager, $client)
     {
@@ -60,7 +64,7 @@ public function testItShouldCreateClient($clientManager, $client)
         $clientManager
             ->expects($this->any())
             ->method('createClient')
-            ->will($this->returnValue(new $client));
+            ->will($this->returnValue(new $client()));
 
         $this->container->set('fos_oauth_server.client_manager.default', $clientManager);
 
@@ -78,7 +82,7 @@ public function testItShouldCreateClient($clientManager, $client)
             ],
         ]);
 
-        $this->assertEquals(0, $commandTester->getStatusCode());
+        $this->assertSame(0, $commandTester->getStatusCode());
 
         $output = $commandTester->getDisplay();