Merge branch '2.7' into 2.8

* 2.7:
  [CS] Apply phpdoc_annotation_without_dot

Author: fabpot

OptionsResolverInterface.php

@@ -40,8 +40,8 @@ interface OptionsResolverInterface
      *
      * The closures should return the lazily created option value.
      *
-     * @param array $defaultValues A list of option names as keys and default
-     *                             values or closures as values.
+     * @param array $defaultValues a list of option names as keys and default
+     *                             values or closures as values
      *
      * @return $this
      */
@@ -55,8 +55,8 @@ 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
-     *                             values or closures as values.
+     * @param array $defaultValues a list of option names as keys and default
+     *                             values or closures as values
      *
      * @return $this
      */
@@ -92,15 +92,15 @@ 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.
+     *                             values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined
+     * @throws InvalidOptionsException if an option has not been defined
      *                                 (see {@link isKnown()}) for which
-     *                                 an allowed value is set.
+     *                                 an allowed value is set
      */
     public function setAllowedValues($allowedValues);
 
@@ -109,28 +109,28 @@ 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.
+     *                             values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined
+     * @throws InvalidOptionsException if an option has not been defined
      *                                 (see {@link isKnown()}) for which
-     *                                 an allowed value is set.
+     *                                 an allowed value is set
      */
     public function addAllowedValues($allowedValues);
 
     /**
      * Sets allowed types for a list of options.
      *
-     * @param array $allowedTypes A list of option names as keys and type
-     *                            names passed as string or array as values.
+     * @param array $allowedTypes a list of option names as keys and type
+     *                            names passed as string or array as values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined for
-     *                                 which an allowed type is set.
+     * @throws InvalidOptionsException if an option has not been defined for
+     *                                 which an allowed type is set
      */
     public function setAllowedTypes($allowedTypes);
 
@@ -139,13 +139,13 @@ 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
-     *                            names passed as string or array as values.
+     * @param array $allowedTypes a list of option names as keys and type
+     *                            names passed as string or array as values
      *
      * @return $this
      *
-     * @throws InvalidOptionsException If an option has not been defined for
-     *                                 which an allowed type is set.
+     * @throws InvalidOptionsException if an option has not been defined for
+     *                                 which an allowed type is set
      */
     public function addAllowedTypes($allowedTypes);
 
@@ -201,12 +201,12 @@ public function isRequired($option);
      *
      * @return array A list of options and their values
      *
-     * @throws InvalidOptionsException   If any of the passed options has not
+     * @throws InvalidOptionsException   if any of the passed options has not
      *                                   been defined or does not contain an
-     *                                   allowed value.
-     * @throws MissingOptionsException   If a required option is missing.
-     * @throws OptionDefinitionException If a cyclic dependency is detected
-     *                                   between two lazy options.
+     *                                   allowed value
+     * @throws MissingOptionsException   if a required option is missing
+     * @throws OptionDefinitionException if a cyclic dependency is detected
+     *                                   between two lazy options
      */
     public function resolve(array $options = array());
 }