Skip to content

Commit a442c6c

Browse files
committed
minor #98 Fix continous integration checks (ajgarlag)
This PR was squashed before being merged into the 0.4-dev branch. Discussion ---------- Fix continous integration checks - Fix coding standards check - Fix static analysis check Commits ------- 187a995 Fix continous integration checks
2 parents 97c4c0a + 187a995 commit a442c6c

File tree

15 files changed

+15
-25
lines changed

15 files changed

+15
-25
lines changed

psalm.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0"?>
22
<psalm
3-
totallyTyped="true"
4-
forbidEcho="true"
3+
errorLevel="1"
54
strictBinaryOperands="true"
6-
phpVersion="7.1"
5+
phpVersion="7.2"
76
allowStringToStandInForClass="true"
87
rememberPropertyAssignmentsAfterCall="false"
98
checkForThrowsInGlobalScope="true"
@@ -15,6 +14,7 @@
1514
<projectFiles>
1615
<directory name="src"/>
1716
<ignoreFiles>
17+
<file name="src/Security/Authenticator/ForwardCompatAuthenticatorTrait.php"/> <!-- @see https://github.com/vimeo/psalm/issues/7863 -->
1818
<directory name="src/DependencyInjection"/>
1919
<directory name="vendor"/>
2020
</ignoreFiles>

src/Controller/AuthorizationController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace League\Bundle\OAuth2ServerBundle\Controller;
66

77
use League\Bundle\OAuth2ServerBundle\Converter\UserConverterInterface;
8-
use League\Bundle\OAuth2ServerBundle\Event\AuthorizationRequestResolveEvent;
98
use League\Bundle\OAuth2ServerBundle\Event\AuthorizationRequestResolveEventFactory;
109
use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
1110
use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
@@ -97,7 +96,6 @@ public function indexAction(Request $request): Response
9796
}
9897
}
9998

100-
/** @var AuthorizationRequestResolveEvent $event */
10199
$event = $this->eventDispatcher->dispatch(
102100
$this->eventFactory->fromAuthorizationRequest($authRequest),
103101
OAuth2Events::AUTHORIZATION_REQUEST_RESOLVE

src/Controller/TokenController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public function indexAction(Request $request): Response
6969

7070
$renderedResponse = $this->httpFoundationFactory->createResponse($response);
7171

72-
/** @var TokenRequestResolveEvent $event */
7372
$event = $this->eventDispatcher->dispatch(
7473
new TokenRequestResolveEvent($renderedResponse),
7574
OAuth2Events::TOKEN_REQUEST_RESOLVE

src/DBAL/Type/ImplodedArray.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private function assertValueCanBeImploded($value): void
8585
return;
8686
}
8787

88-
if (is_scalar($value)) {
88+
if (\is_scalar($value)) {
8989
return;
9090
}
9191

src/DependencyInjection/LeagueOAuth2ServerExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\RefreshTokenManager;
1717
use League\Bundle\OAuth2ServerBundle\Manager\InMemory\AccessTokenManager as InMemoryAccessTokenManager;
1818
use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
19-
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
2019
use League\Bundle\OAuth2ServerBundle\Persistence\Mapping\Driver;
2120
use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
2221
use League\Bundle\OAuth2ServerBundle\Service\CredentialsRevoker\DoctrineCredentialsRevoker;
22+
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
2323
use League\OAuth2\Server\AuthorizationServer;
2424
use League\OAuth2\Server\CryptKey;
2525
use League\OAuth2\Server\Grant\AuthCodeGrant;

src/Manager/Doctrine/ClientManager.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
use League\Bundle\OAuth2ServerBundle\Manager\ClientFilter;
1010
use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
1111
use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
12+
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1213
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
1314
use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
1415
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
15-
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1616
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1717

1818
final class ClientManager implements ClientManagerInterface
@@ -54,7 +54,6 @@ public function find(string $identifier): ?AbstractClient
5454

5555
public function save(AbstractClient $client): void
5656
{
57-
/** @var PreSaveClientEvent $event */
5857
$event = $this->dispatcher->dispatch(new PreSaveClientEvent($client), OAuth2Events::PRE_SAVE_CLIENT);
5958
$client = $event->getClient();
6059

src/Manager/InMemory/ClientManager.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
use League\Bundle\OAuth2ServerBundle\Manager\ClientFilter;
99
use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
1010
use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
11+
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1112
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
1213
use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
1314
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
14-
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1515
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1616

1717
final class ClientManager implements ClientManagerInterface
@@ -38,7 +38,6 @@ public function find(string $identifier): ?AbstractClient
3838

3939
public function save(AbstractClient $client): void
4040
{
41-
/** @var PreSaveClientEvent $event */
4241
$event = $this->dispatcher->dispatch(new PreSaveClientEvent($client), OAuth2Events::PRE_SAVE_CLIENT);
4342
$client = $event->getClient();
4443

src/Persistence/Mapping/Driver.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
1212
use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
1313
use League\Bundle\OAuth2ServerBundle\Model\Client;
14-
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
15-
use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
1614
use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
17-
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
1815

1916
/**
2017
* Metadata driver that enables mapping dynamically accordingly to container configuration.

src/Repository/ScopeRepository.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
1010
use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
1111
use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
12+
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1213
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
1314
use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
14-
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
1515
use League\OAuth2\Server\Entities\ClientEntityInterface;
1616
use League\OAuth2\Server\Entities\ScopeEntityInterface;
1717
use League\OAuth2\Server\Exception\OAuthServerException;
@@ -84,7 +84,6 @@ public function finalizeScopes(
8484

8585
$scopes = $this->setupScopes($client, $this->scopeConverter->toDomainArray(array_values($scopes)));
8686

87-
/** @var ScopeResolveEvent $event */
8887
$event = $this->eventDispatcher->dispatch(
8988
new ScopeResolveEvent(
9089
$scopes,

src/Repository/UserRepository.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use League\Bundle\OAuth2ServerBundle\Event\UserResolveEvent;
99
use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
1010
use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
11-
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
1211
use League\Bundle\OAuth2ServerBundle\OAuth2Events;
12+
use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
1313
use League\OAuth2\Server\Entities\ClientEntityInterface;
1414
use League\OAuth2\Server\Entities\UserEntityInterface;
1515
use League\OAuth2\Server\Repositories\UserRepositoryInterface;
@@ -54,7 +54,6 @@ public function getUserEntityByUserCredentials(
5454
/** @var AbstractClient $client */
5555
$client = $this->clientManager->find($clientEntity->getIdentifier());
5656

57-
/** @var UserResolveEvent $event */
5857
$event = $this->eventDispatcher->dispatch(
5958
new UserResolveEvent(
6059
$username,

0 commit comments

Comments
 (0)