Add support for form-extensions 2.0 (#8064)

* Add support for form-extensions 2.0

* Actualizar test.yaml

.github/workflows/test.yaml

@@ -49,7 +49,7 @@ jobs:
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: false
-                      variant: sonata-project/form-extensions:"2.x-dev as 1.999"
+                      variant: sonata-project/form-extensions:"2.0.0-alpha-1"
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: false

assets/scss/styles.scss

@@ -13,6 +13,7 @@
  */
 
 html {
+  font-size: initial !important;
   min-height: 100%;
   position: relative;
 }

composer.json

@@ -35,7 +35,7 @@
         "sonata-project/block-bundle": "^4.11",
         "sonata-project/doctrine-extensions": "^1.8 || ^2.0",
         "sonata-project/exporter": "^2.14 || ^3.1.1",
-        "sonata-project/form-extensions": "^1.15",
+        "sonata-project/form-extensions": "^1.15 || ^2.0",
         "sonata-project/twig-extensions": "^1.4.1 || ^2.0",
         "symfony/asset": "^5.4 || ^6.2",
         "symfony/config": "^5.4 || ^6.2",

src/Resources/config/twig.php

@@ -153,6 +153,8 @@
             ->tag('twig.runtime')
             ->args([
                 service('request_stack'),
+                // TODO: Remove this argument when dropping support for `sonata-project/form-extensions` 1.x.
+                service('sonata.form.twig.canonicalize_runtime')->nullOnInvalid(),
             ])
 
         // NEXT_MAJOR: Remove the `args()` call.

src/Resources/views/standard_layout.html.twig

@@ -65,8 +65,9 @@ file that was distributed with this source code.
                 {% endfor %}
             {% endblock %}
 
+            {# TODO: Drop locale for moment calls when dropping support for `sonata-project/form-extensions` 1.x #}
             {# localize moment #}
-            {% set localeForMoment = sonata_form_canonicalize_locale_for_moment() %}
+            {% set localeForMoment = canonicalize_locale_for_moment() %}
             {% if localeForMoment %}
                 <script src="{{ asset('bundles/sonataform/moment-locale/' ~ localeForMoment ~ '.js') }}"></script>
             {% endif %}

src/Twig/CanonicalizeRuntime.php

@@ -13,57 +13,36 @@
 
 namespace Sonata\AdminBundle\Twig;
 
+use Sonata\Form\Twig\CanonicalizeRuntime as SonataFormCanonicalizeRuntime;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Extension\RuntimeExtensionInterface;
 
 final class CanonicalizeRuntime implements RuntimeExtensionInterface
 {
-    // @todo: there are more locales which are not supported by "Moment.js" NPM library and they need to be translated/normalized/canonicalized here
-    private const MOMENT_UNSUPPORTED_LOCALES = [
-        'de' => ['de', 'de-at'],
-        'es' => ['es', 'es-do'],
-        'nl' => ['nl', 'nl-be'],
-        'fr' => ['fr', 'fr-ca', 'fr-ch'],
-    ];
-
     /**
+     * TODO: Remove second argument when dropping support for `sonata-project/form-extensions` 1.x.
+     *
      * @internal This class should only be used through Twig
      */
     public function __construct(
-        private RequestStack $requestStack
+        private RequestStack $requestStack,
+        private ?SonataFormCanonicalizeRuntime $canonicalizeRuntime
     ) {
     }
 
     /**
      * NEXT_MAJOR: Remove this method.
      *
-     * @deprecated since sonata-project/admin-bundle version 4.12 use `sonata_form_canonicalize_locale_for_moment` twig function.
-     *
      * Returns a canonicalized locale for "Moment.js" NPM library,
      * or `null` if the locale's language is "en", which doesn't require localization.
      */
     public function getCanonicalizedLocaleForMoment(): ?string
     {
-        @trigger_error(
-            'The `canonicalize_locale_for_moment` twig function is deprecated since sonata-project/admin-bundle 4.12 and will be removed in 5.0.'
-            .'  use `sonata_form_canonicalize_locale_for_moment` instead.',
-            \E_USER_DEPRECATED
-        );
-
-        $locale = $this->getLocale();
-
-        // "en" language doesn't require localization.
-        if (('en' === $lang = substr($locale, 0, 2)) && !\in_array($locale, ['en-au', 'en-ca', 'en-gb', 'en-ie', 'en-nz'], true)) {
+        if (null === $this->canonicalizeRuntime) {
             return null;
         }
 
-        foreach (self::MOMENT_UNSUPPORTED_LOCALES as $language => $locales) {
-            if ($language === $lang && !\in_array($locale, $locales, true)) {
-                $locale = $language;
-            }
-        }
-
-        return $locale;
+        return $this->canonicalizeRuntime->getCanonicalizedLocaleForMoment();
     }
 
     /**

tests/Twig/CanonicalizeRuntimeTest.php

@@ -15,6 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Twig\CanonicalizeRuntime;
+use Sonata\Form\Twig\CanonicalizeRuntime as SonataFormCanonicalizeRuntime;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -29,7 +30,10 @@ protected function setUp(): void
         $this->request = new Request();
         $requestStack = new RequestStack();
         $requestStack->push($this->request);
-        $this->canonicalizeRuntime = new CanonicalizeRuntime($requestStack);
+        $this->canonicalizeRuntime = new CanonicalizeRuntime(
+            $requestStack,
+            class_exists(SonataFormCanonicalizeRuntime::class) ? new SonataFormCanonicalizeRuntime($requestStack) : null,
+        );
     }
 
     /**
@@ -42,6 +46,9 @@ protected function setUp(): void
     public function testCanonicalizedLocaleForMoment(?string $expected, string $original): void
     {
         $this->changeLocale($original);
+
+        $expected = class_exists(SonataFormCanonicalizeRuntime::class) ? $expected : null;
+
         static::assertSame($expected, $this->canonicalizeRuntime->getCanonicalizedLocaleForMoment());
     }
 

tests/Twig/Extension/CanonicalizeExtensionTest.php

@@ -16,6 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Twig\CanonicalizeRuntime;
 use Sonata\AdminBundle\Twig\Extension\CanonicalizeExtension;
+use Sonata\Form\Twig\CanonicalizeRuntime as SonataFormCanonicalizeRuntime;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -35,7 +36,12 @@ protected function setUp(): void
         $this->request = new Request();
         $requestStack = new RequestStack();
         $requestStack->push($this->request);
-        $this->twigExtension = new CanonicalizeExtension(new CanonicalizeRuntime($requestStack));
+        $this->twigExtension = new CanonicalizeExtension(
+            new CanonicalizeRuntime(
+                $requestStack,
+                class_exists(SonataFormCanonicalizeRuntime::class) ? new SonataFormCanonicalizeRuntime($requestStack) : null,
+            )
+        );
     }
 
     /**
@@ -44,6 +50,9 @@ protected function setUp(): void
     public function testCanonicalizedLocaleForMoment(?string $expected, string $original): void
     {
         $this->changeLocale($original);
+
+        $expected = class_exists(SonataFormCanonicalizeRuntime::class) ? $expected : null;
+
         static::assertSame($expected, $this->twigExtension->getCanonicalizedLocaleForMoment());
     }