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

Dumper/CsvFileDumper.php

@@ -54,8 +54,8 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
     /**
      * Sets the delimiter and escape character for CSV.
      *
-     * @param string $delimiter delimiter character
-     * @param string $enclosure enclosure character
+     * @param string $delimiter Delimiter character
+     * @param string $enclosure Enclosure character
      */
     public function setCsvControl($delimiter = ';', $enclosure = '"')
     {

Extractor/AbstractFileExtractor.php

@@ -19,7 +19,7 @@
 abstract class AbstractFileExtractor
 {
     /**
-     * @param string|array $resource files, a file or a directory
+     * @param string|array $resource Files, a file or a directory
      *
      * @return array
      */
@@ -75,7 +75,7 @@ protected function isFile($file)
     abstract protected function canBeExtracted($file);
 
     /**
-     * @param string|array $resource files, a file or a directory
+     * @param string|array $resource Files, a file or a directory
      *
      * @return array files to be extracted
      */

Extractor/ExtractorInterface.php

@@ -24,7 +24,7 @@ interface ExtractorInterface
     /**
      * Extracts translation messages from files, a file or a directory to the catalogue.
      *
-     * @param string|array     $resource  files, a file or a directory
+     * @param string|array     $resource  Files, a file or a directory
      * @param MessageCatalogue $catalogue The catalogue
      */
     public function extract($resource, MessageCatalogue $catalogue);

Loader/CsvFileLoader.php

@@ -52,9 +52,9 @@ protected function loadResource($resource)
     /**
      * Sets the delimiter, enclosure, and escape character for CSV.
      *
-     * @param string $delimiter delimiter character
-     * @param string $enclosure enclosure character
-     * @param string $escape    escape character
+     * @param string $delimiter Delimiter character
+     * @param string $enclosure Enclosure character
+     * @param string $escape    Escape character
      */
     public function setCsvControl($delimiter = ';', $enclosure = '"', $escape = '\\')
     {

Loader/IcuResFileLoader.php

@@ -70,9 +70,9 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * This function takes an array by reference and will modify it
      *
-     * @param \ResourceBundle $rb       the ResourceBundle that will be flattened
-     * @param array           $messages used internally for recursive calls
-     * @param string          $path     current path being parsed, used internally for recursive calls
+     * @param \ResourceBundle $rb       The ResourceBundle that will be flattened
+     * @param array           $messages Used internally for recursive calls
+     * @param string          $path     Current path being parsed, used internally for recursive calls
      *
      * @return array the flattened ResourceBundle
      */

Loader/MoFileLoader.php

@@ -21,23 +21,17 @@ class MoFileLoader extends FileLoader
     /**
      * Magic used for validating the format of a MO file as well as
      * detecting if the machine used to create that file was little endian.
-     *
-     * @var float
      */
     const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
 
     /**
      * Magic used for validating the format of a MO file as well as
      * detecting if the machine used to create that file was big endian.
-     *
-     * @var float
      */
     const MO_BIG_ENDIAN_MAGIC = 0xde120495;
 
     /**
      * The size of the header of a MO file in bytes.
-     *
-     * @var int Number of bytes
      */
     const MO_HEADER_SIZE = 28;
 

LoggingTranslator.php

@@ -23,9 +23,6 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
      */
     private $translator;
 
-    /**
-     * @var LoggerInterface
-     */
     private $logger;
 
     /**

Tests/PluralizationRulesTest.php

@@ -91,8 +91,8 @@ public function failingLangcodes()
     /**
      * We validate only on the plural coverage. Thus the real rules is not tested.
      *
-     * @param string $nplural       plural expected
-     * @param array  $matrix        containing langcodes and their plural index values
+     * @param string $nplural       Plural expected
+     * @param array  $matrix        Containing langcodes and their plural index values
      * @param bool   $expectSuccess
      */
     protected function validateMatrix($nplural, $matrix, $expectSuccess = true)