Fix deprecations

Runroom · Jul 20, 2021 · 2d844fa · 2d844fa
1 parent 609f00e
commit 2d844fa
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 1 deletion.
diff --git a/packages/basic-page-bundle/src/Twig/BasicPageRuntime.php b/packages/basic-page-bundle/src/Twig/BasicPageRuntime.php
@@ -35,6 +35,6 @@ public function getBasicPages(?string $location = null): array
             $criteria['location'] = $location;
         }
 
-        return $this->repository->findBy($criteria) ?? [];
+        return $this->repository->findBy($criteria);
     }
 }
diff --git a/packages/basic-page-bundle/tests/App/Kernel.php b/packages/basic-page-bundle/tests/App/Kernel.php
@@ -23,6 +23,7 @@
 use Runroom\BasicPageBundle\Tests\App\Entity\Media;
 use Runroom\SeoBundle\RunroomSeoBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -117,6 +118,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'locales' => ['es', 'en', 'ca'],
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $container->loadFromExtension('runroom_seo', [
             'locales' => ['es', 'en', 'ca'],
             'xdefault_locale' => 'es',

diff --git a/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php b/packages/ckeditor-sonata-media-bundle/tests/App/Kernel.php
@@ -20,6 +20,7 @@
 use Runroom\CkeditorSonataMediaBundle\Tests\App\Entity\GalleryItem;
 use Runroom\CkeditorSonataMediaBundle\Tests\App\Entity\Media;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\Doctrine\Bridge\Symfony\SonataDoctrineBundle;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Sonata\MediaBundle\Model\GalleryItemInterface;
@@ -105,6 +106,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'strict_variables' => '%kernel.debug%',
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $galleryItemKey = interface_exists(GalleryItemInterface::class) ? 'gallery_item' : 'gallery_has_media';
 
         $container->loadFromExtension('sonata_media', [

diff --git a/packages/cookies-bundle/tests/App/Kernel.php b/packages/cookies-bundle/tests/App/Kernel.php
@@ -22,6 +22,7 @@
 use Runroom\CookiesBundle\RunroomCookiesBundle;
 use Runroom\FormHandlerBundle\RunroomFormHandlerBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -125,6 +126,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'locales' => ['es', 'en', 'ca'],
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $container->loadFromExtension('runroom_cookies', [
             'cookies' => [
                 'mandatory_cookies' => [[

diff --git a/packages/redirection-bundle/tests/App/Kernel.php b/packages/redirection-bundle/tests/App/Kernel.php
@@ -17,6 +17,7 @@
 use Knp\Bundle\MenuBundle\KnpMenuBundle;
 use Runroom\RedirectionBundle\RunroomRedirectionBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -106,6 +107,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'strict_variables' => '%kernel.debug%',
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $container->loadFromExtension('runroom_redirection', [
             'enable_automatic_redirections' => true,
             'automatic_redirections' => [

diff --git a/packages/seo-bundle/tests/App/Kernel.php b/packages/seo-bundle/tests/App/Kernel.php
@@ -23,6 +23,7 @@
 use Runroom\SeoBundle\Tests\App\Entity\GalleryItem;
 use Runroom\SeoBundle\Tests\App\Entity\Media;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\Doctrine\Bridge\Symfony\SonataDoctrineBundle;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Sonata\MediaBundle\Model\GalleryItemInterface;
@@ -138,6 +139,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'locales' => ['es', 'en', 'ca'],
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $galleryItemKey = interface_exists(GalleryItemInterface::class) ? 'gallery_item' : 'gallery_has_media';
 
         $container->loadFromExtension('sonata_media', [

diff --git a/packages/sortable-behavior-bundle/tests/App/Kernel.php b/packages/sortable-behavior-bundle/tests/App/Kernel.php
@@ -17,6 +17,7 @@
 use Knp\Bundle\MenuBundle\KnpMenuBundle;
 use Runroom\SortableBehaviorBundle\RunroomSortableBehaviorBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -107,6 +108,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'exception_controller' => null,
             'strict_variables' => '%kernel.debug%',
         ]);
+
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
     }
 
     /**

diff --git a/packages/translation-bundle/tests/App/Kernel.php b/packages/translation-bundle/tests/App/Kernel.php
@@ -21,6 +21,7 @@
 use Knp\DoctrineBehaviors\DoctrineBehaviorsBundle;
 use Runroom\TranslationBundle\RunroomTranslationBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -118,6 +119,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $container->loadFromExtension('a2lix_translation_form', [
             'locales' => ['es', 'en', 'ca'],
         ]);
+
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
     }
 
     /**

diff --git a/tests/App/Kernel.php b/tests/App/Kernel.php
@@ -33,6 +33,7 @@
 use Runroom\SortableBehaviorBundle\RunroomSortableBehaviorBundle;
 use Runroom\TranslationBundle\RunroomTranslationBundle;
 use Sonata\AdminBundle\SonataAdminBundle;
+use Sonata\AdminBundle\Twig\Extension\DeprecatedTextExtension;
 use Sonata\Doctrine\Bridge\Symfony\SonataDoctrineBundle;
 use Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle;
 use Sonata\MediaBundle\Model\GalleryItemInterface;
@@ -176,6 +177,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             'locales' => ['es', 'en', 'ca'],
         ]);
 
+        if (class_exists(DeprecatedTextExtension::class)) {
+            $container->loadFromExtension('sonata_admin', [
+                'options' => [
+                    'legacy_twig_text_extension' => false,
+                ],
+            ]);
+        }
+
         $galleryItemKey = interface_exists(GalleryItemInterface::class) ? 'gallery_item' : 'gallery_has_media';
 
         $container->loadFromExtension('sonata_media', [