Raise PHPStan's level from 1 to 2

Author: dkarlovi

Command/CleanCommand.php

@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         ];
 
         foreach ($services as $service => $name) {
-            /** @var $instance TokenManagerInterface */
+            /** @var TokenManagerInterface $instance */
             $instance = $this->getContainer()->get($service);
             if ($instance instanceof TokenManagerInterface || $instance instanceof AuthCodeManagerInterface) {
                 $result = $instance->deleteExpired();

Command/CreateClientCommand.php

@@ -13,6 +13,7 @@
 
 namespace FOS\OAuthServerBundle\Command;
 
+use FOS\OAuthServerBundle\Model\ClientManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -63,6 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io->title('Client Credentials');
 
         // Get the client manager
+        /** @var ClientManagerInterface $clientManager */
         $clientManager = $this->getContainer()->get('fos_oauth_server.client_manager.default');
 
         // Create a new client

Controller/AuthorizeController.php

@@ -178,6 +178,7 @@ public function authorizeAction(Request $request)
         $form = $this->authorizeForm;
         $formHandler = $this->authorizeFormHandler;
 
+        /** @var OAuthEvent $event */
         $event = $this->eventDispatcher->dispatch(
             OAuthEvent::PRE_AUTHORIZATION_PROCESS,
             new OAuthEvent($user, $this->getClient())

DependencyInjection/Configuration.php

@@ -30,6 +30,8 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
+
+        /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->root('fos_oauth_server');
 
         $supportedDrivers = ['orm', 'mongodb', 'propel'];

DependencyInjection/FOSOAuthServerExtension.php

@@ -82,12 +82,7 @@ public function load(array $configs, ContainerBuilder $container)
         // TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
         if ('orm' === $config['db_driver']) {
             $ormEntityManagerDefinition = $container->getDefinition('fos_oauth_server.entity_manager');
-            if (method_exists($ormEntityManagerDefinition, 'setFactory')) {
-                $ormEntityManagerDefinition->setFactory([new Reference('doctrine'), 'getManager']);
-            } else {
-                $ormEntityManagerDefinition->setFactoryService('doctrine');
-                $ormEntityManagerDefinition->setFactoryMethod('getManager');
-            }
+            $ormEntityManagerDefinition->setFactory([new Reference('doctrine'), 'getManager']);
         }
 
         if (!empty($config['authorize'])) {
@@ -97,12 +92,7 @@ public function load(array $configs, ContainerBuilder $container)
         // Authorize form factory definition
         // TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
         $authorizeFormDefinition = $container->getDefinition('fos_oauth_server.authorize.form');
-        if (method_exists($authorizeFormDefinition, 'setFactory')) {
-            $authorizeFormDefinition->setFactory([new Reference('form.factory'), 'createNamed']);
-        } else {
-            $authorizeFormDefinition->setFactoryService('form.factory');
-            $authorizeFormDefinition->setFactoryMethod('createNamed');
-        }
+        $authorizeFormDefinition->setFactory([new Reference('form.factory'), 'createNamed']);
     }
 
     /**

Entity/AuthCodeManager.php

@@ -13,7 +13,6 @@
 
 namespace FOS\OAuthServerBundle\Entity;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManager;
 use FOS\OAuthServerBundle\Model\AuthCodeInterface;
 use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
@@ -34,7 +33,7 @@ class AuthCodeManager extends BaseAuthCodeManager
      * @param EntityManager $em
      * @param string        $class
      */
-    public function __construct(ObjectManager $em, $class)
+    public function __construct(EntityManager $em, $class)
     {
         $this->em = $em;
         $this->class = $class;
@@ -79,7 +78,10 @@ public function deleteAuthCode(AuthCodeInterface $authCode)
      */
     public function deleteExpired()
     {
-        $qb = $this->em->getRepository($this->class)->createQueryBuilder('a');
+        /** @var \Doctrine\ORM\EntityRepository $repository */
+        $repository = $this->em->getRepository($this->class);
+
+        $qb = $repository->createQueryBuilder('a');
         $qb
             ->delete()
             ->where('a.expiresAt < ?1')

FOSOAuthServerBundle.php

@@ -18,9 +18,9 @@
 use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;
 use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
 use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\HttpKernel\Kernel;
 
 class FOSOAuthServerBundle extends Bundle
 {
@@ -33,10 +33,9 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        if (version_compare(Kernel::VERSION, '2.1', '>=')) {
-            $extension = $container->getExtension('security');
-            $extension->addSecurityListenerFactory(new OAuthFactory());
-        }
+        /** @var SecurityExtension $extension */
+        $extension = $container->getExtension('security');
+        $extension->addSecurityListenerFactory(new OAuthFactory());
 
         $container->addCompilerPass(new GrantExtensionsCompilerPass());
         $container->addCompilerPass(new TokenStorageCompilerPass());

Makefile

@@ -6,7 +6,7 @@ ci: cs-full-check phpstan phpunit-coverage
 lint: cs-full-check phpstan
 
 phpstan:
-	sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 1 ."
+	sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 2 ."
 
 cs:
 	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"

Model/AuthCodeManagerInterface.php

@@ -36,15 +36,17 @@ public function getClass();
      * Retrieve an auth code using a set of criteria.
      *
      * @param array $criteria
-     * @param AuthCodeInterface|null
+     *
+     * @return AuthCodeInterface|null
      */
     public function findAuthCodeBy(array $criteria);
 
     /**
      * Retrieve an auth code by its token.
      *
      * @param string $token
-     * @param AuthCodeInterface|null
+     *
+     * @return AuthCodeInterface|null
      */
     public function findAuthCodeByToken($token);
 

Model/ClientInterface.php

@@ -33,7 +33,7 @@ public function getRandomId();
     public function setSecret($secret);
 
     /**
-     * @param $secret
+     * @param string $secret
      *
      * @return bool
      */