Merge pull request #9 from eddypouw/master

Skip loading translations for array constants

Author: nicoschoenmaker

src/Loader/EnumLoader.php

@@ -42,6 +42,10 @@ public function load($resource, $locale, $domain = 'messages')
         // constant value as key and the translation as values, or the constant
         // name if no translation was found.
         foreach ($consts as $const => $value) {
+            if (is_array($value)) {
+                continue;
+            }
+
             $key = $this->getPrettyName($domain) . "." . strtolower($const);
 
             $merged[(string) $value] = $translations->has($key) ? $translations->get($key) : strtolower($const);

test/Loader/EnumLoaderTest.php

@@ -2,6 +2,7 @@
 namespace Hostnet\Bundle\EntityTranslationBundle\Loader;
 
 use Hostnet\Bundle\EntityTranslationBundle\Mock\MockEnum;
+use Hostnet\Bundle\EntityTranslationBundle\MockArray\MockArrayEnum;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Translation\Translator;
 
@@ -47,6 +48,27 @@ public function testTranslation()
         );
     }
 
+    public function testTranslationArray()
+    {
+        if(defined('HHVM_VERSION'))   $this->markTestSkipped();
+
+        $this->translator->addResource(
+            "enum",
+            __DIR__ . "/../MockArray/Resources/translations/enum.en.yml",
+            "en",
+            MockArrayEnum::class
+        );
+
+        $this->assertEquals(
+            "Foo1",
+            $this->translator->trans(MockArrayEnum::FOO, [], MockArrayEnum::class)
+        );
+        $this->assertEquals(
+            "Bar2",
+            $this->translator->trans(MockArrayEnum::BAR, [], MockArrayEnum::class)
+        );
+    }
+
     /**
      * @expectedException \RuntimeException
      */

test/MockArray/MockArrayEnum.php

@@ -0,0 +1,9 @@
+<?php
+namespace Hostnet\Bundle\EntityTranslationBundle\MockArray;
+
+class MockArrayEnum
+{
+    const FOO       = 1;
+    const BAR       = 2;
+    const FOO_ARRAY = [1, 2];
+}

test/MockArray/Resources/translations/enum.en.yml

@@ -0,0 +1,8 @@
+hostnet:
+    bundle:
+        entity_translation_bundle:
+            mock_array:
+                # Hostnet\Bundle\EntityTranslationBundle\MockArray\MockArrayEnum enum translations
+                mock_array_enum:
+                    foo : "Foo1"
+                    bar : "Bar2"