style: fix codebase with PHPStan's help

Author: dkarlovi

DependencyInjection/Security/Factory/OAuthFactory.php

@@ -15,8 +15,8 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 

Form/Type/AuthorizeFormType.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Chris Jones <[email protected]>
@@ -35,16 +34,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('scope', $hiddenType);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @todo Remove it when bumping requirements to SF 2.7+
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     /**
      * {@inheritdoc}
      */

Security/Authentication/Provider/OAuthProvider.php

@@ -119,11 +119,6 @@ public function authenticate(TokenInterface $token)
                 return $token;
             }
         } catch (OAuth2ServerException $e) {
-            if (!method_exists('Symfony\Component\Security\Core\Exception\AuthenticationException', 'setToken')) {
-                // Symfony 2.1
-                throw new AuthenticationException('OAuth2 authentication failed', null, 0, $e);
-            }
-
             throw new AuthenticationException('OAuth2 authentication failed', 0, $e);
         }
 

Security/Firewall/OAuthListener.php

@@ -21,7 +21,6 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Http\Firewall\ListenerInterface;
 
 /**
@@ -32,7 +31,7 @@
 class OAuthListener implements ListenerInterface
 {
     /**
-     * @var TokenStorageInterface|SecurityContextInterface
+     * @var TokenStorageInterface
      */
     protected $securityContext;
 
@@ -47,15 +46,15 @@ class OAuthListener implements ListenerInterface
     protected $serverService;
 
     /**
-     * @param TokenStorageInterface|SecurityContextInterface $tokenStorage          the token storage
-     * @param AuthenticationManagerInterface                 $authenticationManager the authentication manager
-     * @param OAuth2                                         $serverService
-     * @param mixed                                          $securityContext
+     * @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)
     {
-        if (!$securityContext instanceof  TokenStorageInterface && !$securityContext instanceof SecurityContextInterface) {
-            throw new \InvalidArgumentException('Wrong type for OAuthListener, it has to implement TokenStorageInterface or SecurityContextInterface');
+        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);

Tests/DependencyInjection/FOSOAuthServerExtensionTest.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DependencyInjection;
+namespace FOS\OAuthServerBundle\Tests\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\XmlFileLoader;

Tests/Security/Authentification/Provider/OAuthProviderTest.php renamed to Tests/Security/Authentication/Provider/OAuthProviderTest.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace FOS\OAuth2ServiceBundle\Tests\Storage;
+namespace FOS\OAuthServerBundle\Tests\Storage;
 
 use FOS\OAuthServerBundle\Model\AccessToken;
 use FOS\OAuthServerBundle\Model\AuthCode;

Tests/Storage/OAuthStorageTest.php

@@ -18,15 +18,16 @@
     "require": {
         "php": "^7.1",
         "friendsofsymfony/oauth2-php": "~1.1",
-        "symfony/framework-bundle": "~2.8|~3.0|^4.0",
-        "symfony/security-bundle": "~2.8|~3.0|^4.0",
+        "symfony/framework-bundle": "~3.0|^4.0",
+        "symfony/security-bundle": "~3.0|^4.0",
         "symfony/dependency-injection": "^2.8|~3.0|^4.0"
     },
     "require-dev": {
-        "symfony/class-loader": "~2.8|~3.0|^4.0",
-        "symfony/yaml": "~2.8|~3.0|^4.0",
-        "symfony/form": "~2.8|~3.0|^4.0",
-        "symfony/console": "~2.8|~3.0|^4.0",
+        "symfony/class-loader": "~3.0|^4.0",
+        "symfony/yaml": "~3.0|^4.0",
+        "symfony/form": "~3.0|^4.0",
+        "symfony/console": "~3.0|^4.0",
+        "symfony/templating": "~3.0|^4.0",
         "willdurand/propel-typehintable-behavior": "^1.0.4",
         "propel/propel1": "^1.6.5",
         "phing/phing": "~2.4",