Merge branch '2.7' into 2.8

* 2.7:
  [DI] minor docblock fixes

Author: nicolas-grekas

Data/Bundle/Reader/BundleEntryReader.php

@@ -28,22 +28,15 @@
  */
 class BundleEntryReader implements BundleEntryReaderInterface
 {
-    /**
-     * @var BundleReaderInterface
-     */
     private $reader;
 
     /**
      * A mapping of locale aliases to locales.
-     *
-     * @var array
      */
     private $localeAliases = array();
 
     /**
      * Creates an entry reader based on the given resource bundle reader.
-     *
-     * @param BundleReaderInterface $reader A resource bundle reader to use
      */
     public function __construct(BundleReaderInterface $reader)
     {

Data/Generator/CurrencyDataGenerator.php

@@ -53,8 +53,6 @@ class CurrencyDataGenerator extends AbstractDataGenerator
 
     /**
      * Monetary units excluded from generation.
-     *
-     * @var array
      */
     private static $blacklist = array(
         self::UNKNOWN_CURRENCY_ID => true,
@@ -162,8 +160,6 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
     }
 
     /**
-     * @param ArrayAccessibleResourceBundle $rootBundle
-     *
      * @return array
      */
     private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle)

Data/Generator/LanguageDataGenerator.php

@@ -28,8 +28,6 @@ class LanguageDataGenerator extends AbstractDataGenerator
 {
     /**
      * Source: http://www-01.sil.org/iso639-3/codes.asp.
-     *
-     * @var array
      */
     private static $preferredAlpha2ToAlpha3Mapping = array(
         'ak' => 'aka',

Data/Generator/RegionDataGenerator.php

@@ -43,8 +43,6 @@ class RegionDataGenerator extends AbstractDataGenerator
 
     /**
      * Regions excluded from generation.
-     *
-     * @var array
      */
     private static $blacklist = array(
         self::UNKNOWN_REGION_ID => true,
@@ -135,8 +133,6 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
     }
 
     /**
-     * @param ArrayAccessibleResourceBundle $localeBundle
-     *
      * @return array
      */
     protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBundle)

DateFormatter/DateFormat/FullTransformer.php

@@ -255,8 +255,6 @@ protected function buildCharsMatch($specialChars)
      * Normalize a preg_replace match array, removing the numeric keys and returning an associative array
      * with the value and pattern values for the matched Transformer.
      *
-     * @param array $data
-     *
      * @return array
      */
     protected function normalizeArray(array $data)
@@ -334,8 +332,6 @@ protected function calculateUnixTimestamp(\DateTime $dateTime, array $options)
      * Add sensible default values for missing items in the extracted date/time options array. The values
      * are base in the beginning of the Unix era.
      *
-     * @param array $options
-     *
      * @return array
      */
     private function getDefaultValueForOptions(array $options)

DateFormatter/DateFormat/MonthTransformer.php

@@ -20,9 +20,6 @@
  */
 class MonthTransformer extends Transformer
 {
-    /**
-     * @var array
-     */
     protected static $months = array(
         'January',
         'February',
@@ -40,22 +37,16 @@ class MonthTransformer extends Transformer
 
     /**
      * Short months names (first 3 letters).
-     *
-     * @var array
      */
     protected static $shortMonths = array();
 
     /**
      * Flipped $months array, $name => $index.
-     *
-     * @var array
      */
     protected static $flippedMonths = array();
 
     /**
      * Flipped $shortMonths array, $name => $index.
-     *
-     * @var array
      */
     protected static $flippedShortMonths = array();
 

DateFormatter/IntlDateFormatter.php

@@ -75,8 +75,6 @@ class IntlDateFormatter
 
     /**
      * Patterns used to format the date when no pattern is provided.
-     *
-     * @var array
      */
     private $defaultDateFormats = array(
         self::NONE => '',
@@ -88,8 +86,6 @@ class IntlDateFormatter
 
     /**
      * Patterns used to format the time when no pattern is provided.
-     *
-     * @var array
      */
     private $defaultTimeFormats = array(
         self::FULL => 'h:mm:ss a zzzz',

Tests/DateFormatter/IntlDateFormatterTest.php

@@ -215,8 +215,6 @@ protected function isIntlFailure($errorCode)
      * + 10 seconds) are added, then we have 86,400 seconds (24h * 60min * 60s)
      * + 10 seconds
      *
-     * @param array $dataSets
-     *
      * @return array
      */
     private function notImplemented(array $dataSets)