Merge branch 'master' of https://github.com/oscarotero/Gettext into po_line_breaks

Author: vaites

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 sudo: false
+dist: trusty
 
 env:
   - COMPOSER_DISABLE_XDEBUG_WARN=1

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Previous releases are documented in [github releases](https://github.com/oscarotero/Gettext/releases)
 
+## [4.7.0] - Unreleased
+### Added
+- Support for UnitID in Xliff [#221]
+- Support for scan multiple domains at the same time [#223]
+
 ## [4.6.3] - 2019-07-15
 ### Added
 - Some VueJs extraction improvements and additions [#205], [#213]
@@ -122,7 +127,10 @@ Previous releases are documented in [github releases](https://github.com/oscarot
 [#213]: https://github.com/oscarotero/Gettext/issues/213
 [#214]: https://github.com/oscarotero/Gettext/issues/214
 [#215]: https://github.com/oscarotero/Gettext/issues/215
+[#221]: https://github.com/oscarotero/Gettext/issues/221
+[#223]: https://github.com/oscarotero/Gettext/issues/223
 
+[4.7.0]: https://github.com/oscarotero/Gettext/compare/v4.6.3...HEAD
 [4.6.3]: https://github.com/oscarotero/Gettext/compare/v4.6.2...v4.6.3
 [4.6.2]: https://github.com/oscarotero/Gettext/compare/v4.6.1...v4.6.2
 [4.6.1]: https://github.com/oscarotero/Gettext/compare/v4.6.0...v4.6.1

src/Extractors/ExtractorMultiInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Gettext\Extractors;
+
+use Gettext\Translations;
+
+interface ExtractorMultiInterface
+{
+    /**
+     * Parses a string and append the translations found in the Translations instance.
+     * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
+     *
+     * @param string $string
+     * @param Translations[] $translations
+     * @param array $options
+     */
+    public static function fromStringMultiple($string, array $translations, array $options = []);
+
+    /**
+     * Parses a string and append the translations found in the Translations instance.
+     * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
+     *
+     * @param $file
+     * @param Translations[] $translations
+     * @param array $options
+     */
+    public static function fromFileMultiple($file, array $translations, array $options = []);
+}

src/Extractors/JsCode.php

@@ -2,13 +2,14 @@
 
 namespace Gettext\Extractors;
 
+use Exception;
 use Gettext\Translations;
 use Gettext\Utils\JsFunctionsScanner;
 
 /**
  * Class to get gettext strings from javascript files.
  */
-class JsCode extends Extractor implements ExtractorInterface
+class JsCode extends Extractor implements ExtractorInterface, ExtractorMultiInterface
 {
     public static $options = [
         'constants' => [],
@@ -36,14 +37,35 @@ class JsCode extends Extractor implements ExtractorInterface
     ];
 
     /**
-     * {@inheritdoc}
-     * @throws \Exception
+     * @inheritdoc
+     * @throws Exception
      */
     public static function fromString($string, Translations $translations, array $options = [])
+    {
+        self::fromStringMultiple($string, [$translations], $options);
+    }
+
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
+    public static function fromStringMultiple($string, array $translations, array $options = [])
     {
         $options += static::$options;
 
         $functions = new JsFunctionsScanner($string);
         $functions->saveGettextFunctions($translations, $options);
     }
+
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
+    public static function fromFileMultiple($file, array $translations, array $options = [])
+    {
+        foreach (self::getFiles($file) as $file) {
+            $options['file'] = $file;
+            static::fromStringMultiple(self::readFile($file), $translations, $options);
+        }
+    }
 }

src/Extractors/PhpCode.php

@@ -2,19 +2,20 @@
 
 namespace Gettext\Extractors;
 
+use Exception;
 use Gettext\Translations;
 use Gettext\Utils\PhpFunctionsScanner;
 
 /**
  * Class to get gettext strings from php files returning arrays.
  */
-class PhpCode extends Extractor implements ExtractorInterface
+class PhpCode extends Extractor implements ExtractorInterface, ExtractorMultiInterface
 {
     public static $options = [
-         // - false: to not extract comments
-         // - empty string: to extract all comments
-         // - non-empty string: to extract comments that start with that string
-         // - array with strings to extract comments format.
+        // - false: to not extract comments
+        // - empty string: to extract all comments
+        // - non-empty string: to extract comments that start with that string
+        // - array with strings to extract comments format.
         'extractComments' => false,
 
         'constants' => [],
@@ -43,8 +44,18 @@ class PhpCode extends Extractor implements ExtractorInterface
 
     /**
      * {@inheritdoc}
+     * @throws Exception
      */
     public static function fromString($string, Translations $translations, array $options = [])
+    {
+        self::fromStringMultiple($string, [$translations], $options);
+    }
+
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
+    public static function fromStringMultiple($string, array $translations, array $options = [])
     {
         $options += static::$options;
 
@@ -57,6 +68,18 @@ public static function fromString($string, Translations $translations, array $op
         $functions->saveGettextFunctions($translations, $options);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public static function fromFileMultiple($file, array $translations, array $options = [])
+    {
+        foreach (self::getFiles($file) as $file) {
+            $options['file'] = $file;
+            static::fromStringMultiple(self::readFile($file), $translations, $options);
+        }
+    }
+
+
     /**
      * Decodes a T_CONSTANT_ENCAPSED_STRING string.
      *
@@ -110,7 +133,11 @@ function ($match) {
         );
     }
 
-    //http://php.net/manual/en/function.chr.php#118804
+    /**
+     * @param $dec
+     * @return string|null
+     * @see http://php.net/manual/en/function.chr.php#118804
+     */
     private static function unicodeChar($dec)
     {
         if ($dec < 0x80) {
@@ -119,20 +146,22 @@ private static function unicodeChar($dec)
 
         if ($dec < 0x0800) {
             return chr(0xC0 + ($dec >> 6))
-                .chr(0x80 + ($dec & 0x3f));
+                . chr(0x80 + ($dec & 0x3f));
         }
 
         if ($dec < 0x010000) {
             return chr(0xE0 + ($dec >> 12))
-                    .chr(0x80 + (($dec >> 6) & 0x3f))
-                    .chr(0x80 + ($dec & 0x3f));
+                . chr(0x80 + (($dec >> 6) & 0x3f))
+                . chr(0x80 + ($dec & 0x3f));
         }
 
         if ($dec < 0x200000) {
             return chr(0xF0 + ($dec >> 18))
-                    .chr(0x80 + (($dec >> 12) & 0x3f))
-                    .chr(0x80 + (($dec >> 6) & 0x3f))
-                    .chr(0x80 + ($dec & 0x3f));
+                . chr(0x80 + (($dec >> 12) & 0x3f))
+                . chr(0x80 + (($dec >> 6) & 0x3f))
+                . chr(0x80 + ($dec & 0x3f));
         }
+
+        return null;
     }
 }