Handle null locales (#63)

* add more php versions to unit tests * handle nullable locale
Locastic · Jul 25, 2023 · b8e612c · b8e612c
1 parent 94afdf4
commit b8e612c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,10 +9,13 @@ on:
 jobs:
   symfony-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: [ '8.0', '8.1', '8.2' ]
     steps:
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: ${{ matrix.php-versions }}
     - uses: actions/checkout@v2
     - name: Copy .env.test.local
       run: php -r "file_exists('.env.test.local') || copy('.env.test', '.env.test.local');"
@@ -21,7 +24,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-php-
     - name: Install Dependencies

diff --git a/src/Model/TranslatableTrait.php b/src/Model/TranslatableTrait.php
@@ -144,8 +144,11 @@ public function getTranslations(): Collection
      */
     public function hasTranslation(TranslationInterface $translation): bool
     {
-        return isset($this->translationsCache[$translation->getLocale()])
-               || (null !== $translation->getLocale() && $this->translations->containsKey($translation->getLocale()));
+        return null !== $translation->getLocale()
+            && (
+                isset($this->translationsCache[$translation->getLocale()])
+                || $this->translations->containsKey($translation->getLocale())
+            );
     }
 
     /**
@@ -155,7 +158,7 @@ public function hasTranslation(TranslationInterface $translation): bool
      */
     public function addTranslation(TranslationInterface $translation): void
     {
-        if (!$this->hasTranslation($translation)) {
+        if (!$this->hasTranslation($translation) && null !== $translation->getLocale()) {
             $this->translationsCache[$translation->getLocale()] = $translation;
 
             $this->translations->set($translation->getLocale(), $translation);
@@ -170,7 +173,7 @@ public function addTranslation(TranslationInterface $translation): void
      */
     public function removeTranslation(TranslationInterface $translation): void
     {
-        if ($this->translations->removeElement($translation)) {
+        if ($this->translations->removeElement($translation) && null !== $translation->getLocale()) {
             unset($this->translationsCache[$translation->getLocale()]);
 
             $translation->setTranslatable(null);

diff --git a/tests/Model/TranslatableTraitTest.php b/tests/Model/TranslatableTraitTest.php
@@ -15,6 +15,17 @@
  */
 class TranslatableTraitTest extends TestCase
 {
+    /**
+     * @test getTranslationLocales
+     */
+    public function testSetTranslatable(): void
+    {
+        $dummyTranslatable = $this->setTranslatable('es', 'en');
+        $this->setTranslation(null, 'no locale', $dummyTranslatable);
+
+        $this->assertEquals([], $dummyTranslatable->getTranslationLocales());
+    }
+
     /**
      * @test getTranslationLocales
      */
@@ -79,7 +90,7 @@ public function testGetTranslationWithoutLocales(): void
         $dummyTranslatable->getTranslation();
     }
 
-    private function setTranslation(string $locale, string $translation, TranslatableInterface $translatable): DummyTranslation
+    private function setTranslation(?string $locale, string $translation, TranslatableInterface $translatable): DummyTranslation
     {
         $dummyTranslation = new DummyTranslation();
         $dummyTranslation->setLocale($locale);