Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop old versions of PHP and Symfony #1705

Merged
merged 3 commits into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@
],
"homepage": "https://docs.sonata-project.org/projects/SonataUserBundle",
"require": {
"php": "^8.0",
"php": "^8.1",
"doctrine/collections": "^1.6 || ^2.0",
"doctrine/common": "^3.1",
"doctrine/persistence": "^3.0.2",
"sonata-project/doctrine-extensions": "^1.13 || ^2.0",
"sonata-project/form-extensions": "^1.4 || ^2.0",
"sonata-project/twig-extensions": "^1.3 || ^2.0",
"symfony/config": "^5.4 || ^6.2 || ^7.0",
"symfony/console": "^5.4 || ^6.2 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
"symfony/event-dispatcher": "^5.4 || ^6.2 || ^7.0",
"symfony/form": "^5.4 || ^6.2 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
"symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
"symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
"symfony/routing": "^5.4 || ^6.2 || ^7.0",
"symfony/config": "^6.4 || ^7.1",
"symfony/console": "^6.4 || ^7.1",
"symfony/dependency-injection": "^6.4 || ^7.1",
"symfony/event-dispatcher": "^6.4 || ^7.1",
"symfony/form": "^6.4 || ^7.1",
"symfony/framework-bundle": "^6.4 || ^7.1",
"symfony/http-foundation": "^6.4 || ^7.1",
"symfony/http-kernel": "^6.4 || ^7.1",
"symfony/options-resolver": "^6.4 || ^7.1",
"symfony/routing": "^6.4 || ^7.1",
"symfony/security-acl": "^3.0",
"symfony/security-core": "^5.4 || ^6.2 || ^7.0",
"symfony/security-csrf": "^5.4 || ^6.2 || ^7.0",
"symfony/translation": "^5.4 || ^6.2 || ^7.0",
"symfony/security-core": "^6.4 || ^7.1",
"symfony/security-csrf": "^6.4 || ^7.1",
"symfony/translation": "^6.4 || ^7.1",
"symfony/translation-contracts": "^2.5 || ^3.0",
"symfony/validator": "^5.4 || ^6.2 || ^7.0",
"symfony/validator": "^6.4 || ^7.1",
"twig/twig": "^3.0"
},
"require-dev": {
Expand All @@ -64,16 +64,16 @@
"psalm/plugin-phpunit": "^0.18",
"psalm/plugin-symfony": "^5.0",
"rector/rector": "^1.1",
"sonata-project/admin-bundle": "^4.20",
"sonata-project/admin-bundle": "^4.34",
"sonata-project/block-bundle": "^4.11 || ^5.0",
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
"symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
"symfony/console": "^5.4 || ^6.2 || ^7.0",
"symfony/filesystem": "^5.4 || ^6.2 || ^7.0",
"symfony/intl": "^5.4 || ^6.2 || ^7.0",
"symfony/mailer": "^5.4 || ^6.2 || ^7.0",
"symfony/mime": "^5.4 || ^6.2 || ^7.0",
"symfony/phpunit-bridge": "^6.2 || ^7.0",
"symfony/browser-kit": "^6.4 || ^7.1",
"symfony/console": "^6.4 || ^7.1",
"symfony/filesystem": "^6.4 || ^7.1",
"symfony/intl": "^6.4 || ^7.1",
"symfony/mailer": "^6.4 || ^7.1",
"symfony/mime": "^6.4 || ^7.1",
"symfony/phpunit-bridge": "^6.4 || ^7.1",
"vimeo/psalm": "^5.0"
},
"conflict": {
Expand Down
2 changes: 1 addition & 1 deletion src/Action/CheckLoginAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

final class CheckLoginAction
{
public function __invoke(): void
public function __invoke(): never
{
throw new \RuntimeException('You must configure the check path to be handled by the firewall using form_login in your security firewall configuration.');
}
Expand Down
2 changes: 1 addition & 1 deletion src/Action/LogoutAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

final class LogoutAction
{
public function __invoke(): void
public function __invoke(): never
{
throw new \RuntimeException('You must activate the logout in your security firewall configuration.');
}
Expand Down
4 changes: 2 additions & 2 deletions src/Twig/RolesMatrixExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public function __construct(private MatrixRolesBuilderInterface $rolesBuilder)
public function getFunctions(): array
{
return [
new TwigFunction('renderMatrix', [$this, 'renderMatrix'], ['needs_environment' => true]),
new TwigFunction('renderMatrix', $this->renderMatrix(...), ['needs_environment' => true]),
new TwigFunction(
'renderRolesList',
[$this, 'renderRolesList'],
$this->renderRolesList(...),
['needs_environment' => true]
),
];
Expand Down
2 changes: 1 addition & 1 deletion tests/Action/CheckLoginActionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

final class CheckLoginActionTest extends TestCase
{
public function testAction(): void
public function testAction(): never
{
$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage('You must configure the check path to be handled by the firewall using form_login in your security firewall configuration.');
Expand Down
2 changes: 1 addition & 1 deletion tests/Action/LogoutActionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

final class LogoutActionTest extends TestCase
{
public function testAction(): void
public function testAction(): never
{
$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage('You must activate the logout in your security firewall configuration.');
Expand Down
Loading