made phpdoc types consistent with those defined in Hack

fabpot · fabpot · commit 2ddb853ae8be · 2014-04-15T07:41:45.000+02:00
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -324,7 +324,7 @@ private function getListenerInfo($listener, $eventId, $eventName)
      * 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 @@ private function updateProfiles($token, $updateChildren)
      * 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/EventListener/ExceptionListener.php b/EventListener/ExceptionListener.php
@@ -93,7 +93,7 @@ public static function getSubscribedEvents()
      *
      * @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/EventListener/ProfilerListener.php b/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/Exception/AccessDeniedHttpException.php b/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/Exception/BadRequestHttpException.php b/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/Exception/ConflictHttpException.php b/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/Exception/GoneHttpException.php b/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/Exception/LengthRequiredHttpException.php b/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/Exception/MethodNotAllowedHttpException.php b/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/Exception/NotAcceptableHttpException.php b/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/Exception/NotFoundHttpException.php b/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/Exception/PreconditionFailedHttpException.php b/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/Exception/PreconditionRequiredHttpException.php b/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/Exception/ServiceUnavailableHttpException.php b/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/Exception/TooManyRequestsHttpException.php b/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/Exception/UnauthorizedHttpException.php b/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/Exception/UnsupportedMediaTypeHttpException.php b/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/Fragment/FragmentHandler.php b/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/Fragment/RoutableFragmentRenderer.php b/Fragment/RoutableFragmentRenderer.php
@@ -41,7 +41,7 @@ public function setFragmentPath($path)
      *
      * @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/HttpCache/Esi.php b/HttpCache/Esi.php
@@ -115,7 +115,7 @@ public function needsEsiParsing(Response $response)
      *
      * @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 @@ public function process(Request $request, Response $response)
      * @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/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -232,7 +232,7 @@ public function terminate(Request $request, Response $response)
      * 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 @@ protected function pass(Request $request, $catch = false)
      * 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 @@ protected function invalidate(Request $request, $catch = false)
      * 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 @@ protected function lookup(Request $request, $catch = false)
      *
      * @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 @@ protected function validate(Request $request, Response $entry, $catch = false)
      * 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 @@ protected function fetch(Request $request, $catch = false)
      * 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/HttpKernel.php b/HttpKernel.php
@@ -84,7 +84,7 @@ public function terminate(Request $request, Response $response)
      * 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 @@ private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
      *
      * @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 @@ private function filterResponse(Response $response, Request $request, $type)
      *
      * @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/HttpKernelInterface.php b/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/Kernel.php b/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 @@ public function getBundle($name, $first = true)
      *
      * @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/KernelInterface.php b/KernelInterface.php
@@ -84,7 +84,7 @@ public function isClassInActiveBundle($class);
      * 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 @@ public function getBundle($name, $first = true);
      *
      * @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/Profiler/MongoDbProfilerStorage.php b/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/Profiler/PdoProfilerStorage.php b/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/Tests/Profiler/Mock/MemcacheMock.php b/Tests/Profiler/Mock/MemcacheMock.php
diff --git a/Tests/Profiler/Mock/MemcachedMock.php b/Tests/Profiler/Mock/MemcachedMock.php
diff --git a/Tests/Profiler/Mock/RedisMock.php b/Tests/Profiler/Mock/RedisMock.php

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ private function getListenerInfo($listener, $eventId, $eventName)`
`324`	`324`	`* Updates the stopwatch data in the profile hierarchy.`
`325`	`325`	`*`
`326`	`326`	`* @param string $token Profile token`
`327`		`- * @param Boolean $updateChildren Whether to update the children altogether`
	`327`	`+ * @param bool $updateChildren Whether to update the children altogether`
`328`	`328`	`*/`
`329`	`329`	`private function updateProfiles($token, $updateChildren)`
`330`	`330`	`{`
`@@ -339,7 +339,7 @@ private function updateProfiles($token, $updateChildren)`
`339`	`339`	`* Update the profiles with the timing and events information and saves them.`
`340`	`340`	`*`
`341`	`341`	`* @param Profile $profile The root profile`
`342`		`- * @param Boolean $updateChildren Whether to update the children altogether`
	`342`	`+ * @param bool $updateChildren Whether to update the children altogether`
`343`	`343`	`*/`
`344`	`344`	`private function saveInfoInProfile(Profile $profile, $updateChildren)`
`345`	`345`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static function getSubscribedEvents()`
`93`	`93`	`*`
`94`	`94`	`* @param \Exception $exception The original \Exception instance`
`95`	`95`	`* @param string $message The error message to log`
`96`		`- * @param Boolean $original False when the handling of the exception thrown another exception`
	`96`	`+ * @param bool $original False when the handling of the exception thrown another exception`
`97`	`97`	`*/`
`98`	`98`	`protected function logException(\Exception $exception, $message, $original = true)`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ class ProfilerListener implements EventSubscriberInterface`
`42`	`42`	`*`
`43`	`43`	`* @param Profiler $profiler A Profiler instance`
`44`	`44`	`* @param RequestMatcherInterface $matcher A RequestMatcher instance`
`45`		`- * @param Boolean $onlyException true if the profiler only collects data when an exception occurs, false otherwise`
`46`		`- * @param Boolean $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise`
	`45`	`+ * @param bool $onlyException true if the profiler only collects data when an exception occurs, false otherwise`
	`46`	`+ * @param bool $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise`
`47`	`47`	`*/`
`48`	`48`	`public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class AccessDeniedHttpException extends HttpException`
`24`	`24`	`*`
`25`	`25`	`* @param string $message The internal exception message`
`26`	`26`	`* @param \Exception $previous The previous exception`
`27`		`- * @param integer $code The internal exception code`
	`27`	`+ * @param int $code The internal exception code`
`28`	`28`	`*/`
`29`	`29`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class BadRequestHttpException extends HttpException`
`23`	`23`	`*`
`24`	`24`	`* @param string $message The internal exception message`
`25`	`25`	`* @param \Exception $previous The previous exception`
`26`		`- * @param integer $code The internal exception code`
	`26`	`+ * @param int $code The internal exception code`
`27`	`27`	`*/`
`28`	`28`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ConflictHttpException extends HttpException`
`23`	`23`	`*`
`24`	`24`	`* @param string $message The internal exception message`
`25`	`25`	`* @param \Exception $previous The previous exception`
`26`		`- * @param integer $code The internal exception code`
	`26`	`+ * @param int $code The internal exception code`
`27`	`27`	`*/`
`28`	`28`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class GoneHttpException extends HttpException`
`23`	`23`	`*`
`24`	`24`	`* @param string $message The internal exception message`
`25`	`25`	`* @param \Exception $previous The previous exception`
`26`		`- * @param integer $code The internal exception code`
	`26`	`+ * @param int $code The internal exception code`
`27`	`27`	`*/`
`28`	`28`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class LengthRequiredHttpException extends HttpException`
`23`	`23`	`*`
`24`	`24`	`* @param string $message The internal exception message`
`25`	`25`	`* @param \Exception $previous The previous exception`
`26`		`- * @param integer $code The internal exception code`
	`26`	`+ * @param int $code The internal exception code`
`27`	`27`	`*/`
`28`	`28`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class MethodNotAllowedHttpException extends HttpException`
`24`	`24`	`* @param array $allow An array of allowed methods`
`25`	`25`	`* @param string $message The internal exception message`
`26`	`26`	`* @param \Exception $previous The previous exception`
`27`		`- * @param integer $code The internal exception code`
	`27`	`+ * @param int $code The internal exception code`
`28`	`28`	`*/`
`29`	`29`	`public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class NotAcceptableHttpException extends HttpException`
`23`	`23`	`*`
`24`	`24`	`* @param string $message The internal exception message`
`25`	`25`	`* @param \Exception $previous The previous exception`
`26`		`- * @param integer $code The internal exception code`
	`26`	`+ * @param int $code The internal exception code`
`27`	`27`	`*/`
`28`	`28`	`public function __construct($message = null, \Exception $previous = null, $code = 0)`
`29`	`29`	`{`