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

OptionsResolver.php

@@ -35,29 +35,21 @@ class OptionsResolver implements Options, OptionsResolverInterface
 
     /**
      * The names of all defined options.
-     *
-     * @var array
      */
     private $defined = array();
 
     /**
      * The default option values.
-     *
-     * @var array
      */
     private $defaults = array();
 
     /**
      * The names of required options.
-     *
-     * @var array
      */
     private $required = array();
 
     /**
      * The resolved option values.
-     *
-     * @var array
      */
     private $resolved = array();
 
@@ -70,31 +62,23 @@ class OptionsResolver implements Options, OptionsResolverInterface
 
     /**
      * A list of accepted values for each option.
-     *
-     * @var array
      */
     private $allowedValues = array();
 
     /**
      * A list of accepted types for each option.
-     *
-     * @var array
      */
     private $allowedTypes = array();
 
     /**
      * A list of closures for evaluating lazy options.
-     *
-     * @var array
      */
     private $lazy = array();
 
     /**
      * A list of lazy options whose closure is currently being called.
      *
      * This list helps detecting circular dependencies between lazy options.
-     *
-     * @var array
      */
     private $calling = array();
 
@@ -105,8 +89,6 @@ class OptionsResolver implements Options, OptionsResolverInterface
      * necessary in order to avoid inconsistencies during the resolving
      * process. If any option is changed after being read, all evaluated
      * lazy options that depend on this option would become invalid.
-     *
-     * @var bool
      */
     private $locked = false;
 

OptionsResolverInterface.php

@@ -40,7 +40,7 @@ interface OptionsResolverInterface
      *
      * The closures should return the lazily created option value.
      *
-     * @param array $defaultValues a list of option names as keys and default
+     * @param array $defaultValues A list of option names as keys and default
      *                             values or closures as values
      *
      * @return $this
@@ -55,7 +55,7 @@ public function setDefaults(array $defaultValues);
      * performance if the previous default value is calculated by an expensive
      * closure.
      *
-     * @param array $defaultValues a list of option names as keys and default
+     * @param array $defaultValues A list of option names as keys and default
      *                             values or closures as values
      *
      * @return $this
@@ -92,7 +92,7 @@ public function setRequired($optionNames);
     /**
      * Sets allowed values for a list of options.
      *
-     * @param array $allowedValues a list of option names as keys and arrays
+     * @param array $allowedValues A list of option names as keys and arrays
      *                             with values acceptable for that option as
      *                             values
      *
@@ -109,7 +109,7 @@ public function setAllowedValues($allowedValues);
      *
      * The values are merged with the allowed values defined previously.
      *
-     * @param array $allowedValues a list of option names as keys and arrays
+     * @param array $allowedValues A list of option names as keys and arrays
      *                             with values acceptable for that option as
      *                             values
      *
@@ -124,7 +124,7 @@ public function addAllowedValues($allowedValues);
     /**
      * Sets allowed types for a list of options.
      *
-     * @param array $allowedTypes a list of option names as keys and type
+     * @param array $allowedTypes A list of option names as keys and type
      *                            names passed as string or array as values
      *
      * @return $this
@@ -139,7 +139,7 @@ public function setAllowedTypes($allowedTypes);
      *
      * The types are merged with the allowed types defined previously.
      *
-     * @param array $allowedTypes a list of option names as keys and type
+     * @param array $allowedTypes A list of option names as keys and type
      *                            names passed as string or array as values
      *
      * @return $this