Add support for customising ModelManagerException messages (sonata-pr…

…oject#8137)
wadjei · Dec 13, 2023 · 097db6f · 097db6f
1 parent 636f338
commit 097db6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/phpunit.xml.dist b/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>
diff --git a/src/Controller/CRUDController.php b/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) {
@@ -1108,12 +1106,10 @@ protected function getBaseTemplate(): string
     /**
      * @throws \Exception
      */
-    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(