CS Fixes

chalasr · chalasr · commit 6821a1387956 · 2022-10-06T13:29:08.000+02:00
diff --git a/src/DependencyInjection/LeagueOAuth2ServerExtension.php b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
@@ -44,9 +44,9 @@ final class LeagueOAuth2ServerExtension extends Extension implements PrependExte
     /**
      * {@inheritdoc}
      *
-     * @throws \Exception
-     *
      * @return void
+     *
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
diff --git a/src/Resources/config/access_token/default.php b/src/Resources/config/access_token/default.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverterInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -6,6 +6,7 @@
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
+
 use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantConfigurator;
 use League\Bundle\OAuth2ServerBundle\Command\ClearExpiredTokensCommand;
 use League\Bundle\OAuth2ServerBundle\Command\CreateClientCommand;
diff --git a/src/Resources/config/storage/doctrine.php b/src/Resources/config/storage/doctrine.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
diff --git a/src/Resources/config/storage/in_memory.php b/src/Resources/config/storage/in_memory.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
diff --git a/src/Security/EventListener/CheckScopeListener.php b/src/Security/EventListener/CheckScopeListener.php
@@ -30,6 +30,7 @@ public function checkPassport(CheckPassportEvent $event): void
     {
         /**
          * @var Passport $passport
+         *
          * @psalm-suppress DeprecatedClass
          */
         $passport = $event->getPassport();
diff --git a/tests/Acceptance/DeleteClientCommandTest.php b/tests/Acceptance/DeleteClientCommandTest.php
@@ -47,11 +47,7 @@ public function testDeleteNonExistentClient(): void
 
     private function findClient(string $identifier): ?Client
     {
-        return
-            $this
-                ->getClientManager()
-                ->find($identifier)
-            ;
+        return $this->getClientManager()->find($identifier);
     }
 
     private function fakeAClient(string $name, string $identifier): Client
@@ -61,12 +57,10 @@ private function fakeAClient(string $name, string $identifier): Client
 
     private function getClientManager(): ClientManagerInterface
     {
-        return
-            $this
-                ->client
-                ->getContainer()
-                ->get(ClientManagerInterface::class)
-            ;
+        return $this->client
+            ->getContainer()
+            ->get(ClientManagerInterface::class)
+        ;
     }
 
     private function command(): Command
diff --git a/tests/Acceptance/DoctrineAccessTokenManagerTest.php b/tests/Acceptance/DoctrineAccessTokenManagerTest.php
@@ -11,7 +11,8 @@
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
 
 /**
- * @TODO   This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ * @TODO This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ *
  * @covers \League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AccessTokenManager
  */
 final class DoctrineAccessTokenManagerTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/DoctrineAuthCodeManagerTest.php b/tests/Acceptance/DoctrineAuthCodeManagerTest.php
@@ -10,7 +10,8 @@
 use League\Bundle\OAuth2ServerBundle\Model\Client;
 
 /**
- * @TODO   This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ * @TODO This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ *
  * @covers \League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AuthorizationCodeManager
  */
 final class DoctrineAuthCodeManagerTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/DoctrineClientManagerTest.php b/tests/Acceptance/DoctrineClientManagerTest.php
@@ -14,7 +14,8 @@
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
- * @TODO   This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ * @TODO This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ *
  * @covers \League\Bundle\OAuth2ServerBundle\Manager\Doctrine\ClientManager
  */
 final class DoctrineClientManagerTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/DoctrineCredentialsRevokerTest.php b/tests/Acceptance/DoctrineCredentialsRevokerTest.php
@@ -15,7 +15,8 @@
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
- * @TODO   This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ * @TODO This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ *
  * @covers \League\Bundle\OAuth2ServerBundle\Service\CredentialsRevoker\DoctrineCredentialsRevoker
  */
 final class DoctrineCredentialsRevokerTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/DoctrineRefreshTokenManagerTest.php b/tests/Acceptance/DoctrineRefreshTokenManagerTest.php
@@ -11,7 +11,8 @@
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
 
 /**
- * @TODO   This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ * @TODO This should be in the Integration tests folder but the current tests infrastructure would need improvements first.
+ *
  * @covers \League\Bundle\OAuth2ServerBundle\Manager\Doctrine\RefreshTokenManager
  */
 final class DoctrineRefreshTokenManagerTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/ListClientsCommandTest.php b/tests/Acceptance/ListClientsCommandTest.php
@@ -94,10 +94,9 @@ public function testListFiltersClients(): void
         $clientA = $this->fakeAClient('client', 'client-a', 'client-a-secret');
         $this->getClientManager()->save($clientA);
 
-        $clientB =
-            $this
-                ->fakeAClient('client', 'client-b', 'client-b-secret')
-                ->setScopes(new Scope('client-b-scope'))
+        $clientB = $this
+            ->fakeAClient('client', 'client-b', 'client-b-secret')
+            ->setScopes(new Scope('client-b-scope'))
         ;
         $this->getClientManager()->save($clientB);
 
@@ -121,12 +120,10 @@ private function fakeAClient(string $name, string $identifier, ?string $secret =
 
     private function getClientManager(): ClientManagerInterface
     {
-        return
-            $this
-                ->client
-                ->getContainer()
-                ->get(ClientManagerInterface::class)
-            ;
+        return $this->client
+            ->getContainer()
+            ->get(ClientManagerInterface::class)
+        ;
     }
 
     private function command(): Command

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ final class LeagueOAuth2ServerExtension extends Extension implements PrependExte`
`44`	`44`	`/**`
`45`	`45`	`* {@inheritdoc}`
`46`	`46`	`*`
`47`		`- * @throws \Exception`
`48`		`- *`
`49`	`47`	`* @return void`
	`48`	`+ *`
	`49`	`+ * @throws \Exception`
`50`	`50`	`*/`
`51`	`51`	`public function load(array $configs, ContainerBuilder $container)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public function checkPassport(CheckPassportEvent $event): void`
`30`	`30`	`{`
`31`	`31`	`/**`
`32`	`32`	`* @var Passport $passport`
	`33`	`+ *`
`33`	`34`	`* @psalm-suppress DeprecatedClass`
`34`	`35`	`*/`
`35`	`36`	`$passport = $event->getPassport();`