From 2d844fa0e94ee3249d6e9155e760ab15fec8851d Mon Sep 17 00:00:00 2001 From: Jordi Date: Tue, 20 Jul 2021 11:02:28 +0200 Subject: [PATCH] Fix deprecations --- packages/basic-page-bundle/src/Twig/BasicPageRuntime.php | 2 +- packages/basic-page-bundle/tests/App/Kernel.php | 9 +++++++++ .../ckeditor-sonata-media-bundle/tests/App/Kernel.php | 9 +++++++++ packages/cookies-bundle/tests/App/Kernel.php | 9 +++++++++ packages/redirection-bundle/tests/App/Kernel.php | 9 +++++++++ packages/seo-bundle/tests/App/Kernel.php | 9 +++++++++ packages/sortable-behavior-bundle/tests/App/Kernel.php | 9 +++++++++ packages/translation-bundle/tests/App/Kernel.php | 9 +++++++++ tests/App/Kernel.php | 9 +++++++++ 9 files changed, 73 insertions(+), 1 deletion(-) diff --git a/packages/basic-page-bundle/src/Twig/BasicPageRuntime.php b/packages/basic-page-bundle/src/Twig/BasicPageRuntime.php index cc1e5ace..bcfef93b 100644 --- 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 index f909823b..0c4c79e0 100644 --- 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 index a06b3d2d..1d73f570 100644 --- 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 index b2878fcd..fae07c66 100644 --- 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 index 74483c4f..8593ebfe 100644 --- 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 index a1920e9d..ae68731b 100644 --- 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 index 211147ff..28e1af21 100644 --- 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 index 7459a2f8..e9dde0b8 100644 --- 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 index f646bf75..60941944 100644 --- 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', [