[Intl] Integrated ICU data into Intl component

symfony · webmozart · Sep 30, 2014 · Sep 15, 2014 · Sep 26, 2014 · be819c162f7507cfe9585da96c26fd440d186aef
commit be819c162f7507cfe9585da96c26fd440d186aef
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,6 @@ install:
     - sh -c 'if [ "$components" = "no" ]; then sh -c "COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install"; fi;'
 
 script:
-    - sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark {};'\''"; fi;'
+    - sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark,intl-data {};'\''"; fi;'
     - sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;'
-    - sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark;'\''"; fi;'
+    - sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark,intl-data;'\''"; fi;'
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/icu": "~1.0",
         "doctrine/common": "~2.2",
         "twig/twig": "~1.12",
         "psr/log": "~1.0"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -23,6 +23,7 @@
     <groups>
         <exclude>
             <group>benchmark</group>
+            <group>intl-data</group>
         </exclude>
     </groups>
 

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -31,7 +31,7 @@ public function testCountriesAreSelectable()
 
         $this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);
         $this->assertContains(new ChoiceView('en_GB', 'en_GB', 'British English'), $choices, '', false, false);
-        $this->assertContains(new ChoiceView('en_US', 'en_US', 'U.S. English'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('en_US', 'en_US', 'American English'), $choices, '', false, false);
         $this->assertContains(new ChoiceView('fr', 'fr', 'French'), $choices, '', false, false);
         $this->assertContains(new ChoiceView('my', 'my', 'Burmese'), $choices, '', false, false);
     }

diff --git a/...ndle/Compiler/BundleCompilerInterface.php → ...ndle/Compiler/BundleCompilerInterface.php b/...ndle/Compiler/BundleCompilerInterface.php → ...ndle/Compiler/BundleCompilerInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Compiler;
+namespace Symfony\Component\Intl\Data\Bundle\Compiler;
 
 /**
  * Compiles a resource bundle.

diff --git a/...esourceBundle/Compiler/BundleCompiler.php → ...tl/Data/Bundle/Compiler/GenrbCompiler.php b/...esourceBundle/Compiler/BundleCompiler.php → ...tl/Data/Bundle/Compiler/GenrbCompiler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Compiler;
+namespace Symfony\Component\Intl\Data\Bundle\Compiler;
 
 use Symfony\Component\Intl\Exception\RuntimeException;
 
@@ -20,7 +20,7 @@
  *
  * @internal
     */
-class BundleCompiler implements BundleCompilerInterface
+class GenrbCompiler implements BundleCompilerInterface
 {
     /**
      * @var string The path to the "genrb" executable.

diff --git a/...rceBundle/Reader/BufferedBundleReader.php → ...ta/Bundle/Reader/BufferedBundleReader.php b/...rceBundle/Reader/BufferedBundleReader.php → ...ta/Bundle/Reader/BufferedBundleReader.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
-use Symfony\Component\Intl\ResourceBundle\Util\RingBuffer;
+use Symfony\Component\Intl\Data\Util\RingBuffer;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -53,12 +53,4 @@ public function read($path, $locale)
 
         return $this->buffer[$hash];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocales($path)
-    {
-        return $this->reader->getLocales($path);
-    }
 }
diff --git a/...eBundle/Reader/StructuredBundleReader.php → .../Data/Bundle/Reader/BundleEntryReader.php b/...eBundle/Reader/StructuredBundleReader.php → .../Data/Bundle/Reader/BundleEntryReader.php
@@ -9,24 +9,24 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Exception\OutOfBoundsException;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Locale;
-use Symfony\Component\Intl\ResourceBundle\Util\RecursiveArrayAccess;
+use Symfony\Component\Intl\Data\Util\RecursiveArrayAccess;
 
 /**
- * Default implementation of {@link StructuredBundleReaderInterface}.
+ * Default implementation of {@link BundleEntryReaderInterface}.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @see StructuredResourceBundleBundleReaderInterface
+ * @see BundleEntryReaderInterface
  *
  * @internal
  */
-class StructuredBundleReader implements StructuredBundleReaderInterface
+class BundleEntryReader implements BundleEntryReaderInterface
 {
     /**
      * @var BundleReaderInterface
@@ -138,7 +138,7 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
             }
 
             // Remember which locales we tried
-            $testedLocales[] = $currentLocale.'.res';
+            $testedLocales[] = $currentLocale;
 
             // Check whether fallback is allowed
             if (!$fallback) {
@@ -162,10 +162,10 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
         // Entry is still NULL, read error occurred. Throw an exception
         // containing the detailed path and locale
         $errorMessage = sprintf(
-            'Couldn\'t read the indices [%s] from "%s/%s.res".',
+            'Couldn\'t read the indices [%s] for the locale "%s" in "%s".',
             implode('][', $indices),
-            $path,
-            $locale
+            $locale,
+            $path
         );
 
         // Append fallback locales, if any
@@ -174,19 +174,11 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
             array_shift($testedLocales);
 
             $errorMessage .= sprintf(
-                ' The indices also couldn\'t be found in the fallback locale(s) "%s".',
+                ' The indices also couldn\'t be found for the fallback locale(s) "%s".',
                 implode('", "', $testedLocales)
             );
         }
 
         throw new MissingResourceException($errorMessage, 0, $exception);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocales($path)
-    {
-        return $this->reader->getLocales($path);
-    }
 }
diff --git a/...eader/StructuredBundleReaderInterface.php → ...dle/Reader/BundleEntryReaderInterface.php b/...eader/StructuredBundleReaderInterface.php → ...dle/Reader/BundleEntryReaderInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 use Symfony\Component\Intl\Exception\MissingResourceException;
 
@@ -20,7 +20,7 @@
  *
  * @internal
  */
-interface StructuredBundleReaderInterface extends BundleReaderInterface
+interface BundleEntryReaderInterface extends BundleReaderInterface
 {
     /**
      * Reads an entry from a resource bundle.

diff --git a/...ceBundle/Reader/BundleReaderInterface.php → ...a/Bundle/Reader/BundleReaderInterface.php b/...ceBundle/Reader/BundleReaderInterface.php → ...a/Bundle/Reader/BundleReaderInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 /**
  * Reads resource bundle files.
@@ -30,13 +30,4 @@ interface BundleReaderInterface
      *               complex data, a scalar value otherwise.
      */
     public function read($path, $locale);
-
-    /**
-     * Reads the available locales of a resource bundle.
-     *
-     * @param string $path The path to the resource bundle.
-     *
-     * @return string[] A list of supported locale codes.
-     */
-    public function getLocales($path);
 }
diff --git a/...ourceBundle/Reader/BinaryBundleReader.php → ...l/Data/Bundle/Reader/IntlBundleReader.php b/...ourceBundle/Reader/BinaryBundleReader.php → ...l/Data/Bundle/Reader/IntlBundleReader.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
-use Symfony\Component\Intl\ResourceBundle\Util\ArrayAccessibleResourceBundle;
+use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
 
 /**
  * Reads binary .res resource bundles.
@@ -21,7 +21,7 @@
  *
  * @internal
  */
-class BinaryBundleReader implements BundleReaderInterface
+class IntlBundleReader implements BundleReaderInterface
 {
     /**
      * {@inheritdoc}
@@ -52,18 +52,4 @@ public function read($path, $locale)
         // which are OK for us.
         return new ArrayAccessibleResourceBundle($bundle);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocales($path)
-    {
-        $locales = glob($path.'/*.res');
-
-        // Remove file extension and sort
-        array_walk($locales, function (&$locale) { $locale = basename($locale, '.res'); });
-        sort($locales);
-
-        return $locales;
-    }
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
+
+use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
+use Symfony\Component\Intl\Exception\RuntimeException;
+
+/**
+ * Reads .json resource bundles.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @internal
+ */
+class JsonBundleReader implements BundleReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function read($path, $locale)
+    {
+        $fileName = $path.'/'.$locale.'.json';
+
+        if (!file_exists($fileName)) {
+            throw new ResourceBundleNotFoundException(sprintf(
+                'The resource bundle "%s/%s.json" does not exist.',
+                $path,
+                $locale
+            ));
+        }
+
+        if (!is_file($fileName)) {
+            throw new RuntimeException(sprintf(
+                'The resource bundle "%s/%s.json" is not a file.',
+                $path,
+                $locale
+            ));
+        }
+
+        $data = json_decode(file_get_contents($fileName), true);
+
+        if (null === $data) {
+            throw new RuntimeException(sprintf(
+                'The resource bundle "%s/%s.json" contains invalid JSON: %s',
+                $path,
+                $locale,
+                self::getLastJsonError()
+            ));
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return string The last error message created by {@link json_decode()}
+     *
+     * @link http://de2.php.net/manual/en/function.json-last-error-msg.php#113243
+     */
+    private static function getLastJsonError()
+    {
+            if (function_exists('json_last_error_msg')) {
+            return json_last_error_msg();
+        }
+
+        static $errors = array(
+            JSON_ERROR_NONE => null,
+            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+            JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',
+            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+        );
+
+        $error = json_last_error();
+
+        return array_key_exists($error, $errors)
+            ? $errors[$error]
+            : sprintf('Unknown error (%s)', $error);
+    }
+}
diff --git a/...ResourceBundle/Reader/PhpBundleReader.php → ...tl/Data/Bundle/Reader/PhpBundleReader.php b/...ResourceBundle/Reader/PhpBundleReader.php → ...tl/Data/Bundle/Reader/PhpBundleReader.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Reader;
+namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Exception\RuntimeException;
@@ -48,18 +48,4 @@ public function read($path, $locale)
 
         return include $fileName;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocales($path)
-    {
-        $locales = glob($path.'/*.php');
-
-        // Remove file extension and sort
-        array_walk($locales, function (&$locale) { $locale = basename($locale, '.php'); });
-        sort($locales);
-
-        return $locales;
-    }
 }
diff --git a/...ceBundle/Writer/BundleWriterInterface.php → ...a/Bundle/Writer/BundleWriterInterface.php b/...ceBundle/Writer/BundleWriterInterface.php → ...a/Bundle/Writer/BundleWriterInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Intl\ResourceBundle\Writer;
+namespace Symfony\Component\Intl\Data\Bundle\Writer;
 
 /**
  * Writes resource bundle files.