Merge pull request #234 from schlessera/use-factory-methods-for-extensible-classes

Remove direct references to class `Translation`

Author: oscarotero

src/Extractors/Po.php

@@ -23,7 +23,7 @@ public static function fromString($string, Translations $translations, array $op
         $lines = explode("\n", $string);
         $i = 0;
 
-        $translation = new Translation('', '');
+        $translation = $translations->createNewTranslation('', '');
 
         for ($n = count($lines); $i < $n; ++$i) {
             $line = trim($lines[$i]);
@@ -36,7 +36,7 @@ public static function fromString($string, Translations $translations, array $op
                     $translations[] = $translation;
                 }
 
-                $translation = new Translation('', '');
+                $translation = $translations->createNewTranslation('', '');
                 continue;
             }
 

src/Extractors/Xliff.php

@@ -40,7 +40,7 @@ public static function fromString($string, Translations $translations, array $op
                         $targets[] = (string) $target;
                     }
 
-                    $translation = new Translation(null, (string) $segment->source);
+                    $translation = $translations->createNewTranslation(null, (string) $segment->source);
                     if (isset($unit['id'])) {
                         $unitId = (string) $unit['id'];
                         $translation->addComment("XLIFF_UNIT_ID: $unitId");

src/Translation.php

@@ -32,6 +32,21 @@ public static function generateId($context, $original)
         return "{$context}\004{$original}";
     }
 
+    /**
+     * Create a new instance of a Translation object.
+     *
+     * This is a factory method that will work even when Translation is extended.
+     *
+     * @param string $context  The context of the translation
+     * @param string $original The original string
+     * @param string $plural   The original plural string
+     * @return static New Translation instance
+     */
+    public static function create($context, $original, $plural = '')
+    {
+        return new static($context, $original, $plural);
+    }
+
     /**
      * Construct.
      *

src/Translations.php

@@ -120,13 +120,19 @@ class Translations extends ArrayObject
         ],
     ];
 
-    private $headers;
+    protected $headers;
+
+    protected $translationClass;
 
     /**
      * @see ArrayObject::__construct()
      */
-    public function __construct($input = [], $flags = 0, $iterator_class = 'ArrayIterator')
-    {
+    public function __construct(
+        $input = [],
+        $flags = 0,
+        $iterator_class = 'ArrayIterator',
+        $translationClass = 'Gettext\Translation'
+    ) {
         $this->headers = static::$options['defaultHeaders'];
 
         foreach (static::$options['defaultDateHeaders'] as $header) {
@@ -135,6 +141,8 @@ public function __construct($input = [], $flags = 0, $iterator_class = 'ArrayIte
 
         $this->headers[self::HEADER_LANGUAGE] = '';
 
+        $this->translationClass = $translationClass;
+
         parent::__construct($input, $flags, $iterator_class);
     }
 
@@ -455,7 +463,7 @@ public function countTranslated()
      */
     public function insert($context, $original, $plural = '')
     {
-        return $this->offsetSet(null, new Translation($context, $original, $plural));
+        return $this->offsetSet(null, $this->createNewTranslation($context, $original, $plural));
     }
 
     /**
@@ -473,4 +481,18 @@ public function mergeWith(Translations $translations, $options = Merge::DEFAULTS
 
         return $this;
     }
+
+    /**
+     * Create a new instance of a Translation object.
+     *
+     * @param string $context  The context of the translation
+     * @param string $original The original string
+     * @param string $plural   The original plural string
+     * @return Translation New Translation instance
+     */
+    public function createNewTranslation($context, $original, $plural = '')
+    {
+        $class = $this->translationClass;
+        return $class::create($context, $original, $plural);
+    }
 }