Fix pack with tests

composer.json

@@ -50,7 +50,9 @@
         "nelmio/api-doc-bundle": "^2.11",
         "phpspec/prophecy": "^1.0",
         "sonata-project/exporter": "^1.11 || ^2.0",
-        "symfony/phpunit-bridge": "^4.3"
+        "symfony/browser-kit": "4.3",
+        "symfony/phpunit-bridge": "^4.3",
+        "symfony/twig-bundle": "^4.3"
     },
     "suggest": {
         "sonata-project/doctrine-extensions": "Direct replacement for Doctrine behavioral extensions",

src/CoreBundle/DependencyInjection/SonataCoreExtension.php

@@ -196,7 +196,12 @@ public function registerFlashTypes(ContainerBuilder $container, array $config)
 
         $identifier = 'sonata.twig.flashmessage.manager';
 
-        $definition = $container->getDefinition($identifier);
+        if ($container->has($identifier)) {
+            $definition = $container->getDefinition($identifier);
+        } else {
+            $definition = $container->getDefinition('sonata.core.flashmessage.manager');
+        }
+
         $definition->replaceArgument(2, $types);
         $definition->replaceArgument(3, $cssClasses);
 

src/CoreBundle/Resources/config/core_form_types.xml

@@ -90,7 +90,7 @@
         <service id="sonata.core.form.type.datetime_range_picker" alias="sonata.form.type.datetime_range_picker" public="true">
             <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
         </service>
-        <service id="sonata.core.form.type.equal" class="sonata.form.type.equal" public="true">
+        <service id="sonata.core.form.type.equal" class="Sonata\Form\Type\EqualType" public="true">
             <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
         </service>
     </services>

src/CoreBundle/Resources/config/core_twig.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sonata.core.twig.extension.wrapping" class="Sonata\Twig\Extension\FormTypeExtension">
-            <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "sonata.twig.extension.wrapping" instead.</deprecated>
-            <tag name="twig.extension"/>
-            <argument>%sonata.core.form_type%</argument>
+        <service id="sonata.core.twig.extension.wrapping" alias="sonata.twig.extension.wrapping">
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
         </service>
         <service id="sonata.core.twig.extension.text" class="Sonata\CoreBundle\Twig\Extension\DeprecatedTextExtension">
             <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0.</deprecated>
@@ -13,8 +11,9 @@
         <service id="sonata.core.twig.status_runtime" alias="sonata.twig.status_runtime">
             <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
         </service>
-        <service id="sonata.core.twig.status_extension" alias="sonata.twig.status_extension">
-            <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
+        <service id="sonata.core.twig.status_extension" class="Sonata\CoreBundle\Twig\Extension\StatusExtension">
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "sonata.twig.status_extension" instead.</deprecated>
+            <tag name="twig.extension"/>
         </service>
         <service id="sonata.core.twig.deprecated_template_extension" alias="sonata.twig.deprecated_template_extension">
             <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>

src/CoreBundle/Twig/Extension/StatusExtension.php

@@ -14,17 +14,17 @@
 namespace Sonata\CoreBundle\Twig\Extension;
 
 use Sonata\CoreBundle\Component\Status\StatusClassRendererInterface;
+use Sonata\Twig\Extension\StatusExtension as BaseStatusExtension;
 use Sonata\Twig\Extension\StatusRuntime;
-use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
 /**
  * @author Hugo Briand <briand@ekino.com>
  * @author Titouan Galopin <galopintitouan@gmail.com>
  *
- * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
+ * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0. Use "Sonata\Twig\Extension\StatusExtension" instead.
  */
-class StatusExtension extends AbstractExtension
+class StatusExtension extends BaseStatusExtension
 {
     /**
      * @var StatusClassRendererInterface[]

src/Form/Bridge/Symfony/SonataFormBundle.php

@@ -13,8 +13,13 @@
 
 namespace Sonata\Form\Bridge\Symfony;
 
+use Sonata\Form\Bridge\Symfony\DependencyInjection\SonataFormExtension;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class SonataFormBundle extends Bundle
 {
+    protected function getContainerExtensionClass()
+    {
+        return SonataFormExtension::class;
+    }
 }

src/Twig/Bridge/Symfony/DependencyInjection/SonataTwigExtension.php

@@ -41,21 +41,21 @@ public function load(array $configs, ContainerBuilder $container): void
     /**
      * Registers flash message types defined in configuration to flash manager.
      */
-    public function registerFlashTypes(ContainerBuilder $container, array $config): void
+    public function registerFlashTypes(ContainerBuilder $container, array $config)
     {
         $mergedConfig = array_merge_recursive($config['flashmessage'], [
             'success' => ['types' => [
-                'success' => ['domain' => 'SonataTwigBundle'],
+                'success' => ['domain' => 'SonataCoreBundle'],
                 'sonata_flash_success' => ['domain' => 'SonataAdminBundle'],
                 'sonata_user_success' => ['domain' => 'SonataUserBundle'],
                 'fos_user_success' => ['domain' => 'FOSUserBundle'],
             ]],
             'warning' => ['types' => [
-                'warning' => ['domain' => 'SonataTwigBundle'],
+                'warning' => ['domain' => 'SonataCoreBundle'],
                 'sonata_flash_info' => ['domain' => 'SonataAdminBundle'],
             ]],
             'danger' => ['types' => [
-                'error' => ['domain' => 'SonataTwigBundle'],
+                'error' => ['domain' => 'SonataCoreBundle'],
                 'sonata_flash_error' => ['domain' => 'SonataAdminBundle'],
                 'sonata_user_error' => ['domain' => 'SonataUserBundle'],
             ]],
@@ -71,8 +71,8 @@ public function registerFlashTypes(ContainerBuilder $container, array $config):
         $identifier = 'sonata.twig.flashmessage.manager';
 
         $definition = $container->getDefinition($identifier);
-        $definition->replaceArgument(1, $types);
-        $definition->replaceArgument(2, $cssClasses);
+        $definition->replaceArgument(2, $types);
+        $definition->replaceArgument(3, $cssClasses);
 
         $container->setDefinition($identifier, $definition);
     }

src/Twig/Bridge/Symfony/Resources/config/flash.xml

@@ -9,8 +9,8 @@
             <tag name="sonata.status.renderer"/>
             <argument type="service" id="session"/>
             <argument type="service" id="translator"/>
-            <argument/>
-            <argument/>
+            <argument type="collection"/>
+            <argument type="collection"/>
         </service>
         <service id="sonata.twig.flashmessage.twig.runtime" class="Sonata\Twig\Extension\FlashMessageRuntime">
             <tag name="twig.runtime"/>

src/Twig/Bridge/Symfony/SonataTwigBundle.php

@@ -17,6 +17,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+/**
+ * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ */
 final class SonataTwigBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void

src/Twig/Extension/FlashMessageRuntime.php

@@ -53,5 +53,3 @@ public function getFlashMessagesTypes()
         return $this->flashManager->getHandledTypes();
     }
 }
-
-class_exists(\Sonata\CoreBundle\Twig\Extension\FlashMessageRuntime::class);

src/Twig/Extension/StatusExtension.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\Twig\Extension;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+/**
+ * @author Hugo Briand <briand@ekino.com>
+ * @author Titouan Galopin <galopintitouan@gmail.com>
+ */
+class StatusExtension extends AbstractExtension
+{
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('sonata_status_class', [StatusRuntime::class, 'statusClass']),
+        ];
+    }
+
+    public function getName()
+    {
+        return 'sonata_twig_status';
+    }
+}

tests/CoreBundle/App/AppKernel.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\CoreBundle\Tests\App;
+
+use Sonata\CoreBundle\SonataCoreBundle;
+use Sonata\Doctrine\Bridge\Symfony\Bundle\SonataDoctrineBundle;
+use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+final class AppKernel extends Kernel
+{
+    use MicroKernelTrait;
+
+    public function __construct()
+    {
+        parent::__construct('test', false);
+    }
+
+    public function registerBundles(): array
+    {
+        return [
+            new FrameworkBundle(),
+            new TwigBundle(),
+            new SonataDoctrineBundle(),
+            new SonataCoreBundle(),
+        ];
+    }
+
+    public function getCacheDir(): string
+    {
+        return $this->getBaseDir().'cache';
+    }
+
+    public function getLogDir(): string
+    {
+        return $this->getBaseDir().'log';
+    }
+
+    public function getProjectDir(): string
+    {
+        return __DIR__;
+    }
+
+    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    {
+        $route = new Route('/');
+        $route->setDefault('_controller', TemplateController::class.'::templateAction');
+        $routes->setDefault('template', 'index.html.twig');
+        $routes->addRoute($route);
+    }
+
+    protected function configureContainer(ContainerBuilder $containerBuilder, LoaderInterface $loader): void
+    {
+        $loader->load(__DIR__.'/config.yml');
+    }
+
+    private function getBaseDir(): string
+    {
+        return sys_get_temp_dir().'/sonata-project/core-bundle/var/';
+    }
+}

tests/CoreBundle/App/config.yml

@@ -0,0 +1,11 @@
+framework:
+    secret: secret
+    test: true
+    session:
+        handler_id: ~
+        storage_id: session.storage.mock_file
+        name: 'MOCKSESSID'
+
+twig:
+    paths:
+        - '%kernel.project_dir%/templates'

tests/CoreBundle/App/templates/index.html.twig

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Welcome!</title>
+</head>
+<body>
+</body>
+</html>

tests/CoreBundle/Functional/FunctionalTest.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\CoreBundle\Tests\Functional;
+
+use Sonata\CoreBundle\Tests\App\AppKernel;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+final class FunctionalTest extends WebTestCase
+{
+    public function testRenderFlashes(): void
+    {
+        $kernel = new AppKernel();
+
+        $client = $this->createClientBC($kernel);
+        $client->request('GET', '/');
+
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+    }
+
+    protected static function getKernelClass(): string
+    {
+        return AppKernel::class;
+    }
+
+    private function createClientBC(KernelInterface $kernel)
+    {
+        if (class_exists(KernelBrowser::class)) {
+            return new KernelBrowser($kernel);
+        }
+
+        return static::createClient();
+    }
+}