Support custom ModelManagerException messages

phpunit.xml.dist

@@ -36,5 +36,6 @@ It's auto-generated by sonata-project/dev-kit package.
         <env name="KERNEL_CLASS" value="\Sonata\AdminBundle\Tests\App\AppKernel" />
         <server name="APP_ENV" value="test" force="true" />
         <server name="APP_DEBUG" value="false" />
+        <ini name="memory_limit" value="256M" />
     </php>
 </phpunit>

src/Controller/CRUDController.php

@@ -170,11 +170,10 @@ public function batchActionDelete(ProxyQueryInterface $query): Response
             );
         } catch (ModelManagerException $e) {
             // NEXT_MAJOR: Remove this catch.
-            $this->handleModelManagerException($e);
-
+            $errorMessage = $this->handleModelManagerException($e);
             $this->addFlash(
                 'sonata_flash_error',
-                $this->trans('flash_batch_delete_error', [], 'SonataAdminBundle')
+                $errorMessage ?? $this->trans('flash_batch_delete_error', [], 'SonataAdminBundle')
             );
         } catch (ModelManagerThrowable $e) {
             $errorMessage = $this->handleModelManagerThrowable($e);
@@ -229,15 +228,15 @@ public function deleteAction(Request $request): Response
                 );
             } catch (ModelManagerException $e) {
                 // NEXT_MAJOR: Remove this catch.
-                $this->handleModelManagerException($e);
+                $errorMessage = $this->handleModelManagerException($e);
 
                 if ($this->isXmlHttpRequest($request)) {
                     return $this->renderJson(['result' => 'error']);
                 }
 
                 $this->addFlash(
                     'sonata_flash_error',
-                    $this->trans(
+                    $errorMessage ?? $this->trans(
                         'flash_delete_error',
                         ['%name%' => $this->escapeHtml($objectName)],
                         'SonataAdminBundle'
@@ -295,7 +294,6 @@ public function editAction(Request $request): Response
         if (null !== $preResponse) {
             return $preResponse;
         }
-
         $this->admin->setSubject($existingObject);
         $objectId = $this->admin->getNormalizedIdentifier($existingObject);
         \assert(null !== $objectId);
@@ -334,7 +332,7 @@ public function editAction(Request $request): Response
                     return $this->redirectTo($request, $existingObject);
                 } catch (ModelManagerException $e) {
                     // NEXT_MAJOR: Remove this catch.
-                    $this->handleModelManagerException($e);
+                    $errorMessage = $this->handleModelManagerException($e);
 
                     $isFormValid = false;
                 } catch (ModelManagerThrowable $e) {
@@ -610,7 +608,7 @@ public function createAction(Request $request): Response
                     return $this->redirectTo($request, $newObject);
                 } catch (ModelManagerException $e) {
                     // NEXT_MAJOR: Remove this catch.
-                    $this->handleModelManagerException($e);
+                    $errorMessage = $this->handleModelManagerException($e);
 
                     $isFormValid = false;
                 } catch (ModelManagerThrowable $e) {
@@ -1107,13 +1105,12 @@ protected function getBaseTemplate(): string
 
     /**
      * @throws \Exception
+     * @return string|null|void A custom error message to display in the flag bag instead of the generic one
      */
-    protected function handleModelManagerException(\Exception $exception): void
+    protected function handleModelManagerException(\Exception $exception)
     {
         if ($exception instanceof ModelManagerThrowable) {
-            $this->handleModelManagerThrowable($exception);
-
-            return;
+            return $this->handleModelManagerThrowable($exception);
         }
 
         @trigger_error(sprintf(

src/DependencyInjection/Configuration.php

@@ -174,6 +174,7 @@
 {
     /**
      * @psalm-suppress UndefinedInterfaceMethod
+     * @psalm-suppress PossiblyNullReference - end() can return null, apparently
      *
      * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
      */

tests/App/Controller/CustomModelManagerExceptionMessageController.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sonata\AdminBundle\Tests\App\Controller;
+
+use Exception;
+use Sonata\AdminBundle\Controller\CRUDController;
+
+/**
+ * @phpstan-extends CRUDController<object>
+ */
+final class CustomModelManagerExceptionMessageController extends CRUDController
+{
+    public const ERROR_MESSAGE = 'message from model manager exception';
+
+    protected function handleModelManagerException(Exception $exception): string
+    {
+        return self::ERROR_MESSAGE;
+    }
+}

tests/App/Controller/CustomModelManagerThrowableMessageController.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sonata\AdminBundle\Tests\App\Controller;
+
+use Sonata\AdminBundle\Controller\CRUDController;
+use Sonata\AdminBundle\Exception\ModelManagerThrowable;
+
+/**
+ * @phpstan-extends CRUDController<object>
+ */
+final class CustomModelManagerThrowableMessageController extends CRUDController
+{
+    public const ERROR_MESSAGE = 'message from model manager throwable';
+
+    protected function handleModelManagerThrowable(ModelManagerThrowable $exception): string
+    {
+        return self::ERROR_MESSAGE;
+    }
+}