Fix deprecations and SA

sonata-project · Dec 16, 2023 · 75687bd · 75687bd
1 parent a7d6a75
commit 75687bd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Admin/Extension/Gedmo/TranslatableAdminExtension.php b/src/Admin/Extension/Gedmo/TranslatableAdminExtension.php
@@ -79,6 +79,7 @@ private function setLocale(object $object): void
         \assert($objectManager instanceof ObjectManager);
 
         $configuration = $this->translatableListener->getConfiguration($objectManager, $objectClassName);
+        /** @psalm-suppress InvalidArrayOffset */
         if (!isset($configuration['locale'])) {
             throw new \LogicException(sprintf(
                 'There is no locale or language property found on class: "%s"',

diff --git a/src/Twig/Extension/SonataTranslationExtension.php b/src/Twig/Extension/SonataTranslationExtension.php
@@ -64,7 +64,7 @@ public function isTranslatable($object): bool
         return $this->getTranslatableChecker()->isTranslatable($object);
     }
 
-    public function getLocaleName(string $locale, ?string $displayLocale = null): ?string
+    public function getLocaleName(string $locale, ?string $displayLocale = null): string
     {
         return Locales::getName($locale, $displayLocale);
     }

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -79,9 +79,6 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         $routes->import(sprintf('%s/config/routes.yaml', $this->getProjectDir()));
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $container->setParameter('app.base_dir', $this->getBaseDir());

diff --git a/tests/Provider/Knplabs/LocaleProviderTest.php b/tests/Provider/Knplabs/LocaleProviderTest.php
@@ -66,12 +66,12 @@ public function __construct(private string $locale)
             {
             }
 
-            public function provideCurrentLocale(): ?string
+            public function provideCurrentLocale(): string
             {
                 return $this->locale;
             }
 
-            public function provideFallbackLocale(): ?string
+            public function provideFallbackLocale(): string
             {
                 return $this->locale;
             }

diff --git a/tests/Traits/DoctrineOrmTestCase.php b/tests/Traits/DoctrineOrmTestCase.php
@@ -80,7 +80,9 @@ final protected function getConfiguration(): Configuration
         return ORMSetup::createAttributeMetadataConfiguration(
             [],
             false,
-            sys_get_temp_dir().'/sonata-translation-bundle'
+            sys_get_temp_dir().'/sonata-translation-bundle',
+            null,
+            true,
         );
     }
 }