Merge branch '2.7' into 2.8

* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks

Author: nicolas-grekas

Data/Bundle/Compiler/GenrbCompiler.php

@@ -22,17 +22,13 @@
  */
 class GenrbCompiler implements BundleCompilerInterface
 {
-    /**
-     * @var string The path to the "genrb" executable
-     */
     private $genrb;
 
     /**
      * Creates a new compiler based on the "genrb" executable.
      *
      * @param string $genrb   Optional. The path to the "genrb" executable
-     * @param string $envVars Optional. Environment variables to be loaded when
-     *                        running "genrb".
+     * @param string $envVars Optional. Environment variables to be loaded when running "genrb".
      *
      * @throws RuntimeException if the "genrb" cannot be found
      */

Data/Bundle/Reader/BufferedBundleReader.php

@@ -20,19 +20,14 @@
  */
 class BufferedBundleReader implements BundleReaderInterface
 {
-    /**
-     * @var BundleReaderInterface
-     */
     private $reader;
-
     private $buffer;
 
     /**
      * Buffers a given reader.
      *
      * @param BundleReaderInterface $reader     The reader to buffer
-     * @param int                   $bufferSize the number of entries to store
-     *                                          in the buffer
+     * @param int                   $bufferSize The number of entries to store in the buffer
      */
     public function __construct(BundleReaderInterface $reader, $bufferSize)
     {

Data/Bundle/Writer/TextBundleWriter.php

@@ -46,7 +46,7 @@ public function write($path, $locale, $data, $fallback = true)
      * @param resource $file       The file handle to write to
      * @param string   $bundleName The name of the bundle
      * @param mixed    $value      The value of the node
-     * @param bool     $fallback   whether the resource bundle should be merged
+     * @param bool     $fallback   Whether the resource bundle should be merged
      *                             with the fallback locale
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
@@ -66,8 +66,7 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)
      * @param resource $file          The file handle to write to
      * @param mixed    $value         The value of the node
      * @param int      $indentation   The number of levels to indent
-     * @param bool     $requireBraces whether to require braces to be printed
-     *                                around the value
+     * @param bool     $requireBraces Whether to require braces to be printedaround the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -153,7 +152,7 @@ private function writeIntVector($file, array $value, $indentation)
      *
      * @param resource $file          The file handle to write to
      * @param string   $value         The value of the node
-     * @param bool     $requireBraces whether to require braces to be printed
+     * @param bool     $requireBraces Whether to require braces to be printed
      *                                around the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
@@ -199,7 +198,7 @@ private function writeArray($file, array $value, $indentation)
      * @param resource           $file        The file handle to write to
      * @param array|\Traversable $value       The value of the node
      * @param int                $indentation The number of levels to indent
-     * @param bool               $fallback    whether the table should be merged
+     * @param bool               $fallback    Whether the table should be merged
      *                                        with the fallback locale
      *
      * @throws UnexpectedTypeException when $value is not an array and not a

Data/Generator/AbstractDataGenerator.php

@@ -26,20 +26,13 @@
  */
 abstract class AbstractDataGenerator
 {
-    /**
-     * @var GenrbCompiler
-     */
     private $compiler;
-
-    /**
-     * @var string
-     */
     private $dirName;
 
     public function __construct(GenrbCompiler $compiler, $dirName)
     {
         $this->compiler = $compiler;
-        $this->dirName = $dirName;
+        $this->dirName = (string) $dirName;
     }
 
     public function generateData(GeneratorConfig $config)

Data/Generator/CurrencyDataGenerator.php

@@ -26,29 +26,17 @@
 class CurrencyDataGenerator extends AbstractDataGenerator
 {
     const UNKNOWN_CURRENCY_ID = 'XXX';
-
     const EUROPEAN_COMPOSITE_UNIT_ID = 'XBA';
-
     const EUROPEAN_MONETARY_UNIT_ID = 'XBB';
-
     const EUROPEAN_UNIT_OF_ACCOUNT_XBC_ID = 'XBC';
-
     const EUROPEAN_UNIT_OF_ACCOUNT_XBD_ID = 'XBD';
-
     const TESTING_CURRENCY_CODE_ID = 'XTS';
-
     const ADB_UNIT_OF_ACCOUNT_ID = 'XUA';
-
     const GOLD_ID = 'XAU';
-
     const SILVER_ID = 'XAG';
-
     const PLATINUM_ID = 'XPT';
-
     const PALLADIUM_ID = 'XPD';
-
     const SUCRE_ID = 'XSU';
-
     const SPECIAL_DRAWING_RIGHTS_ID = 'XDR';
 
     /**

Data/Generator/GeneratorConfig.php

@@ -22,21 +22,18 @@
  */
 class GeneratorConfig
 {
-    /**
-     * @var string
-     */
     private $sourceDir;
-
-    /**
-     * @var string
-     */
     private $icuVersion;
 
     /**
      * @var BundleWriterInterface[]
      */
     private $bundleWriters = array();
 
+    /**
+     * @param string $sourceDir
+     * @param string $icuVersion
+     */
     public function __construct($sourceDir, $icuVersion)
     {
         $this->sourceDir = $sourceDir;

Data/Generator/LanguageDataGenerator.php

@@ -157,20 +157,20 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
         return array(
             'Version' => $rootBundle['Version'],
             'Languages' => $this->languageCodes,
-            'Aliases' => $metadataBundle['languageAlias'],
+            'Aliases' => array_map(function (\ResourceBundle $bundle) {
+                return $bundle['replacement'];
+            }, iterator_to_array($metadataBundle['alias']['language'])),
             'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
         );
     }
 
     private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle)
     {
-        // Data structure has changed in ICU 5.5 from "languageAlias" to "alias->language"
-        $aliases = $metadataBundle['languageAlias'] ?: $metadataBundle['alias']['language'];
+        $aliases = iterator_to_array($metadataBundle['alias']['language']);
         $alpha2ToAlpha3 = array();
 
         foreach ($aliases as $alias => $language) {
-            // $language is a string before ICU 5.5
-            $language = is_string($language) ? $language : $language['replacement'];
+            $language = $language['replacement'];
             if (2 === strlen($language) && 3 === strlen($alias)) {
                 if (isset(self::$preferredAlpha2ToAlpha3Mapping[$language])) {
                     // Validate to prevent typos
@@ -184,7 +184,7 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
                     }
 
                     $alpha3 = self::$preferredAlpha2ToAlpha3Mapping[$language];
-                    $alpha2 = is_string($aliases[$alpha3]) ? $aliases[$alpha3] : $aliases[$alpha3]['replacement'];
+                    $alpha2 = $aliases[$alpha3]['replacement'];
 
                     if ($language !== $alpha2) {
                         throw new RuntimeException(

Data/Generator/LocaleDataGenerator.php

@@ -29,29 +29,14 @@
  */
 class LocaleDataGenerator
 {
-    /**
-     * @var string
-     */
     private $dirName;
-
-    /**
-     * @var LanguageDataProvider
-     */
     private $languageDataProvider;
-
-    /**
-     * @var ScriptDataProvider
-     */
     private $scriptDataProvider;
-
-    /**
-     * @var RegionDataProvider
-     */
     private $regionDataProvider;
 
     public function __construct($dirName, LanguageDataProvider $languageDataProvider, ScriptDataProvider $scriptDataProvider, RegionDataProvider $regionDataProvider)
     {
-        $this->dirName = $dirName;
+        $this->dirName = (string) $dirName;
         $this->languageDataProvider = $languageDataProvider;
         $this->scriptDataProvider = $scriptDataProvider;
         $this->regionDataProvider = $regionDataProvider;

Data/Generator/RegionDataGenerator.php

@@ -28,17 +28,11 @@
 class RegionDataGenerator extends AbstractDataGenerator
 {
     const UNKNOWN_REGION_ID = 'ZZ';
-
     const OUTLYING_OCEANIA_REGION_ID = 'QO';
-
     const EUROPEAN_UNION_ID = 'EU';
-
     const NETHERLANDS_ANTILLES_ID = 'AN';
-
     const BOUVET_ISLAND_ID = 'BV';
-
     const HEARD_MCDONALD_ISLANDS_ID = 'HM';
-
     const CLIPPERTON_ISLAND_ID = 'CP';
 
     /**

Data/Provider/CurrencyDataProvider.php

@@ -25,21 +25,11 @@
 class CurrencyDataProvider
 {
     const INDEX_SYMBOL = 0;
-
     const INDEX_NAME = 1;
-
     const INDEX_FRACTION_DIGITS = 0;
-
     const INDEX_ROUNDING_INCREMENT = 1;
 
-    /**
-     * @var string
-     */
     private $path;
-
-    /**
-     * @var BundleEntryReaderInterface
-     */
     private $reader;
 
     /**