Skip to content

Commit

Permalink
Avoid deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentLanglet authored and jordisala1991 committed Feb 27, 2022
1 parent 30d3825 commit 80845ad
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.16",
"psalm/plugin-symfony": "^3.0",
"sonata-project/admin-bundle": "^4.8",
"sonata-project/admin-bundle": "^4.9",
"sonata-project/block-bundle": "^4.0",
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
"symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
Expand All @@ -74,7 +74,7 @@
"vimeo/psalm": "^4.9.2"
},
"conflict": {
"sonata-project/admin-bundle": "<4.8",
"sonata-project/admin-bundle": "<4.9",
"sonata-project/block-bundle": "<4.0",
"sonata-project/doctrine-orm-admin-bundle": "<4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/admin_mongodb.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'manager_type' => 'doctrine_mongodb',
'group' => 'sonata_user',
'label' => 'users',
'label_catalogue' => 'SonataUserBundle',
'translation_domain' => 'SonataUserBundle',
'label_translator_strategy' => 'sonata.admin.label.strategy.underscore',
'icon' => '<i class=\'fa fa-users\'></i>',
])
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/admin_orm.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'manager_type' => 'orm',
'group' => 'sonata_user',
'label' => 'users',
'label_catalogue' => 'SonataUserBundle',
'translation_domain' => 'SonataUserBundle',
'label_translator_strategy' => 'sonata.admin.label.strategy.underscore',
'icon' => '<i class=\'fa fa-users\'></i>',
])
Expand Down
5 changes: 3 additions & 2 deletions tests/Security/RolesBuilder/AdminRolesBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ protected function setUp(): void
$this->pool = new Pool($container, ['sonata.admin.bar']);
$this->configuration = new SonataConfiguration('title', 'logo', [
'confirm_exit' => true,
'default_admin_route' => 'show',
'default_group' => 'group',
'default_icon' => 'icon',
'default_label_catalogue' => 'label_catalogue',
'default_translation_domain' => 'label_catalogue',
'dropdown_number_groups_per_colums' => 1,
'form_type' => 'horizontal',
'html5_validate' => true,
Expand All @@ -91,7 +92,7 @@ protected function setUp(): void
'role_admin' => 'ROLE_ADMIN',
'role_super_admin' => 'ROLE_SUPER_ADMIN',
'search' => true,
'skin' => 'blue',
'skin' => 'skin-blue',
'sort_admins' => true,
'stylesheets' => [],
'use_bootlint' => true,
Expand Down
5 changes: 3 additions & 2 deletions tests/Security/RolesBuilder/SecurityRolesBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ protected function setUp(): void
$this->authorizationChecker = $this->createMock(AuthorizationCheckerInterface::class);
$this->configuration = new SonataConfiguration('title', 'logo', [
'confirm_exit' => true,
'default_admin_route' => 'show',
'default_group' => 'group',
'default_icon' => 'icon',
'default_label_catalogue' => 'label_catalogue',
'default_translation_domain' => 'label_catalogue',
'dropdown_number_groups_per_colums' => 1,
'form_type' => 'horizontal',
'html5_validate' => true,
Expand All @@ -63,7 +64,7 @@ protected function setUp(): void
'role_admin' => 'ROLE_SONATA_ADMIN',
'role_super_admin' => 'ROLE_SUPER_ADMIN',
'search' => true,
'skin' => 'blue',
'skin' => 'skin-blue',
'sort_admins' => true,
'stylesheets' => [],
'use_bootlint' => true,
Expand Down

0 comments on commit 80845ad

Please sign in to comment.