Skip to content

Commit 57d1518

Browse files
committed
Fix cs + ignore CI on php 8 & SF 6.2
1 parent 819fbd3 commit 57d1518

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
- 'highest'
2929
remove-dependencies: [ '' ]
3030
coverage: [ 'none' ]
31+
exclude:
32+
- php-version: '8.0'
33+
symfony-version: '6.2.*'
3134
include:
3235
- php-version: '8.0'
3336
symfony-version: '5.4.*'

src/Security/Security.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
namespace Overblog\GraphQLBundle\Security;
66

77
use LogicException;
8+
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
89
use Symfony\Component\HttpKernel\Kernel;
910
use Symfony\Component\Security\Core\Security as CoreSecurity;
1011
use Symfony\Component\Security\Core\User\UserInterface;
11-
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
1212

1313
use function array_reduce;
1414

@@ -40,7 +40,7 @@ abstract class BaseSecurity
4040
public function __construct($security)
4141
{
4242
// @phpstan-ignore-next-line
43-
$this->coreSecurity = $security ?? new class () {
43+
$this->coreSecurity = $security ?? new class() {
4444
public function isGranted(): bool
4545
{
4646
throw new LogicException('The "symfony/security-core" component is required.');

tests/ExpressionLanguage/ExpressionFunction/Security/GetUserTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
use Overblog\GraphQLBundle\Generator\TypeGenerator;
99
use Overblog\GraphQLBundle\Security\Security;
1010
use Overblog\GraphQLBundle\Tests\ExpressionLanguage\TestCase;
11+
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
12+
use Symfony\Component\HttpKernel\Kernel;
1113
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
1214
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1315
use Symfony\Component\Security\Core\Security as CoreSecurity;
14-
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
15-
use Symfony\Component\HttpKernel\Kernel;
1616
use Symfony\Component\Security\Core\User\InMemoryUser;
1717
use Symfony\Component\Security\Core\User\User;
1818
use Symfony\Component\Security\Core\User\UserInterface;

tests/ExpressionLanguage/TestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
use PHPUnit\Framework\MockObject\Rule\InvokedCount;
1717
use PHPUnit\Framework\MockObject\Stub;
1818
use PHPUnit\Framework\TestCase as BaseTestCase;
19+
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
1920
use Symfony\Component\ExpressionLanguage\Expression;
2021
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
21-
use Symfony\Component\Security\Core\Security as CoreSecurity;
22-
use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
2322
use Symfony\Component\HttpKernel\Kernel;
23+
use Symfony\Component\Security\Core\Security as CoreSecurity;
2424

2525
use function array_keys;
2626
use function call_user_func_array;

0 commit comments

Comments
 (0)