Merge branch '2.4'

* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -44,7 +44,7 @@ class ContainerAwareEventManager extends EventManager
      *                          the name of the method that is invoked on listeners.
      * @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners.
      *                             If not supplied, the single empty EventArgs instance is used.
-     * @return boolean
+     * @return bool
      */
     public function dispatchEvent($eventName, EventArgs $eventArgs = null)
     {
@@ -81,7 +81,7 @@ class ContainerAwareEventManager extends EventManager
      *
      * @param string $event
      *
-     * @return boolean TRUE if the specified event has any listeners, FALSE otherwise.
+     * @return bool    TRUE if the specified event has any listeners, FALSE otherwise.
      */
     public function hasListeners($event)
     {

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

@@ -156,7 +156,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *
      * @param ContainerBuilder $container
      *
-     * @return boolean whether this compiler pass really should register the mappings
+     * @return bool    whether this compiler pass really should register the mappings
      */
     protected function enabled(ContainerBuilder $container)
     {

src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -59,21 +59,21 @@ class EntityChoiceList extends ObjectChoiceList
     /**
      * Whether to use the identifier for index generation
      *
-     * @var Boolean
+     * @var bool
      */
     private $idAsIndex = false;
 
     /**
      * Whether to use the identifier for value generation
      *
-     * @var Boolean
+     * @var bool
      */
     private $idAsValue = false;
 
     /**
      * Whether the entities have already been loaded.
      *
-     * @var Boolean
+     * @var bool
      */
     private $loaded = false;
 
@@ -369,7 +369,7 @@ class EntityChoiceList extends ObjectChoiceList
      *
      * @param mixed $entity The choice to create an index for
      *
-     * @return integer|string A unique index containing only ASCII letters,
+     * @return int|string     A unique index containing only ASCII letters,
      *                        digits and underscores.
      */
     protected function createIndex($entity)
@@ -390,7 +390,7 @@ class EntityChoiceList extends ObjectChoiceList
      *
      * @param mixed $entity The choice to create a value for
      *
-     * @return integer|string A unique value without character limitations.
+     * @return int|string     A unique value without character limitations.
      */
     protected function createValue($entity)
     {

src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php

@@ -158,7 +158,7 @@ class DbalSessionHandler implements \SessionHandlerInterface
     * @param string $id
     * @param string $data
     *
-    * @return Boolean
+    * @return bool
     */
     private function createNewSession($id, $data = '')
     {

src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

@@ -167,7 +167,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
     /**
      * Updates the logging level based on the verbosity setting of the console output.
      *
-     * @return Boolean Whether the handler is enabled and verbosity is not set to quiet.
+     * @return bool    Whether the handler is enabled and verbosity is not set to quiet.
      */
     private function updateLevel()
     {

src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

@@ -55,14 +55,14 @@ class ModelChoiceList extends ObjectChoiceList
     /**
      * Whether the model objects have already been loaded.
      *
-     * @var Boolean
+     * @var bool
      */
     protected $loaded = false;
 
     /**
      * Whether to use the identifier for index generation.
      *
-     * @var Boolean
+     * @var bool
      */
     private $identifierAsIndex = false;
 
@@ -366,7 +366,7 @@ class ModelChoiceList extends ObjectChoiceList
      *
      * @param mixed $model The choice to create an index for
      *
-     * @return integer|string A unique index containing only ASCII letters,
+     * @return int|string     A unique index containing only ASCII letters,
      *                        digits and underscores.
      */
     protected function createIndex($model)
@@ -387,7 +387,7 @@ class ModelChoiceList extends ObjectChoiceList
      *
      * @param mixed $model The choice to create a value for
      *
-     * @return integer|string A unique value without character limitations.
+     * @return int|string     A unique value without character limitations.
      */
     protected function createValue($model)
     {
@@ -472,7 +472,7 @@ class ModelChoiceList extends ObjectChoiceList
      *
      * @param \ColumnMap $column
      *
-     * @return Boolean
+     * @return bool
      */
     private function isScalar(\ColumnMap $column)
     {
@@ -489,7 +489,7 @@ class ModelChoiceList extends ObjectChoiceList
      * @param mixed $choice
      * @param mixed $givenChoice
      *
-     * @return Boolean
+     * @return bool
      */
     private function isEqual($choice, $givenChoice)
     {

src/Symfony/Bridge/Propel1/Logger/PropelLogger.php

@@ -38,7 +38,7 @@ class PropelLogger implements \BasicLogger
     protected $stopwatch;
 
     /**
-     * @var Boolean
+     * @var bool
      */
     private $isPrepared = false;
 

src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php

@@ -110,7 +110,7 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
     /**
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      */
     public function __isset($name)
     {

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

@@ -113,7 +113,7 @@ class FormExtension extends \Twig_Extension
      * @param ChoiceView   $choice        The choice to check.
      * @param string|array $selectedValue The selected value to compare.
      *
-     * @return Boolean Whether the choice is selected.
+     * @return bool    Whether the choice is selected.
      *
      * @see ChoiceView::isSelected()
      */

src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php

@@ -74,7 +74,7 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE
      * @param FormView $view      The form view for finding the applying themes.
      * @param string   $blockName The name of the block to load.
      *
-     * @return Boolean True if the resource could be loaded, false otherwise.
+     * @return bool    True if the resource could be loaded, false otherwise.
      */
     protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName)
     {

src/Symfony/Bridge/Twig/NodeVisitor/Scope.php

@@ -32,7 +32,7 @@ class Scope
     private $data = array();
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $left = false;
 
@@ -95,7 +95,7 @@ class Scope
      *
      * @param string $key
      *
-     * @return boolean
+     * @return bool
      */
     public function has($key)
     {

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php

@@ -49,7 +49,7 @@ class RouterCacheWarmer implements CacheWarmerInterface
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return Boolean always true
+     * @return bool    always true
      */
     public function isOptional()
     {

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php

@@ -55,7 +55,7 @@ class TemplatePathsCacheWarmer extends CacheWarmer
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return Boolean always true
+     * @return bool    always true
      */
     public function isOptional()
     {

src/Symfony/Bundle/FrameworkBundle/Console/Application.php

@@ -63,7 +63,7 @@ class Application extends BaseApplication
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return integer 0 if everything went fine, or an error code
+     * @return int     0 if everything went fine, or an error code
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {

src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php

@@ -255,7 +255,7 @@ class Controller extends ContainerAware
      *
      * @param string $id The service id
      *
-     * @return Boolean true if the service id is defined, false otherwise
+     * @return bool    true if the service id is defined, false otherwise
      */
     public function has($id)
     {

src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php

@@ -108,7 +108,7 @@ class GlobalVariables
     /**
      * Returns the current app debug mode.
      *
-     * @return Boolean The current debug mode
+     * @return bool    The current debug mode
      */
     public function getDebug()
     {

src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

@@ -65,7 +65,7 @@ class SecurityDataCollector extends DataCollector
     /**
      * Checks if security is enabled.
      *
-     * @return Boolean true if security is enabled, false otherwise
+     * @return bool    true if security is enabled, false otherwise
      */
     public function isEnabled()
     {
@@ -95,7 +95,7 @@ class SecurityDataCollector extends DataCollector
     /**
      * Checks if the user is authenticated or not.
      *
-     * @return Boolean true if the user is authenticated, false otherwise
+     * @return bool    true if the user is authenticated, false otherwise
      */
     public function isAuthenticated()
     {

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php

@@ -146,7 +146,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
      *
      * @param array $config
      *
-     * @return Boolean Whether a possibly configured RememberMeServices should be set for this listener
+     * @return bool    Whether a possibly configured RememberMeServices should be set for this listener
      */
     protected function isRememberMeAware($config)
     {

src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php

@@ -69,7 +69,7 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return Boolean always true
+     * @return bool    always true
      */
     public function isOptional()
     {

src/Symfony/Component/BrowserKit/Cookie.php

@@ -297,7 +297,7 @@ class Cookie
     /**
      * Returns the secure flag of the cookie.
      *
-     * @return Boolean The cookie secure flag
+     * @return bool    The cookie secure flag
      *
      * @api
      */
@@ -309,7 +309,7 @@ class Cookie
     /**
      * Returns the httponly flag of the cookie.
      *
-     * @return Boolean The cookie httponly flag
+     * @return bool    The cookie httponly flag
      *
      * @api
      */
@@ -321,7 +321,7 @@ class Cookie
     /**
      * Returns true if the cookie has expired.
      *
-     * @return Boolean true if the cookie has expired, false otherwise
+     * @return bool    true if the cookie has expired, false otherwise
      *
      * @api
      */

src/Symfony/Component/BrowserKit/History.php

@@ -45,7 +45,7 @@ class History
     /**
      * Returns true if the history is empty.
      *
-     * @return Boolean true if the history is empty, false otherwise
+     * @return bool    true if the history is empty, false otherwise
      */
     public function isEmpty()
     {

src/Symfony/Component/BrowserKit/Response.php

@@ -92,7 +92,7 @@ class Response
     /**
      * Gets the response status code.
      *
-     * @return integer The response status code
+     * @return int     The response status code
      *
      * @api
      */

src/Symfony/Component/ClassLoader/ApcClassLoader.php

@@ -99,7 +99,7 @@ class ApcClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      */
     public function loadClass($class)
     {

src/Symfony/Component/ClassLoader/ClassLoader.php

@@ -114,7 +114,7 @@ class ClassLoader
      * Can be used to check if the autoloader uses the include path to check
      * for classes.
      *
-     * @return Boolean
+     * @return bool
      */
     public function getUseIncludePath()
     {
@@ -144,7 +144,7 @@ class ClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      */
     public function loadClass($class)
     {

src/Symfony/Component/ClassLoader/DebugClassLoader.php

@@ -98,7 +98,7 @@ class DebugClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      *
      * @throws \RuntimeException
      */

src/Symfony/Component/ClassLoader/UniversalClassLoader.php

@@ -81,7 +81,7 @@ class UniversalClassLoader
      * Can be used to check if the autoloader uses the include path to check
      * for classes.
      *
-     * @return Boolean
+     * @return bool
      */
     public function getUseIncludePath()
     {
@@ -243,7 +243,7 @@ class UniversalClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      */
     public function loadClass($class)
     {

src/Symfony/Component/ClassLoader/WinCacheClassLoader.php

@@ -96,7 +96,7 @@ class WinCacheClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      */
     public function loadClass($class)
     {

src/Symfony/Component/ClassLoader/XcacheClassLoader.php

@@ -93,7 +93,7 @@ class XcacheClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      */
     public function loadClass($class)
     {

src/Symfony/Component/Config/ConfigCache.php

@@ -56,7 +56,7 @@ class ConfigCache
      * This method always returns true when debug is off and the
      * cache file exists.
      *
-     * @return Boolean true if the cache is fresh, false otherwise
+     * @return bool    true if the cache is fresh, false otherwise
      */
     public function isFresh()
     {

src/Symfony/Component/Config/Definition/ArrayNode.php

@@ -159,7 +159,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     /**
      * Checks if the node has a default value.
      *
-     * @return Boolean
+     * @return bool
      */
     public function hasDefaultValue()
     {

src/Symfony/Component/Config/Definition/BaseNode.php

@@ -173,7 +173,7 @@ abstract class BaseNode implements NodeInterface
     /**
      * Checks if this node is required.
      *
-     * @return Boolean
+     * @return bool
      */
     public function isRequired()
     {

src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php

@@ -33,7 +33,7 @@ class BooleanNodeDefinition extends ScalarNodeDefinition
     /**
      * Instantiate a Node
      *
-     * @return BooleanNode The node
+     * @return boolNode    The node
      */
     protected function instantiateNode()
     {

src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php

@@ -23,7 +23,7 @@ class IntegerNodeDefinition extends NumericNodeDefinition
     /**
      * Instantiates a Node.
      *
-     * @return IntegerNode The node
+     * @return intNode     The node
      */
     protected function instantiateNode()
     {

src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php

@@ -81,7 +81,7 @@ class NodeBuilder implements NodeParentInterface
      *
      * @param string $name The name of the node
      *
-     * @return BooleanNodeDefinition The child node
+     * @return boolNodeDefinition    The child node
      */
     public function booleanNode($name)
     {
@@ -93,7 +93,7 @@ class NodeBuilder implements NodeParentInterface
      *
      * @param string $name the name of the node
      *
-     * @return IntegerNodeDefinition The child node
+     * @return intNodeDefinition     The child node
      */
     public function integerNode($name)
     {

src/Symfony/Component/Config/Definition/NodeInterface.php

@@ -38,14 +38,14 @@ interface NodeInterface
     /**
      * Returns true when the node is required.
      *
-     * @return Boolean If the node is required
+     * @return bool    If the node is required
      */
     public function isRequired();
 
     /**
      * Returns true when the node has a default value.
      *
-     * @return Boolean If the node has a default value
+     * @return bool    If the node has a default value
      */
     public function hasDefaultValue();
 

src/Symfony/Component/Config/Definition/PrototypedArrayNode.php

@@ -100,7 +100,7 @@ class PrototypedArrayNode extends ArrayNode
     /**
      * Checks if the node has a default value.
      *
-     * @return Boolean
+     * @return bool
      */
     public function hasDefaultValue()
     {

src/Symfony/Component/Config/FileLocator.php

@@ -80,7 +80,7 @@ class FileLocator implements FileLocatorInterface
      *
      * @param string $file A file path
      *
-     * @return Boolean
+     * @return bool
      */
     private function isAbsolutePath($file)
     {

src/Symfony/Component/Config/Loader/LoaderInterface.php

@@ -32,7 +32,7 @@ interface LoaderInterface
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null);
 

src/Symfony/Component/Config/Resource/DirectoryResource.php

@@ -63,7 +63,7 @@ class DirectoryResource implements ResourceInterface, \Serializable
      *
      * @param int     $timestamp The last time the resource was loaded
      *
-     * @return Boolean true if the resource has not been updated, false otherwise
+     * @return bool    true if the resource has not been updated, false otherwise
      */
     public function isFresh($timestamp)
     {

src/Symfony/Component/Config/Resource/FileResource.php

@@ -57,7 +57,7 @@ class FileResource implements ResourceInterface, \Serializable
      *
      * @param int     $timestamp The last time the resource was loaded
      *
-     * @return Boolean true if the resource has not been updated, false otherwise
+     * @return bool    true if the resource has not been updated, false otherwise
      */
     public function isFresh($timestamp)
     {

src/Symfony/Component/Config/Resource/ResourceInterface.php

@@ -30,7 +30,7 @@ interface ResourceInterface
      *
      * @param int     $timestamp The last time the resource was loaded
      *
-     * @return Boolean true if the resource has not been updated, false otherwise
+     * @return bool    true if the resource has not been updated, false otherwise
      */
     public function isFresh($timestamp);
 

src/Symfony/Component/Console/Application.php

@@ -102,7 +102,7 @@ class Application
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return integer 0 if everything went fine, or an error code
+     * @return int     0 if everything went fine, or an error code
      *
      * @throws \Exception When doRun returns Exception
      *
@@ -161,7 +161,7 @@ class Application
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return integer 0 if everything went fine, or an error code
+     * @return int     0 if everything went fine, or an error code
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
@@ -455,7 +455,7 @@ class Application
      *
      * @param string $name The command name or alias
      *
-     * @return Boolean true if the command exists, false otherwise
+     * @return bool    true if the command exists, false otherwise
      *
      * @api
      */
@@ -880,7 +880,7 @@ class Application
      * @param InputInterface  $input   An Input instance
      * @param OutputInterface $output  An Output instance
      *
-     * @return integer 0 if everything went fine, or an error code
+     * @return int     0 if everything went fine, or an error code
      */
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
     {

src/Symfony/Component/Console/Command/Command.php

@@ -134,7 +134,7 @@ class Command
      * Override this to check for x or y and return false if the command can not
      * run properly under the current conditions.
      *
-     * @return Boolean
+     * @return bool
      */
     public function isEnabled()
     {
@@ -159,7 +159,7 @@ class Command
      * @param InputInterface  $input  An InputInterface instance
      * @param OutputInterface $output An OutputInterface instance
      *
-     * @return null|integer null or 0 if everything went fine, or an error code
+     * @return null|int     null or 0 if everything went fine, or an error code
      *
      * @throws \LogicException When this abstract method is not implemented
      * @see    setCode()
@@ -202,7 +202,7 @@ class Command
      * @param InputInterface  $input  An InputInterface instance
      * @param OutputInterface $output An OutputInterface instance
      *
-     * @return integer The command exit code
+     * @return int     The command exit code
      *
      * @throws \Exception
      *

src/Symfony/Component/Console/Event/ConsoleExceptionEvent.php

@@ -58,7 +58,7 @@ class ConsoleExceptionEvent extends ConsoleEvent
     /**
      * Gets the exit code.
      *
-     * @return integer The command exit code
+     * @return int     The command exit code
      */
     public function getExitCode()
     {

src/Symfony/Component/Console/Event/ConsoleTerminateEvent.php

@@ -25,7 +25,7 @@ class ConsoleTerminateEvent extends ConsoleEvent
     /**
      * The exit code of the command.
      *
-     * @var integer
+     * @var int
      */
     private $exitCode;
 
@@ -49,7 +49,7 @@ class ConsoleTerminateEvent extends ConsoleEvent
     /**
      * Gets the exit code.
      *
-     * @return integer The command exit code
+     * @return int     The command exit code
      */
     public function getExitCode()
     {

src/Symfony/Component/Console/Formatter/OutputFormatter.php

@@ -75,7 +75,7 @@ class OutputFormatter implements OutputFormatterInterface
     /**
      * Gets the decorated flag.
      *
-     * @return Boolean true if the output will decorate messages, false otherwise
+     * @return bool    true if the output will decorate messages, false otherwise
      *
      * @api
      */
@@ -102,7 +102,7 @@ class OutputFormatter implements OutputFormatterInterface
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -194,7 +194,7 @@ class OutputFormatter implements OutputFormatterInterface
      *
      * @param string $string
      *
-     * @return OutputFormatterStyle|Boolean false if string is not format string
+     * @return OutputFormatterStyle|bool    false if string is not format string
      */
     private function createStyleFromString($string)
     {

src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php

@@ -32,7 +32,7 @@ interface OutputFormatterInterface
     /**
      * Gets the decorated flag.
      *
-     * @return Boolean true if the output will decorate messages, false otherwise
+     * @return bool    true if the output will decorate messages, false otherwise
      *
      * @api
      */
@@ -53,7 +53,7 @@ interface OutputFormatterInterface
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */

src/Symfony/Component/Console/Helper/DialogHelper.php

@@ -39,7 +39,7 @@ class DialogHelper extends InputAwareHelper
      * @param string          $errorMessage Message which will be shown if invalid value from choice list would be picked
      * @param bool            $multiselect  Select more than one value separated by comma
      *
-     * @return integer|string|array The selected value or values (the key of the choices array)
+     * @return int|string|array     The selected value or values (the key of the choices array)
      *
      * @throws \InvalidArgumentException
      */
@@ -232,7 +232,7 @@ class DialogHelper extends InputAwareHelper
      * @param string|array    $question The question to ask
      * @param bool            $default  The default answer if the user enters nothing
      *
-     * @return Boolean true if the user has confirmed, false otherwise
+     * @return bool    true if the user has confirmed, false otherwise
      */
     public function askConfirmation(OutputInterface $output, $question, $default = true)
     {
@@ -410,7 +410,7 @@ class DialogHelper extends InputAwareHelper
     /**
      * Return a valid Unix shell
      *
-     * @return string|Boolean  The valid shell name, false in case no valid shell is found
+     * @return string|bool     The valid shell name, false in case no valid shell is found
      */
     private function getShell()
     {

src/Symfony/Component/Console/Helper/Helper.php

@@ -47,7 +47,7 @@ abstract class Helper implements HelperInterface
      *
      * @param string $string The string to check its length
      *
-     * @return integer The length of the string
+     * @return int     The length of the string
      */
     public static function strlen($string)
     {

src/Symfony/Component/Console/Helper/HelperSet.php

@@ -56,7 +56,7 @@ class HelperSet implements \IteratorAggregate
      *
      * @param string $name The helper name
      *
-     * @return Boolean true if the helper is defined, false otherwise
+     * @return bool    true if the helper is defined, false otherwise
      */
     public function has($name)
     {

src/Symfony/Component/Console/Helper/ProgressHelper.php

@@ -50,21 +50,21 @@ class ProgressHelper extends Helper
     /**
      * Current step
      *
-     * @var integer
+     * @var int
      */
     private $current;
 
     /**
      * Maximum number of steps
      *
-     * @var integer
+     * @var int
      */
     private $max;
 
     /**
      * Start time of the progress bar
      *
-     * @var integer
+     * @var int
      */
     private $startTime;
 

src/Symfony/Component/Console/Input/ArgvInput.php

@@ -278,7 +278,7 @@ class ArgvInput extends Input
      *
      * @param string|array $values The value(s) to look for in the raw parameters (can be an array)
      *
-     * @return Boolean true if the value is contained in the raw parameters
+     * @return bool    true if the value is contained in the raw parameters
      */
     public function hasParameterOption($values)
     {

src/Symfony/Component/Console/Input/ArrayInput.php

@@ -65,7 +65,7 @@ class ArrayInput extends Input
      *
      * @param string|array $values The values to look for in the raw parameters (can be an array)
      *
-     * @return Boolean true if the value is contained in the raw parameters
+     * @return bool    true if the value is contained in the raw parameters
      */
     public function hasParameterOption($values)
     {

src/Symfony/Component/Console/Input/Input.php

@@ -81,7 +81,7 @@ abstract class Input implements InputInterface
     /**
      * Checks if the input is interactive.
      *
-     * @return Boolean Returns true if the input is interactive
+     * @return bool    Returns true if the input is interactive
      */
     public function isInteractive()
     {
@@ -148,7 +148,7 @@ abstract class Input implements InputInterface
      *
      * @param string|int     $name The InputArgument name or position
      *
-     * @return Boolean true if the InputArgument object exists, false otherwise
+     * @return bool    true if the InputArgument object exists, false otherwise
      */
     public function hasArgument($name)
     {
@@ -205,7 +205,7 @@ abstract class Input implements InputInterface
      *
      * @param string $name The InputOption name
      *
-     * @return Boolean true if the InputOption object exists, false otherwise
+     * @return bool    true if the InputOption object exists, false otherwise
      */
     public function hasOption($name)
     {

src/Symfony/Component/Console/Input/InputArgument.php

@@ -69,7 +69,7 @@ class InputArgument
     /**
      * Returns true if the argument is required.
      *
-     * @return Boolean true if parameter mode is self::REQUIRED, false otherwise
+     * @return bool    true if parameter mode is self::REQUIRED, false otherwise
      */
     public function isRequired()
     {
@@ -79,7 +79,7 @@ class InputArgument
     /**
      * Returns true if the argument can take multiple values.
      *
-     * @return Boolean true if mode is self::IS_ARRAY, false otherwise
+     * @return bool    true if mode is self::IS_ARRAY, false otherwise
      */
     public function isArray()
     {

src/Symfony/Component/Console/Input/InputDefinition.php

@@ -173,7 +173,7 @@ class InputDefinition
      *
      * @param string|int     $name The InputArgument name or position
      *
-     * @return Boolean true if the InputArgument object exists, false otherwise
+     * @return bool    true if the InputArgument object exists, false otherwise
      *
      * @api
      */
@@ -199,7 +199,7 @@ class InputDefinition
     /**
      * Returns the number of InputArguments.
      *
-     * @return integer The number of InputArguments
+     * @return int     The number of InputArguments
      */
     public function getArgumentCount()
     {
@@ -209,7 +209,7 @@ class InputDefinition
     /**
      * Returns the number of required InputArguments.
      *
-     * @return integer The number of required InputArguments
+     * @return int     The number of required InputArguments
      */
     public function getArgumentRequiredCount()
     {
@@ -315,7 +315,7 @@ class InputDefinition
      *
      * @param string $name The InputOption name
      *
-     * @return Boolean true if the InputOption object exists, false otherwise
+     * @return bool    true if the InputOption object exists, false otherwise
      *
      * @api
      */
@@ -341,7 +341,7 @@ class InputDefinition
      *
      * @param string $name The InputOption shortcut
      *
-     * @return Boolean true if the InputOption object exists, false otherwise
+     * @return bool    true if the InputOption object exists, false otherwise
      */
     public function hasShortcut($name)
     {

src/Symfony/Component/Console/Input/InputInterface.php

@@ -33,7 +33,7 @@ interface InputInterface
      *
      * @param string|array $values The values to look for in the raw parameters (can be an array)
      *
-     * @return Boolean true if the value is contained in the raw parameters
+     * @return bool    true if the value is contained in the raw parameters
      */
     public function hasParameterOption($values);
 
@@ -97,7 +97,7 @@ interface InputInterface
      *
      * @param string|int     $name The InputArgument name or position
      *
-     * @return Boolean true if the InputArgument object exists, false otherwise
+     * @return bool    true if the InputArgument object exists, false otherwise
      */
     public function hasArgument($name);
 
@@ -132,14 +132,14 @@ interface InputInterface
      *
      * @param string $name The InputOption name
      *
-     * @return Boolean true if the InputOption object exists, false otherwise
+     * @return bool    true if the InputOption object exists, false otherwise
      */
     public function hasOption($name);
 
     /**
      * Is this input means interactive?
      *
-     * @return Boolean
+     * @return bool
      */
     public function isInteractive();
 

src/Symfony/Component/Console/Input/InputOption.php

@@ -112,7 +112,7 @@ class InputOption
     /**
      * Returns true if the option accepts a value.
      *
-     * @return Boolean true if value mode is not self::VALUE_NONE, false otherwise
+     * @return bool    true if value mode is not self::VALUE_NONE, false otherwise
      */
     public function acceptValue()
     {
@@ -122,7 +122,7 @@ class InputOption
     /**
      * Returns true if the option requires a value.
      *
-     * @return Boolean true if value mode is self::VALUE_REQUIRED, false otherwise
+     * @return bool    true if value mode is self::VALUE_REQUIRED, false otherwise
      */
     public function isValueRequired()
     {
@@ -132,7 +132,7 @@ class InputOption
     /**
      * Returns true if the option takes an optional value.
      *
-     * @return Boolean true if value mode is self::VALUE_OPTIONAL, false otherwise
+     * @return bool    true if value mode is self::VALUE_OPTIONAL, false otherwise
      */
     public function isValueOptional()
     {
@@ -142,7 +142,7 @@ class InputOption
     /**
      * Returns true if the option can take multiple values.
      *
-     * @return Boolean true if mode is self::VALUE_IS_ARRAY, false otherwise
+     * @return bool    true if mode is self::VALUE_IS_ARRAY, false otherwise
      */
     public function isArray()
     {
@@ -197,7 +197,7 @@ class InputOption
      * Checks whether the given option equals this one
      *
      * @param InputOption $option option to compare
-     * @return Boolean
+     * @return bool
      */
     public function equals(InputOption $option)
     {

src/Symfony/Component/Console/Output/ConsoleOutput.php

@@ -104,7 +104,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
      * STDOUT and doesn't properly convert ASCII to EBCDIC, resulting in garbage
      * output.
      *
-     * @return boolean
+     * @return bool
      */
     protected function hasStdoutSupport()
     {

src/Symfony/Component/Console/Output/OutputInterface.php

@@ -69,7 +69,7 @@ interface OutputInterface
     /**
      * Gets the current verbosity of the output.
      *
-     * @return integer The current level of verbosity (one of the VERBOSITY constants)
+     * @return int     The current level of verbosity (one of the VERBOSITY constants)
      *
      * @api
      */
@@ -87,7 +87,7 @@ interface OutputInterface
     /**
      * Gets the decorated flag.
      *
-     * @return Boolean true if the output will decorate messages, false otherwise
+     * @return bool    true if the output will decorate messages, false otherwise
      *
      * @api
      */

src/Symfony/Component/Console/Output/StreamOutput.php

@@ -90,7 +90,7 @@ class StreamOutput extends Output
      *  -  Windows without Ansicon and ConEmu
      *  -  non tty consoles
      *
-     * @return Boolean true if the stream supports colorization, false otherwise
+     * @return bool    true if the stream supports colorization, false otherwise
      */
     protected function hasColorSupport()
     {

src/Symfony/Component/Console/Shell.php

@@ -163,7 +163,7 @@ EOF;
      *
      * @param string $text The last segment of the entered text
      *
-     * @return Boolean|array A list of guessed strings or true
+     * @return bool|array    A list of guessed strings or true
      */
     private function autocompleter($text)
     {

src/Symfony/Component/Console/Tester/ApplicationTester.php

@@ -56,7 +56,7 @@ class ApplicationTester
      * @param array $input   An array of arguments and options
      * @param array $options An array of options
      *
-     * @return integer The command exit code
+     * @return int     The command exit code
      */
     public function run(array $input, $options = array())
     {
@@ -119,7 +119,7 @@ class ApplicationTester
     /**
      * Gets the status code returned by the last execution of the application.
      *
-     * @return integer The status code
+     * @return int     The status code
      */
     public function getStatusCode()
     {

src/Symfony/Component/Console/Tester/CommandTester.php

@@ -51,7 +51,7 @@ class CommandTester
      * @param array $input   An array of arguments and options
      * @param array $options An array of options
      *
-     * @return integer The command exit code
+     * @return int     The command exit code
      */
     public function execute(array $input, array $options = array())
     {
@@ -123,7 +123,7 @@ class CommandTester
     /**
      * Gets the status code returned by the last execution of the application.
      *
-     * @return integer The status code
+     * @return int     The status code
      */
     public function getStatusCode()
     {

src/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php

@@ -28,7 +28,7 @@ interface HandlerInterface
      * @param Reader      $reader
      * @param TokenStream $stream
      *
-     * @return boolean
+     * @return bool
      */
     public function handle(Reader $reader, TokenStream $stream);
 }

src/Symfony/Component/CssSelector/Parser/Token.php

@@ -81,7 +81,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isFileEnd()
     {
@@ -91,7 +91,7 @@ class Token
     /**
      * @param array $values
      *
-     * @return boolean
+     * @return bool
      */
     public function isDelimiter(array $values = array())
     {
@@ -107,7 +107,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isWhitespace()
     {
@@ -115,7 +115,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isIdentifier()
     {
@@ -123,7 +123,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isHash()
     {
@@ -131,7 +131,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isNumber()
     {
@@ -139,7 +139,7 @@ class Token
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isString()
     {

src/Symfony/Component/CssSelector/Parser/TokenStream.php

@@ -30,7 +30,7 @@ class TokenStream
     private $tokens = array();
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $frozen = false;
 
@@ -50,7 +50,7 @@ class TokenStream
     private $peeked = null;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $peeking = false;
 

src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php

@@ -73,7 +73,7 @@ class NodeExtension extends AbstractExtension
     /**
      * @param int $flag
      *
-     * @return boolean
+     * @return bool
      */
     public function hasFlag($flag)
     {
@@ -261,7 +261,7 @@ class NodeExtension extends AbstractExtension
      *
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     private function isSafeName($name)
     {

src/Symfony/Component/Debug/DebugClassLoader.php

@@ -135,7 +135,7 @@ class DebugClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
      *
      * @throws \RuntimeException
      */

src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php

@@ -181,7 +181,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     /**
      * @param string $class
      *
-     * @return Boolean
+     * @return bool
      */
     private function classExists($class)
     {

src/Symfony/Component/DependencyInjection/Alias.php

@@ -36,7 +36,7 @@ class Alias
     /**
      * Checks if this DI Alias should be public or not.
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php

@@ -114,7 +114,7 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface
      * @param string           $id
      * @param Definition       $definition
      *
-     * @return Boolean If the definition is inlineable
+     * @return bool    If the definition is inlineable
      */
     private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition)
     {

src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php

@@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 class RepeatedPass implements CompilerPassInterface
 {
     /**
-     * @var Boolean
+     * @var bool
      */
     private $repeat = false;
 

src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php

@@ -33,7 +33,7 @@ class ServiceReferenceGraph
      *
      * @param string $id Id to check
      *
-     * @return Boolean
+     * @return bool
      */
     public function hasNode($id)
     {

src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php

@@ -63,7 +63,7 @@ class ServiceReferenceGraphNode
     /**
      * Checks if the value of this node is an Alias.
      *
-     * @return Boolean True if the value is an Alias instance
+     * @return bool    True if the value is an Alias instance
      */
     public function isAlias()
     {
@@ -73,7 +73,7 @@ class ServiceReferenceGraphNode
     /**
      * Checks if the value of this node is a Definition.
      *
-     * @return Boolean True if the value is a Definition instance
+     * @return bool    True if the value is a Definition instance
      */
     public function isDefinition()
     {

src/Symfony/Component/DependencyInjection/Container.php

@@ -110,7 +110,7 @@ class Container implements IntrospectableContainerInterface
     /**
      * Returns true if the container parameter bag are frozen.
      *
-     * @return Boolean true if the container parameter bag are frozen, false otherwise
+     * @return bool    true if the container parameter bag are frozen, false otherwise
      *
      * @api
      */
@@ -152,7 +152,7 @@ class Container implements IntrospectableContainerInterface
      *
      * @param string $name The parameter name
      *
-     * @return Boolean The presence of parameter in container
+     * @return bool    The presence of parameter in container
      *
      * @api
      */
@@ -225,7 +225,7 @@ class Container implements IntrospectableContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if the service is defined, false otherwise
+     * @return bool    true if the service is defined, false otherwise
      *
      * @api
      */
@@ -334,7 +334,7 @@ class Container implements IntrospectableContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if service has already been initialized, false otherwise
+     * @return bool    true if service has already been initialized, false otherwise
      */
     public function initialized($id)
     {
@@ -491,7 +491,7 @@ class Container implements IntrospectableContainerInterface
      *
      * @param string $name The name of the scope
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -507,7 +507,7 @@ class Container implements IntrospectableContainerInterface
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -100,7 +100,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     /**
      * Checks if resources are tracked.
      *
-     * @return Boolean true if resources are tracked, false otherwise
+     * @return bool    true if resources are tracked, false otherwise
      */
     public function isTrackingResources()
     {
@@ -174,7 +174,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @param string $name The name of the extension
      *
-     * @return Boolean If the extension exists
+     * @return bool    If the extension exists
      *
      * @api
      */
@@ -428,7 +428,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if the service is defined, false otherwise
+     * @return bool    true if the service is defined, false otherwise
      *
      * @api
      */
@@ -709,7 +709,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if the alias exists, false otherwise
+     * @return bool    true if the alias exists, false otherwise
      *
      * @api
      */
@@ -839,7 +839,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if the service definition exists, false otherwise
+     * @return bool    true if the service definition exists, false otherwise
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/ContainerInterface.php

@@ -65,7 +65,7 @@ interface ContainerInterface
      *
      * @param string $id The service identifier
      *
-     * @return Boolean true if the service is defined, false otherwise
+     * @return bool    true if the service is defined, false otherwise
      *
      * @api
      */
@@ -89,7 +89,7 @@ interface ContainerInterface
      *
      * @param string $name The parameter name
      *
-     * @return Boolean The presence of parameter in container
+     * @return bool    The presence of parameter in container
      *
      * @api
      */
@@ -137,7 +137,7 @@ interface ContainerInterface
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -150,7 +150,7 @@ interface ContainerInterface
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/Definition.php

@@ -386,7 +386,7 @@ class Definition
      *
      * @param string $method The method name to search for
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -477,7 +477,7 @@ class Definition
      *
      * @param string $name
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -591,7 +591,7 @@ class Definition
     /**
      * Whether this service is public facing
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -619,7 +619,7 @@ class Definition
     /**
      * Whether this service is synchronized.
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -645,7 +645,7 @@ class Definition
     /**
      * Whether this service is lazy.
      *
-     * @return Boolean
+     * @return bool
      */
     public function isLazy()
     {
@@ -673,7 +673,7 @@ class Definition
      * Whether this definition is synthetic, that is not constructed by the
      * container, but dynamically injected.
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */
@@ -703,7 +703,7 @@ class Definition
      * Whether this definition is abstract, that means it merely serves as a
      * template for other definitions.
      *
-     * @return Boolean
+     * @return bool
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -373,7 +373,7 @@ class PhpDumper extends Dumper
      * @param string     $id
      * @param Definition $definition
      *
-     * @return Boolean
+     * @return bool
      */
     private function isSimpleInstance($id, $definition)
     {
@@ -1134,7 +1134,7 @@ EOF;
      * @param bool    $deep
      * @param array   $visited
      *
-     * @return Boolean
+     * @return bool
      */
     private function hasReference($id, array $arguments, $deep = false, array $visited = array())
     {

src/Symfony/Component/DependencyInjection/Extension/Extension.php

@@ -111,7 +111,7 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
      * @param ContainerBuilder $container
      * @param array            $config
      *
-     * @return Boolean Whether the configuration is enabled
+     * @return bool    Whether the configuration is enabled
      *
      * @throws InvalidArgumentException When the config is not enableable
      */

src/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php

@@ -25,7 +25,7 @@ interface IntrospectableContainerInterface extends ContainerInterface
      *
      * @param string $id
      *
-     * @return Boolean true if the service has been initialized, false otherwise
+     * @return bool    true if the service has been initialized, false otherwise
      *
      */
     public function initialized($id);

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

@@ -52,7 +52,7 @@ class ClosureLoader extends Loader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

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

@@ -53,7 +53,7 @@ class IniFileLoader extends FileLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

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

@@ -48,7 +48,7 @@ class PhpFileLoader extends FileLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

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

@@ -67,7 +67,7 @@ class XmlFileLoader extends FileLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {
@@ -391,7 +391,7 @@ class XmlFileLoader extends FileLoader
      *
      * @param \DOMDocument $dom
      *
-     * @return Boolean
+     * @return bool
      *
      * @throws RuntimeException When extension references a non-existent XSD file
      */

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

@@ -74,7 +74,7 @@ class YamlFileLoader extends FileLoader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool    true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {

src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php

@@ -127,7 +127,7 @@ class ParameterBag implements ParameterBagInterface
      *
      * @param string $name The parameter name
      *
-     * @return Boolean true if the parameter name is defined, false otherwise
+     * @return bool    true if the parameter name is defined, false otherwise
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php

@@ -75,7 +75,7 @@ interface ParameterBagInterface
      *
      * @param string $name The parameter name
      *
-     * @return Boolean true if the parameter name is defined, false otherwise
+     * @return bool    true if the parameter name is defined, false otherwise
      *
      * @api
      */

src/Symfony/Component/DependencyInjection/Reference.php

@@ -63,7 +63,7 @@ class Reference
     /**
      * Returns true when this Reference is strict
      *
-     * @return Boolean
+     * @return bool
      */
     public function isStrict()
     {

src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php

@@ -27,7 +27,7 @@ class ChoiceFormField extends FormField
      */
     private $type;
     /**
-     * @var Boolean
+     * @var bool
      */
     private $multiple;
     /**
@@ -35,14 +35,14 @@ class ChoiceFormField extends FormField
      */
     private $options;
     /**
-     * @var boolean
+     * @var bool
      */
     private $validationDisabled = false;
 
     /**
      * Returns true if the field should be included in the submitted values.
      *
-     * @return Boolean true if the field should be included in the submitted values, false otherwise
+     * @return bool    true if the field should be included in the submitted values, false otherwise
      */
     public function hasValue()
     {
@@ -57,7 +57,7 @@ class ChoiceFormField extends FormField
     /**
      * Check if the current selected option is disabled
      *
-     * @return Boolean
+     * @return bool
      */
     public function isDisabled()
     {
@@ -192,7 +192,7 @@ class ChoiceFormField extends FormField
     /**
      * Returns true if the field accepts multiple values.
      *
-     * @return Boolean true if the field accepts multiple values, false otherwise
+     * @return bool    true if the field accepts multiple values, false otherwise
      */
     public function isMultiple()
     {

src/Symfony/Component/DomCrawler/Field/FormField.php

@@ -39,7 +39,7 @@ abstract class FormField
      */
     protected $xpath;
     /**
-     * @var Boolean
+     * @var bool
      */
     protected $disabled;
 
@@ -98,7 +98,7 @@ abstract class FormField
     /**
      * Returns true if the field should be included in the submitted values.
      *
-     * @return Boolean true if the field should be included in the submitted values, false otherwise
+     * @return bool    true if the field should be included in the submitted values, false otherwise
      */
     public function hasValue()
     {
@@ -108,7 +108,7 @@ abstract class FormField
     /**
      * Check if the current field is disabled
      *
-     * @return Boolean
+     * @return bool
      */
     public function isDisabled()
     {

src/Symfony/Component/DomCrawler/Form.php

@@ -228,7 +228,7 @@ class Form extends Link implements \ArrayAccess
      *
      * @param string $name The field name
      *
-     * @return Boolean true if the field exists, false otherwise
+     * @return bool    true if the field exists, false otherwise
      *
      * @api
      */
@@ -296,7 +296,7 @@ class Form extends Link implements \ArrayAccess
      *
      * @param string $name The field name
      *
-     * @return Boolean true if the field exists, false otherwise
+     * @return bool    true if the field exists, false otherwise
      */
     public function offsetExists($name)
     {

src/Symfony/Component/DomCrawler/FormFieldRegistry.php

@@ -99,7 +99,7 @@ class FormFieldRegistry
      *
      * @param string $name The fully qualified name of the field
      *
-     * @return Boolean Whether the form has the given field
+     * @return bool    Whether the form has the given field
      */
     public function has($name)
     {

src/Symfony/Component/EventDispatcher/Event.php

@@ -30,7 +30,7 @@ namespace Symfony\Component\EventDispatcher;
 class Event
 {
     /**
-     * @var Boolean Whether no further event listeners should be triggered
+     * @var bool    Whether no further event listeners should be triggered
      */
     private $propagationStopped = false;
 
@@ -48,7 +48,7 @@ class Event
      * Returns whether further event listeners should be triggered.
      *
      * @see Event::stopPropagation
-     * @return Boolean Whether propagation was already stopped for this event.
+     * @return bool    Whether propagation was already stopped for this event.
      *
      * @api
      */

src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php

@@ -90,7 +90,7 @@ interface EventDispatcherInterface
      *
      * @param string $eventName The name of the event
      *
-     * @return Boolean true if the specified event has any listeners, false otherwise
+     * @return bool    true if the specified event has any listeners, false otherwise
      */
     public function hasListeners($eventName = null);
 }

src/Symfony/Component/EventDispatcher/GenericEvent.php

@@ -118,7 +118,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
      *
      * @param string $key Key of arguments array.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasArgument($key)
     {
@@ -167,7 +167,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
      *
      * @param string $key Array key.
      *
-     * @return boolean
+     * @return bool
      */
     public function offsetExists($key)
     {

src/Symfony/Component/ExpressionLanguage/Token.php

@@ -59,7 +59,7 @@ class Token
      * @param array|int     $type  The type to test
      * @param string|null   $value The token value
      *
-     * @return Boolean
+     * @return bool
      */
     public function test($type, $value = null)
     {

src/Symfony/Component/Filesystem/Filesystem.php

@@ -90,7 +90,7 @@ class Filesystem
      *
      * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
      *
-     * @return Boolean true if the file exists, false otherwise
+     * @return bool    true if the file exists, false otherwise
      */
     public function exists($files)
     {
@@ -413,7 +413,7 @@ class Filesystem
      *
      * @param string $file A file path
      *
-     * @return Boolean
+     * @return bool
      */
     public function isAbsolutePath($file)
     {

src/Symfony/Component/Finder/Adapter/AbstractAdapter.php

@@ -230,7 +230,7 @@ abstract class AbstractAdapter implements AdapterInterface
      *
      * @see isSupported
      *
-     * @return Boolean Whether the adapter is supported
+     * @return bool    Whether the adapter is supported
      */
     abstract protected function canBeUsed();
 }