Merge 4.x into 5.x

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.28.1](https://github.com/sonata-project/SonataAdminBundle/compare/4.28.0...4.28.1) - 2023-11-20
+### Fixed
+- [[#8125](https://github.com/sonata-project/SonataAdminBundle/pull/8125)] Needing to submit form twice when using CRUDController::render() ([@AntoineRoue](https://github.com/AntoineRoue))
+
 ## [4.28.0](https://github.com/sonata-project/SonataAdminBundle/compare/4.27.1...4.28.0) - 2023-10-19
 ### Changed
 - [[#8116](https://github.com/sonata-project/SonataAdminBundle/pull/8116)] Automatically detect `base_template` and `admin` twig variable ([@core23](https://github.com/core23))

src/Controller/CRUDController.php

@@ -986,6 +986,25 @@ final public function configureAdmin(Request $request): void
         $this->templateRegistry = $this->admin->getTemplateRegistry();
     }
 
+    /**
+     * Add twig globals which are used in every template.
+     */
+    final public function setTwigGlobals(Request $request): void
+    {
+        $twig = $this->container->get('twig');
+        \assert($twig instanceof Environment);
+
+        $twig->addGlobal('admin', $this->admin);
+
+        if ($this->isXmlHttpRequest($request)) {
+            $baseTemplate = $this->templateRegistry->getTemplate('ajax');
+        } else {
+            $baseTemplate = $this->templateRegistry->getTemplate('layout');
+        }
+
+        $twig->addGlobal('base_template', $baseTemplate);
+    }
+
     /**
      * Renders a view while passing mandatory parameters on to the template.
      *

src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -396,8 +396,8 @@ private function getDefaultMethodCalls(ContainerBuilder $container, string $serv
                 \E_USER_DEPRECATED
             );
 
-            // NEXT_MAJOR: Uncomment the exception instead of the deprecation.
-            // throw new InvalidArgumentException(sprintf('Missing tag information "model_class" on service "%s".', $serviceId));
+        // NEXT_MAJOR: Uncomment the exception instead of the deprecation.
+        // throw new InvalidArgumentException(sprintf('Missing tag information "model_class" on service "%s".', $serviceId));
         } else {
             $methodCalls[] = ['setModelClass', [$modelClass]];
 

src/EventListener/ConfigureCRUDControllerListener.php

@@ -38,6 +38,8 @@ public function onKernelController(ControllerEvent $event): void
         $request = $event->getRequest();
 
         $controller->configureAdmin($request);
+
+        $controller->setTwigGlobals($request);
     }
 
     public static function getSubscribedEvents(): array

src/Resources/config/event_listener.php

@@ -13,19 +13,11 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Sonata\AdminBundle\EventListener\AdminEventListener;
 use Sonata\AdminBundle\EventListener\ConfigureCRUDControllerListener;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->services()
 
-        ->set('sonata.admin.event_listener.admin_event', AdminEventListener::class)
-            ->tag('kernel.event_subscriber')
-            ->args([
-                new ReferenceConfigurator('twig'),
-                new ReferenceConfigurator('sonata.admin.request.fetcher'),
-            ])
-
         ->set('sonata.admin.event_listener.configure_crud_controller', ConfigureCRUDControllerListener::class)
             ->tag('kernel.event_subscriber');
 };

tests/Controller/CRUDControllerTest.php

@@ -74,6 +74,7 @@
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 /**
  * @author Andrej Hudec <pulzarraider@gmail.com>
@@ -383,6 +384,32 @@ public function testConfigureAdminWithoutTemplateRegistryThrowsException(): void
         $controller->configureAdmin($this->request);
     }
 
+    public function testSetTwigGlobals(): void
+    {
+        $twig = new Environment(new ArrayLoader([]));
+        $this->container->set('twig', $twig);
+
+        $this->controller->setTwigGlobals($this->request);
+
+        $globals = $twig->getGlobals();
+        static::assertSame($this->admin, $globals['admin']);
+        static::assertSame('@SonataAdmin/standard_layout.html.twig', $globals['base_template']);
+    }
+
+    public function testSetTwigGlobalsWithAjaxRequest(): void
+    {
+        $this->request->request->set('_xml_http_request', true);
+
+        $twig = new Environment(new ArrayLoader([]));
+        $this->container->set('twig', $twig);
+
+        $this->controller->setTwigGlobals($this->request);
+
+        $globals = $twig->getGlobals();
+        static::assertSame($this->admin, $globals['admin']);
+        static::assertSame('@SonataAdmin/ajax_layout.html.twig', $globals['base_template']);
+    }
+
     public function testGetBaseTemplate(): void
     {
         static::assertSame(

tests/EventListener/ConfigureCRUDControllerListenerTest.php

@@ -22,6 +22,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Twig\Environment;
 
 final class ConfigureCRUDControllerListenerTest extends TestCase
 {
@@ -64,6 +65,21 @@ public function testItConfiguresCRUDController(): void
             ->with($request)
             ->willReturn($admin);
 
+        $twig = $this->createMock(Environment::class);
+        $container->set('twig', $twig);
+
+        $matcher = static::exactly(2);
+        $twig
+            ->expects($matcher)
+            ->method('addGlobal')
+            ->willReturnCallback(static function (string $name) use ($matcher) {
+                match ($matcher->getInvocationCount()) {
+                    1 => static::assertSame($name, 'admin'),
+                    2 => static::assertSame($name, 'base_template'),
+                    default => throw new \LogicException('Exactly 2 calls'),
+                };
+            });
+
         $this->listener->onKernelController($controllerEvent);
     }
 }