Remove admin deprecations

composer.json

@@ -22,7 +22,7 @@
         "ext-json": "*",
         "nucleos/user-bundle": "^1.6",
         "psr/log": "^1.0",
-        "sonata-project/admin-bundle": "^3.57",
+        "sonata-project/admin-bundle": "^3.90",
         "sonata-project/doctrine-extensions": "^1.5.1",
         "symfony/config": "^4.4",
         "symfony/dependency-injection": "^4.4",

src/Admin/Model/GroupAdmin.php

@@ -51,7 +51,7 @@ public function __construct($code, $class, $baseControllerName, GroupManagerInte
         $this->groupManager = $groupManager;
     }
 
-    public function getNewInstance()
+    protected function createNewInstance(): object
     {
         return $this->groupManager->createGroup('');
     }

src/Admin/Model/UserAdmin.php

@@ -52,27 +52,6 @@ public function __construct($code, $class, $baseControllerName, UserManagerInter
         $this->userManager = $userManager;
     }
 
-    public function getNewInstance()
-    {
-        $instance = $this->userManager->createUser();
-
-        // TODO: Find a better way to create editabe form models
-        // BC layer
-        try {
-            $instance->getUsername();
-        } catch (DomainException $exception) {
-            $instance->setUsername('');
-        }
-
-        try {
-            $instance->getEmail();
-        } catch (DomainException $exception) {
-            $instance->setEmail('');
-        }
-
-        return $instance;
-    }
-
     public function getFormBuilder(): FormBuilderInterface
     {
         $this->formOptions['data_class'] = $this->getClass();
@@ -87,21 +66,42 @@ public function getFormBuilder(): FormBuilderInterface
         return $formBuilder;
     }
 
-    public function getExportFields(): array
+    public function preUpdate($user): void
+    {
+        $this->userManager->updateCanonicalFields($user);
+        $this->userManager->updatePassword($user);
+    }
+
+    protected function configureExportFields(): array
     {
         // avoid security field to be exported
         return array_filter(
-            parent::getExportFields(),
+            parent::configureExportFields(),
             static function ($v): bool {
                 return !\in_array($v, ['password', 'salt'], true);
             }
         );
     }
 
-    public function preUpdate($user): void
+    protected function createNewInstance(): object
     {
-        $this->userManager->updateCanonicalFields($user);
-        $this->userManager->updatePassword($user);
+        $instance = $this->userManager->createUser();
+
+        // TODO: Find a better way to create editabe form models
+        // BC layer
+        try {
+            $instance->getUsername();
+        } catch (DomainException $exception) {
+            $instance->setUsername('');
+        }
+
+        try {
+            $instance->getEmail();
+        } catch (DomainException $exception) {
+            $instance->setEmail('');
+        }
+
+        return $instance;
     }
 
     protected function configureListFields(ListMapper $listMapper): void

tests/Form/Type/RolesMatrixTypeTest.php

@@ -65,24 +65,6 @@ public function testSubmitValidData(): void
         static::assertContains('ROLE_FOO', $form->getData());
     }
 
-    public function testSubmitInvalidData(): void
-    {
-        $form = $this->factory->create(
-            RolesMatrixType::class,
-            null,
-            [
-                'multiple' => true,
-                'expanded' => true,
-                'required' => false,
-            ]
-        );
-
-        $form->submit([0 => 'ROLE_NOT_EXISTS']);
-
-        static::assertFalse($form->isSynchronized());
-        static::assertNull($form->getData());
-    }
-
     /**
      * @return PreloadedExtension[]
      */

tests/Form/Type/SecurityRolesTypeTest.php

@@ -64,24 +64,6 @@ public function testSubmitValidData(): void
         static::assertContains('ROLE_FOO', $form->getData());
     }
 
-    public function testSubmitInvalidData(): void
-    {
-        $form = $this->factory->create(
-            $this->getSecurityRolesTypeName(),
-            null,
-            [
-                'multiple' => true,
-                'expanded' => true,
-                'required' => false,
-            ]
-        );
-
-        $form->submit([0 => 'ROLE_NOT_EXISTS']);
-
-        static::assertFalse($form->isSynchronized());
-        static::assertNull($form->getData());
-    }
-
     public function testSubmitWithHiddenRoleData(): void
     {
         $originalRoles = ['ROLE_SUPER_ADMIN', 'ROLE_USER'];