Merge branch '2.8' into 3.3

* 2.8:
  Docblock fixes

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * only do anything if the parameter is present. (But regardless of the
      * value of that parameter.
      *
-     * @var string
+     * @var string|false
      */
     protected $enabledParameter;
 

src/Symfony/Bridge/Twig/Extension/CodeExtension.php

@@ -196,7 +196,7 @@ public function formatFile($file, $line, $text = null)
      * @param string $file An absolute file path
      * @param int    $line The line number
      *
-     * @return string A link of false
+     * @return string|false A link or false
      */
     public function getFileLink($file, $line)
     {

src/Symfony/Bundle/FrameworkBundle/Client.php

@@ -62,7 +62,7 @@ public function getKernel()
     /**
      * Gets the profile associated with the current Response.
      *
-     * @return HttpProfile A Profile instance
+     * @return HttpProfile|false A Profile instance
      */
     public function getProfile()
     {

src/Symfony/Component/Config/Util/XmlUtils.php

@@ -109,7 +109,7 @@ public static function loadFile($file, $schemaOrCallable = null)
     }
 
     /**
-     * Converts a \DomElement object to a PHP array.
+     * Converts a \DOMElement object to a PHP array.
      *
      * The following rules applies during the conversion:
      *
@@ -123,7 +123,7 @@ public static function loadFile($file, $schemaOrCallable = null)
      *
      *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
-     * @param \DomElement $element     A \DomElement instance
+     * @param \DOMElement $element     A \DOMElement instance
      * @param bool        $checkPrefix Check prefix in an element or an attribute name
      *
      * @return array A PHP array

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

@@ -683,7 +683,7 @@ private function loadFromExtensions(\DOMDocument $xml)
     }
 
     /**
-     * Converts a \DomElement object to a PHP array.
+     * Converts a \DOMElement object to a PHP array.
      *
      * The following rules applies during the conversion:
      *
@@ -697,7 +697,7 @@ private function loadFromExtensions(\DOMDocument $xml)
      *
      *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
-     * @param \DomElement $element A \DomElement instance
+     * @param \DOMElement $element A \DOMElement instance
      *
      * @return array A PHP array
      */

src/Symfony/Component/Form/Extension/Core/Type/DateType.php

@@ -285,7 +285,7 @@ public function getBlockPrefix()
     private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
     {
         $pattern = $formatter->getPattern();
-        $timezone = $formatter->getTimezoneId();
+        $timezone = $formatter->getTimeZoneId();
         $formattedTimestamps = array();
 
         $formatter->setTimeZone('UTC');

src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php

@@ -46,7 +46,7 @@ public function validate($value, Constraint $constraint)
             if ($value instanceof \DateTimeImmutable) {
                 // If $value is immutable, convert the compared value to a
                 // DateTimeImmutable too
-                $comparedValue = new \DatetimeImmutable($comparedValue);
+                $comparedValue = new \DateTimeImmutable($comparedValue);
             } elseif ($value instanceof \DateTimeInterface) {
                 // Otherwise use DateTime
                 $comparedValue = new \DateTime($comparedValue);