Skip to content

Symfony 8 #1730

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.

Sign up for GitHub

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

Merged
dmaicher merged 1 commit into from
Dec 18, 2025
Merged

Symfony 8 #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
"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": "^6.4 || ^7.3",
"symfony/console": "^6.4 || ^7.3",
"symfony/dependency-injection": "^6.4 || ^7.3",
"symfony/event-dispatcher": "^6.4 || ^7.3",
"symfony/form": "^6.4 || ^7.3",
"symfony/framework-bundle": "^6.4 || ^7.3",
"symfony/http-foundation": "^6.4 || ^7.3",
"symfony/http-kernel": "^6.4 || ^7.3",
"symfony/options-resolver": "^6.4 || ^7.3",
"symfony/routing": "^6.4 || ^7.3",
"symfony/config": "^6.4 || ^7.3 || ^8.0",
"symfony/console": "^6.4 || ^7.3 || ^8.0",
"symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
"symfony/event-dispatcher": "^6.4 || ^7.3 || ^8.0",
"symfony/form": "^6.4 || ^7.3 || ^8.0",
"symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
"symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
"symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
"symfony/options-resolver": "^6.4 || ^7.3 || ^8.0",
"symfony/routing": "^6.4 || ^7.3 || ^8.0",
"symfony/security-acl": "^3.0",
"symfony/security-core": "^6.4 || ^7.3",
"symfony/security-csrf": "^6.4 || ^7.3",
"symfony/translation": "^6.4 || ^7.3",
"symfony/security-core": "^6.4 || ^7.3 || ^8.0",
"symfony/security-csrf": "^6.4 || ^7.3 || ^8.0",
"symfony/translation": "^6.4 || ^7.3 || ^8.0",
"symfony/translation-contracts": "^2.5 || ^3.0",
"symfony/validator": "^6.4 || ^7.3",
"symfony/validator": "^6.4 || ^7.3 || ^8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand All @@ -65,11 +65,11 @@
"sonata-project/admin-bundle": "^4.39",
"sonata-project/block-bundle": "^5.0",
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
"symfony/browser-kit": "^6.4 || ^7.3",
"symfony/filesystem": "^6.4 || ^7.3",
"symfony/intl": "^6.4 || ^7.3",
"symfony/mailer": "^6.4 || ^7.3",
"symfony/mime": "^6.4 || ^7.3"
"symfony/browser-kit": "^6.4 || ^7.3 || ^8.0",
"symfony/filesystem": "^6.4 || ^7.3 || ^8.0",
"symfony/intl": "^6.4 || ^7.3 || ^8.0",
"symfony/mailer": "^6.4 || ^7.3 || ^8.0",
"symfony/mime": "^6.4 || ^7.3 || ^8.0"
},
"conflict": {
"sonata-project/admin-bundle": "<4.20",
Expand Down
1 change: 1 addition & 0 deletions src/Resources/config/routing/admin_resetting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
return static function (RoutingConfigurator $routes) {
foreach (debug_backtrace() as $trace) {
if (isset($trace['object'], $trace['args'])
/* @phpstan-ignore class.notFound */
&& $trace['object'] instanceof XmlFileLoader
&& $trace['args'][0] === __DIR__.'/admin_resetting.php'
&& $trace['args'][3] === __DIR__.'/admin_resetting.xml'
Expand Down
1 change: 1 addition & 0 deletions src/Resources/config/routing/admin_security.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
return static function (RoutingConfigurator $routes) {
foreach (debug_backtrace() as $trace) {
if (isset($trace['object'], $trace['args'])
/* @phpstan-ignore class.notFound */
&& $trace['object'] instanceof XmlFileLoader
&& $trace['args'][0] === __DIR__.'/admin_security.php'
&& $trace['args'][3] === __DIR__.'/admin_security.xml'
Expand Down
3 changes: 2 additions & 1 deletion src/Security/Authorization/Voter/UserAclVoter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Sonata\UserBundle\Model\UserInterface;
use Symfony\Component\Security\Acl\Voter\AclVoter;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Vote;

final class UserAclVoter extends AclVoter
{
Expand All @@ -38,7 +39,7 @@ public function supportsAttribute($attribute): bool
*
* @return self::ACCESS_ABSTAIN|self::ACCESS_DENIED
*/
public function vote(TokenInterface $token, mixed $subject, array $attributes): int
public function vote(TokenInterface $token, mixed $subject, array $attributes, ?Vote $vote = null): int
{
if (!\is_object($subject) || !$this->supportsClass($subject::class)) {
return self::ACCESS_ABSTAIN;
Expand Down