Skip to content

Commit c0382eb

Browse files
dkarlovidkarlovi
committed
Raise PHPStan's level from 1 to 2
1 parent d8b9d5e commit c0382eb

16 files changed

+54
-39
lines changed

‎Command/CleanCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
5050
];
5151

5252
foreach ($services as $service => $name) {
53-
/** @var $instance TokenManagerInterface */
53+
/** @var TokenManagerInterface $instance */
5454
$instance = $this->getContainer()->get($service);
5555
if ($instance instanceof TokenManagerInterface || $instance instanceof AuthCodeManagerInterface) {
5656
$result = $instance->deleteExpired();

‎Command/CreateClientCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace FOS\OAuthServerBundle\Command;
1515

16+
use FOS\OAuthServerBundle\Model\ClientManagerInterface;
1617
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
1718
use Symfony\Component\Console\Input\InputInterface;
1819
use Symfony\Component\Console\Input\InputOption;
@@ -63,6 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
6364
$io->title('Client Credentials');
6465

6566
// Get the client manager
67+
/** @var ClientManagerInterface $clientManager */
6668
$clientManager = $this->getContainer()->get('fos_oauth_server.client_manager.default');
6769

6870
// Create a new client

‎Controller/AuthorizeController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ public function authorizeAction(Request $request)
178178
$form = $this->authorizeForm;
179179
$formHandler = $this->authorizeFormHandler;
180180

181+
/** @var OAuthEvent $event */
181182
$event = $this->eventDispatcher->dispatch(
182183
OAuthEvent::PRE_AUTHORIZATION_PROCESS,
183184
new OAuthEvent($user, $this->getClient())

‎DependencyInjection/Configuration.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class Configuration implements ConfigurationInterface
3030
public function getConfigTreeBuilder()
3131
{
3232
$treeBuilder = new TreeBuilder();
33+
34+
/** @var ArrayNodeDefinition $rootNode */
3335
$rootNode = $treeBuilder->root('fos_oauth_server');
3436

3537
$supportedDrivers = ['orm', 'mongodb', 'propel'];

‎DependencyInjection/FOSOAuthServerExtension.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,7 @@ public function load(array $configs, ContainerBuilder $container)
8282
// TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
8383
if ('orm' === $config['db_driver']) {
8484
$ormEntityManagerDefinition = $container->getDefinition('fos_oauth_server.entity_manager');
85-
if (method_exists($ormEntityManagerDefinition, 'setFactory')) {
86-
$ormEntityManagerDefinition->setFactory([new Reference('doctrine'), 'getManager']);
87-
} else {
88-
$ormEntityManagerDefinition->setFactoryService('doctrine');
89-
$ormEntityManagerDefinition->setFactoryMethod('getManager');
90-
}
85+
$ormEntityManagerDefinition->setFactory([new Reference('doctrine'), 'getManager']);
9186
}
9287

9388
if (!empty($config['authorize'])) {
@@ -97,12 +92,7 @@ public function load(array $configs, ContainerBuilder $container)
9792
// Authorize form factory definition
9893
// TODO: Go back to xml configuration when bumping the requirement to Symfony >=2.6
9994
$authorizeFormDefinition = $container->getDefinition('fos_oauth_server.authorize.form');
100-
if (method_exists($authorizeFormDefinition, 'setFactory')) {
101-
$authorizeFormDefinition->setFactory([new Reference('form.factory'), 'createNamed']);
102-
} else {
103-
$authorizeFormDefinition->setFactoryService('form.factory');
104-
$authorizeFormDefinition->setFactoryMethod('createNamed');
105-
}
95+
$authorizeFormDefinition->setFactory([new Reference('form.factory'), 'createNamed']);
10696
}
10797

10898
/**

‎Entity/AuthCodeManager.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
namespace FOS\OAuthServerBundle\Entity;
1515

16-
use Doctrine\Common\Persistence\ObjectManager;
1716
use Doctrine\ORM\EntityManager;
1817
use FOS\OAuthServerBundle\Model\AuthCodeInterface;
1918
use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
@@ -34,7 +33,7 @@ class AuthCodeManager extends BaseAuthCodeManager
3433
* @param EntityManager $em
3534
* @param string $class
3635
*/
37-
public function __construct(ObjectManager $em, $class)
36+
public function __construct(EntityManager $em, $class)
3837
{
3938
$this->em = $em;
4039
$this->class = $class;
@@ -79,7 +78,10 @@ public function deleteAuthCode(AuthCodeInterface $authCode)
7978
*/
8079
public function deleteExpired()
8180
{
82-
$qb = $this->em->getRepository($this->class)->createQueryBuilder('a');
81+
/** @var \Doctrine\ORM\EntityRepository $repository */
82+
$repository = $this->em->getRepository($this->class);
83+
84+
$qb = $repository->createQueryBuilder('a');
8385
$qb
8486
->delete()
8587
->where('a.expiresAt < ?1')

‎FOSOAuthServerBundle.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
use FOS\OAuthServerBundle\DependencyInjection\Compiler\TokenStorageCompilerPass;
1919
use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
2020
use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
21+
use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
2122
use Symfony\Component\DependencyInjection\ContainerBuilder;
2223
use Symfony\Component\HttpKernel\Bundle\Bundle;
23-
use Symfony\Component\HttpKernel\Kernel;
2424

2525
class FOSOAuthServerBundle extends Bundle
2626
{
@@ -33,10 +33,9 @@ public function build(ContainerBuilder $container)
3333
{
3434
parent::build($container);
3535

36-
if (version_compare(Kernel::VERSION, '2.1', '>=')) {
37-
$extension = $container->getExtension('security');
38-
$extension->addSecurityListenerFactory(new OAuthFactory());
39-
}
36+
/** @var SecurityExtension $extension */
37+
$extension = $container->getExtension('security');
38+
$extension->addSecurityListenerFactory(new OAuthFactory());
4039

4140
$container->addCompilerPass(new GrantExtensionsCompilerPass());
4241
$container->addCompilerPass(new TokenStorageCompilerPass());

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ci: cs-full-check phpstan phpunit-coverage
66
lint: cs-full-check phpstan
77

88
phpstan:
9-
sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 1 ."
9+
sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 2 ."
1010

1111
cs:
1212
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"

‎Model/AuthCodeManagerInterface.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ public function getClass();
3636
* Retrieve an auth code using a set of criteria.
3737
*
3838
* @param array $criteria
39-
* @param AuthCodeInterface|null
39+
*
40+
* @return AuthCodeInterface|null
4041
*/
4142
public function findAuthCodeBy(array $criteria);
4243

4344
/**
4445
* Retrieve an auth code by its token.
4546
*
4647
* @param string $token
47-
* @param AuthCodeInterface|null
48+
*
49+
* @return AuthCodeInterface|null
4850
*/
4951
public function findAuthCodeByToken($token);
5052

‎Model/ClientInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getRandomId();
3333
public function setSecret($secret);
3434

3535
/**
36-
* @param $secret
36+
* @param string $secret
3737
*
3838
* @return bool
3939
*/

0 commit comments

Comments
 (0)