Merge branch '2.3' into 2.4

* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php

Author: fabpot

Options.php

@@ -52,7 +52,7 @@ class Options implements \ArrayAccess, \Iterator, \Countable
      * process. If any option is changed after being read, all evaluated
      * lazy options that depend on this option would become invalid.
      *
-     * @var Boolean
+     * @var bool
      */
     private $reading = false;
 
@@ -244,7 +244,7 @@ public function get($option)
      *
      * @param string $option The option name.
      *
-     * @return Boolean Whether the option exists.
+     * @return bool    Whether the option exists.
      */
     public function has($option)
     {
@@ -324,7 +324,7 @@ public function all()
      *
      * @param string $option The option name.
      *
-     * @return Boolean Whether the option exists.
+     * @return bool    Whether the option exists.
      *
      * @see \ArrayAccess::offsetExists()
      */

OptionsResolverInterface.php

@@ -175,7 +175,7 @@ public function setNormalizers(array $normalizers);
      *
      * @param string $option The name of the option.
      *
-     * @return Boolean Whether the option is known.
+     * @return bool    Whether the option is known.
      */
     public function isKnown($option);
 
@@ -188,7 +188,7 @@ public function isKnown($option);
      *
      * @param string $option The name of the option.
      *
-     * @return Boolean Whether the option is required.
+     * @return bool    Whether the option is required.
      */
     public function isRequired($option);