diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 78f29c8f8..7d3620b03 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,12 @@ jobs: - description: 'Symfony 5.*' php: '8.1' symfony-versions: '^5.4' + - description: 'Symfony 6.*' + php: '8.1' + symfony-versions: '^6.3' + - description: 'Symfony 7.*' + php: '8.2' + symfony-versions: '^7.0' name: PHP ${{ matrix.php }} ${{ matrix.description }} steps: - name: Checkout diff --git a/Model/User.php b/Model/User.php index a6858eac8..6aba172a9 100644 --- a/Model/User.php +++ b/Model/User.php @@ -183,7 +183,7 @@ public function addRole($role) /** * @return void */ - public function eraseCredentials() + public function eraseCredentials(): void { $this->plainPassword = null; } diff --git a/Security/UserChecker.php b/Security/UserChecker.php index e2aa6581b..57f4ed961 100644 --- a/Security/UserChecker.php +++ b/Security/UserChecker.php @@ -25,7 +25,7 @@ class UserChecker implements UserCheckerInterface /** * @return void */ - public function checkPreAuth(BaseUserInterface $user) + public function checkPreAuth(BaseUserInterface $user): void { if (!$user->isEnabled()) { $ex = new DisabledException('User account is disabled.'); @@ -37,7 +37,7 @@ public function checkPreAuth(BaseUserInterface $user) /** * @return void */ - public function checkPostAuth(BaseUserInterface $user) + public function checkPostAuth(BaseUserInterface $user): void { } } diff --git a/composer.json b/composer.json index 56b157917..3bd681204 100644 --- a/composer.json +++ b/composer.json @@ -24,21 +24,21 @@ "php": "^7.4 || ^8.0", "ext-dom": "*", "ext-json": "*", - "symfony/config": "^4.4 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0", - "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0", + "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0 || ^7.0", "symfony/event-dispatcher-contracts": "^1.1 || ^2.0 || ^3.0", - "symfony/form": "^4.4 || ^5.0 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0", - "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0", - "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0", - "symfony/routing": "^4.4 || ^5.0 || ^6.0", - "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0", - "symfony/security-core": "^4.4 || ^5.0 || ^6.0", - "symfony/translation": "^4.4 || ^5.0 || ^6.0", - "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0", - "symfony/validator": "^4.4 || ^5.0 || ^6.0", + "symfony/form": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/routing": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/security-core": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/translation": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/validator": "^4.4 || ^5.0 || ^6.0 || ^7.0", "twig/twig": "^1.34 || ^2.4 || ^3.0" }, "conflict": { @@ -49,10 +49,11 @@ "require-dev": { "doctrine/doctrine-bundle": "^1.3 || ^2", "friendsofphp/php-cs-fixer": "^3.0.2, !=3.5.0", + "phpunit/phpunit": "^9.0", "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0", - "symfony/console": "^4.4 || ^5.0 || ^6.0", + "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0", "symfony/phpunit-bridge": "^6.1", - "symfony/yaml": "^4.4 || ^5.0 || ^6.0" + "symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "config": { "sort-packages": true