[Intl] Switch from json to php resources

Author: jderusse

Data/Bundle/Reader/JsonBundleReader.php

@@ -35,12 +35,8 @@ public function read(string $path, string $locale)
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
-        if (!file_exists($fileName)) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
-        }
-
         if (!is_file($fileName)) {
-            throw new RuntimeException(sprintf('The resource bundle "%s" is not a file.', $fileName));
+            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         $data = json_decode(file_get_contents($fileName), true);

Data/Bundle/Reader/PhpBundleReader.php

@@ -35,12 +35,8 @@ public function read(string $path, string $locale)
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
-        if (!file_exists($fileName)) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s/%s.php" does not exist.', $path, $locale));
-        }
-
         if (!is_file($fileName)) {
-            throw new RuntimeException(sprintf('The resource bundle "%s/%s.php" is not a file.', $path, $locale));
+            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         return include $fileName;

Data/Generator/CurrencyDataGenerator.php

@@ -130,7 +130,9 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
 
     private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle): array
     {
-        $symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
+        $symbolNamePairs = array_map(function ($pair) {
+            return \array_slice(iterator_to_array($pair), 0, 2);
+        }, iterator_to_array($rootBundle['Currencies']));
 
         // Remove unwanted currencies
         $symbolNamePairs = array_diff_key($symbolNamePairs, self::DENYLIST);

Intl.php

@@ -125,7 +125,7 @@ public static function getIcuDataVersion(): string
      */
     public static function getIcuStubVersion(): string
     {
-        return '68.2';
+        return '69.1';
     }
 
     /**

ResourceBundle.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
-use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
+use Symfony\Component\Intl\Data\Bundle\Reader\PhpBundleReader;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
@@ -47,7 +47,7 @@ final protected static function readEntry(array $indices, string $locale = null,
     {
         if (null === self::$entryReader) {
             self::$entryReader = new BundleEntryReader(new BufferedBundleReader(
-                new JsonBundleReader(),
+                new PhpBundleReader(),
                 Intl::BUFFER_SIZE
             ));
 

Resources/bin/update-data.php

@@ -11,7 +11,7 @@
 
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
-use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
+use Symfony\Component\Intl\Data\Bundle\Writer\PhpBundleWriter;
 use Symfony\Component\Intl\Data\Generator\CurrencyDataGenerator;
 use Symfony\Component\Intl\Data\Generator\GeneratorConfig;
 use Symfony\Component\Intl\Data\Generator\LanguageDataGenerator;
@@ -166,9 +166,9 @@
 
 $compiler = new GenrbCompiler($genrb, $genrbEnv);
 $config = new GeneratorConfig($sourceDir.'/data', $icuVersionInDownload);
-$jsonDir = dirname(__DIR__).'/data';
+$dataDir = dirname(__DIR__).'/data';
 
-$config->addBundleWriter($jsonDir, new JsonBundleWriter());
+$config->addBundleWriter($dataDir, new PhpBundleWriter());
 
 echo "Starting resource bundle compilation. This may take a while...\n";
 
@@ -218,13 +218,13 @@
 
 GIT_INFO;
 
-$gitInfoFile = $jsonDir.'/git-info.txt';
+$gitInfoFile = $dataDir.'/git-info.txt';
 
 file_put_contents($gitInfoFile, $gitInfo);
 
 echo "Wrote $gitInfoFile.\n";
 
-$versionFile = $jsonDir.'/version.txt';
+$versionFile = $dataDir.'/version.txt';
 
 file_put_contents($versionFile, "$icuVersionInDownload\n");