tries to solve #90 with backward compatibility

Author: oscarotero

src/Generators/Jed.php

@@ -4,15 +4,37 @@
 
 use Gettext\Translations;
 
-class Jed extends Generator implements GeneratorInterface
+class Jed extends PhpArray implements GeneratorInterface
 {
     /**
      * {@parentDoc}.
      */
     public static function toString(Translations $translations)
     {
-        $array = PhpArray::toArray($translations);
+        $array = static::toArray($translations);
 
         return json_encode($array);
     }
+
+    /**
+     * {@parentdoc}
+     */
+    protected static function buildArray(Translations $translations)
+    {
+        $array = array();
+
+        $context_glue = "\004";
+
+        foreach ($translations as $translation) {
+            $key = ($translation->hasContext() ? $translation->getContext().$context_glue : '').$translation->getOriginal();
+
+            if ($translation->hasPluralTranslation()) {
+                $array[$key] = array_merge(array($translation->getTranslation()), $translation->getPluralTranslation());
+            } else {
+                $array[$key] = array($translation->getTranslation());
+            }
+        }
+
+        return $array;
+    }
 }

src/Generators/PhpArray.php

@@ -25,20 +25,7 @@ public static function toString(Translations $translations)
      */
     public static function toArray(Translations $translations)
     {
-        $array = array();
-
-        $context_glue = "\004";
-
-        foreach ($translations as $translation) {
-            $key = ($translation->hasContext() ? $translation->getContext().$context_glue : '').$translation->getOriginal();
-            $entry = array($translation->getPlural(), $translation->getTranslation());
-
-            if ($translation->hasPluralTranslation()) {
-                $entry = array_merge($entry, $translation->getPluralTranslation());
-            }
-
-            $array[$key] = $entry;
-        }
+        $array = self::buildArray($translations);
 
         $domain = $translations->getDomain() ?: 'messages';
         $lang = $translations->getLanguage() ?: 'en';
@@ -61,4 +48,31 @@ public static function toArray(Translations $translations)
 
         return $fullArray;
     }
+
+    /**
+     * Generates an array with all translations
+     * 
+     * @param Translations $translations
+     *
+     * @return array
+     */
+    protected static function buildArray(Translations $translations)
+    {
+        $array = array();
+
+        $context_glue = "\004";
+
+        foreach ($translations as $translation) {
+            $key = ($translation->hasContext() ? $translation->getContext().$context_glue : '').$translation->getOriginal();
+            $entry = array($translation->getPlural(), $translation->getTranslation());
+
+            if ($translation->hasPluralTranslation()) {
+                $entry = array_merge($entry, $translation->getPluralTranslation());
+            }
+
+            $array[$key] = $entry;
+        }
+
+        return $array;
+    }
 }