diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
index ae3379bfe0..115763412b 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
@@ -60,7 +60,7 @@ class WebProcessorTest extends \PHPUnit_Framework_TestCase
}
/**
- * @param integer $level
+ * @param int $level
* @param string $message
*
* @return array Record
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
index aba65e85f1..150f3ee4a1 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -39,7 +39,7 @@ class LazyServiceProjectServiceContainer extends Container
* This service is shared.
* This method always returns the same instance of the service.
*
- * @param boolean $lazyLoad whether to try lazy-loading the service with a proxy
+ * @param bool $lazyLoad whether to try lazy-loading the service with a proxy
*
* @return stdClass A stdClass instance.
*/
diff --git a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
index 3ae96a276f..30185bc4e6 100644
--- a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
+++ b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
@@ -34,7 +34,7 @@ class MessageDataCollector extends DataCollector
* to avoid the creation of these objects when no emails are sent.
*
* @param ContainerInterface $container A ContainerInterface instance
- * @param Boolean $isSpool
+ * @param bool $isSpool
*/
public function __construct(ContainerInterface $container, $isSpool)
{
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
index 852bd3af84..763f315f8a 100644
--- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -157,7 +157,7 @@ class CodeExtension extends \Twig_Extension
* Formats a file path.
*
* @param string $file An absolute file path
- * @param integer $line The line number
+ * @param int $line The line number
* @param string $text Use this text for the link rather than the file path
*
* @return string
@@ -186,7 +186,7 @@ class CodeExtension extends \Twig_Extension
* Returns the link for a given file/line pair.
*
* @param string $file An absolute file path
- * @param integer $line The line number
+ * @param int $line The line number
*
* @return string A link of false
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index 81469e984e..cfd388ad6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -412,7 +412,7 @@ EOF
* Renders list of tagged services grouped by tag
*
* @param OutputInterface $output
- * @param Boolean $showPrivate
+ * @param bool $showPrivate
*/
protected function outputTags(OutputInterface $output, $showPrivate = false)
{
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index 5655595a68..adc2533dcb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -38,7 +38,7 @@ class Controller extends ContainerAware
*
* @param string $route The name of the route
* @param mixed $parameters An array of parameters
- * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
+ * @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
*
* @return string The generated URL
*
@@ -70,7 +70,7 @@ class Controller extends ContainerAware
* Returns a RedirectResponse to the given URL.
*
* @param string $url The URL to redirect to
- * @param integer $status The status code to use for the Response
+ * @param int $status The status code to use for the Response
*
* @return RedirectResponse
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index f9c3b49256..76abdaa701 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -36,8 +36,8 @@ class RedirectController extends ContainerAware
*
* @param Request $request The request instance
* @param string $route The route name to redirect to
- * @param Boolean $permanent Whether the redirection is permanent
- * @param Boolean|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
+ * @param bool $permanent Whether the redirection is permanent
+ * @param bool|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
*
* @return Response A Response instance
*
@@ -72,10 +72,10 @@ class RedirectController extends ContainerAware
*
* @param Request $request The request instance
* @param string $path The absolute path or URL to redirect to
- * @param Boolean $permanent Whether the redirect is permanent or not
+ * @param bool $permanent Whether the redirect is permanent or not
* @param string|null $scheme The URL scheme (null to keep the current one)
- * @param integer|null $httpPort The HTTP port (null to keep the current one for the same scheme or the configured port in the container)
- * @param integer|null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the configured port in the container)
+ * @param int |null $httpPort The HTTP port (null to keep the current one for the same scheme or the configured port in the container)
+ * @param int |null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the configured port in the container)
*
* @return Response A Response instance
*
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index 105d14a8fe..db8acbe48b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -27,7 +27,7 @@ class TemplateController extends ContainerAware
* @param string $template The template name
* @param int|null $maxAge Max age for client caching
* @param int|null $sharedAge Max age for shared (proxy) caching
- * @param Boolean|null $private Whether or not caching should apply for client caches only
+ * @param bool|null $private Whether or not caching should apply for client caches only
*
* @return Response A Response instance
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index f07c994a5d..2e5a2312dd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -46,7 +46,7 @@ abstract class HttpCache extends BaseHttpCache
* Forwards the Request to the backend and returns the Response.
*
* @param Request $request A Request instance
- * @param Boolean $raw Whether to catch exceptions or not
+ * @param bool $raw Whether to catch exceptions or not
* @param Response $entry A Response instance (the stale entry if present, null otherwise)
*
* @return Response A Response instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
index edbf7a878a..be845ae31b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -151,7 +151,7 @@ class CodeHelper extends Helper
* Formats a file path.
*
* @param string $file An absolute file path
- * @param integer $line The line number
+ * @param int $line The line number
* @param string $text Use this text for the link rather than the file path
*
* @return string
@@ -180,7 +180,7 @@ class CodeHelper extends Helper
* Returns the link for a given file/line pair.
*
* @param string $file An absolute file path
- * @param integer $line The line number
+ * @param int $line The line number
*
* @return string A link of false
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
index 845b75d59a..76f7003635 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
@@ -38,7 +38,7 @@ class RouterHelper extends Helper
*
* @param string $name The name of the route
* @param mixed $parameters An array of parameters
- * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
+ * @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
*
* @return string The generated URL
*
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
index ac917e7908..14560e3d77 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
@@ -57,7 +57,7 @@ class FilesystemLoader implements LoaderInterface
* Returns true if the template is still fresh.
*
* @param TemplateReferenceInterface $template The template name as an array
- * @param integer $time The last modification time of the cached template (timestamp)
+ * @param int $time The last modification time of the cached template (timestamp)
*
* @return Boolean
*/
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
index 0ff6b8cbb7..1dc9ce56e2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -56,7 +56,7 @@ class TemplateLocator implements FileLocatorInterface
*
* @param TemplateReferenceInterface $template A template
* @param string $currentPath Unused
- * @param Boolean $first Unused
+ * @param bool $first Unused
*
* @return string The full path for the file
*
diff --git a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
index c7135f54e1..8f24ec9ee5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
+++ b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
@@ -82,7 +82,7 @@ class LogoutUrlHelper extends Helper
* Generates the logout URL for the firewall.
*
* @param string $key The firewall key
- * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
+ * @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
*
* @return string The logout URL
*
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
index 5a52791966..9557fb4aba 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -64,7 +64,7 @@ class ExceptionController
}
/**
- * @param integer $startObLevel
+ * @param int $startObLevel
*
* @return string
*/
@@ -86,8 +86,8 @@ class ExceptionController
/**
* @param Request $request
* @param string $format
- * @param integer $code An HTTP response status code
- * @param Boolean $debug
+ * @param int $code An HTTP response status code
+ * @param bool $debug
*
* @return TemplateReference
*/
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 8bf7a8f604..8c7746577c 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -70,7 +70,7 @@ abstract class Client
/**
* Sets whether to automatically follow redirects or not.
*
- * @param Boolean $followRedirect Whether to follow redirects
+ * @param bool $followRedirect Whether to follow redirects
*
* @api
*/
@@ -82,7 +82,7 @@ abstract class Client
/**
* Sets the maximum number of requests that crawler can follow.
*
- * @param integer $maxRedirects
+ * @param int $maxRedirects
*/
public function setMaxRedirects($maxRedirects)
{
@@ -93,7 +93,7 @@ abstract class Client
/**
* Sets the insulated flag.
*
- * @param Boolean $insulated Whether to insulate the requests or not
+ * @param bool $insulated Whether to insulate the requests or not
*
* @throws \RuntimeException When Symfony Process Component is not installed
*
@@ -287,7 +287,7 @@ abstract class Client
* @param array $files The files
* @param array $server The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)
* @param string $content The raw body data
- * @param Boolean $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
+ * @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
*
* @return Crawler
*
@@ -601,7 +601,7 @@ abstract class Client
* Makes a request from a Request object directly.
*
* @param Request $request A Request instance
- * @param Boolean $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
+ * @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
*
* @return Crawler
*/
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
index 15f1bd310a..7b9c3ed20d 100644
--- a/src/Symfony/Component/BrowserKit/Cookie.php
+++ b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -53,9 +53,9 @@ class Cookie
* @param string $expires The time the cookie expires
* @param string $path The path on the server in which the cookie will be available on
* @param string $domain The domain that the cookie is available
- * @param Boolean $secure Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client
- * @param Boolean $httponly The cookie httponly flag
- * @param Boolean $encodedValue Whether the value is encoded or not
+ * @param bool $secure Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client
+ * @param bool $httponly The cookie httponly flag
+ * @param bool $encodedValue Whether the value is encoded or not
*
* @api
*/
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
index 4ecfddbf4a..4e9dda0eb0 100644
--- a/src/Symfony/Component/BrowserKit/CookieJar.php
+++ b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -201,7 +201,7 @@ class CookieJar
* Returns not yet expired cookie values for the given URI.
*
* @param string $uri A URI
- * @param Boolean $returnsRawValue Returns raw value or urldecoded value
+ * @param bool $returnsRawValue Returns raw value or urldecoded value
*
* @return array An array of cookie values
*/
diff --git a/src/Symfony/Component/BrowserKit/Response.php b/src/Symfony/Component/BrowserKit/Response.php
index 182fdda48d..1babab274e 100644
--- a/src/Symfony/Component/BrowserKit/Response.php
+++ b/src/Symfony/Component/BrowserKit/Response.php
@@ -31,7 +31,7 @@ class Response
* then the value is an array of all the values.
*
* @param string $content The content of the response
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of headers
*
* @api
@@ -117,7 +117,7 @@ class Response
* Gets a response header.
*
* @param string $header The header name
- * @param Boolean $first Whether to return the first value or all header values
+ * @param bool $first Whether to return the first value or all header values
*
* @return string|array The first header value if $first is true, an array of values otherwise
*/
diff --git a/src/Symfony/Component/ClassLoader/ApcClassLoader.php b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
index c4c156f703..da049523b8 100644
--- a/src/Symfony/Component/ClassLoader/ApcClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
@@ -79,7 +79,7 @@ class ApcClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
index 784b7f5555..902cdeff4f 100644
--- a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
+++ b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -28,8 +28,8 @@ class ClassCollectionLoader
* @param array $classes An array of classes to load
* @param string $cacheDir A cache directory
* @param string $name The cache name prefix
- * @param Boolean $autoReload Whether to flush the cache when the cache is stale or not
- * @param Boolean $adaptive Whether to remove already declared classes or not
+ * @param bool $autoReload Whether to flush the cache when the cache is stale or not
+ * @param bool $adaptive Whether to remove already declared classes or not
* @param string $extension File extension of the resulting file
*
* @throws \InvalidArgumentException When class can't be loaded
diff --git a/src/Symfony/Component/ClassLoader/ClassLoader.php b/src/Symfony/Component/ClassLoader/ClassLoader.php
index 00de5b980b..76994d0dfc 100644
--- a/src/Symfony/Component/ClassLoader/ClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/ClassLoader.php
@@ -103,7 +103,7 @@ class ClassLoader
/**
* Turns on searching the include for class files.
*
- * @param Boolean $useIncludePath
+ * @param bool $useIncludePath
*/
public function setUseIncludePath($useIncludePath)
{
@@ -124,7 +124,7 @@ class ClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
diff --git a/src/Symfony/Component/ClassLoader/MapClassLoader.php b/src/Symfony/Component/ClassLoader/MapClassLoader.php
index 82010a77ae..7557b0ddf3 100644
--- a/src/Symfony/Component/ClassLoader/MapClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/MapClassLoader.php
@@ -33,7 +33,7 @@ class MapClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
index 734af7430c..d2ff02d540 100644
--- a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -70,7 +70,7 @@ class UniversalClassLoader
* Turns on searching the include for class files. Allows easy loading
* of installed PEAR packages
*
- * @param Boolean $useIncludePath
+ * @param bool $useIncludePath
*/
public function useIncludePath($useIncludePath)
{
@@ -229,7 +229,7 @@ class UniversalClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*
* @api
*/
diff --git a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
index 3d09fa99f9..510ef9d982 100644
--- a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php
@@ -76,7 +76,7 @@ class WinCacheClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
index 662e36f436..095fe89054 100644
--- a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
@@ -73,7 +73,7 @@ class XcacheClassLoader
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
index b7d8347b4f..22afd31359 100644
--- a/src/Symfony/Component/Config/ConfigCache.php
+++ b/src/Symfony/Component/Config/ConfigCache.php
@@ -32,7 +32,7 @@ class ConfigCache
* Constructor.
*
* @param string $file The absolute cache path
- * @param Boolean $debug Whether debugging is enabled or not
+ * @param bool $debug Whether debugging is enabled or not
*/
public function __construct($file, $debug)
{
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
index 5854867213..0f293a340b 100644
--- a/src/Symfony/Component/Config/Definition/ArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -109,7 +109,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
* Sets whether to add default values for this array if it has not been
* defined in any of the configuration files.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*/
public function setAddIfNotSet($boolean)
{
@@ -119,7 +119,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/**
* Sets whether false is allowed as value indicating that the array should be unset.
*
- * @param Boolean $allow
+ * @param bool $allow
*/
public function setAllowFalse($allow)
{
@@ -129,7 +129,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/**
* Sets whether new keys can be defined in subsequent configurations.
*
- * @param Boolean $allow
+ * @param bool $allow
*/
public function setAllowNewKeys($allow)
{
@@ -139,7 +139,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/**
* Sets if deep merging should occur.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*/
public function setPerformDeepMerging($boolean)
{
@@ -149,7 +149,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/**
* Whether extra keys should just be ignore without an exception.
*
- * @param Boolean $boolean To allow extra keys
+ * @param bool $boolean To allow extra keys
*/
public function setIgnoreExtraKeys($boolean)
{
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index 10193086fb..9318676df9 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -138,7 +138,7 @@ abstract class BaseNode implements NodeInterface
/**
* Set this node as required.
*
- * @param Boolean $boolean Required node
+ * @param bool $boolean Required node
*/
public function setRequired($boolean)
{
@@ -148,7 +148,7 @@ abstract class BaseNode implements NodeInterface
/**
* Sets if this node can be overridden.
*
- * @param Boolean $allow
+ * @param bool $allow
*/
public function setAllowOverwrite($allow)
{
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index b129f66771..4c4dbcebdf 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -105,7 +105,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
/**
* Adds children with a default value when none are defined.
*
- * @param integer|string|array|null $children The number of children|The child name|The children names to be added
+ * @param int |string|array|null $children The number of children|The child name|The children names to be added
*
* This method is applicable to prototype nodes only.
*
@@ -185,7 +185,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
* This method is applicable to prototype nodes only.
*
* @param string $name The name of the key
- * @param Boolean $removeKeyItem Whether or not the key item should be removed.
+ * @param bool $removeKeyItem Whether or not the key item should be removed.
*
* @return ArrayNodeDefinition
*/
@@ -200,7 +200,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
/**
* Sets whether the node can be unset.
*
- * @param Boolean $allow
+ * @param bool $allow
*
* @return ArrayNodeDefinition
*/
@@ -303,7 +303,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
/**
* Sets key normalization.
*
- * @param Boolean $bool Whether to enable key normalization
+ * @param bool $bool Whether to enable key normalization
*
* @return ArrayNodeDefinition
*/
diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
index 5e09ff5ca0..61142069a4 100644
--- a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -37,7 +37,7 @@ class MergeBuilder
/**
* Sets whether the node can be unset.
*
- * @param Boolean $allow
+ * @param bool $allow
*
* @return MergeBuilder
*/
@@ -51,7 +51,7 @@ class MergeBuilder
/**
* Sets whether the node can be overwritten.
*
- * @param Boolean $deny Whether the overwriting is forbidden or not
+ * @param bool $deny Whether the overwriting is forbidden or not
*
* @return MergeBuilder
*/
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
index 289e1c4f4d..a1a251f7b7 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -120,7 +120,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Creates the node.
*
- * @param Boolean $forceRootNode Whether to force this node as the root node
+ * @param bool $forceRootNode Whether to force this node as the root node
*
* @return NodeInterface
*/
@@ -282,7 +282,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Sets whether the node can be overwritten.
*
- * @param Boolean $deny Whether the overwriting is forbidden or not
+ * @param bool $deny Whether the overwriting is forbidden or not
*
* @return NodeDefinition
*/
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index 2e76156574..c96a35727b 100644
--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -48,7 +48,7 @@ class PrototypedArrayNode extends ArrayNode
* Sets the minimum number of elements that a prototype based node must
* contain. By default this is zero, meaning no elements.
*
- * @param integer $number
+ * @param int $number
*/
public function setMinNumberOfElements($number)
{
@@ -77,7 +77,7 @@ class PrototypedArrayNode extends ArrayNode
* array, then you can set the second argument of this method to false.
*
* @param string $attribute The name of the attribute which value is to be used as a key
- * @param Boolean $remove Whether or not to remove the key
+ * @param bool $remove Whether or not to remove the key
*/
public function setKeyAttribute($attribute, $remove = true)
{
@@ -124,7 +124,7 @@ class PrototypedArrayNode extends ArrayNode
/**
* Adds default children when none are set.
*
- * @param integer|string|array|null $children The number of children|The child name|The children names to be added
+ * @param int |string|array|null $children The number of children|The child name|The children names to be added
*/
public function setAddChildrenIfNoneSet($children = array('defaults'))
{
diff --git a/src/Symfony/Component/Config/Definition/ReferenceDumper.php b/src/Symfony/Component/Config/Definition/ReferenceDumper.php
index 54309021b7..26eea78e1a 100644
--- a/src/Symfony/Component/Config/Definition/ReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/ReferenceDumper.php
@@ -39,7 +39,7 @@ class ReferenceDumper
/**
* @param NodeInterface $node
- * @param integer $depth
+ * @param int $depth
*/
private function writeNode(NodeInterface $node, $depth = 0)
{
diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php
index 883a71420f..9099aba9c2 100644
--- a/src/Symfony/Component/Config/Definition/VariableNode.php
+++ b/src/Symfony/Component/Config/Definition/VariableNode.php
@@ -55,7 +55,7 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
/**
* Sets if this node is allowed to have an empty value.
*
- * @param Boolean $boolean True if this entity will accept empty values.
+ * @param bool $boolean True if this entity will accept empty values.
*/
public function setAllowEmptyValue($boolean)
{
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
index 71fe8d07f7..d05cf8f89f 100644
--- a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
+++ b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
@@ -21,7 +21,7 @@ class FileLoaderLoadException extends \Exception
/**
* @param string $resource The resource that could not be imported
* @param string $sourceResource The original resource importing the new resource
- * @param integer $code The error code
+ * @param int $code The error code
* @param \Exception $previous A previous exception
*/
public function __construct($resource, $sourceResource = null, $code = null, $previous = null)
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index 7f9dadcc6d..000dda1fb5 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -35,7 +35,7 @@ class FileLocator implements FileLocatorInterface
*
* @param mixed $name The file name to locate
* @param string $currentPath The current path
- * @param Boolean $first Whether to return the first occurrence or an array of filenames
+ * @param bool $first Whether to return the first occurrence or an array of filenames
*
* @return string|array The full path to the file|An array of file paths
*
diff --git a/src/Symfony/Component/Config/FileLocatorInterface.php b/src/Symfony/Component/Config/FileLocatorInterface.php
index 4ff19b4de9..4287e3d1d0 100644
--- a/src/Symfony/Component/Config/FileLocatorInterface.php
+++ b/src/Symfony/Component/Config/FileLocatorInterface.php
@@ -21,7 +21,7 @@ interface FileLocatorInterface
*
* @param mixed $name The file name to locate
* @param string $currentPath The current path
- * @param Boolean $first Whether to return the first occurrence or an array of filenames
+ * @param bool $first Whether to return the first occurrence or an array of filenames
*
* @return string|array The full path to the file|An array of file paths
*
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 8bd587957e..981d16f92b 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -53,7 +53,7 @@ abstract class FileLoader extends Loader
*
* @param mixed $resource A Resource
* @param string $type The resource type
- * @param Boolean $ignoreErrors Whether to ignore import errors or not
+ * @param bool $ignoreErrors Whether to ignore import errors or not
* @param string $sourceResource The original resource importing the new resource
*
* @return mixed
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
index 5ccd204ef9..710e3065e4 100644
--- a/src/Symfony/Component/Config/Resource/DirectoryResource.php
+++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -61,7 +61,7 @@ class DirectoryResource implements ResourceInterface, \Serializable
/**
* Returns true if the resource has not been updated since the given timestamp.
*
- * @param integer $timestamp The last time the resource was loaded
+ * @param int $timestamp The last time the resource was loaded
*
* @return Boolean true if the resource has not been updated, false otherwise
*/
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
index 619f84bcef..16373f1d5f 100644
--- a/src/Symfony/Component/Config/Resource/FileResource.php
+++ b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -55,7 +55,7 @@ class FileResource implements ResourceInterface, \Serializable
/**
* Returns true if the resource has not been updated since the given timestamp.
*
- * @param integer $timestamp The last time the resource was loaded
+ * @param int $timestamp The last time the resource was loaded
*
* @return Boolean true if the resource has not been updated, false otherwise
*/
diff --git a/src/Symfony/Component/Config/Resource/ResourceInterface.php b/src/Symfony/Component/Config/Resource/ResourceInterface.php
index d624a573b0..66e03a037b 100644
--- a/src/Symfony/Component/Config/Resource/ResourceInterface.php
+++ b/src/Symfony/Component/Config/Resource/ResourceInterface.php
@@ -28,7 +28,7 @@ interface ResourceInterface
/**
* Returns true if the resource has not been updated since the given timestamp.
*
- * @param integer $timestamp The last time the resource was loaded
+ * @param int $timestamp The last time the resource was loaded
*
* @return Boolean true if the resource has not been updated, false otherwise
*/
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index f5e0324f54..71192c8d3a 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -117,7 +117,7 @@ class XmlUtils
* * The nested-tags are converted to keys (bar)
*
* @param \DomElement $element A \DomElement instance
- * @param Boolean $checkPrefix Check prefix in an element or an attribute name
+ * @param bool $checkPrefix Check prefix in an element or an attribute name
*
* @return array A PHP array
*/
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 81b5c2460a..0753e19ed9 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -270,7 +270,7 @@ class Application
/**
* Sets whether to catch exceptions or not during commands execution.
*
- * @param Boolean $boolean Whether to catch exceptions or not during commands execution
+ * @param bool $boolean Whether to catch exceptions or not during commands execution
*
* @api
*/
@@ -282,7 +282,7 @@ class Application
/**
* Sets whether to automatically exit after a command execution or not.
*
- * @param Boolean $boolean Whether to automatically exit after a command execution or not
+ * @param bool $boolean Whether to automatically exit after a command execution or not
*
* @api
*/
@@ -675,7 +675,7 @@ class Application
* Returns a text representation of the Application.
*
* @param string $namespace An optional namespace name
- * @param boolean $raw Whether to return raw command list
+ * @param bool $raw Whether to return raw command list
*
* @return string A string representing the Application
*
@@ -692,7 +692,7 @@ class Application
* Returns an XML representation of the Application.
*
* @param string $namespace An optional namespace name
- * @param Boolean $asDom Whether to return a DOM or an XML string
+ * @param bool $asDom Whether to return a DOM or an XML string
*
* @return string|\DOMDocument An XML string representing the Application
*
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index af1b91f2b1..7b9e969f2d 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -279,7 +279,7 @@ class Command
*
* This method is not part of public API and should not be used directly.
*
- * @param Boolean $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
+ * @param bool $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
*/
public function mergeApplicationDefinition($mergeArgs = true)
{
@@ -354,7 +354,7 @@ class Command
* Adds an argument.
*
* @param string $name The argument name
- * @param integer $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
+ * @param int $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
* @param string $description A description text
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
*
@@ -374,7 +374,7 @@ class Command
*
* @param string $name The option name
* @param string $shortcut The shortcut (can be null)
- * @param integer $mode The option mode: One of the InputOption::VALUE_* constants
+ * @param int $mode The option mode: One of the InputOption::VALUE_* constants
* @param string $description A description text
* @param mixed $default The default value (must be null for InputOption::VALUE_REQUIRED or InputOption::VALUE_NONE)
*
@@ -583,7 +583,7 @@ class Command
/**
* Returns an XML representation of the command.
*
- * @param Boolean $asDom Whether to return a DOM or an XML string
+ * @param bool $asDom Whether to return a DOM or an XML string
*
* @return string|\DOMDocument An XML string representing the command
*
diff --git a/src/Symfony/Component/Console/Event/ConsoleTerminateEvent.php b/src/Symfony/Component/Console/Event/ConsoleTerminateEvent.php
index 9f80cb70a0..689bb2a824 100644
--- a/src/Symfony/Component/Console/Event/ConsoleTerminateEvent.php
+++ b/src/Symfony/Component/Console/Event/ConsoleTerminateEvent.php
@@ -39,7 +39,7 @@ class ConsoleTerminateEvent extends ConsoleEvent
/**
* Sets the exit code.
*
- * @param integer $exitCode The command exit code
+ * @param int $exitCode The command exit code
*/
public function setExitCode($exitCode)
{
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
index 2e53d64e08..1cf79a4ea8 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -39,7 +39,7 @@ class OutputFormatter implements OutputFormatterInterface
/**
* Initializes console output formatter.
*
- * @param Boolean $decorated Whether this formatter should actually decorate strings
+ * @param bool $decorated Whether this formatter should actually decorate strings
* @param OutputFormatterStyleInterface[] $styles Array of "name => FormatterStyle" instances
*
* @api
@@ -63,7 +63,7 @@ class OutputFormatter implements OutputFormatterInterface
/**
* Sets the decorated flag.
*
- * @param Boolean $decorated Whether to decorate the messages or not
+ * @param bool $decorated Whether to decorate the messages or not
*
* @api
*/
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
index 0836084236..4fe54a580e 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
@@ -23,7 +23,7 @@ interface OutputFormatterInterface
/**
* Sets the decorated flag.
*
- * @param Boolean $decorated Whether to decorate the messages or not
+ * @param bool $decorated Whether to decorate the messages or not
*
* @api
*/
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 0317d5d08d..25ccfd8888 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -49,7 +49,7 @@ class DescriptorHelper extends Helper
* @param OutputInterface $output
* @param object $object
* @param string $format
- * @param boolean $raw
+ * @param bool $raw
*/
public function describe(OutputInterface $output, $object, $format = null, $raw = false, $namespace = null)
{
diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
index f372aa9e91..36f96e8002 100644
--- a/src/Symfony/Component/Console/Helper/DialogHelper.php
+++ b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -31,10 +31,10 @@ class DialogHelper extends Helper
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param array $choices List of choices to pick from
- * @param Boolean|string $default The default answer if the user enters nothing
- * @param Boolean|integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
+ * @param bool|string $default The default answer if the user enters nothing
+ * @param bool|integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
* @param string $errorMessage Message which will be shown if invalid value from choice list would be picked
- * @param Boolean $multiselect Select more than one value separated by comma
+ * @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)
*
@@ -223,7 +223,7 @@ class DialogHelper extends Helper
*
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
- * @param Boolean $default The default answer if the user enters nothing
+ * @param bool $default The default answer if the user enters nothing
*
* @return Boolean true if the user has confirmed, false otherwise
*/
@@ -246,7 +246,7 @@ class DialogHelper extends Helper
*
* @param OutputInterface $output An Output instance
* @param string|array $question The question
- * @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
+ * @param bool $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
*
* @return string The answer
*
@@ -321,7 +321,7 @@ class DialogHelper extends Helper
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param callable $validator A PHP callback
- * @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
+ * @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
* @param string $default The default answer if none is given by the user
* @param array $autocomplete List of values to autocomplete
*
@@ -350,8 +350,8 @@ class DialogHelper extends Helper
* @param OutputInterface $output An Output instance
* @param string|array $question The question to ask
* @param callable $validator A PHP callback
- * @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
- * @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
+ * @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
+ * @param bool $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
*
* @return string The response
*
@@ -444,7 +444,7 @@ class DialogHelper extends Helper
* @param callable $interviewer A callable that will ask for a question and return the result
* @param OutputInterface $output An Output instance
* @param callable $validator A PHP callback
- * @param integer $attempts Max number of times to ask before giving up ; false will ask infinitely
+ * @param int $attempts Max number of times to ask before giving up ; false will ask infinitely
*
* @return string The validated response
*
diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php
index a5f1d1ccad..58227fdb19 100644
--- a/src/Symfony/Component/Console/Helper/FormatterHelper.php
+++ b/src/Symfony/Component/Console/Helper/FormatterHelper.php
@@ -39,7 +39,7 @@ class FormatterHelper extends Helper
*
* @param string|array $messages The message to write in the block
* @param string $style The style to apply to the whole block
- * @param Boolean $large Whether to return a large block
+ * @param bool $large Whether to return a large block
*
* @return string The formatter message
*/
diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php
index ea0f503a63..e3f1832d57 100644
--- a/src/Symfony/Component/Console/Helper/ProgressHelper.php
+++ b/src/Symfony/Component/Console/Helper/ProgressHelper.php
@@ -178,7 +178,7 @@ class ProgressHelper extends Helper
* Starts the progress output.
*
* @param OutputInterface $output An Output instance
- * @param integer|null $max Maximum steps
+ * @param int |null $max Maximum steps
*/
public function start(OutputInterface $output, $max = null)
{
@@ -220,8 +220,8 @@ class ProgressHelper extends Helper
/**
* Advances the progress output X steps.
*
- * @param integer $step Number of steps to advance
- * @param Boolean $redraw Whether to redraw or not
+ * @param int $step Number of steps to advance
+ * @param bool $redraw Whether to redraw or not
*
* @throws \LogicException
*/
@@ -248,8 +248,8 @@ class ProgressHelper extends Helper
/**
* Sets the current progress.
*
- * @param integer $current The current progress
- * @param Boolean $redraw Whether to redraw or not
+ * @param int $current The current progress
+ * @param bool $redraw Whether to redraw or not
*
* @throws \LogicException
*/
@@ -282,7 +282,7 @@ class ProgressHelper extends Helper
/**
* Outputs the current progress string.
*
- * @param Boolean $finish Forces the end result
+ * @param bool $finish Forces the end result
*
* @throws \LogicException
*/
@@ -343,7 +343,7 @@ class ProgressHelper extends Helper
/**
* Generates the array map of format variables to values.
*
- * @param Boolean $finish Forces the end result
+ * @param bool $finish Forces the end result
*
* @return array Array of format vars and values
*/
@@ -401,7 +401,7 @@ class ProgressHelper extends Helper
/**
* Converts seconds into human-readable format.
*
- * @param integer $secs Number of seconds
+ * @param int $secs Number of seconds
*
* @return string Time in readable format
*/
diff --git a/src/Symfony/Component/Console/Helper/TableHelper.php b/src/Symfony/Component/Console/Helper/TableHelper.php
index 0f81da089f..aeccb4dc4b 100644
--- a/src/Symfony/Component/Console/Helper/TableHelper.php
+++ b/src/Symfony/Component/Console/Helper/TableHelper.php
@@ -277,7 +277,7 @@ class TableHelper extends Helper
/**
* Sets cell padding type.
*
- * @param integer $padType STR_PAD_*
+ * @param int $padType STR_PAD_*
*
* @return TableHelper
*/
@@ -376,7 +376,7 @@ class TableHelper extends Helper
* Renders table cell with padding.
*
* @param array $row
- * @param integer $column
+ * @param int $column
* @param string $cellFormat
*/
private function renderCell(array $row, $column, $cellFormat)
@@ -425,7 +425,7 @@ class TableHelper extends Helper
/**
* Gets column width.
*
- * @param integer $column
+ * @param int $column
*
* @return int
*/
@@ -448,7 +448,7 @@ class TableHelper extends Helper
* Gets cell width.
*
* @param array $row
- * @param integer $column
+ * @param int $column
*
* @return int
*/
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index d523a6f83a..a881c03960 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -90,7 +90,7 @@ abstract class Input implements InputInterface
/**
* Sets the input interactivity.
*
- * @param Boolean $interactive If the input should be interactive
+ * @param bool $interactive If the input should be interactive
*/
public function setInteractive($interactive)
{
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
index ffe977271b..8ffd2f563d 100644
--- a/src/Symfony/Component/Console/Input/InputArgument.php
+++ b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -33,7 +33,7 @@ class InputArgument
* Constructor.
*
* @param string $name The argument name
- * @param integer $mode The argument mode: self::REQUIRED or self::OPTIONAL
+ * @param int $mode The argument mode: self::REQUIRED or self::OPTIONAL
* @param string $description A description text
* @param mixed $default The default value (for self::OPTIONAL mode only)
*
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 93ca9167dc..b87b147521 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -433,7 +433,7 @@ class InputDefinition
/**
* Returns an XML representation of the InputDefinition.
*
- * @param Boolean $asDom Whether to return a DOM or an XML string
+ * @param bool $asDom Whether to return a DOM or an XML string
*
* @return string|\DOMDocument An XML string representing the InputDefinition
*
diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php
index cf0270caa2..79ad8854fd 100644
--- a/src/Symfony/Component/Console/Input/InputInterface.php
+++ b/src/Symfony/Component/Console/Input/InputInterface.php
@@ -146,7 +146,7 @@ interface InputInterface
/**
* Sets the input interactivity.
*
- * @param Boolean $interactive If the input should be interactive
+ * @param bool $interactive If the input should be interactive
*/
public function setInteractive($interactive);
}
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
index e1fdea04f2..0548d00163 100644
--- a/src/Symfony/Component/Console/Input/InputOption.php
+++ b/src/Symfony/Component/Console/Input/InputOption.php
@@ -36,7 +36,7 @@ class InputOption
*
* @param string $name The option name
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
- * @param integer $mode The option mode: One of the VALUE_* constants
+ * @param int $mode The option mode: One of the VALUE_* constants
* @param string $description A description text
* @param mixed $default The default value (must be null for self::VALUE_REQUIRED or self::VALUE_NONE)
*
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
index b305ab0005..491ccae416 100644
--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -35,8 +35,8 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
/**
* Constructor.
*
- * @param integer $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
- * @param Boolean|null $decorated Whether to decorate messages (null for auto-guessing)
+ * @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
+ * @param bool|null $decorated Whether to decorate messages (null for auto-guessing)
* @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
*
* @api
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
index 0daedc3eaf..ae62ea0609 100644
--- a/src/Symfony/Component/Console/Output/Output.php
+++ b/src/Symfony/Component/Console/Output/Output.php
@@ -37,8 +37,8 @@ abstract class Output implements OutputInterface
/**
* Constructor.
*
- * @param integer $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
- * @param Boolean $decorated Whether to decorate messages
+ * @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
+ * @param bool $decorated Whether to decorate messages
* @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
*
* @api
@@ -139,7 +139,7 @@ abstract class Output implements OutputInterface
* Writes a message to the output.
*
* @param string $message A message to write to the output
- * @param Boolean $newline Whether to add a newline or not
+ * @param bool $newline Whether to add a newline or not
*/
abstract protected function doWrite($message, $newline);
}
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
index 83d5013fdd..27cb70321e 100644
--- a/src/Symfony/Component/Console/Output/OutputInterface.php
+++ b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -36,8 +36,8 @@ interface OutputInterface
* Writes a message to the output.
*
* @param string|array $messages The message as an array of lines or a single string
- * @param Boolean $newline Whether to add a newline
- * @param integer $type The type of output (one of the OUTPUT constants)
+ * @param bool $newline Whether to add a newline
+ * @param int $type The type of output (one of the OUTPUT constants)
*
* @throws \InvalidArgumentException When unknown output type is given
*
@@ -49,7 +49,7 @@ interface OutputInterface
* Writes a message to the output and adds a newline at the end.
*
* @param string|array $messages The message as an array of lines of a single string
- * @param integer $type The type of output (one of the OUTPUT constants)
+ * @param int $type The type of output (one of the OUTPUT constants)
*
* @throws \InvalidArgumentException When unknown output type is given
*
@@ -60,7 +60,7 @@ interface OutputInterface
/**
* Sets the verbosity of the output.
*
- * @param integer $level The level of verbosity (one of the VERBOSITY constants)
+ * @param int $level The level of verbosity (one of the VERBOSITY constants)
*
* @api
*/
@@ -78,7 +78,7 @@ interface OutputInterface
/**
* Sets the decorated flag.
*
- * @param Boolean $decorated Whether to decorate the messages
+ * @param bool $decorated Whether to decorate the messages
*
* @api
*/
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
index 4194ed3d1e..f3c44587b6 100644
--- a/src/Symfony/Component/Console/Output/StreamOutput.php
+++ b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -36,8 +36,8 @@ class StreamOutput extends Output
* Constructor.
*
* @param mixed $stream A stream resource
- * @param integer $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
- * @param Boolean|null $decorated Whether to decorate messages (null for auto-guessing)
+ * @param int $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
+ * @param bool|null $decorated Whether to decorate messages (null for auto-guessing)
* @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
*
* @throws \InvalidArgumentException When first argument is not a real stream
diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php
index 2e57e1a35d..86152685a8 100644
--- a/src/Symfony/Component/Console/Tester/ApplicationTester.php
+++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php
@@ -78,7 +78,7 @@ class ApplicationTester
/**
* Gets the display returned by the last execution of the application.
*
- * @param Boolean $normalize Whether to normalize end of lines to \n or not
+ * @param bool $normalize Whether to normalize end of lines to \n or not
*
* @return string The display
*/
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
index 02715b00e3..bcb2a31b32 100644
--- a/src/Symfony/Component/Console/Tester/CommandTester.php
+++ b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -73,7 +73,7 @@ class CommandTester
/**
* Gets the display returned by the last execution of the command.
*
- * @param Boolean $normalize Whether to normalize end of lines to \n or not
+ * @param bool $normalize Whether to normalize end of lines to \n or not
*
* @return string The display
*/
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index 3df22f6833..6c7c3be583 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -169,7 +169,7 @@ class Parser implements ParserInterface
* Parses next simple node (hash, class, pseudo, negation).
*
* @param TokenStream $stream
- * @param boolean $insideNegation
+ * @param bool $insideNegation
*
* @throws SyntaxErrorException
*
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
index 5cc6693a01..ff8f333ada 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -46,8 +46,8 @@ class FunctionExtension extends AbstractExtension
/**
* @param XPathExpr $xpath
* @param FunctionNode $function
- * @param boolean $last
- * @param boolean $addNameTest
+ * @param bool $last
+ * @param bool $addNameTest
*
* @return XPathExpr
*
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index 7d22d98de2..3aecfc0166 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -53,7 +53,7 @@ class NodeExtension extends AbstractExtension
/**
* @param int $flag
- * @param boolean $on
+ * @param bool $on
*
* @return NodeExtension
*/
diff --git a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
index 6f5162e0ce..f0f2f98767 100644
--- a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
+++ b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
@@ -40,7 +40,7 @@ class XPathExpr
* @param string $path
* @param string $element
* @param string $condition
- * @param boolean $starPrefix
+ * @param bool $starPrefix
*/
public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
{
diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
index 2e36805ca3..7c6d928836 100644
--- a/src/Symfony/Component/Debug/Debug.php
+++ b/src/Symfony/Component/Debug/Debug.php
@@ -30,8 +30,8 @@ class Debug
* If the Symfony ClassLoader component is available, a special
* class loader is also registered.
*
- * @param integer $errorReportingLevel The level of error reporting you want
- * @param Boolean $displayErrors Whether to display errors (for development) or just log them (for production)
+ * @param int $errorReportingLevel The level of error reporting you want
+ * @param bool $displayErrors Whether to display errors (for development) or just log them (for production)
*/
public static function enable($errorReportingLevel = null, $displayErrors = true)
{
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 09eba3f28d..2436a1f249 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -56,8 +56,8 @@ class ErrorHandler
/**
* Registers the error handler.
*
- * @param integer $level The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable)
- * @param Boolean $displayErrors Display errors (for dev environment) or just log they (production usage)
+ * @param int $level The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable)
+ * @param bool $displayErrors Display errors (for dev environment) or just log they (production usage)
*
* @return ErrorHandler The registered error handler
*/
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
index 458d647f0b..9688c711b6 100644
--- a/src/Symfony/Component/Debug/ExceptionHandler.php
+++ b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -43,7 +43,7 @@ class ExceptionHandler
/**
* Registers the exception handler.
*
- * @param Boolean $debug
+ * @param bool $debug
*
* @return ExceptionHandler The registered exception handler
*/
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
index 25f978a104..099953d4ee 100644
--- a/src/Symfony/Component/DependencyInjection/Alias.php
+++ b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -23,7 +23,7 @@ class Alias
* Constructor.
*
* @param string $id Alias identifier
- * @param Boolean $public If this alias is public
+ * @param bool $public If this alias is public
*
* @api
*/
@@ -48,7 +48,7 @@ class Alias
/**
* Sets if this Alias is public.
*
- * @param Boolean $boolean If this Alias should be public
+ * @param bool $boolean If this Alias should be public
*
* @api
*/
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
index 2378fcdd38..293b36a9c9 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -36,7 +36,7 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface
/**
* Constructor.
*
- * @param Boolean $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
+ * @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
*/
public function __construct($onlyConstructorArguments = false)
{
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
index 93d5806036..83aef9b2c6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
@@ -70,7 +70,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
* Processes arguments to determine invalid references.
*
* @param array $arguments An array of Reference objects
- * @param Boolean $inMethodCall
+ * @param bool $inMethodCall
*
* @return array
*
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index ecf35ee4a0..701a3b4b65 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -254,7 +254,7 @@ class Container implements IntrospectableContainerInterface
* with a get{$id}Service() method, the former has always precedence.
*
* @param string $id The service identifier
- * @param integer $invalidBehavior The behavior when the service does not exist
+ * @param int $invalidBehavior The behavior when the service does not exist
*
* @return object The associated service
*
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index fb5e4b57a3..0d00068e26 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -84,7 +84,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* If you are not using the loaders and therefore don't want
* to depend on the Config component, set this flag to false.
*
- * @param Boolean $track true if you want to track resources, false otherwise
+ * @param bool $track true if you want to track resources, false otherwise
*/
public function setResourceTracking($track)
{
@@ -445,7 +445,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* Gets a service.
*
* @param string $id The service identifier
- * @param integer $invalidBehavior The behavior when the service does not exist
+ * @param int $invalidBehavior The behavior when the service does not exist
*
* @return object The associated service
*
@@ -901,7 +901,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*
* @param Definition $definition A service definition instance
* @param string $id The service identifier
- * @param Boolean $tryProxy Whether to try proxying the service with a lazy proxy
+ * @param bool $tryProxy Whether to try proxying the service with a lazy proxy
*
* @return object The service described by the service definition
*
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 12874703c1..b39c80eb57 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -240,7 +240,7 @@ class Definition
/**
* Sets a specific argument
*
- * @param integer $index
+ * @param int $index
* @param mixed $argument
*
* @return Definition The current instance
@@ -275,7 +275,7 @@ class Definition
/**
* Gets an argument to pass to the service constructor/factory method.
*
- * @param integer $index
+ * @param int $index
*
* @return mixed The argument value
*
@@ -548,7 +548,7 @@ class Definition
/**
* Sets the visibility of this service.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*
* @return Definition The current instance
*
@@ -576,7 +576,7 @@ class Definition
/**
* Sets the synchronized flag of this service.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*
* @return Definition The current instance
*
@@ -604,7 +604,7 @@ class Definition
/**
* Sets the lazy flag of this service.
*
- * @param Boolean $lazy
+ * @param bool $lazy
*
* @return Definition The current instance
*/
@@ -629,7 +629,7 @@ class Definition
* Sets whether this definition is synthetic, that is not constructed by the
* container, but dynamically injected.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*
* @return Definition the current instance
*
@@ -659,7 +659,7 @@ class Definition
* Whether this definition is abstract, that means it merely serves as a
* template for other definitions.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*
* @return Definition the current instance
*
diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
index 1f72b8f16b..e1c44e6f74 100644
--- a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
+++ b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -167,7 +167,7 @@ class DefinitionDecorator extends Definition
* If replaceArgument() has been used to replace an argument, this method
* will return the replacement value.
*
- * @param integer $index
+ * @param int $index
*
* @return mixed The argument value
*
@@ -198,7 +198,7 @@ class DefinitionDecorator extends Definition
* certain conventions when you want to overwrite the arguments of the
* parent definition, otherwise your arguments will only be appended.
*
- * @param integer $index
+ * @param int $index
* @param mixed $value
*
* @return DefinitionDecorator the current instance
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index 4499e52310..5ee1b7eea0 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -123,7 +123,7 @@ class GraphvizDumper extends Dumper
*
* @param string $id The service id used to find edges
* @param array $arguments An array of arguments
- * @param Boolean $required
+ * @param bool $required
* @param string $name
*
* @return array An array of edges
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index d7d5a8a619..bd98bdb077 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -544,7 +544,7 @@ EOF;
if ($definition->isLazy()) {
$lazyInitialization = '$lazyLoad = true';
- $lazyInitializationDoc = "\n * @param boolean \$lazyLoad whether to try lazy-loading the service with a proxy\n *";
+ $lazyInitializationDoc = "\n * @param bool \$lazyLoad whether to try lazy-loading the service with a proxy\n *";
} else {
$lazyInitialization = '';
$lazyInitializationDoc = '';
@@ -955,7 +955,7 @@ EOF;
*
* @param array $parameters
* @param string $path
- * @param integer $indent
+ * @param int $indent
*
* @return string
*
@@ -1104,7 +1104,7 @@ EOF;
*
* @param string $id
* @param array $arguments
- * @param Boolean $deep
+ * @param bool $deep
* @param array $visited
*
* @return Boolean
@@ -1141,7 +1141,7 @@ EOF;
* Dumps values.
*
* @param array $value
- * @param Boolean $interpolate
+ * @param bool $interpolate
*
* @return string
*
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 0a9d35fdaf..03f418ee60 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -275,7 +275,7 @@ class YamlDumper extends Dumper
* Prepares parameters.
*
* @param array $parameters
- * @param Boolean $escape
+ * @param bool $escape
*
* @return array
*/
diff --git a/src/Symfony/Component/DependencyInjection/Reference.php b/src/Symfony/Component/DependencyInjection/Reference.php
index 1517da2988..94cd5b1124 100644
--- a/src/Symfony/Component/DependencyInjection/Reference.php
+++ b/src/Symfony/Component/DependencyInjection/Reference.php
@@ -29,7 +29,7 @@ class Reference
*
* @param string $id The service identifier
* @param int $invalidBehavior The behavior when the service does not exist
- * @param Boolean $strict Sets how this reference is validated
+ * @param bool $strict Sets how this reference is validated
*
* @see Container
*/
diff --git a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
index c591f3e809..a9af790d4d 100644
--- a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
+++ b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
@@ -36,7 +36,7 @@ class SimpleXMLElement extends \SimpleXMLElement
* Returns arguments as valid PHP types.
*
* @param string $name
- * @param Boolean $lowercase
+ * @param bool $lowercase
*
* @return mixed
*/
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index b6c852e691..b096dcd815 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -280,7 +280,7 @@ class Crawler extends \SplObjectStorage
/**
* Returns a node given its position in the node list.
*
- * @param integer $position The position
+ * @param int $position The position
*
* @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist.
*
@@ -772,7 +772,7 @@ class Crawler extends \SplObjectStorage
}
/**
- * @param integer $position
+ * @param int $position
*
* @return \DOMElement|null
*/
diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
index 4f822206ad..c65b5c9c4f 100644
--- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
@@ -23,7 +23,7 @@ class FileFormField extends FormField
/**
* Sets the PHP error code associated with the field.
*
- * @param integer $error The error code (one of UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, or UPLOAD_ERR_EXTENSION)
+ * @param int $error The error code (one of UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, or UPLOAD_ERR_EXTENSION)
*
* @throws \InvalidArgumentException When error code doesn't exist
*/
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index e685b5facd..ea7edf0fc5 100644
--- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -57,7 +57,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
* @param string $eventName Event for which the listener is added
* @param array $callback The service ID of the listener service & the method
* name that has to be called
- * @param integer $priority The higher this value, the earlier an event listener
+ * @param int $priority The higher this value, the earlier an event listener
* will be triggered in the chain.
* Defaults to 0.
*
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index 7aead23b0d..c2469aafb7 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -42,7 +42,7 @@ interface EventDispatcherInterface
*
* @param string $eventName The event to listen on
* @param callable $listener The listener
- * @param integer $priority The higher this value, the earlier an event
+ * @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
*
* @api
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 69e3361146..92e02d680f 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -29,7 +29,7 @@ class Filesystem
*
* @param string $originFile The original filename
* @param string $targetFile The target filename
- * @param boolean $override Whether to override an existing file or not
+ * @param bool $override Whether to override an existing file or not
*
* @throws IOException When copy fails
*/
@@ -66,7 +66,7 @@ class Filesystem
* Creates a directory recursively.
*
* @param string|array|\Traversable $dirs The directory path
- * @param integer $mode The directory mode
+ * @param int $mode The directory mode
*
* @throws IOException On any directory creation failure
*/
@@ -105,8 +105,8 @@ class Filesystem
* Sets access and modification time of file.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
- * @param integer $time The touch time as a Unix timestamp
- * @param integer $atime The access time as a Unix timestamp
+ * @param int $time The touch time as a Unix timestamp
+ * @param int $atime The access time as a Unix timestamp
*
* @throws IOException When touch fails
*/
@@ -161,9 +161,9 @@ class Filesystem
* Change mode for an array of files or directories.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change mode
- * @param integer $mode The new mode (octal)
- * @param integer $umask The mode mask (octal)
- * @param Boolean $recursive Whether change the mod recursively or not
+ * @param int $mode The new mode (octal)
+ * @param int $umask The mode mask (octal)
+ * @param bool $recursive Whether change the mod recursively or not
*
* @throws IOException When the change fail
*/
@@ -184,7 +184,7 @@ class Filesystem
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change owner
* @param string $user The new owner user name
- * @param Boolean $recursive Whether change the owner recursively or not
+ * @param bool $recursive Whether change the owner recursively or not
*
* @throws IOException When the change fail
*/
@@ -211,7 +211,7 @@ class Filesystem
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change group
* @param string $group The group name
- * @param Boolean $recursive Whether change the group recursively or not
+ * @param bool $recursive Whether change the group recursively or not
*
* @throws IOException When the change fail
*/
@@ -238,7 +238,7 @@ class Filesystem
*
* @param string $origin The origin filename or directory
* @param string $target The new filename or directory
- * @param Boolean $overwrite Whether to overwrite the target if it already exists
+ * @param bool $overwrite Whether to overwrite the target if it already exists
*
* @throws IOException When target file or directory already exists
* @throws IOException When origin cannot be renamed
@@ -260,7 +260,7 @@ class Filesystem
*
* @param string $originDir The origin directory path
* @param string $targetDir The symbolic link name
- * @param Boolean $copyOnWindows Whether to copy files if on Windows
+ * @param bool $copyOnWindows Whether to copy files if on Windows
*
* @throws IOException When symlink fails
*/
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
index 028a5e5a71..01940385de 100644
--- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
+++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -148,7 +148,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
/**
* @param Command $command
* @param string[] $names
- * @param Boolean $not
+ * @param bool $not
*/
private function buildNamesFiltering(Command $command, array $names, $not = false)
{
@@ -196,7 +196,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
* @param Command $command
* @param string $dir
* @param string[] $paths
- * @param Boolean $not
+ * @param bool $not
*/
private function buildPathsFiltering(Command $command, $dir, array $paths, $not = false)
{
@@ -321,7 +321,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
/**
* @param Command $command
* @param array $contains
- * @param Boolean $not
+ * @param bool $not
*/
abstract protected function buildContentFiltering(Command $command, array $contains, $not = false);
}
diff --git a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php
index 50c018bc50..6d004909e0 100644
--- a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php
+++ b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php
@@ -17,14 +17,14 @@ namespace Symfony\Component\Finder\Adapter;
interface AdapterInterface
{
/**
- * @param Boolean $followLinks
+ * @param bool $followLinks
*
* @return AdapterInterface Current instance
*/
public function setFollowLinks($followLinks);
/**
- * @param integer $mode
+ * @param int $mode
*
* @return AdapterInterface Current instance
*/
@@ -115,7 +115,7 @@ interface AdapterInterface
public function setNotPath(array $notPaths);
/**
- * @param boolean $ignore
+ * @param bool $ignore
*
* @return AdapterInterface Current instance
*/
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 344fbb7304..e945fab13e 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -90,7 +90,7 @@ class Finder implements \IteratorAggregate, \Countable
* Registers a finder engine implementation.
*
* @param AdapterInterface $adapter An adapter instance
- * @param integer $priority Highest is selected first
+ * @param int $priority Highest is selected first
*
* @return Finder The current Finder instance
*/
@@ -415,7 +415,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Excludes "hidden" directories and files (starting with a dot).
*
- * @param Boolean $ignoreDotFiles Whether to exclude "hidden" files or not
+ * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
*
* @return Finder The current Finder instance
*
@@ -437,7 +437,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Forces the finder to ignore version control directories.
*
- * @param Boolean $ignoreVCS Whether to exclude VCS files or not
+ * @param bool $ignoreVCS Whether to exclude VCS files or not
*
* @return Finder The current Finder instance
*
@@ -632,7 +632,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* By default, scanning unreadable directories content throws an AccessDeniedException.
*
- * @param boolean $ignore
+ * @param bool $ignore
*
* @return Finder The current Finder instance
*/
diff --git a/src/Symfony/Component/Finder/Glob.php b/src/Symfony/Component/Finder/Glob.php
index dd26384ed7..df65ac7547 100644
--- a/src/Symfony/Component/Finder/Glob.php
+++ b/src/Symfony/Component/Finder/Glob.php
@@ -39,8 +39,8 @@ class Glob
* Returns a regexp which is the equivalent of the glob pattern.
*
* @param string $glob The glob pattern
- * @param Boolean $strictLeadingDot
- * @param Boolean $strictWildcardSlash
+ * @param bool $strictLeadingDot
+ * @param bool $strictWildcardSlash
*
* @return string regex The regexp
*/
diff --git a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
index 5b7bbb10b9..b716948baf 100644
--- a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
@@ -27,7 +27,7 @@ class FileTypeFilterIterator extends FilterIterator
* Constructor.
*
* @param \Iterator $iterator The Iterator to filter
- * @param integer $mode The mode (self::ONLY_FILES or self::ONLY_DIRECTORIES)
+ * @param int $mode The mode (self::ONLY_FILES or self::ONLY_DIRECTORIES)
*/
public function __construct(\Iterator $iterator, $mode)
{
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index f189712dfd..56303d57a2 100644
--- a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -36,7 +36,7 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
*
* @param string $path
* @param int $flags
- * @param boolean $ignoreUnreadableDirs
+ * @param bool $ignoreUnreadableDirs
*
* @throws \RuntimeException
*/
diff --git a/src/Symfony/Component/Finder/Iterator/SortableIterator.php b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
index cdc734f474..05c6a7e4ea 100644
--- a/src/Symfony/Component/Finder/Iterator/SortableIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
@@ -31,7 +31,7 @@ class SortableIterator implements \IteratorAggregate
* Constructor.
*
* @param \Traversable $iterator The Iterator to filter
- * @param integer|callback $sort The sort type (SORT_BY_NAME, SORT_BY_TYPE, or a PHP callback)
+ * @param int |callback $sort The sort type (SORT_BY_NAME, SORT_BY_TYPE, or a PHP callback)
*
* @throws \InvalidArgumentException
*/
diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
index 54f4f176fb..350ff29ea4 100644
--- a/src/Symfony/Component/Finder/Shell/Command.php
+++ b/src/Symfony/Component/Finder/Shell/Command.php
@@ -283,7 +283,7 @@ class Command
* Insert a string or a Command instance before the bit at given position $index (index starts from 0).
*
* @param string|Command $bit
- * @param integer $index
+ * @param int $index
*
* @return Command The current Command instance
*/
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
index f762514346..900de4125a 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -19,8 +19,8 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
* @dataProvider getPaths
*
* @param string $path
- * @param Boolean $seekable
- * @param Boolean $supports
+ * @param bool $seekable
+ * @param bool $supports
* @param string $message
*/
public function testRewind($path, $seekable, $contains, $message = null)
@@ -40,8 +40,8 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
* @dataProvider getPaths
*
* @param string $path
- * @param Boolean $seekable
- * @param Boolean $supports
+ * @param bool $seekable
+ * @param bool $supports
* @param string $message
*/
public function testSeek($path, $seekable, $contains, $message = null)
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index 347be10d29..76506b73a0 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -146,7 +146,7 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
* themes.
* @param array $blockNameHierarchy The block hierarchy, with the most
* specific block name at the end.
- * @param integer $hierarchyLevel The level in the block hierarchy that
+ * @param int $hierarchyLevel The level in the block hierarchy that
* should be loaded.
*
* @return Boolean True if the resource could be loaded, false otherwise.
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index 2d7ccd1569..fe0ab1ad65 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -374,7 +374,7 @@ class Button implements \IteratorAggregate, FormInterface
* Submits data to the button.
*
* @param null|string $submittedData The data.
- * @param Boolean $clearMissing Not used.
+ * @param bool $clearMissing Not used.
*
* @return Button The button instance
*
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index f9b0546b1f..352ca88ea5 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -169,7 +169,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* @param string $eventName
* @param callable $listener
- * @param integer $priority
+ * @param int $priority
*
* @throws BadMethodCallException
*/
@@ -198,7 +198,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
* This method should not be invoked.
*
* @param DataTransformerInterface $viewTransformer
- * @param Boolean $forcePrepend
+ * @param bool $forcePrepend
*
* @throws BadMethodCallException
*/
@@ -225,7 +225,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
* This method should not be invoked.
*
* @param DataTransformerInterface $modelTransformer
- * @param Boolean $forceAppend
+ * @param bool $forceAppend
*
* @throws BadMethodCallException
*/
@@ -283,7 +283,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
/**
* Set whether the button is disabled.
*
- * @param Boolean $disabled Whether the button is disabled
+ * @param bool $disabled Whether the button is disabled
*
* @return ButtonBuilder The button builder.
*/
@@ -313,7 +313,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $errorBubbling
+ * @param bool $errorBubbling
*
* @throws BadMethodCallException
*/
@@ -327,7 +327,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $required
+ * @param bool $required
*
* @throws BadMethodCallException
*/
@@ -355,7 +355,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $mapped
+ * @param bool $mapped
*
* @throws BadMethodCallException
*/
@@ -369,7 +369,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $byReference
+ * @param bool $byReference
*
* @throws BadMethodCallException
*/
@@ -383,7 +383,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $virtual
+ * @param bool $virtual
*
* @throws BadMethodCallException
*/
@@ -397,7 +397,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $compound
+ * @param bool $compound
*
* @throws BadMethodCallException
*/
@@ -439,7 +439,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* This method should not be invoked.
*
- * @param Boolean $locked
+ * @param bool $locked
*
* @throws BadMethodCallException
*/
@@ -503,7 +503,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
/**
* Unsupported method.
*
- * @param Boolean $initialize
+ * @param bool $initialize
*
* @throws BadMethodCallException
*/
@@ -519,7 +519,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
/**
* Unsupported method.
*
- * @param Boolean $inheritData
+ * @param bool $inheritData
*
* @throws BadMethodCallException
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
index 4f6b12275b..cf0e9c1102 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
@@ -41,7 +41,7 @@ class BooleanToStringTransformer implements DataTransformerInterface
/**
* Transforms a Boolean into a string.
*
- * @param Boolean $value Boolean value.
+ * @param bool $value Boolean value.
*
* @return string String value.
*
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
index b521c95572..1ca1da41c0 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -28,7 +28,7 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface
* Constructor.
*
* @param ChoiceListInterface $choiceList
- * @param Boolean $placeholderPresent
+ * @param bool $placeholderPresent
*/
public function __construct(ChoiceListInterface $choiceList, $placeholderPresent)
{
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
index 3b7678ddef..922d3c5bd8 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -32,7 +32,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
* @param string $inputTimezone The input timezone
* @param string $outputTimezone The output timezone
* @param array $fields The date fields
- * @param Boolean $pad Whether to use padding
+ * @param bool $pad Whether to use padding
*
* @throws UnexpectedTypeException if a timezone is not a string
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index d755e48547..f04b867599 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -34,9 +34,9 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
*
* @param string $inputTimezone The name of the input timezone
* @param string $outputTimezone The name of the output timezone
- * @param integer $dateFormat The date format
- * @param integer $timeFormat The time format
- * @param integer $calendar One of the \IntlDateFormatter calendar constants
+ * @param int $dateFormat The date format
+ * @param int $timeFormat The time format
+ * @param int $calendar One of the \IntlDateFormatter calendar constants
* @param string $pattern A pattern to pass to \IntlDateFormatter
*
* @throws UnexpectedTypeException If a format is not supported or if a timezone is not a string
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
index 131f45cb2f..32068b06c5 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
@@ -56,7 +56,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
* @param string $inputTimezone The name of the input timezone
* @param string $outputTimezone The name of the output timezone
* @param string $format The date format
- * @param Boolean $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format
+ * @param bool $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format
*
* @throws UnexpectedTypeException if a timezone is not a string
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index b0c59b3ede..199c996f1b 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -55,7 +55,7 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
/**
* Transforms a number type into localized number.
*
- * @param integer|float $value Number value.
+ * @param int |float $value Number value.
*
* @return string Localized value.
*
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index e099d436bf..ff43697379 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -40,7 +40,7 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
*
* @see self::$types for a list of supported types
*
- * @param integer $precision The precision
+ * @param int $precision The precision
* @param string $type One of the supported types
*
* @throws UnexpectedTypeException if the given value of type is unknown
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
index 925585db40..a3e27d57e3 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
@@ -32,7 +32,7 @@ class FixRadioInputListener implements EventSubscriberInterface
* Constructor.
*
* @param ChoiceListInterface $choiceList
- * @param Boolean $placeholderPresent
+ * @param bool $placeholderPresent
*/
public function __construct(ChoiceListInterface $choiceList, $placeholderPresent)
{
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index 4d0bdfaae0..51ca781a36 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -36,9 +36,9 @@ class MergeCollectionListener implements EventSubscriberInterface
/**
* Creates a new listener.
*
- * @param Boolean $allowAdd Whether values might be added to the
+ * @param bool $allowAdd Whether values might be added to the
* collection.
- * @param Boolean $allowDelete Whether values might be removed from the
+ * @param bool $allowDelete Whether values might be removed from the
* collection.
*/
public function __construct($allowAdd = false, $allowDelete = false)
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
index eb8907f1af..e53046caf5 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
@@ -26,7 +26,7 @@ interface ViolationMapperInterface
* @param ConstraintViolation $violation The violation to map.
* @param FormInterface $form The root form of the tree
* to map it to.
- * @param Boolean $allowNonSynchronized Whether to allow
+ * @param bool $allowNonSynchronized Whether to allow
* mapping to non-synchronized forms.
*/
public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false);
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
index 06d091954e..12a4241077 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -198,7 +198,7 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
* In this example, "address" and "office" map to forms, while
* "street does not.
*
- * @param integer $index The element index.
+ * @param int $index The element index.
*
* @return Boolean Whether the element maps to a form.
*
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 5d16f9ca02..952c67f9e7 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -784,7 +784,7 @@ class Form implements \IteratorAggregate, FormInterface
*
* This method should only be used to help debug a form.
*
- * @param integer $level The indentation level (used internally)
+ * @param int $level The indentation level (used internally)
*
* @return string A string representation of all errors
*/
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index 6cc686d53e..d73c403d98 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -713,7 +713,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
/**
* Alias of {@link setInheritData()}.
*
- * @param Boolean $inheritData Whether the form should inherit its parent's data.
+ * @param bool $inheritData Whether the form should inherit its parent's data.
*
* @return FormConfigBuilder The configuration object.
*
diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index 62d12c09cb..276a2fa446 100644
--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -23,7 +23,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param string $eventName The name of the event to listen to.
* @param callable $listener The listener to execute.
- * @param integer $priority The priority of the listener. Listeners
+ * @param int $priority The priority of the listener. Listeners
* with a higher priority are called before
* listeners with a lower priority.
*
@@ -49,7 +49,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* view to the normalized format.
*
* @param DataTransformerInterface $viewTransformer
- * @param Boolean $forcePrepend if set to true, prepend instead of appending
+ * @param bool $forcePrepend if set to true, prepend instead of appending
*
* @return self The configuration object.
*/
@@ -71,7 +71,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* normalized to the model format.
*
* @param DataTransformerInterface $modelTransformer
- * @param Boolean $forceAppend if set to true, append instead of prepending
+ * @param bool $forceAppend if set to true, append instead of prepending
*
* @return self The configuration object.
*/
@@ -115,7 +115,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Set whether the form is disabled.
*
- * @param Boolean $disabled Whether the form is disabled
+ * @param bool $disabled Whether the form is disabled
*
* @return self The configuration object.
*/
@@ -133,7 +133,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Sets whether errors bubble up to the parent.
*
- * @param Boolean $errorBubbling
+ * @param bool $errorBubbling
*
* @return self The configuration object.
*/
@@ -142,7 +142,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Sets whether this field is required to be filled out when submitted.
*
- * @param Boolean $required
+ * @param bool $required
*
* @return self The configuration object.
*/
@@ -163,7 +163,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* Sets whether the form should be mapped to an element of its
* parent's data.
*
- * @param Boolean $mapped Whether the form should be mapped.
+ * @param bool $mapped Whether the form should be mapped.
*
* @return self The configuration object.
*/
@@ -172,7 +172,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Sets whether the form's data should be modified by reference.
*
- * @param Boolean $byReference Whether the data should be
+ * @param bool $byReference Whether the data should be
* modified by reference.
*
* @return self The configuration object.
@@ -182,7 +182,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Sets whether the form should read and write the data of its parent.
*
- * @param Boolean $inheritData Whether the form should inherit its parent's data.
+ * @param bool $inheritData Whether the form should inherit its parent's data.
*
* @return self The configuration object.
*/
@@ -191,7 +191,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
/**
* Sets whether the form should be compound.
*
- * @param Boolean $compound Whether the form should be compound.
+ * @param bool $compound Whether the form should be compound.
*
* @return self The configuration object.
*
@@ -224,7 +224,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* this configuration. The data can only be modified then by
* submitting the form.
*
- * @param Boolean $locked Whether to lock the default data.
+ * @param bool $locked Whether to lock the default data.
*
* @return self The configuration object.
*/
@@ -269,7 +269,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* Should be set to true only for root forms.
*
- * @param Boolean $initialize True to initialize the form automatically,
+ * @param bool $initialize True to initialize the form automatically,
* false to suppress automatic initialization.
* In the second case, you need to call
* {@link FormInterface::initialize()} manually.
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
index 343165ca46..d9b23aa368 100644
--- a/src/Symfony/Component/Form/FormError.php
+++ b/src/Symfony/Component/Form/FormError.php
@@ -51,7 +51,7 @@ class FormError
* @param string|null $messageTemplate The template for the error message
* @param array $messageParameters The parameters that should be
* substituted in the message template.
- * @param integer|null $messagePluralization The value for error message pluralization
+ * @param int |null $messagePluralization The value for error message pluralization
*
* @see \Symfony\Component\Translation\Translator
*/
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index 7a77e0f3f4..5ffe76d1ce 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -253,7 +253,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* Submits data to the form, transforms and validates it.
*
* @param null|string|array $submittedData The submitted data.
- * @param Boolean $clearMissing Whether to set fields to NULL
+ * @param bool $clearMissing Whether to set fields to NULL
* when they are missing in the
* submitted data.
*
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index e06824ec95..ba92e14e37 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -78,7 +78,7 @@ interface FormRendererEngineInterface
* its parent etc.
* @param array $blockNameHierarchy The block name hierarchy, with
* the root block at the beginning.
- * @param integer $hierarchyLevel The level in the hierarchy at
+ * @param int $hierarchyLevel The level in the hierarchy at
* which to start looking. Level 0
* indicates the root block, i.e.
* the first element of
@@ -122,7 +122,7 @@ interface FormRendererEngineInterface
* its parent etc.
* @param array $blockNameHierarchy The block name hierarchy, with
* the root block at the beginning.
- * @param integer $hierarchyLevel The level in the hierarchy at
+ * @param int $hierarchyLevel The level in the hierarchy at
* which to start looking. Level 0
* indicates the root block, i.e.
* the first element of
diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php
index 6616ff5092..0deb838d80 100644
--- a/src/Symfony/Component/Form/Guess/Guess.php
+++ b/src/Symfony/Component/Form/Guess/Guess.php
@@ -86,7 +86,7 @@ abstract class Guess
/**
* Constructor.
*
- * @param integer $confidence The confidence
+ * @param int $confidence The confidence
*
* @throws InvalidArgumentException if the given value of confidence is unknown
*/
diff --git a/src/Symfony/Component/Form/Guess/TypeGuess.php b/src/Symfony/Component/Form/Guess/TypeGuess.php
index 3241e603df..7136b7874b 100644
--- a/src/Symfony/Component/Form/Guess/TypeGuess.php
+++ b/src/Symfony/Component/Form/Guess/TypeGuess.php
@@ -37,7 +37,7 @@ class TypeGuess extends Guess
* @param string $type The guessed field type
* @param array $options The options for creating instances of the
* guessed class
- * @param integer $confidence The confidence that the guessed class name
+ * @param int $confidence The confidence that the guessed class name
* is correct
*/
public function __construct($type, array $options, $confidence)
diff --git a/src/Symfony/Component/Form/Guess/ValueGuess.php b/src/Symfony/Component/Form/Guess/ValueGuess.php
index 2e3333ba5b..bf450d6002 100644
--- a/src/Symfony/Component/Form/Guess/ValueGuess.php
+++ b/src/Symfony/Component/Form/Guess/ValueGuess.php
@@ -28,7 +28,7 @@ class ValueGuess extends Guess
* Constructor
*
* @param string $value The guessed value
- * @param integer $confidence The confidence that the guessed class name
+ * @param int $confidence The confidence that the guessed class name
* is correct
*/
public function __construct($value, $confidence)
diff --git a/src/Symfony/Component/Form/SubmitButton.php b/src/Symfony/Component/Form/SubmitButton.php
index 47d4be0e28..1ff65bcbe1 100644
--- a/src/Symfony/Component/Form/SubmitButton.php
+++ b/src/Symfony/Component/Form/SubmitButton.php
@@ -35,7 +35,7 @@ class SubmitButton extends Button implements ClickableInterface
* Submits data to the button.
*
* @param null|string $submittedData The data.
- * @param Boolean $clearMissing Not used.
+ * @param bool $clearMissing Not used.
*
* @return SubmitButton The button instance
*
diff --git a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
index b57aa9da8d..435bdf1b2d 100644
--- a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
+++ b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
@@ -47,7 +47,7 @@ abstract class FormPerformanceTestCase extends FormIntegrationTestCase
}
/**
- * @param integer $maxRunningTime
+ * @param int $maxRunningTime
* @throws \InvalidArgumentException
*/
public function setMaxRunningTime($maxRunningTime)
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
index faa10e2a7a..06a2cb088f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -61,7 +61,7 @@ class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
/**
* @param FormConfigInterface $config
- * @param Boolean $synchronized
+ * @param bool $synchronized
* @return \PHPUnit_Framework_MockObject_MockObject
*/
private function getForm(FormConfigInterface $config, $synchronized = true, $submitted = true)
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index ddcb657ee2..d43e0732cd 100644
--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -35,12 +35,12 @@ class BinaryFileResponse extends Response
* Constructor.
*
* @param \SplFileInfo|string $file The file to stream
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
- * @param boolean $public Files are public by default
+ * @param bool $public Files are public by default
* @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename
- * @param boolean $autoEtag Whether the ETag header should be automatically set
- * @param boolean $autoLastModified Whether the Last-Modified header should be automatically set
+ * @param bool $autoEtag Whether the ETag header should be automatically set
+ * @param bool $autoLastModified Whether the Last-Modified header should be automatically set
*/
public function __construct($file, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
{
@@ -55,12 +55,12 @@ class BinaryFileResponse extends Response
/**
* @param \SplFileInfo|string $file The file to stream
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
- * @param boolean $public Files are public by default
+ * @param bool $public Files are public by default
* @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename
- * @param boolean $autoEtag Whether the ETag header should be automatically set
- * @param boolean $autoLastModified Whether the Last-Modified header should be automatically set
+ * @param bool $autoEtag Whether the ETag header should be automatically set
+ * @param bool $autoLastModified Whether the Last-Modified header should be automatically set
*/
public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
{
@@ -72,8 +72,8 @@ class BinaryFileResponse extends Response
*
* @param \SplFileInfo|string $file The file to stream
* @param string $contentDisposition
- * @param Boolean $autoEtag
- * @param Boolean $autoLastModified
+ * @param bool $autoEtag
+ * @param bool $autoLastModified
*
* @return BinaryFileResponse
*
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
index c7bceb918c..6dffbc92cf 100644
--- a/src/Symfony/Component/HttpFoundation/Cookie.php
+++ b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -33,11 +33,11 @@ class Cookie
*
* @param string $name The name of the cookie
* @param string $value The value of the cookie
- * @param integer|string|\DateTime $expire The time the cookie expires
+ * @param int |string|\DateTime $expire The time the cookie expires
* @param string $path The path on the server in which the cookie will be available on
* @param string $domain The domain that the cookie is available to
- * @param Boolean $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client
- * @param Boolean $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
+ * @param bool $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client
+ * @param bool $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
*
* @throws \InvalidArgumentException
*
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
index 4fabfb9106..0fdf7b0428 100644
--- a/src/Symfony/Component/HttpFoundation/File/File.php
+++ b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -29,7 +29,7 @@ class File extends \SplFileInfo
* Constructs a new file from the given path.
*
* @param string $path The path to the file
- * @param Boolean $checkPath Whether to check the path or not
+ * @param bool $checkPath Whether to check the path or not
*
* @throws FileNotFoundException If the given path is not a file
*
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
index f971ca0aae..d89e3f209a 100644
--- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -80,9 +80,9 @@ class UploadedFile extends File
* @param string $path The full temporary path to the file
* @param string $originalName The original file name
* @param string $mimeType The type of the file as provided by PHP
- * @param integer $size The file size
- * @param integer $error The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants)
- * @param Boolean $test Whether the test mode is active
+ * @param int $size The file size
+ * @param int $error The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants)
+ * @param bool $test Whether the test mode is active
*
* @throws FileException If file_uploads is disabled
* @throws FileNotFoundException If the file does not exist
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index b579eb991a..693f79e4f9 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -119,7 +119,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
*
* @param string $key The header name
* @param mixed $default The default value
- * @param Boolean $first Whether to return the first value or all header values
+ * @param bool $first Whether to return the first value or all header values
*
* @return string|array The first header value if $first is true, an array of values otherwise
*
@@ -149,7 +149,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
*
* @param string $key The key
* @param string|array $values The value or an array of values
- * @param Boolean $replace Whether to replace the actual value or not (true by default)
+ * @param bool $replace Whether to replace the actual value or not (true by default)
*
* @api
*/
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index 4a96d082d5..631f111c97 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -31,7 +31,7 @@ class JsonResponse extends Response
* Constructor.
*
* @param mixed $data The response data
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
*/
public function __construct($data = null, $status = 200, $headers = array())
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index c8720cdc12..7067822ee4 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -92,7 +92,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $path The key
* @param mixed $default The default value if the parameter key does not exist
- * @param boolean $deep If true, a path like foo[bar] will find deeper items
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return mixed
*
@@ -193,7 +193,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
- * @param boolean $deep If true, a path like foo[bar] will find deeper items
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -209,7 +209,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
- * @param boolean $deep If true, a path like foo[bar] will find deeper items
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -225,7 +225,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
- * @param boolean $deep If true, a path like foo[bar] will find deeper items
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@@ -242,7 +242,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
- * @param boolean $deep If true, a path like foo[bar] will find deeper items
+ * @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return integer The filtered value
*
@@ -258,8 +258,8 @@ class ParameterBag implements \IteratorAggregate, \Countable
*
* @param string $key Key.
* @param mixed $default Default = null.
- * @param boolean $deep Default = false.
- * @param integer $filter FILTER_* constant.
+ * @param bool $deep Default = false.
+ * @param int $filter FILTER_* constant.
* @param mixed $options Filter options.
*
* @see http://php.net/manual/en/function.filter-var.php
diff --git a/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
index fbf377bae0..1ae4a147f1 100644
--- a/src/Symfony/Component/HttpFoundation/RedirectResponse.php
+++ b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -26,7 +26,7 @@ class RedirectResponse extends Response
* Creates a redirect response so that it conforms to the rules defined for a redirect status code.
*
* @param string $url The URL to redirect to
- * @param integer $status The status code (302 by default)
+ * @param int $status The status code (302 by default)
* @param array $headers The headers (Location is always set to the given URL)
*
* @throws \InvalidArgumentException
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 685772b250..0cbd2323e7 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -680,7 +680,7 @@ class Request
*
* @param string $key the key
* @param mixed $default the default value
- * @param Boolean $deep is parameter deep in multidimensional array
+ * @param bool $deep is parameter deep in multidimensional array
*
* @return mixed
*/
@@ -1398,7 +1398,7 @@ class Request
/**
* Returns the request body content.
*
- * @param Boolean $asResource If true, a resource will be returned
+ * @param bool $asResource If true, a resource will be returned
*
* @return string|resource The request body content or a resource to read the body stream.
*
diff --git a/src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php b/src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
index b6bbfc2d93..4a684e1123 100644
--- a/src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
@@ -90,7 +90,7 @@ interface SessionHandlerInterface
*
* @see http://php.net/sessionhandlerinterface.gc
*
- * @param integer $lifetime Max lifetime in seconds to keep sessions stored.
+ * @param int $lifetime Max lifetime in seconds to keep sessions stored.
*
* @throws \RuntimeException On fatal error.
*
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index 37e6c610c2..d8acef5609 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -128,7 +128,7 @@ class Response
* Constructor.
*
* @param string $content The response content
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
*
* @throws \InvalidArgumentException When the HTTP status code is not valid
@@ -155,7 +155,7 @@ class Response
* ->setSharedMaxAge(300);
*
* @param string $content The response content
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
*
* @return Response
@@ -406,7 +406,7 @@ class Response
/**
* Sets the response status code.
*
- * @param integer $code HTTP status code
+ * @param int $code HTTP status code
* @param mixed $text HTTP status text
*
* If the status text is null it will be automatically populated for the known
@@ -723,7 +723,7 @@ class Response
*
* This methods sets the Cache-Control max-age directive.
*
- * @param integer $value Number of seconds
+ * @param int $value Number of seconds
*
* @return Response
*
@@ -741,7 +741,7 @@ class Response
*
* This methods sets the Cache-Control s-maxage directive.
*
- * @param integer $value Number of seconds
+ * @param int $value Number of seconds
*
* @return Response
*
@@ -781,7 +781,7 @@ class Response
*
* This method adjusts the Cache-Control/s-maxage directive.
*
- * @param integer $seconds Number of seconds
+ * @param int $seconds Number of seconds
*
* @return Response
*
@@ -799,7 +799,7 @@ class Response
*
* This method adjusts the Cache-Control/max-age directive.
*
- * @param integer $seconds Number of seconds
+ * @param int $seconds Number of seconds
*
* @return Response
*
@@ -866,7 +866,7 @@ class Response
* Sets the ETag value.
*
* @param string|null $etag The ETag unique identifier or null to remove the header
- * @param Boolean $weak Whether you want a weak ETag or not
+ * @param bool $weak Whether you want a weak ETag or not
*
* @return Response
*
@@ -1003,7 +1003,7 @@ class Response
* Sets the Vary header.
*
* @param string|array $headers
- * @param Boolean $replace Whether to replace the actual value of not (true by default)
+ * @param bool $replace Whether to replace the actual value of not (true by default)
*
* @return Response
*
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
index c0dd358e85..cf02ea3dd1 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
@@ -100,7 +100,7 @@ class NamespacedAttributeBag extends AttributeBag
* This method allows structured namespacing of session attributes.
*
* @param string $name Key name
- * @param boolean $writeContext Write context, default false
+ * @param bool $writeContext Write context, default false
*
* @return array
*/
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
index a94fad00d6..81353cc799 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
@@ -73,7 +73,7 @@ interface SessionInterface
* Clears all session attributes and flashes and regenerates the
* session and deletes the old session from persistence.
*
- * @param integer $lifetime Sets the cookie lifetime for the session cookie. A null value
+ * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
* will leave the system settings unchanged, 0 sets the cookie
* to expire with browser session. Time is in seconds, and is
* not a Unix timestamp.
@@ -88,8 +88,8 @@ interface SessionInterface
* Migrates the current session to a new session id while maintaining all
* session attributes.
*
- * @param Boolean $destroy Whether to delete the old session or leave it to garbage collection.
- * @param integer $lifetime Sets the cookie lifetime for the session cookie. A null value
+ * @param bool $destroy Whether to delete the old session or leave it to garbage collection.
+ * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
* will leave the system settings unchanged, 0 sets the cookie
* to expire with browser session. Time is in seconds, and is
* not a Unix timestamp.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
index 892d004b5d..f521e025fb 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
@@ -87,7 +87,7 @@ class MetadataBag implements SessionBagInterface
/**
* Stamps a new session's metadata.
*
- * @param integer $lifetime Sets the cookie lifetime for the session cookie. A null value
+ * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
* will leave the system settings unchanged, 0 sets the cookie
* to expire with browser session. Time is in seconds, and is
* not a Unix timestamp.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
index ee6eb89728..1792beefdc 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
@@ -87,7 +87,7 @@ abstract class AbstractProxy
*
* @internal
*
- * @param Boolean $flag
+ * @param bool $flag
*
* @throws \LogicException
*/
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
index 74f19c5216..135e91a58b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
@@ -88,8 +88,8 @@ interface SessionStorageInterface
* Note regenerate+destroy should not clear the session data in memory
* only delete the session data from persistent storage.
*
- * @param Boolean $destroy Destroy session when regenerating?
- * @param integer $lifetime Sets the cookie lifetime for the session cookie. A null value
+ * @param bool $destroy Destroy session when regenerating?
+ * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
* will leave the system settings unchanged, 0 sets the cookie
* to expire with browser session. Time is in seconds, and is
* not a Unix timestamp.
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index ae579beaa9..d2f49c7653 100644
--- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -35,7 +35,7 @@ class StreamedResponse extends Response
* Constructor.
*
* @param mixed $callback A valid PHP callback
- * @param integer $status The response status code
+ * @param int $status The response status code
* @param array $headers An array of response headers
*
* @api
diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
index 4cdd9291bc..f25f010b40 100644
--- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -324,7 +324,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, TraceableEve
* Updates the stopwatch data in the profile hierarchy.
*
* @param string $token Profile token
- * @param Boolean $updateChildren Whether to update the children altogether
+ * @param bool $updateChildren Whether to update the children altogether
*/
private function updateProfiles($token, $updateChildren)
{
@@ -339,7 +339,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, TraceableEve
* Update the profiles with the timing and events information and saves them.
*
* @param Profile $profile The root profile
- * @param Boolean $updateChildren Whether to update the children altogether
+ * @param bool $updateChildren Whether to update the children altogether
*/
private function saveInfoInProfile(Profile $profile, $updateChildren)
{
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
index 55950b29ed..b4384544b2 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -93,7 +93,7 @@ class ExceptionListener implements EventSubscriberInterface
*
* @param \Exception $exception The original \Exception instance
* @param string $message The error message to log
- * @param Boolean $original False when the handling of the exception thrown another exception
+ * @param bool $original False when the handling of the exception thrown another exception
*/
protected function logException(\Exception $exception, $message, $original = true)
{
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
index 2295593ab0..c981717a31 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -42,8 +42,8 @@ class ProfilerListener implements EventSubscriberInterface
*
* @param Profiler $profiler A Profiler instance
* @param RequestMatcherInterface $matcher A RequestMatcher instance
- * @param Boolean $onlyException true if the profiler only collects data when an exception occurs, false otherwise
- * @param Boolean $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise
+ * @param bool $onlyException true if the profiler only collects data when an exception occurs, false otherwise
+ * @param bool $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise
*/
public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
index 714102bed8..79d8639a5f 100644
--- a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
@@ -24,7 +24,7 @@ class AccessDeniedHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
index 33463452b0..3f30a437b7 100644
--- a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
@@ -23,7 +23,7 @@ class BadRequestHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
index e416b345a4..35f077670e 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
@@ -23,7 +23,7 @@ class ConflictHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
index 9fea1643bd..219da32635 100644
--- a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
@@ -23,7 +23,7 @@ class GoneHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
index 7aca014d71..878388a9cc 100644
--- a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
@@ -23,7 +23,7 @@ class LengthRequiredHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
index 3a81586a62..78dd26bf0f 100644
--- a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
@@ -24,7 +24,7 @@ class MethodNotAllowedHttpException extends HttpException
* @param array $allow An array of allowed methods
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
index 6ac448aa73..0985d4ab64 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
@@ -23,7 +23,7 @@ class NotAcceptableHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
index 547976c3f1..4639e379b9 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
@@ -23,7 +23,7 @@ class NotFoundHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
index 4126c881a3..0dc2174bf4 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
@@ -23,7 +23,7 @@ class PreconditionFailedHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
index 75ba17702a..fb1494dda7 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
@@ -24,7 +24,7 @@ class PreconditionRequiredHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
index 09bbb6ed31..dcf4d745f8 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
@@ -24,7 +24,7 @@ class ServiceUnavailableHttpException extends HttpException
* @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
index b1232ef6cb..cd0702bf0f 100644
--- a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
@@ -22,10 +22,10 @@ class TooManyRequestsHttpException extends HttpException
/**
* Constructor.
*
- * @param integer|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
+ * @param int |string $retryAfter The number of seconds or HTTP-date after which the request may be retried
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
index 2527d62f89..0dfe42db97 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
@@ -24,7 +24,7 @@ class UnauthorizedHttpException extends HttpException
* @param string $challenge WWW-Authenticate challenge string
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($challenge, $message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
index 88bceecfee..b2634702b9 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -23,7 +23,7 @@ class UnsupportedMediaTypeHttpException extends HttpException
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
- * @param integer $code The internal exception code
+ * @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
{
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
index af9b9ba98b..b61b0805d3 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -36,7 +36,7 @@ class FragmentHandler
* Constructor.
*
* @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances
- * @param Boolean $debug Whether the debug mode is enabled or not
+ * @param bool $debug Whether the debug mode is enabled or not
*/
public function __construct(array $renderers = array(), $debug = false)
{
diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
index bd133ce46e..f3163e16c8 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -41,7 +41,7 @@ abstract class RoutableFragmentRenderer implements FragmentRendererInterface
*
* @param ControllerReference $reference A ControllerReference instance
* @param Request $request A Request instance
- * @param Boolean $absolute Whether to generate an absolute URL or not
+ * @param bool $absolute Whether to generate an absolute URL or not
*
* @return string A fragment URI
*/
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 53acc4d3e5..57863c70f9 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -115,7 +115,7 @@ class Esi
*
* @param string $uri A URI
* @param string $alt An alternate URI
- * @param Boolean $ignoreErrors Whether to ignore errors or not
+ * @param bool $ignoreErrors Whether to ignore errors or not
* @param string $comment A comment to add as an esi:include tag
*
* @return string
@@ -185,7 +185,7 @@ class Esi
* @param HttpCache $cache An HttpCache instance
* @param string $uri The main URI
* @param string $alt An alternative URI
- * @param Boolean $ignoreErrors Whether to ignore errors or not
+ * @param bool $ignoreErrors Whether to ignore errors or not
*
* @return string
*
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 2c622492c8..43e339dace 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -232,7 +232,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* Forwards the Request to the backend without storing the Response in the cache.
*
* @param Request $request A Request instance
- * @param Boolean $catch Whether to process exceptions
+ * @param bool $catch Whether to process exceptions
*
* @return Response A Response instance
*/
@@ -247,7 +247,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* Invalidates non-safe methods (like POST, PUT, and DELETE).
*
* @param Request $request A Request instance
- * @param Boolean $catch Whether to process exceptions
+ * @param bool $catch Whether to process exceptions
*
* @return Response A Response instance
*
@@ -296,7 +296,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* it triggers "miss" processing.
*
* @param Request $request A Request instance
- * @param Boolean $catch whether to process exceptions
+ * @param bool $catch whether to process exceptions
*
* @return Response A Response instance
*
@@ -350,7 +350,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
*
* @param Request $request A Request instance
* @param Response $entry A Response instance to validate
- * @param Boolean $catch Whether to process exceptions
+ * @param bool $catch Whether to process exceptions
*
* @return Response A Response instance
*/
@@ -411,7 +411,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* This methods is triggered when the cache missed or a reload is required.
*
* @param Request $request A Request instance
- * @param Boolean $catch whether to process exceptions
+ * @param bool $catch whether to process exceptions
*
* @return Response A Response instance
*/
@@ -445,7 +445,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
* Forwards the Request to the backend and returns the Response.
*
* @param Request $request A Request instance
- * @param Boolean $catch Whether to catch exceptions or not
+ * @param bool $catch Whether to catch exceptions or not
* @param Response $entry A Response instance (the stale entry if present, null otherwise)
*
* @return Response A Response instance
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 837a16ff37..c1e0e61a19 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -84,7 +84,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
* Exceptions are not caught.
*
* @param Request $request A Request instance
- * @param integer $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+ * @param int $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
*
* @return Response A Response instance
*
@@ -144,7 +144,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
*
* @param Response $response A Response instance
* @param Request $request An error message in case the response is not a Response object
- * @param integer $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+ * @param int $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
*
* @return Response The filtered Response instance
*
@@ -164,7 +164,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
*
* @param \Exception $e An \Exception instance
* @param Request $request A Request instance
- * @param integer $type The type of the request
+ * @param int $type The type of the request
*
* @return Response A Response instance
*
diff --git a/src/Symfony/Component/HttpKernel/HttpKernelInterface.php b/src/Symfony/Component/HttpKernel/HttpKernelInterface.php
index f49d37ccb1..79d44f179e 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernelInterface.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernelInterface.php
@@ -33,9 +33,9 @@ interface HttpKernelInterface
* and do its best to convert them to a Response instance.
*
* @param Request $request A Request instance
- * @param integer $type The type of the request
+ * @param int $type The type of the request
* (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
- * @param Boolean $catch Whether to catch exceptions or not
+ * @param bool $catch Whether to catch exceptions or not
*
* @return Response A Response instance
*
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 6ac0e4f370..713d3b1866 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -70,7 +70,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
* Constructor.
*
* @param string $environment The environment
- * @param Boolean $debug Whether to enable debugging or not
+ * @param bool $debug Whether to enable debugging or not
*
* @api
*/
@@ -262,7 +262,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
*
* @param string $name A resource name to locate
* @param string $dir A directory where to look for the resource first
- * @param Boolean $first Whether to return the first path or paths for all matching bundles
+ * @param bool $first Whether to return the first path or paths for all matching bundles
*
* @return string|array The absolute path of the resource or an array if $first is false
*
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
index 8ba01b9dd0..c197471f29 100644
--- a/src/Symfony/Component/HttpKernel/KernelInterface.php
+++ b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -84,7 +84,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
* Returns a bundle and optionally its descendants by its name.
*
* @param string $name Bundle name
- * @param Boolean $first Whether to return the first bundle only or together with its descendants
+ * @param bool $first Whether to return the first bundle only or together with its descendants
*
* @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false
*
@@ -113,7 +113,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
*
* @param string $name A resource name to locate
* @param string $dir A directory where to look for the resource first
- * @param Boolean $first Whether to return the first path or paths for all matching bundles
+ * @param bool $first Whether to return the first path or paths for all matching bundles
*
* @return string|array The absolute path of the resource or an array if $first is false
*
diff --git a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
index 5489d6db88..1180660e2f 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
@@ -23,7 +23,7 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface
* @param string $dsn A data source name
* @param string $username Not used
* @param string $password Not used
- * @param integer $lifetime The lifetime to use for the purge
+ * @param int $lifetime The lifetime to use for the purge
*/
public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
{
diff --git a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
index fadd8453f1..7f41f0d60e 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
@@ -31,7 +31,7 @@ abstract class PdoProfilerStorage implements ProfilerStorageInterface
* @param string $dsn A data source name
* @param string $username The username for the database
* @param string $password The password for the database
- * @param integer $lifetime The lifetime to use for the purge
+ * @param int $lifetime The lifetime to use for the purge
*/
public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
{
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php
index 014f5492fc..9e51c051f3 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php
@@ -31,8 +31,8 @@ class MemcacheMock
* Open memcached server connection
*
* @param string $host
- * @param integer $port
- * @param integer $timeout
+ * @param int $port
+ * @param int $timeout
*
* @return boolean
*/
@@ -51,8 +51,8 @@ class MemcacheMock
* Open memcached server persistent connection
*
* @param string $host
- * @param integer $port
- * @param integer $timeout
+ * @param int $port
+ * @param int $timeout
*
* @return boolean
*/
@@ -71,14 +71,14 @@ class MemcacheMock
* Add a memcached server to connection pool
*
* @param string $host
- * @param integer $port
- * @param boolean $persistent
- * @param integer $weight
- * @param integer $timeout
- * @param integer $retry_interval
- * @param boolean $status
+ * @param int $port
+ * @param bool $persistent
+ * @param int $weight
+ * @param int $timeout
+ * @param int $retry_interval
+ * @param bool $status
* @param callable $failure_callback
- * @param integer $timeoutms
+ * @param int $timeoutms
*
* @return boolean
*/
@@ -98,8 +98,8 @@ class MemcacheMock
*
* @param string $key
* @param mixed $var
- * @param integer $flag
- * @param integer $expire
+ * @param int $flag
+ * @param int $expire
*
* @return boolean
*/
@@ -123,8 +123,8 @@ class MemcacheMock
*
* @param string $key
* @param string $var
- * @param integer $flag
- * @param integer $expire
+ * @param int $flag
+ * @param int $expire
*
* @return boolean
*/
@@ -144,8 +144,8 @@ class MemcacheMock
*
* @param string $key
* @param mixed $var
- * @param integer $flag
- * @param integer $expire
+ * @param int $flag
+ * @param int $expire
*
* @return boolean
*/
@@ -168,7 +168,7 @@ class MemcacheMock
* Retrieve item from the server.
*
* @param string|array $key
- * @param integer|array $flags
+ * @param int |array $flags
*
* @return mixed
*/
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php
index 2b17d70d28..07806b7530 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php
@@ -30,7 +30,7 @@ class MemcachedMock
/**
* Set a Memcached option
*
- * @param integer $option
+ * @param int $option
* @param mixed $value
*
* @return boolean
@@ -44,8 +44,8 @@ class MemcachedMock
* Add a memcached server to connection pool
*
* @param string $host
- * @param integer $port
- * @param integer $weight
+ * @param int $port
+ * @param int $weight
*
* @return boolean
*/
@@ -65,7 +65,7 @@ class MemcachedMock
*
* @param string $key
* @param mixed $value
- * @param integer $expiration
+ * @param int $expiration
*
* @return boolean
*/
@@ -89,7 +89,7 @@ class MemcachedMock
*
* @param string $key
* @param mixed $value
- * @param integer $expiration
+ * @param int $expiration
*
* @return boolean
*/
@@ -109,7 +109,7 @@ class MemcachedMock
*
* @param string $key
* @param mixed $value
- * @param integer $expiration
+ * @param int $expiration
*
* @return boolean
*/
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
index ca2980edde..79c9607933 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
@@ -32,7 +32,7 @@ class RedisMock
* Add a server to connection pool
*
* @param string $host
- * @param integer $port
+ * @param int $port
* @param float $timeout
*
* @return boolean
@@ -51,8 +51,8 @@ class RedisMock
/**
* Set client option.
*
- * @param integer $name
- * @param integer $value
+ * @param int $name
+ * @param int $value
*
* @return boolean
*/
@@ -85,7 +85,7 @@ class RedisMock
* Store data at the server with expiration time.
*
* @param string $key
- * @param integer $ttl
+ * @param int $ttl
* @param mixed $value
*
* @return boolean
@@ -105,7 +105,7 @@ class RedisMock
* Sets an expiration time on an item.
*
* @param string $key
- * @param integer $ttl
+ * @param int $ttl
*
* @return boolean
*/
diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php
index 8c0ffc337d..cb240c81d1 100644
--- a/src/Symfony/Component/Intl/Collator/Collator.php
+++ b/src/Symfony/Component/Intl/Collator/Collator.php
@@ -99,7 +99,7 @@ class Collator
* Sort array maintaining index association
*
* @param array &$array Input array
- * @param integer $sortFlag Flags for sorting, can be one of the following:
+ * @param int $sortFlag Flags for sorting, can be one of the following:
* Collator::SORT_REGULAR - compare items normally (don't change types)
* Collator::SORT_NUMERIC - compare items numerically
* Collator::SORT_STRING - compare items as strings
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index 507b9a654e..752d65c0c9 100644
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -187,7 +187,7 @@ class IntlDateFormatter
/**
* Format the date/time value (timestamp) as a string
*
- * @param integer|\DateTime $timestamp The timestamp to format. \DateTime objects
+ * @param int |\DateTime $timestamp The timestamp to format. \DateTime objects
* are supported as of PHP 5.3.4.
*
* @return string|Boolean The formatted value or false if formatting failed.
@@ -489,7 +489,7 @@ class IntlDateFormatter
* patterns, parsing as much as possible to obtain a value. Extra space, unrecognized tokens, or
* invalid values ("February 30th") are not accepted.
*
- * @param Boolean $lenient Sets whether the parser is lenient or not. Currently
+ * @param bool $lenient Sets whether the parser is lenient or not. Currently
* only false (strict) is supported.
*
* @return Boolean true on success or false on failure
diff --git a/src/Symfony/Component/Intl/Globals/IntlGlobals.php b/src/Symfony/Component/Intl/Globals/IntlGlobals.php
index 6da000111f..ce47509202 100644
--- a/src/Symfony/Component/Intl/Globals/IntlGlobals.php
+++ b/src/Symfony/Component/Intl/Globals/IntlGlobals.php
@@ -67,7 +67,7 @@ abstract class IntlGlobals
/**
* Returns whether the error code indicates a failure
*
- * @param integer $errorCode The error code returned by IntlGlobals::getErrorCode()
+ * @param int $errorCode The error code returned by IntlGlobals::getErrorCode()
*
* @return Boolean
*/
@@ -104,7 +104,7 @@ abstract class IntlGlobals
/**
* Returns the symbolic name for a given error code
*
- * @param integer $code The error code returned by IntlGlobals::getErrorCode()
+ * @param int $code The error code returned by IntlGlobals::getErrorCode()
*
* @return string
*/
@@ -120,7 +120,7 @@ abstract class IntlGlobals
/**
* Sets the current error
*
- * @param integer $code One of the error constants in this class
+ * @param int $code One of the error constants in this class
* @param string $message The ICU class error message
*
* @throws \InvalidArgumentException If the code is not one of the error constants in this class
diff --git a/src/Symfony/Component/Intl/Locale/Locale.php b/src/Symfony/Component/Intl/Locale/Locale.php
index f16d937b02..2a025891a5 100644
--- a/src/Symfony/Component/Intl/Locale/Locale.php
+++ b/src/Symfony/Component/Intl/Locale/Locale.php
@@ -76,7 +76,7 @@ class Locale
*
* @param string $langtag The language tag to check
* @param string $locale The language range to check against
- * @param Boolean $canonicalize
+ * @param bool $canonicalize
*
* @return string The corresponding locale code
*
@@ -271,7 +271,7 @@ class Locale
*
* @param array $langtag A list of the language tags to compare to locale
* @param string $locale The locale to use as the language range when matching
- * @param Boolean $canonicalize If true, the arguments will be converted to canonical form before matching
+ * @param bool $canonicalize If true, the arguments will be converted to canonical form before matching
* @param string $default The locale to use if no match is found
*
* @see http://www.php.net/manual/en/locale.lookup.php
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index b2314ac4f2..62b2aa0cc9 100644
--- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -693,7 +693,7 @@ class NumberFormatter
/**
* Rounds a value.
*
- * @param integer|float $value The value to round
+ * @param int |float $value The value to round
* @param int $precision The number of decimal digits to round to
*
* @return integer|float The rounded value
@@ -711,7 +711,7 @@ class NumberFormatter
/**
* Formats a number.
*
- * @param integer|float $value The numeric value to format
+ * @param int |float $value The numeric value to format
* @param int $precision The number of decimal digits to use
*
* @return string The formatted number
@@ -726,7 +726,7 @@ class NumberFormatter
/**
* Returns the precision value if the DECIMAL style is being used and the FRACTION_DIGITS attribute is unitialized.
*
- * @param integer|float $value The value to get the precision from if the FRACTION_DIGITS attribute is unitialized
+ * @param int |float $value The value to get the precision from if the FRACTION_DIGITS attribute is unitialized
* @param int $precision The precision value to returns if the FRACTION_DIGITS attribute is initialized
*
* @return int The precision value
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/ResourceBundle/Reader/BufferedBundleReader.php
index e44074b168..f005eeb4ac 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/Reader/BufferedBundleReader.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/Reader/BufferedBundleReader.php
@@ -29,7 +29,7 @@ class BufferedBundleReader implements BundleReaderInterface
* Buffers a given reader.
*
* @param BundleReaderInterface $reader The reader to buffer.
- * @param integer $bufferSize The number of entries to store
+ * @param int $bufferSize The number of entries to store
* in the buffer.
*/
public function __construct(BundleReaderInterface $reader, $bufferSize)
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Reader/StructuredBundleReaderInterface.php b/src/Symfony/Component/Intl/ResourceBundle/Reader/StructuredBundleReaderInterface.php
index c22ad93b97..5d435c485c 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/Reader/StructuredBundleReaderInterface.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/Reader/StructuredBundleReaderInterface.php
@@ -36,7 +36,7 @@ interface StructuredBundleReaderInterface extends BundleReaderInterface
* @param string $path The path to the resource bundle.
* @param string $locale The locale to read.
* @param string[] $indices The indices to read from the bundle.
- * @param Boolean $fallback Whether to merge the value with the value from
+ * @param bool $fallback Whether to merge the value with the value from
* the fallback locale (e.g. "en" for "en_GB").
* Only applicable if the result is multivalued
* (i.e. array or \ArrayAccess) or cannot be found
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/ResourceBundle/Writer/TextBundleWriter.php
index 342ee2dc5c..c2fff38c7b 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/Writer/TextBundleWriter.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/Writer/TextBundleWriter.php
@@ -58,8 +58,8 @@ class TextBundleWriter implements BundleWriterInterface
*
* @param resource $file The file handle to write to.
* @param mixed $value The value of the node.
- * @param integer $indentation The number of levels to indent.
- * @param Boolean $requireBraces Whether to require braces to be printed
+ * @param int $indentation The number of levels to indent.
+ * @param bool $requireBraces Whether to require braces to be printed
* around the value.
*
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
@@ -103,7 +103,7 @@ class TextBundleWriter implements BundleWriterInterface
* Writes an "integer" node.
*
* @param resource $file The file handle to write to.
- * @param integer $value The value of the node.
+ * @param int $value The value of the node.
*
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
*/
@@ -117,7 +117,7 @@ class TextBundleWriter implements BundleWriterInterface
*
* @param resource $file The file handle to write to.
* @param array $value The value of the node.
- * @param integer $indentation The number of levels to indent.
+ * @param int $indentation The number of levels to indent.
*
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
*/
@@ -137,7 +137,7 @@ class TextBundleWriter implements BundleWriterInterface
*
* @param resource $file The file handle to write to.
* @param string $value The value of the node.
- * @param Boolean $requireBraces Whether to require braces to be printed
+ * @param bool $requireBraces Whether to require braces to be printed
* around the value.
*
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
@@ -158,7 +158,7 @@ class TextBundleWriter implements BundleWriterInterface
*
* @param resource $file The file handle to write to.
* @param array $value The value of the node.
- * @param integer $indentation The number of levels to indent.
+ * @param int $indentation The number of levels to indent.
*
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
*/
@@ -182,7 +182,7 @@ class TextBundleWriter implements BundleWriterInterface
*
* @param resource $file The file handle to write to.
* @param array $value The value of the node.
- * @param integer $indentation The number of levels to indent.
+ * @param int $indentation The number of levels to indent.
*/
private function writeTable($file, array $value, $indentation)
{
diff --git a/src/Symfony/Component/Intl/Resources/stubs/functions.php b/src/Symfony/Component/Intl/Resources/stubs/functions.php
index 7a2d4b6729..c7eb16eb31 100644
--- a/src/Symfony/Component/Intl/Resources/stubs/functions.php
+++ b/src/Symfony/Component/Intl/Resources/stubs/functions.php
@@ -19,7 +19,7 @@ if (!function_exists('intl_is_failure')) {
*
* @author Bernhard Schussek
*
- * @param integer $errorCode The error code returned by intl_get_error_code().
+ * @param int $errorCode The error code returned by intl_get_error_code().
*
* @return Boolean Whether the error code indicates an error.
*
@@ -66,7 +66,7 @@ if (!function_exists('intl_is_failure')) {
* Stub implementation for the {@link intl_error_name()} function of the intl
* extension.
*
- * @param integer $errorCode The error code.
+ * @param int $errorCode The error code.
*
* @return string The name of the error code constant.
*
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
index d5927fee83..25e45628e1 100644
--- a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -924,7 +924,7 @@ abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
abstract protected function getIntlErrorCode();
/**
- * @param integer $errorCode
+ * @param int $errorCode
*
* @return Boolean
*/
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
index c7801f4300..e59e6aa1ab 100644
--- a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -734,7 +734,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
abstract protected function getIntlErrorCode();
/**
- * @param integer $errorCode
+ * @param int $errorCode
*
* @return Boolean
*/
diff --git a/src/Symfony/Component/Intl/Util/IcuVersion.php b/src/Symfony/Component/Intl/Util/IcuVersion.php
index e305a07528..92faf37aa3 100644
--- a/src/Symfony/Component/Intl/Util/IcuVersion.php
+++ b/src/Symfony/Component/Intl/Util/IcuVersion.php
@@ -46,7 +46,7 @@ class IcuVersion
* @param string $version1 A version string.
* @param string $version2 A version string to compare.
* @param string $operator The comparison operator.
- * @param integer|null $precision The number of components to compare. Pass
+ * @param int |null $precision The number of components to compare. Pass
* NULL to compare the versions unchanged.
*
* @return Boolean Whether the comparison succeeded.
@@ -81,7 +81,7 @@ class IcuVersion
* // => '12.3'
*
* @param string $version An ICU version string.
- * @param integer|null $precision The number of components to include. Pass
+ * @param int |null $precision The number of components to include. Pass
* NULL to return the version unchanged.
*
* @return string|null The normalized ICU version or NULL if it couldn't be
diff --git a/src/Symfony/Component/Intl/Util/Version.php b/src/Symfony/Component/Intl/Util/Version.php
index 5f6a43374b..c85e9d4090 100644
--- a/src/Symfony/Component/Intl/Util/Version.php
+++ b/src/Symfony/Component/Intl/Util/Version.php
@@ -36,7 +36,7 @@ class Version
* @param string $version1 A version string.
* @param string $version2 A version string to compare.
* @param string $operator The comparison operator.
- * @param integer|null $precision The number of components to compare. Pass
+ * @param int |null $precision The number of components to compare. Pass
* NULL to compare the versions unchanged.
*
* @return Boolean Whether the comparison succeeded.
@@ -64,7 +64,7 @@ class Version
* // => '1.2'
*
* @param string $version A version string.
- * @param integer|null $precision The number of components to include. Pass
+ * @param int |null $precision The number of components to include. Pass
* NULL to return the version unchanged.
*
* @return string|null The normalized version or NULL if it couldn't be
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
index d146057e08..93948e1db0 100644
--- a/src/Symfony/Component/Process/PhpProcess.php
+++ b/src/Symfony/Component/Process/PhpProcess.php
@@ -34,7 +34,7 @@ class PhpProcess extends Process
* @param string $script The PHP script to run (as a string)
* @param string $cwd The working directory
* @param array $env The environment variables
- * @param integer $timeout The timeout in seconds
+ * @param int $timeout The timeout in seconds
* @param array $options An array of options for proc_open
*
* @api
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 8f78fd5792..362c2a7e5f 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -123,7 +123,7 @@ class Process
* @param string|null $cwd The working directory or null to use the working dir of the current PHP process
* @param array|null $env The environment variables or null to inherit
* @param string|null $stdin The STDIN content
- * @param integer|float|null $timeout The timeout in seconds or null to disable
+ * @param int |float|null $timeout The timeout in seconds or null to disable
* @param array $options An array of options for proc_open
*
* @throws RuntimeException When proc_open is not installed
@@ -351,7 +351,7 @@ class Process
/**
* Sends a POSIX signal to the process.
*
- * @param integer $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
+ * @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
*
* @return Process
*
@@ -646,8 +646,8 @@ class Process
/**
* Stops the process.
*
- * @param integer|float $timeout The timeout in seconds
- * @param integer $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL
+ * @param int |float $timeout The timeout in seconds
+ * @param int $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL
*
* @return integer The exit-code of the process
*
@@ -746,7 +746,7 @@ class Process
*
* To disable the timeout, set this value to null.
*
- * @param integer|float|null $timeout The timeout in seconds
+ * @param int |float|null $timeout The timeout in seconds
*
* @return self The current Process instance
*
@@ -770,7 +770,7 @@ class Process
/**
* Enables or disables the TTY mode.
*
- * @param boolean $tty True to enabled and false to disable
+ * @param bool $tty True to enabled and false to disable
*
* @return self The current Process instance
*/
@@ -922,7 +922,7 @@ class Process
/**
* Sets whether or not Windows compatibility is enabled.
*
- * @param Boolean $enhance
+ * @param bool $enhance
*
* @return self The current Process instance
*/
@@ -950,7 +950,7 @@ class Process
* determine the success of a process when PHP has been compiled with
* the --enable-sigchild option
*
- * @param Boolean $enhance
+ * @param bool $enhance
*
* @return self The current Process instance
*/
@@ -1035,7 +1035,7 @@ class Process
/**
* Updates the status of the process, reads pipes.
*
- * @param Boolean $blocking Whether to use a blocking read call.
+ * @param bool $blocking Whether to use a blocking read call.
*/
protected function updateStatus($blocking)
{
@@ -1077,8 +1077,8 @@ class Process
/**
* Reads pipes, executes callback.
*
- * @param Boolean $blocking Whether to use blocking calls or not.
- * @param Boolean $close Whether to close file handles or not.
+ * @param bool $blocking Whether to use blocking calls or not.
+ * @param bool $close Whether to close file handles or not.
*/
private function readPipes($blocking, $close)
{
@@ -1155,8 +1155,8 @@ class Process
/**
* Sends a POSIX signal to the process.
*
- * @param integer $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
- * @param Boolean $throwException Whether to throw exception in case signal failed
+ * @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
+ * @param bool $throwException Whether to throw exception in case signal failed
*
* @return Boolean True if the signal was sent successfully, false otherwise
*
diff --git a/src/Symfony/Component/Process/ProcessPipes.php b/src/Symfony/Component/Process/ProcessPipes.php
index 12cc47a8c8..d03dd6ba0c 100644
--- a/src/Symfony/Component/Process/ProcessPipes.php
+++ b/src/Symfony/Component/Process/ProcessPipes.php
@@ -151,7 +151,7 @@ class ProcessPipes
/**
* Reads data in file handles and pipes.
*
- * @param Boolean $blocking Whether to use blocking calls or not.
+ * @param bool $blocking Whether to use blocking calls or not.
*
* @return array An array of read data indexed by their fd.
*/
@@ -163,7 +163,7 @@ class ProcessPipes
/**
* Reads data in file handles and pipes, closes them if EOF is reached.
*
- * @param Boolean $blocking Whether to use blocking calls or not.
+ * @param bool $blocking Whether to use blocking calls or not.
*
* @return array An array of read data indexed by their fd.
*/
@@ -189,7 +189,7 @@ class ProcessPipes
/**
* Writes stdin data.
*
- * @param Boolean $blocking Whether to use blocking calls or not.
+ * @param bool $blocking Whether to use blocking calls or not.
* @param string|null $stdin The data to write.
*/
public function write($blocking, $stdin)
@@ -240,7 +240,7 @@ class ProcessPipes
/**
* Reads data in file handles.
*
- * @param Boolean $close Whether to close file handles or not.
+ * @param bool $close Whether to close file handles or not.
*
* @return array An array of read data indexed by their fd.
*/
@@ -276,8 +276,8 @@ class ProcessPipes
/**
* Reads data in file pipes streams.
*
- * @param Boolean $blocking Whether to use blocking calls or not.
- * @param Boolean $close Whether to close file handles or not.
+ * @param bool $blocking Whether to use blocking calls or not.
+ * @param bool $close Whether to close file handles or not.
*
* @return array An array of read data indexed by their fd.
*/
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
index 6cb0af5ba3..738319e24c 100644
--- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -779,7 +779,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
* @param null $cwd
* @param array $env
* @param null $stdin
- * @param integer $timeout
+ * @param int $timeout
* @param array $options
*
* @return Process
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 0a2eae259a..b3229d5461 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -100,7 +100,7 @@ class PropertyAccessor implements PropertyAccessorInterface
*
* @param object|array $objectOrArray The object or array to read from
* @param PropertyPathInterface $propertyPath The property path to read
- * @param integer $lastIndex The index up to which should be read
+ * @param int $lastIndex The index up to which should be read
*
* @return array The values read in the path.
*
@@ -424,7 +424,7 @@ class PropertyAccessor implements PropertyAccessorInterface
*
* @param \ReflectionClass $class The class of the method
* @param string $methodName The method name
- * @param integer $parameters The number of parameters
+ * @param int $parameters The number of parameters
*
* @return Boolean Whether the method is public and has $parameters
* required parameters
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
index f4eb0fb93f..45118f98a8 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -45,9 +45,9 @@ class PropertyPathBuilder
* Appends a (sub-) path to the current path.
*
* @param PropertyPathInterface|string $path The path to append.
- * @param integer $offset The offset where the appended
+ * @param int $offset The offset where the appended
* piece starts in $path.
- * @param integer $length The length of the appended piece.
+ * @param int $length The length of the appended piece.
* If 0, the full path is appended.
*/
public function append($path, $offset = 0, $length = 0)
@@ -93,8 +93,8 @@ class PropertyPathBuilder
/**
* Removes elements from the current path.
*
- * @param integer $offset The offset at which to remove
- * @param integer $length The length of the removed piece
+ * @param int $offset The offset at which to remove
+ * @param int $length The length of the removed piece
*
* @throws OutOfBoundsException if offset is invalid
*/
@@ -110,12 +110,12 @@ class PropertyPathBuilder
/**
* Replaces a sub-path by a different (sub-) path.
*
- * @param integer $offset The offset at which to replace.
- * @param integer $length The length of the piece to replace.
+ * @param int $offset The offset at which to replace.
+ * @param int $length The length of the piece to replace.
* @param PropertyPathInterface|string $path The path to insert.
- * @param integer $pathOffset The offset where the inserted piece
+ * @param int $pathOffset The offset where the inserted piece
* starts in $path.
- * @param integer $pathLength The length of the inserted piece.
+ * @param int $pathLength The length of the inserted piece.
* If 0, the full path is inserted.
*
* @throws OutOfBoundsException If the offset is invalid
@@ -147,7 +147,7 @@ class PropertyPathBuilder
/**
* Replaces a property element by an index element.
*
- * @param integer $offset The offset at which to replace
+ * @param int $offset The offset at which to replace
* @param string $name The new name of the element. Optional.
*
* @throws OutOfBoundsException If the offset is invalid
@@ -168,7 +168,7 @@ class PropertyPathBuilder
/**
* Replaces an index element by a property element.
*
- * @param integer $offset The offset at which to replace
+ * @param int $offset The offset at which to replace
* @param string $name The new name of the element. Optional.
*
* @throws OutOfBoundsException If the offset is invalid
@@ -235,9 +235,9 @@ class PropertyPathBuilder
* removed at $offset and another chunk of length $insertionLength
* can be inserted.
*
- * @param integer $offset The offset where the removed chunk starts
- * @param integer $cutLength The length of the removed chunk
- * @param integer $insertionLength The length of the inserted chunk
+ * @param int $offset The offset where the removed chunk starts
+ * @param int $cutLength The length of the removed chunk
+ * @param int $insertionLength The length of the inserted chunk
*/
private function resize($offset, $cutLength, $insertionLength)
{
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
index 95f34ffae6..fe5c7c8842 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
@@ -54,7 +54,7 @@ interface PropertyPathInterface extends \Traversable
/**
* Returns the element at the given index in the property path
*
- * @param integer $index The index key
+ * @param int $index The index key
*
* @return string A property or index name
*
@@ -65,7 +65,7 @@ interface PropertyPathInterface extends \Traversable
/**
* Returns whether the element at the given index is a property
*
- * @param integer $index The index in the property path
+ * @param int $index The index in the property path
*
* @return Boolean Whether the element at this index is a property
*
@@ -76,7 +76,7 @@ interface PropertyPathInterface extends \Traversable
/**
* Returns whether the element at the given index is an array index
*
- * @param integer $index The index in the property path
+ * @param int $index The index in the property path
*
* @return Boolean Whether the element at this index is an array index
*
diff --git a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
index 8c25f34b12..4afc3cbcfd 100644
--- a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
+++ b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
@@ -41,7 +41,7 @@ interface ConfigurableRequirementsInterface
* Enables or disables the exception on incorrect parameters.
* Passing null will deactivate the requirements check completely.
*
- * @param Boolean|null $enabled
+ * @param bool|null $enabled
*/
public function setStrictRequirements($enabled);
diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
index 8e3b2778b9..b89966d08c 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -72,7 +72,7 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
*
* @param string $name The name of the route
* @param mixed $parameters An array of parameters
- * @param Boolean|string $referenceType The type of reference to be generated (one of the constants)
+ * @param bool|string $referenceType The type of reference to be generated (one of the constants)
*
* @return string The generated URL
*
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index dc17ffbe98..e378d67ff9 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -78,7 +78,7 @@ EOF;
/**
* Generates the code for the match method implementing UrlMatcherInterface.
*
- * @param Boolean $supportsRedirections Whether redirections are supported by the base class
+ * @param bool $supportsRedirections Whether redirections are supported by the base class
*
* @return string Match method as PHP code
*/
@@ -103,7 +103,7 @@ EOF;
* Generates PHP code to match a RouteCollection with all its routes.
*
* @param RouteCollection $routes A RouteCollection instance
- * @param Boolean $supportsRedirections Whether redirections are supported by the base class
+ * @param bool $supportsRedirections Whether redirections are supported by the base class
*
* @return string PHP code
*/
@@ -144,7 +144,7 @@ EOF;
* Generates PHP code recursively to match a tree of routes
*
* @param DumperPrefixCollection $collection A DumperPrefixCollection instance
- * @param Boolean $supportsRedirections Whether redirections are supported by the base class
+ * @param bool $supportsRedirections Whether redirections are supported by the base class
* @param string $parentPrefix Prefix of the parent collection
*
* @return string PHP code
@@ -184,7 +184,7 @@ EOF;
*
* @param Route $route A Route instance
* @param string $name The name of the Route
- * @param Boolean $supportsRedirections Whether redirections are supported by the base class
+ * @param bool $supportsRedirections Whether redirections are supported by the base class
* @param string|null $parentPrefix The prefix of the parent collection used to optimize the code
*
* @return string PHP code
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
index cb53696896..8c7fae9d50 100644
--- a/src/Symfony/Component/Routing/RequestContext.php
+++ b/src/Symfony/Component/Routing/RequestContext.php
@@ -43,8 +43,8 @@ class RequestContext
* @param string $method The HTTP method
* @param string $host The HTTP host name
* @param string $scheme The HTTP scheme
- * @param integer $httpPort The HTTP port
- * @param integer $httpsPort The HTTPS port
+ * @param int $httpPort The HTTP port
+ * @param int $httpsPort The HTTPS port
* @param string $path The path
* @param string $queryString The query string
*
diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php
index 7ced4b3af8..cd3a11ccfe 100644
--- a/src/Symfony/Component/Routing/RouteCompiler.php
+++ b/src/Symfony/Component/Routing/RouteCompiler.php
@@ -196,8 +196,8 @@ class RouteCompiler implements RouteCompilerInterface
* Computes the regexp used to match a specific token. It can be static text or a subpattern.
*
* @param array $tokens The route tokens
- * @param integer $index The index of the current token
- * @param integer $firstOptional The index of the first optional token
+ * @param int $index The index of the current token
+ * @param int $firstOptional The index of the first optional token
*
* @return string The regexp pattern for a single token
*/
diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
index 69d4d955bd..57c5329336 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -318,7 +318,7 @@ SELECTCLAUSE;
* object identities.
*
* @param ObjectIdentityInterface $oid
- * @param Boolean $directChildrenOnly
+ * @param bool $directChildrenOnly
* @return string
*/
protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly)
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
index 29d3cfd640..7b0f4bc68e 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -354,7 +354,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
/**
* Constructs the SQL for deleting access control entries.
*
- * @param integer $oidPK
+ * @param int $oidPK
* @return string
*/
protected function getDeleteAccessControlEntriesSql($oidPK)
@@ -369,7 +369,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
/**
* Constructs the SQL for deleting a specific ACE.
*
- * @param integer $acePK
+ * @param int $acePK
* @return string
*/
protected function getDeleteAccessControlEntrySql($acePK)
@@ -384,7 +384,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
/**
* Constructs the SQL for deleting an object identity.
*
- * @param integer $pk
+ * @param int $pk
* @return string
*/
protected function getDeleteObjectIdentitySql($pk)
@@ -399,7 +399,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
/**
* Constructs the SQL for deleting relation entries.
*
- * @param integer $pk
+ * @param int $pk
* @return string
*/
protected function getDeleteObjectIdentityRelationsSql($pk)
@@ -414,16 +414,16 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
/**
* Constructs the SQL for inserting an ACE.
*
- * @param integer $classId
- * @param integer|null $objectIdentityId
+ * @param int $classId
+ * @param int |null $objectIdentityId
* @param string|null $field
- * @param integer $aceOrder
- * @param integer $securityIdentityId
+ * @param int $aceOrder
+ * @param int $securityIdentityId
* @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param int $mask
+ * @param bool $granting
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
* @return string
*/
protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure)
@@ -478,8 +478,8 @@ QUERY;
/**
* Constructs the SQL for inserting a relation entry.
*
- * @param integer $objectIdentityId
- * @param integer $ancestorId
+ * @param int $objectIdentityId
+ * @param int $ancestorId
* @return string
*/
protected function getInsertObjectIdentityRelationSql($objectIdentityId, $ancestorId)
@@ -496,8 +496,8 @@ QUERY;
* Constructs the SQL for inserting an object identity.
*
* @param string $identifier
- * @param integer $classId
- * @param Boolean $entriesInheriting
+ * @param int $classId
+ * @param bool $entriesInheriting
* @return string
*/
protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInheriting)
@@ -546,10 +546,10 @@ QUERY;
/**
* Constructs the SQL for selecting an ACE.
*
- * @param integer $classId
- * @param integer $oid
+ * @param int $classId
+ * @param int $oid
* @param string $field
- * @param integer $order
+ * @param int $order
* @return string
*/
protected function getSelectAccessControlEntryIdSql($classId, $oid, $field, $order)
@@ -614,7 +614,7 @@ QUERY;
/**
* Constructs the SQL for updating an object identity.
*
- * @param integer $pk
+ * @param int $pk
* @param array $changes
* @throws \InvalidArgumentException
* @return string
@@ -636,7 +636,7 @@ QUERY;
/**
* Constructs the SQL for updating an ACE.
*
- * @param integer $pk
+ * @param int $pk
* @param array $sets
* @throws \InvalidArgumentException
* @return string
@@ -709,7 +709,7 @@ QUERY;
/**
* Deletes all ACEs for the given object identity primary key.
*
- * @param integer $oidPK
+ * @param int $oidPK
*/
private function deleteAccessControlEntries($oidPK)
{
@@ -719,7 +719,7 @@ QUERY;
/**
* Deletes the object identity from the database.
*
- * @param integer $pk
+ * @param int $pk
*/
private function deleteObjectIdentity($pk)
{
@@ -729,7 +729,7 @@ QUERY;
/**
* Deletes all entries from the relations table from the database.
*
- * @param integer $pk
+ * @param int $pk
*/
private function deleteObjectIdentityRelations($pk)
{
diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
index 4665c0e18d..41b2cd6396 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Acl.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php
@@ -49,11 +49,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Constructor
*
- * @param integer $id
+ * @param int $id
* @param ObjectIdentityInterface $objectIdentity
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
* @param array $loadedSids
- * @param Boolean $entriesInheriting
+ * @param bool $entriesInheriting
*/
public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)
{
@@ -398,7 +398,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Deletes an ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @throws \OutOfBoundsException
*/
private function deleteAce($property, $index)
@@ -422,7 +422,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Deletes a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
* @throws \OutOfBoundsException
*/
@@ -447,10 +447,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Inserts an ACE
*
* @param string $property
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
+ * @param bool $granting
* @param string $strategy
* @throws \OutOfBoundsException
* @throws \InvalidArgumentException
@@ -495,11 +495,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Inserts a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
+ * @param bool $granting
* @param string $strategy
* @throws \InvalidArgumentException
* @throws \OutOfBoundsException
@@ -552,8 +552,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates an ACE
*
* @param string $property
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param string $strategy
* @throws \OutOfBoundsException
*/
@@ -579,9 +579,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates auditing for an ACE
*
* @param array &$aces
- * @param integer $index
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param int $index
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
* @throws \OutOfBoundsException
*/
private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure)
@@ -605,9 +605,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param string $strategy
* @throws \InvalidArgumentException
* @throws \OutOfBoundsException
diff --git a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
index 8174873531..feb2c42725 100644
--- a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
+++ b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
@@ -25,7 +25,7 @@ abstract class AuditLogger implements AuditLoggerInterface
/**
* Performs some checks if logging was requested
*
- * @param Boolean $granted
+ * @param bool $granted
* @param EntryInterface $ace
*/
public function logIfNeeded($granted, EntryInterface $ace)
@@ -44,7 +44,7 @@ abstract class AuditLogger implements AuditLoggerInterface
/**
* This method is only called when logging is needed
*
- * @param Boolean $granted
+ * @param bool $granted
* @param EntryInterface $ace
*/
abstract protected function doLog($granted, EntryInterface $ace);
diff --git a/src/Symfony/Component/Security/Acl/Domain/Entry.php b/src/Symfony/Component/Security/Acl/Domain/Entry.php
index 42449c4462..f49c95b418 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Entry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Entry.php
@@ -34,14 +34,14 @@ class Entry implements AuditableEntryInterface
/**
* Constructor
*
- * @param integer $id
+ * @param int $id
* @param AclInterface $acl
* @param SecurityIdentityInterface $sid
* @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditFailure
- * @param Boolean $auditSuccess
+ * @param int $mask
+ * @param bool $granting
+ * @param bool $auditFailure
+ * @param bool $auditSuccess
*/
public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
{
@@ -125,7 +125,7 @@ class Entry implements AuditableEntryInterface
* Do never call this method directly. Use the respective methods on the
* AclInterface instead.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*/
public function setAuditFailure($boolean)
{
@@ -138,7 +138,7 @@ class Entry implements AuditableEntryInterface
* Do never call this method directly. Use the respective methods on the
* AclInterface instead.
*
- * @param Boolean $boolean
+ * @param bool $boolean
*/
public function setAuditSuccess($boolean)
{
@@ -151,7 +151,7 @@ class Entry implements AuditableEntryInterface
* Do never call this method directly. Use the respective methods on the
* AclInterface instead.
*
- * @param integer $mask
+ * @param int $mask
*/
public function setMask($mask)
{
diff --git a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
index f05736754e..e4554f9941 100644
--- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
@@ -27,15 +27,15 @@ class FieldEntry extends Entry implements FieldEntryInterface
/**
* Constructor
*
- * @param integer $id
+ * @param int $id
* @param AclInterface $acl
* @param string $field
* @param SecurityIdentityInterface $sid
* @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditFailure
- * @param Boolean $auditSuccess
+ * @param int $mask
+ * @param bool $granting
+ * @param bool $auditFailure
+ * @param bool $auditSuccess
*/
public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
{
diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
index d50584308c..0ebb8bc24f 100644
--- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
+++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
@@ -128,7 +128,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* @param EntryInterface[] $aces An array of ACE to check against
* @param array $masks An array of permission masks
* @param SecurityIdentityInterface[] $sids An array of SecurityIdentityInterface implementations
- * @param Boolean $administrativeMode True turns off audit logging
+ * @param bool $administrativeMode True turns off audit logging
*
* @return Boolean true, or false; either granting, or denying access respectively.
*
@@ -188,7 +188,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* Strategy EQUAL:
* The ACE will be considered applicable when the bitmasks are equal.
*
- * @param integer $requiredMask
+ * @param int $requiredMask
* @param EntryInterface $ace
*
* @return Boolean
diff --git a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php
index ea9604e43b..4673e012db 100644
--- a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php
@@ -37,7 +37,7 @@ interface AclCacheInterface
/**
* Retrieves an ACL for the given object identity primary key from the cache
*
- * @param integer $primaryKey
+ * @param int $primaryKey
* @return AclInterface
*/
public function getFromCacheById($primaryKey);
diff --git a/src/Symfony/Component/Security/Acl/Model/AclInterface.php b/src/Symfony/Component/Security/Acl/Model/AclInterface.php
index 02bbd008e5..800eaa8933 100644
--- a/src/Symfony/Component/Security/Acl/Model/AclInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AclInterface.php
@@ -82,7 +82,7 @@ interface AclInterface extends \Serializable
* @param string $field
* @param array $masks
* @param array $securityIdentities
- * @param Boolean $administrativeMode
+ * @param bool $administrativeMode
* @return Boolean
*/
public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
@@ -93,7 +93,7 @@ interface AclInterface extends \Serializable
* @throws NoAceFoundException when no ACE was applicable for this request
* @param array $masks
* @param array $securityIdentities
- * @param Boolean $administrativeMode
+ * @param bool $administrativeMode
* @return Boolean
*/
public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
diff --git a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
index 615cf145ac..dd8fb1967b 100644
--- a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
@@ -24,7 +24,7 @@ interface AclProviderInterface
* Retrieves all child object identities from the database
*
* @param ObjectIdentityInterface $parentOid
- * @param Boolean $directChildrenOnly
+ * @param bool $directChildrenOnly
*
* @return array returns an array of child 'ObjectIdentity's
*/
diff --git a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php
index 09bcbb8664..11fe7f5aa6 100644
--- a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php
@@ -22,7 +22,7 @@ interface AuditLoggerInterface
* This method is called whenever access is granted, or denied, and
* administrative mode is turned off.
*
- * @param Boolean $granted
+ * @param bool $granted
* @param EntryInterface $ace
*/
public function logIfNeeded($granted, EntryInterface $ace);
diff --git a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php
index 14b4c04727..f5ed9ddd2c 100644
--- a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php
@@ -21,38 +21,38 @@ interface AuditableAclInterface extends MutableAclInterface
/**
* Updates auditing for class-based ACE
*
- * @param integer $index
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param int $index
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
*/
public function updateClassAuditing($index, $auditSuccess, $auditFailure);
/**
* Updates auditing for class-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
*/
public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure);
/**
* Updates auditing for object-based ACE
*
- * @param integer $index
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param int $index
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
*/
public function updateObjectAuditing($index, $auditSuccess, $auditFailure);
/**
* Updates auditing for object-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
*/
public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
}
diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
index 365a779df3..d76c598d40 100644
--- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
@@ -24,14 +24,14 @@ interface MutableAclInterface extends AclInterface
/**
* Deletes a class-based ACE
*
- * @param integer $index
+ * @param int $index
*/
public function deleteClassAce($index);
/**
* Deletes a class-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
*/
public function deleteClassFieldAce($index, $field);
@@ -39,14 +39,14 @@ interface MutableAclInterface extends AclInterface
/**
* Deletes an object-based ACE
*
- * @param integer $index
+ * @param int $index
*/
public function deleteObjectAce($index);
/**
* Deletes an object-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
*/
public function deleteObjectFieldAce($index, $field);
@@ -62,9 +62,9 @@ interface MutableAclInterface extends AclInterface
* Inserts a class-based ACE
*
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
+ * @param int $mask
+ * @param int $index
+ * @param bool $granting
* @param string $strategy
*/
public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -74,9 +74,9 @@ interface MutableAclInterface extends AclInterface
*
* @param string $field
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
+ * @param int $mask
+ * @param int $index
+ * @param bool $granting
* @param string $strategy
*/
public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -85,9 +85,9 @@ interface MutableAclInterface extends AclInterface
* Inserts an object-based ACE
*
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
+ * @param int $mask
+ * @param int $index
+ * @param bool $granting
* @param string $strategy
*/
public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -97,9 +97,9 @@ interface MutableAclInterface extends AclInterface
*
* @param string $field
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
+ * @param int $mask
+ * @param int $index
+ * @param bool $granting
* @param string $strategy
*/
public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -107,7 +107,7 @@ interface MutableAclInterface extends AclInterface
/**
* Sets whether entries are inherited
*
- * @param Boolean $boolean
+ * @param bool $boolean
*/
public function setEntriesInheriting($boolean);
@@ -121,8 +121,8 @@ interface MutableAclInterface extends AclInterface
/**
* Updates a class-based ACE
*
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param string $strategy if null the strategy should not be changed
*/
public function updateClassAce($index, $mask, $strategy = null);
@@ -130,9 +130,9 @@ interface MutableAclInterface extends AclInterface
/**
* Updates a class-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param string $strategy if null the strategy should not be changed
*/
public function updateClassFieldAce($index, $field, $mask, $strategy = null);
@@ -140,8 +140,8 @@ interface MutableAclInterface extends AclInterface
/**
* Updates an object-based ACE
*
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param string $strategy if null the strategy should not be changed
*/
public function updateObjectAce($index, $mask, $strategy = null);
@@ -149,9 +149,9 @@ interface MutableAclInterface extends AclInterface
/**
* Updates an object-field-based ACE
*
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param string $strategy if null the strategy should not be changed
*/
public function updateObjectFieldAce($index, $field, $mask, $strategy = null);
diff --git a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
index 7f8f81bb28..def5fd17db 100644
--- a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -24,7 +24,7 @@ interface PermissionGrantingStrategyInterface
* @param AclInterface $acl
* @param array $masks
* @param array $sids
- * @param Boolean $administrativeMode
+ * @param bool $administrativeMode
* @return Boolean
*/
public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
@@ -36,7 +36,7 @@ interface PermissionGrantingStrategyInterface
* @param string $field
* @param array $masks
* @param array $sids
- * @param Boolean $administrativeMode
+ * @param bool $administrativeMode
*
* @return Boolean
*/
diff --git a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
index 017e7c0241..c0d21ace41 100644
--- a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
+++ b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
@@ -72,7 +72,7 @@ class MaskBuilder
/**
* Constructor
*
- * @param integer $mask optional; defaults to 0
+ * @param int $mask optional; defaults to 0
*
* @throws \InvalidArgumentException
*/
@@ -178,7 +178,7 @@ class MaskBuilder
/**
* Returns the code for the passed mask
*
- * @param integer $mask
+ * @param int $mask
* @throws \InvalidArgumentException
* @throws \RuntimeException
* @return string
diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
index de1973dc02..f713e8f68f 100644
--- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
+++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php
@@ -38,7 +38,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface
* Constructor.
*
* @param AuthenticationProviderInterface[] $providers An array of AuthenticationProviderInterface instances
- * @param Boolean $eraseCredentials Whether to erase credentials after authentication or not
+ * @param bool $eraseCredentials Whether to erase credentials after authentication or not
*
* @throws \InvalidArgumentException
*/
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
index a9a22056d6..4913be8466 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -38,7 +38,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
* @param UserCheckerInterface $userChecker An UserCheckerInterface instance
* @param string $providerKey The provider key
* @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance
- * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
+ * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not
*/
public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
{
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
index 18c3e70ade..14fbddab69 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -37,7 +37,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
*
* @param UserCheckerInterface $userChecker An UserCheckerInterface interface
* @param string $providerKey A provider key
- * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
+ * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not
*
* @throws \InvalidArgumentException
*/
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
index 11f69da32d..a9094697b0 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
@@ -76,7 +76,7 @@ interface TokenInterface extends \Serializable
/**
* Sets the authenticated flag.
*
- * @param Boolean $isAuthenticated The authenticated flag
+ * @param bool $isAuthenticated The authenticated flag
*/
public function setAuthenticated($isAuthenticated);
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
index 2b2a1584d0..6e5effb86a 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -32,8 +32,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
*
* @param VoterInterface[] $voters An array of VoterInterface instances
* @param string $strategy The vote strategy
- * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
- * @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
+ * @param bool $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
+ * @param bool $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
*
* @throws \InvalidArgumentException
*/
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
index 5a0f12261c..1dcf3a6969 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -27,7 +27,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
/**
* Constructor.
*
- * @param integer $cost The algorithmic cost that should be used
+ * @param int $cost The algorithmic cost that should be used
*
* @throws \RuntimeException When no BCrypt encoder is available
* @throws \InvalidArgumentException if cost is out of range
diff --git a/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
index a7e5546f54..9aa240ad7c 100644
--- a/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
@@ -28,8 +28,8 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
* Constructor.
*
* @param string $algorithm The digest algorithm to use
- * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
- * @param integer $iterations The number of iterations to use to stretch the password hash
+ * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
+ * @param int $iterations The number of iterations to use to stretch the password hash
*/
public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 5000)
{
diff --git a/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
index 8a5a958448..55b5261ee1 100644
--- a/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
@@ -37,9 +37,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
* Constructor.
*
* @param string $algorithm The digest algorithm to use
- * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
- * @param integer $iterations The number of iterations to use to stretch the password hash
- * @param integer $length Length of derived key to create
+ * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
+ * @param int $iterations The number of iterations to use to stretch the password hash
+ * @param int $length Length of derived key to create
*/
public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40)
{
diff --git a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
index 22f3da4580..bdb058ab63 100644
--- a/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
@@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder
/**
* Constructor.
*
- * @param Boolean $ignorePasswordCase Compare password case-insensitive
+ * @param bool $ignorePasswordCase Compare password case-insensitive
*/
public function __construct($ignorePasswordCase = false)
{
diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php
index c55cecfa02..0326f1dc4a 100644
--- a/src/Symfony/Component/Security/Core/SecurityContext.php
+++ b/src/Symfony/Component/Security/Core/SecurityContext.php
@@ -36,7 +36,7 @@ class SecurityContext implements SecurityContextInterface
*
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
* @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance
- * @param Boolean $alwaysAuthenticate
+ * @param bool $alwaysAuthenticate
*/
public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false)
{
diff --git a/src/Symfony/Component/Security/Core/Util/SecureRandomInterface.php b/src/Symfony/Component/Security/Core/Util/SecureRandomInterface.php
index 2c35a7219e..2cf777931b 100644
--- a/src/Symfony/Component/Security/Core/Util/SecureRandomInterface.php
+++ b/src/Symfony/Component/Security/Core/Util/SecureRandomInterface.php
@@ -21,7 +21,7 @@ interface SecureRandomInterface
/**
* Generates the specified number of secure random bytes.
*
- * @param integer $nbBytes
+ * @param int $nbBytes
*
* @return string
*/
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 06df099a0a..c734db065e 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -34,7 +34,7 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
* @param HttpKernelInterface $kernel
* @param HttpUtils $httpUtils An HttpUtils instance
* @param string $loginPath The path to the login form
- * @param Boolean $useForward Whether to forward or redirect to the login form
+ * @param bool $useForward Whether to forward or redirect to the login form
*/
public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, $loginPath, $useForward = false)
{
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
index 0c8b21b780..a7b0226d05 100644
--- a/src/Symfony/Component/Security/Http/HttpUtils.php
+++ b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -53,7 +53,7 @@ class HttpUtils
*
* @param Request $request A Request instance
* @param string $path A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo))
- * @param integer $status The status code
+ * @param int $status The status code
*
* @return RedirectResponse A RedirectResponse instance
*/
diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
index df0ea1b5a0..64d41bec80 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -116,7 +116,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
*
* @param string $class
* @param string $username The username
- * @param integer $expires The Unix timestamp when the cookie expires
+ * @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
*
* @throws \RuntimeException if username contains invalid chars
@@ -138,7 +138,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
*
* @param string $class
* @param string $username The username
- * @param integer $expires The Unix timestamp when the cookie expires
+ * @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
*
* @throws \RuntimeException when the private key is empty
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
index f8dfab35a8..6a593f85f1 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -38,8 +38,8 @@ class JsonDecode implements DecoderInterface
/**
* Constructs a new JsonDecode instance.
*
- * @param Boolean $associative True to return the result associative array, false for a nested stdClass hierarchy
- * @param integer $depth Specifies the recursion depth
+ * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy
+ * @param int $depth Specifies the recursion depth
*/
public function __construct($associative = false, $depth = 512)
{
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
index e87f20f9c4..1ffcb34010 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -213,7 +213,7 @@ class StopwatchEvent
/**
* Formats a time.
*
- * @param integer|float $time A raw time
+ * @param int |float $time A raw time
*
* @return float The formatted time
*
diff --git a/src/Symfony/Component/Stopwatch/StopwatchPeriod.php b/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
index 54fd193382..bd0e28b59b 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchPeriod.php
@@ -25,8 +25,8 @@ class StopwatchPeriod
/**
* Constructor
*
- * @param integer $start The relative time of the start of the period
- * @param integer $end The relative time of the end of the period
+ * @param int $start The relative time of the start of the period
+ * @param int $end The relative time of the end of the period
*/
public function __construct($start, $end)
{
diff --git a/src/Symfony/Component/Templating/Helper/SlotsHelper.php b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
index 98b2b872d8..e8a8533f9f 100644
--- a/src/Symfony/Component/Templating/Helper/SlotsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
@@ -84,7 +84,7 @@ class SlotsHelper extends Helper
* Gets the slot value.
*
* @param string $name The slot name
- * @param Boolean|string $default The default slot content
+ * @param bool|string $default The default slot content
*
* @return string The slot content
*
@@ -112,7 +112,7 @@ class SlotsHelper extends Helper
* Outputs a slot.
*
* @param string $name The slot name
- * @param Boolean|string $default The default slot content
+ * @param bool|string $default The default slot content
*
* @return Boolean true if the slot is defined or if a default content has been provided, false otherwise
*
diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php
index 9fcb6bf767..357f61edf2 100644
--- a/src/Symfony/Component/Templating/Loader/CacheLoader.php
+++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php
@@ -86,7 +86,7 @@ class CacheLoader extends Loader
* Returns true if the template is still fresh.
*
* @param TemplateReferenceInterface $template A template
- * @param integer $time The last modification time of the cached template (timestamp)
+ * @param int $time The last modification time of the cached template (timestamp)
*
* @return Boolean
*/
diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
index 2009856e79..06146f3e93 100644
--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
+++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
@@ -68,7 +68,7 @@ class ChainLoader extends Loader
* Returns true if the template is still fresh.
*
* @param TemplateReferenceInterface $template A template
- * @param integer $time The last modification time of the cached template (timestamp)
+ * @param int $time The last modification time of the cached template (timestamp)
*
* @return Boolean
*/
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
index 563010c6a6..44de5f0cfe 100644
--- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -88,7 +88,7 @@ class FilesystemLoader extends Loader
* Returns true if the template is still fresh.
*
* @param TemplateReferenceInterface $template A template
- * @param integer $time The last modification time of the cached template (timestamp)
+ * @param int $time The last modification time of the cached template (timestamp)
*
* @return Boolean true if the template is still fresh, false otherwise
*
diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php
index 3f96222b11..ddbe27a4e1 100644
--- a/src/Symfony/Component/Templating/Loader/LoaderInterface.php
+++ b/src/Symfony/Component/Templating/Loader/LoaderInterface.php
@@ -38,7 +38,7 @@ interface LoaderInterface
* Returns true if the template is still fresh.
*
* @param TemplateReferenceInterface $template A template
- * @param integer $time The last modification time of the cached template (timestamp)
+ * @param int $time The last modification time of the cached template (timestamp)
*
* @return Boolean
*
diff --git a/src/Symfony/Component/Translation/Interval.php b/src/Symfony/Component/Translation/Interval.php
index 033b018840..b9f071c67c 100644
--- a/src/Symfony/Component/Translation/Interval.php
+++ b/src/Symfony/Component/Translation/Interval.php
@@ -36,7 +36,7 @@ class Interval
/**
* Tests if the given number is in the math interval.
*
- * @param integer $number A number
+ * @param int $number A number
* @param string $interval An interval
*
* @return Boolean
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index e3cad7f773..3902ec3a13 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -169,7 +169,7 @@ class MoFileLoader extends ArrayLoader implements LoaderInterface
* Reads an unsigned long from stream respecting endianess.
*
* @param resource $stream
- * @param boolean $isBigEndian
+ * @param bool $isBigEndian
* @return integer
*/
private function readLong($stream, $isBigEndian)
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index f46b5dfee4..a86b02c2ee 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -124,7 +124,7 @@ class XliffFileLoader implements LoaderInterface
/**
* Returns the XML errors of the internal XML parser
*
- * @param Boolean $internalErrors
+ * @param bool $internalErrors
*
* @return array An array of errors
*/
diff --git a/src/Symfony/Component/Translation/MessageSelector.php b/src/Symfony/Component/Translation/MessageSelector.php
index 8b416e947c..1802d16e27 100644
--- a/src/Symfony/Component/Translation/MessageSelector.php
+++ b/src/Symfony/Component/Translation/MessageSelector.php
@@ -40,7 +40,7 @@ class MessageSelector
* {0} There are no apples|one: There is one apple|more: There are %count% apples
*
* @param string $message The message being translated
- * @param integer $number The number of items represented for the message
+ * @param int $number The number of items represented for the message
* @param string $locale The locale to use for choosing
*
* @return string
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
index fe29ba599a..3cd978d722 100644
--- a/src/Symfony/Component/Translation/PluralizationRules.php
+++ b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -24,7 +24,7 @@ class PluralizationRules
/**
* Returns the plural position to use for the given locale and number.
*
- * @param integer $number The number
+ * @param int $number The number
* @param string $locale The locale
*
* @return integer The plural position
diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
index 26f9e2f97d..0381535468 100644
--- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
+++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
@@ -95,7 +95,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase
*
* @param string $nplural plural expected
* @param array $matrix containing langcodes and their plural index values.
- * @param boolean $expectSuccess
+ * @param bool $expectSuccess
*/
protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
{
diff --git a/src/Symfony/Component/Translation/TranslatorInterface.php b/src/Symfony/Component/Translation/TranslatorInterface.php
index 3dcdd4fc37..a97fd10b8a 100644
--- a/src/Symfony/Component/Translation/TranslatorInterface.php
+++ b/src/Symfony/Component/Translation/TranslatorInterface.php
@@ -38,7 +38,7 @@ interface TranslatorInterface
* Translates the given choice message by choosing a translation according to a number.
*
* @param string $id The message id (may also be an object that can be cast to string)
- * @param integer $number The number to use to find the indice of the message
+ * @param int $number The number to use to find the indice of the message
* @param array $parameters An array of parameters for the message
* @param string $domain The domain for the message
* @param string $locale The locale
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
index 36a42aaec4..05e9d6ad91 100644
--- a/src/Symfony/Component/Validator/ConstraintViolation.php
+++ b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -72,7 +72,7 @@ class ConstraintViolation implements ConstraintViolationInterface
* value.
* @param mixed $invalidValue The invalid value causing the
* violation.
- * @param integer|null $messagePluralization The pluralization parameter.
+ * @param int |null $messagePluralization The pluralization parameter.
* @param mixed $code The error code of the
* violation, if any.
*/
diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
index 21b857ec09..f941964dc3 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
@@ -41,7 +41,7 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
/**
* Returns the violation at a given offset.
*
- * @param integer $offset The offset of the violation.
+ * @param int $offset The offset of the violation.
*
* @return ConstraintViolationInterface The violation.
*
@@ -54,7 +54,7 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
/**
* Returns whether the given offset exists.
*
- * @param integer $offset The violation offset.
+ * @param int $offset The violation offset.
*
* @return Boolean Whether the offset exists.
*
@@ -65,7 +65,7 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
/**
* Sets a violation at a given offset.
*
- * @param integer $offset The violation offset.
+ * @param int $offset The violation offset.
* @param ConstraintViolationInterface $violation The violation.
*
* @api
@@ -75,7 +75,7 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
/**
* Removes a violation at a given offset.
*
- * @param integer $offset The offset to remove.
+ * @param int $offset The offset to remove.
*
* @api
*/
diff --git a/src/Symfony/Component/Validator/DefaultTranslator.php b/src/Symfony/Component/Validator/DefaultTranslator.php
index 20b2e11350..c93f1b1f98 100644
--- a/src/Symfony/Component/Validator/DefaultTranslator.php
+++ b/src/Symfony/Component/Validator/DefaultTranslator.php
@@ -118,7 +118,7 @@ class DefaultTranslator implements TranslatorInterface
* // -> These are 3 donkeys.
*
* @param string $id The message id
- * @param integer $number The number to use to find the index of the message
+ * @param int $number The number to use to find the index of the message
* @param array $parameters An array of parameters for the message
* @param string $domain Ignored
* @param string $locale Ignored
diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php
index 0b6c86633d..d50d3c7c59 100644
--- a/src/Symfony/Component/Validator/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/ExecutionContextInterface.php
@@ -91,8 +91,8 @@ interface ExecutionContextInterface
* @param string $message The error message.
* @param array $params The parameters substituted in the error message.
* @param mixed $invalidValue The invalid, validated value.
- * @param integer|null $pluralization The number to use to pluralize of the message.
- * @param integer|null $code The violation code.
+ * @param int |null $pluralization The number to use to pluralize of the message.
+ * @param int |null $code The violation code.
*
* @api
*/
@@ -106,8 +106,8 @@ interface ExecutionContextInterface
* @param string $message The error message.
* @param array $params The parameters substituted in the error message.
* @param mixed $invalidValue The invalid, validated value.
- * @param integer|null $pluralization The number to use to pluralize of the message.
- * @param integer|null $code The violation code.
+ * @param int |null $pluralization The number to use to pluralize of the message.
+ * @param int |null $code The violation code.
*
* @api
*/
@@ -147,9 +147,9 @@ interface ExecutionContextInterface
* @param null|string|string[] $groups The groups to validate in. If you don't pass any
* groups here, the current group of the context
* will be used.
- * @param Boolean $traverse Whether to traverse the value if it is an array
+ * @param bool $traverse Whether to traverse the value if it is an array
* or an instance of \Traversable.
- * @param Boolean $deep Whether to traverse the value recursively if
+ * @param bool $deep Whether to traverse the value recursively if
* it is a collection of collections.
*/
public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false);
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index b7e003ec3d..7ca93e87ec 100644
--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -392,7 +392,7 @@ class ClassMetadata extends ElementMetadata implements MetadataInterface, ClassB
/**
* Sets whether a group sequence provider should be used.
*
- * @param Boolean $active
+ * @param bool $active
*
* @throws GroupDefinitionException
*/
diff --git a/src/Symfony/Component/Validator/ValidationVisitorInterface.php b/src/Symfony/Component/Validator/ValidationVisitorInterface.php
index e4163718b3..05b63b8ca3 100644
--- a/src/Symfony/Component/Validator/ValidationVisitorInterface.php
+++ b/src/Symfony/Component/Validator/ValidationVisitorInterface.php
@@ -57,8 +57,8 @@ interface ValidationVisitorInterface
* @param mixed $value The value to validate.
* @param string $group The validation group to validate.
* @param string $propertyPath The current property path in the validation graph.
- * @param Boolean $traverse Whether to traverse the value if it is traversable.
- * @param Boolean $deep Whether to traverse nested traversable values recursively.
+ * @param bool $traverse Whether to traverse the value if it is traversable.
+ * @param bool $deep Whether to traverse nested traversable values recursively.
*
* @throws Exception\NoSuchMetadataException If no metadata can be found for
* the given value.
diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php
index 98e02d90cf..f12f851139 100644
--- a/src/Symfony/Component/Validator/ValidatorInterface.php
+++ b/src/Symfony/Component/Validator/ValidatorInterface.php
@@ -28,8 +28,8 @@ interface ValidatorInterface
*
* @param mixed $value The value to validate
* @param array|null $groups The validation groups to validate.
- * @param Boolean $traverse Whether to traverse the value if it is traversable.
- * @param Boolean $deep Whether to traverse nested traversable values recursively.
+ * @param bool $traverse Whether to traverse the value if it is traversable.
+ * @param bool $deep Whether to traverse nested traversable values recursively.
*
* @return ConstraintViolationListInterface A list of constraint violations. If the
* list is empty, validation succeeded.
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index 8709f8b7e4..e9f3d824dd 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -28,7 +28,7 @@ class Dumper
/**
* Sets the indentation.
*
- * @param integer $num The amount of spaces to use for indentation of nested nodes.
+ * @param int $num The amount of spaces to use for indentation of nested nodes.
*/
public function setIndentation($num)
{
@@ -39,10 +39,10 @@ class Dumper
* Dumps a PHP value to YAML.
*
* @param mixed $input The PHP value
- * @param integer $inline The level where you switch to inline YAML
- * @param integer $indent The level of indentation (used internally)
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param int $inline The level where you switch to inline YAML
+ * @param int $indent The level of indentation (used internally)
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string The YAML representation of the PHP value
*/
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
index 938097b8b3..d84a22fe6a 100644
--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -34,8 +34,8 @@ class ParseException extends RuntimeException
* Constructor.
*
* @param string $message The error message
- * @param integer $parsedLine The line where the error occurred
- * @param integer $snippet The snippet of code near the problem
+ * @param int $parsedLine The line where the error occurred
+ * @param int $snippet The snippet of code near the problem
* @param string $parsedFile The file name where the error occurred
* @param \Exception $previous The previous exception
*/
@@ -110,7 +110,7 @@ class ParseException extends RuntimeException
/**
* Sets the line where the error occurred.
*
- * @param integer $parsedLine The file line
+ * @param int $parsedLine The file line
*/
public function setParsedLine($parsedLine)
{
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 88822d4b0b..ff5bc7cc0c 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -30,8 +30,8 @@ class Inline
* Converts a YAML string to a PHP array.
*
* @param string $value A YAML string
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return array A PHP array representing the YAML string
*
@@ -83,8 +83,8 @@ class Inline
* Dumps a given PHP variable to a YAML string.
*
* @param mixed $value The PHP variable to convert
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string The YAML string representing the PHP array
*
@@ -149,8 +149,8 @@ class Inline
* Dumps a PHP array to a YAML string.
*
* @param array $value The PHP array to dump
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string The YAML string representing the PHP array
*/
@@ -184,8 +184,8 @@ class Inline
* @param scalar $scalar
* @param string $delimiters
* @param array $stringDelimiters
- * @param integer &$i
- * @param Boolean $evaluate
+ * @param int &$i
+ * @param bool $evaluate
*
* @return string A YAML string
*
@@ -232,7 +232,7 @@ class Inline
* Parses a quoted scalar to YAML.
*
* @param string $scalar
- * @param integer &$i
+ * @param int &$i
*
* @return string A YAML string
*
@@ -262,7 +262,7 @@ class Inline
* Parses a sequence to a YAML string.
*
* @param string $sequence
- * @param integer &$i
+ * @param int &$i
*
* @return string A YAML string
*
@@ -318,7 +318,7 @@ class Inline
* Parses a mapping to a YAML string.
*
* @param string $mapping
- * @param integer &$i
+ * @param int &$i
*
* @return string A YAML string
*
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 36aa9b0ace..5a908a4b4a 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -31,7 +31,7 @@ class Parser
/**
* Constructor
*
- * @param integer $offset The offset of YAML document (used for line numbers in error messages)
+ * @param int $offset The offset of YAML document (used for line numbers in error messages)
*/
public function __construct($offset = 0)
{
@@ -42,8 +42,8 @@ class Parser
* Parses a YAML string to a PHP value.
*
* @param string $value A YAML string
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return mixed A PHP value
*
@@ -281,7 +281,7 @@ class Parser
/**
* Returns the next embed block of YAML.
*
- * @param integer $indentation The indent level at which the block is to be read, or null for default
+ * @param int $indentation The indent level at which the block is to be read, or null for default
*
* @return string A YAML string
*
@@ -374,8 +374,8 @@ class Parser
* Parses a YAML value.
*
* @param string $value A YAML value
- * @param Boolean $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
- * @param Boolean $objectSupport True if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+ * @param bool $objectSupport True if object support is enabled, false otherwise
*
* @return mixed A PHP value
*
@@ -418,7 +418,7 @@ class Parser
*
* @param string $separator The separator that was used to begin this folded scalar (| or >)
* @param string $indicator The indicator that was used to begin this folded scalar (+ or -)
- * @param integer $indentation The indentation that was used to begin this folded scalar
+ * @param int $indentation The indentation that was used to begin this folded scalar
*
* @return string The text value
*/
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
index c98f6ecdd9..61793fb3ae 100644
--- a/src/Symfony/Component/Yaml/Yaml.php
+++ b/src/Symfony/Component/Yaml/Yaml.php
@@ -39,8 +39,8 @@ class Yaml
* as an input is a deprecated feature and will be removed in 3.0.
*
* @param string $input Path to a YAML file or a string containing YAML
- * @param Boolean $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
- * @param Boolean $objectSupport True if object support is enabled, false otherwise
+ * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+ * @param bool $objectSupport True if object support is enabled, false otherwise
*
* @return array The YAML converted to a PHP array
*
@@ -81,10 +81,10 @@ class Yaml
* to convert the array into friendly YAML.
*
* @param array $array PHP array
- * @param integer $inline The level where you switch to inline YAML
- * @param integer $indent The amount of spaces to use for indentation of nested nodes.
- * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param Boolean $objectSupport true if object support is enabled, false otherwise
+ * @param int $inline The level where you switch to inline YAML
+ * @param int $indent The amount of spaces to use for indentation of nested nodes.
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string A YAML string representing the original PHP array
*