Merge 2.x into 3.x

sonata-project · Oct 9, 2021 · c0ab559 · c0ab559
2 parents 737b8d5 + 84d8dd8
commit c0ab559
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/phpstan-object-manager.php b/phpstan-object-manager.php
@@ -0,0 +1,21 @@
+<?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.
+ */
+
+use Sonata\TranslationBundle\Tests\App\AppKernel;
+
+require __DIR__.'/vendor/autoload.php';
+
+$kernel = new AppKernel();
+$kernel->boot();
+
+return $kernel->getContainer()->get('doctrine')->getManager();
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -7,6 +7,9 @@ parameters:
     bootstrapFiles:
         - vendor/bin/.phpunit/phpunit/vendor/autoload.php
 
+    doctrine:
+        objectManagerLoader: phpstan-object-manager.php
+
     paths:
         - src
         - tests

diff --git a/src/DependencyInjection/SonataTranslationExtension.php b/src/DependencyInjection/SonataTranslationExtension.php
@@ -155,6 +155,7 @@ private function registerTranslatableListener(ContainerBuilder $container, array
         $container->register('sonata_translation.listener.translatable', TranslatableListener::class)
             ->addMethodCall('setAnnotationReader', [new Reference('annotation_reader')])
             ->addMethodCall('setDefaultLocale', ['%locale%'])
+            ->addMethodCall('setTranslatableLocale', ['%locale%'])
             ->addMethodCall('setTranslationFallback', [false])
             ->addTag('doctrine.event_subscriber');
     }

diff --git a/tests/App/DataFixtures/GedmoCategoryFixtures.php b/tests/App/DataFixtures/GedmoCategoryFixtures.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
+use Gedmo\Translatable\Entity\Translation;
 use Sonata\TranslationBundle\Tests\App\Entity\GedmoCategory;
 
 final class GedmoCategoryFixtures extends Fixture
@@ -25,17 +26,12 @@ public function load(ObjectManager $manager): void
     {
         $novelCategory = new GedmoCategory(self::CATEGORY, 'Novel');
 
-        $manager->persist($novelCategory);
-        $manager->flush();
-
-        $novelCategory->setLocale('es');
-        $novelCategory->setName('Novela');
-
-        $manager->flush();
-
-        $novelCategory->setLocale('fr');
-        $novelCategory->setName('Roman');
+        $repository = $manager->getRepository(Translation::class);
+        $repository
+            ->translate($novelCategory, 'name', 'es', 'Novela')
+            ->translate($novelCategory, 'name', 'fr', 'Roman');
 
+        $manager->persist($novelCategory);
         $manager->flush();
     }
 }
diff --git a/tests/App/Entity/KnpCategoryTranslation.php b/tests/App/Entity/KnpCategoryTranslation.php
@@ -34,7 +34,7 @@ class KnpCategoryTranslation implements TranslationInterface
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255)
+     * @ORM\Column(type="string", length=255, nullable=true)
      */
     private $name;
 

diff --git a/tests/DependencyInjection/SonataTranslationExtensionTest.php b/tests/DependencyInjection/SonataTranslationExtensionTest.php
@@ -92,6 +92,12 @@ public function testRegistersTranslatableListenerWhenUsingGedmo(): void
             'setAnnotationReader',
             [new Reference('annotation_reader')]
         );
+
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
+            'sonata_translation.listener.translatable',
+            'setTranslatableLocale',
+            ['%locale%']
+        );
     }
 
     protected function getContainerExtensions(): array