Merge pull request #64 from trikoder/various-improvements

Various improvements
trikoder · Jun 6, 2019 · 5fb4c7e · 5fb4c7e
2 parents 91b3d75 + 49169cd
commit 5fb4c7e
Show file tree

Hide file tree

Showing 22 changed files with 214 additions and 156 deletions.
diff --git a/Command/CreateClientCommand.php b/Command/CreateClientCommand.php
@@ -20,6 +20,9 @@ final class CreateClientCommand extends Command
 {
     protected static $defaultName = 'trikoder:oauth2:create-client';
 
+    /**
+     * @var ClientManagerInterface
+     */
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)
@@ -29,7 +32,7 @@ public function __construct(ClientManagerInterface $clientManager)
         $this->clientManager = $clientManager;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Creates a new oAuth2 client')
@@ -67,7 +70,7 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $client = $this->buildClientFromInput($input);

diff --git a/Command/DeleteClientCommand.php b/Command/DeleteClientCommand.php
@@ -14,11 +14,16 @@
 final class DeleteClientCommand extends Command
 {
     protected static $defaultName = 'trikoder:oauth2:delete-client';
+
+    /**
+     * @var ClientManagerInterface
+     */
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)
     {
         parent::__construct();
+
         $this->clientManager = $clientManager;
     }
 

diff --git a/Command/ListClientsCommand.php b/Command/ListClientsCommand.php
@@ -18,9 +18,13 @@
 
 final class ListClientsCommand extends Command
 {
-    public const ALLOWED_COLUMNS = ['identifier', 'secret', 'scope', 'redirect uri', 'grant type'];
+    private const ALLOWED_COLUMNS = ['identifier', 'secret', 'scope', 'redirect uri', 'grant type'];
 
     protected static $defaultName = 'trikoder:oauth2:list-clients';
+
+    /**
+     * @var ClientManagerInterface
+     */
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)
@@ -117,13 +121,11 @@ private function getRows(array $clients, array $columns): array
 
     private function getColumns(InputInterface $input): array
     {
-        $allowedColumns = self::ALLOWED_COLUMNS;
-
         $requestedColumns = $input->getOption('columns');
         $requestedColumns = array_map(function (string $column): string {
             return strtolower(trim($column));
         }, $requestedColumns);
 
-        return array_intersect($requestedColumns, $allowedColumns);
+        return array_intersect($requestedColumns, self::ALLOWED_COLUMNS);
     }
 }
diff --git a/Command/UpdateClientCommand.php b/Command/UpdateClientCommand.php
@@ -20,6 +20,9 @@ final class UpdateClientCommand extends Command
 {
     protected static $defaultName = 'trikoder:oauth2:update-client';
 
+    /**
+     * @var ClientManagerInterface
+     */
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)

diff --git a/Controller/AuthorizationController.php b/Controller/AuthorizationController.php
@@ -37,8 +37,12 @@ final class AuthorizationController
      */
     private $userConverter;
 
-    public function __construct(AuthorizationServer $server, EventDispatcherInterface $eventDispatcher, AuthorizationRequestResolveEventFactory $eventFactory, UserConverter $userConverter)
-    {
+    public function __construct(
+        AuthorizationServer $server,
+        EventDispatcherInterface $eventDispatcher,
+        AuthorizationRequestResolveEventFactory $eventFactory,
+        UserConverter $userConverter
+    ) {
         $this->server = $server;
         $this->eventDispatcher = $eventDispatcher;
         $this->eventFactory = $eventFactory;

diff --git a/Converter/UserConverter.php b/Converter/UserConverter.php
@@ -10,7 +10,7 @@
 
 final class UserConverter
 {
-    public function toLeague(UserInterface $user = null): UserEntityInterface
+    public function toLeague(?UserInterface $user): UserEntityInterface
     {
         $userEntity = new User();
         if ($user instanceof UserInterface) {

diff --git a/DBAL/Type/ImplodedArray.php b/DBAL/Type/ImplodedArray.php
@@ -60,6 +60,9 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
         return parent::getSQLDeclaration($fieldDeclaration, $platform);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function requiresSQLCommentHint(AbstractPlatform $platform)
     {
         return true;

diff --git a/DependencyInjection/TrikoderOAuth2Extension.php b/DependencyInjection/TrikoderOAuth2Extension.php
@@ -233,7 +233,7 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
         ;
     }
 
-    private function configurePersistence(LoaderInterface $loader, ContainerBuilder $container, array $config)
+    private function configurePersistence(LoaderInterface $loader, ContainerBuilder $container, array $config): void
     {
         if (\count($config) > 1) {
             throw new LogicException('Only one persistence method can be configured at a time.');

diff --git a/EventListener/AuthorizationRequestUserResolvingListener.php b/EventListener/AuthorizationRequestUserResolvingListener.php
@@ -9,26 +9,21 @@
 use Trikoder\Bundle\OAuth2Bundle\Event\AuthorizationRequestResolveEvent;
 
 /**
- * Class AuthorizationRequestUserResolvingListener
- *
  * Listener sets currently authenticated user to authorization request context
  */
-class AuthorizationRequestUserResolvingListener
+final class AuthorizationRequestUserResolvingListener
 {
     /**
      * @var Security
      */
     private $security;
 
-    /**
-     * AuthorizationRequestUserResolvingListener constructor.
-     */
     public function __construct(Security $security)
     {
         $this->security = $security;
     }
 
-    public function onAuthorizationRequest(AuthorizationRequestResolveEvent $event)
+    public function onAuthorizationRequest(AuthorizationRequestResolveEvent $event): void
     {
         $user = $this->security->getUser();
         if ($user instanceof UserInterface) {

diff --git a/EventListener/ConvertExceptionToResponseListener.php b/EventListener/ConvertExceptionToResponseListener.php
@@ -14,7 +14,7 @@
  */
 final class ConvertExceptionToResponseListener
 {
-    public function onKernelException(GetResponseForExceptionEvent $event)
+    public function onKernelException(GetResponseForExceptionEvent $event): void
     {
         $exception = $event->getException();
         if ($exception instanceof InsufficientScopesException || $exception instanceof Oauth2AuthenticationFailedException) {

diff --git a/League/Entity/Client.php b/League/Entity/Client.php
@@ -24,7 +24,7 @@ public function getName()
     /**
      * @param string[] $redirectUri
      */
-    public function setRedirectUri(array $redirectUri)
+    public function setRedirectUri(array $redirectUri): void
     {
         $this->redirectUri = $redirectUri;
     }

diff --git a/Manager/ClientFilter.php b/Manager/ClientFilter.php
@@ -11,15 +11,17 @@
 final class ClientFilter
 {
     /**
-     * @var array
+     * @var Grant[]
      */
     private $grants = [];
+
     /**
-     * @var array
+     * @var RedirectUri[]
      */
     private $redirectUris = [];
+
     /**
-     * @var array
+     * @var Scope[]
      */
     private $scopes = [];