Skip to content

Commit c2e134f

Browse files
committed
minor symfony#10701 Made types used by Symfony compatible with the ones of Hack (fabpot)
This PR was merged into the 2.3 branch. Discussion ---------- Made types used by Symfony compatible with the ones of Hack | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a PHP supports several ways to express types: like Boolean/bool or integer/int. Hack only supports one of them, so this PR proposes to use the Hack type to make Symfony a bit more "compatible" with Hack (gradual upgrade ;)). Commits ------- 3c9c10f made phpdoc types consistent with those defined in Hack 0555b7f made types consistent with those defined in Hack
2 parents 5033e7a + 3c9c10f commit c2e134f

File tree

265 files changed

+720
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+720
-720
lines changed

src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testUsesRequestServerData()
6060
}
6161

6262
/**
63-
* @param integer $level
63+
* @param int $level
6464
* @param string $message
6565
*
6666
* @return array Record

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct()
3939
* This service is shared.
4040
* This method always returns the same instance of the service.
4141
*
42-
* @param boolean $lazyLoad whether to try lazy-loading the service with a proxy
42+
* @param bool $lazyLoad whether to try lazy-loading the service with a proxy
4343
*
4444
* @return stdClass A stdClass instance.
4545
*/

src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MessageDataCollector extends DataCollector
3434
* to avoid the creation of these objects when no emails are sent.
3535
*
3636
* @param ContainerInterface $container A ContainerInterface instance
37-
* @param Boolean $isSpool
37+
* @param bool $isSpool
3838
*/
3939
public function __construct(ContainerInterface $container, $isSpool)
4040
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function fileExcerpt($file, $line)
157157
* Formats a file path.
158158
*
159159
* @param string $file An absolute file path
160-
* @param integer $line The line number
160+
* @param int $line The line number
161161
* @param string $text Use this text for the link rather than the file path
162162
*
163163
* @return string
@@ -186,7 +186,7 @@ public function formatFile($file, $line, $text = null)
186186
* Returns the link for a given file/line pair.
187187
*
188188
* @param string $file An absolute file path
189-
* @param integer $line The line number
189+
* @param int $line The line number
190190
*
191191
* @return string A link of false
192192
*/

src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ protected function resolveServiceDefinition($serviceId)
412412
* Renders list of tagged services grouped by tag
413413
*
414414
* @param OutputInterface $output
415-
* @param Boolean $showPrivate
415+
* @param bool $showPrivate
416416
*/
417417
protected function outputTags(OutputInterface $output, $showPrivate = false)
418418
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Controller extends ContainerAware
3838
*
3939
* @param string $route The name of the route
4040
* @param mixed $parameters An array of parameters
41-
* @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
41+
* @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
4242
*
4343
* @return string The generated URL
4444
*
@@ -70,7 +70,7 @@ public function forward($controller, array $path = array(), array $query = array
7070
* Returns a RedirectResponse to the given URL.
7171
*
7272
* @param string $url The URL to redirect to
73-
* @param integer $status The status code to use for the Response
73+
* @param int $status The status code to use for the Response
7474
*
7575
* @return RedirectResponse
7676
*/

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class RedirectController extends ContainerAware
3636
*
3737
* @param Request $request The request instance
3838
* @param string $route The route name to redirect to
39-
* @param Boolean $permanent Whether the redirection is permanent
40-
* @param Boolean|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
39+
* @param bool $permanent Whether the redirection is permanent
40+
* @param bool|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
4141
*
4242
* @return Response A Response instance
4343
*
@@ -72,10 +72,10 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
7272
*
7373
* @param Request $request The request instance
7474
* @param string $path The absolute path or URL to redirect to
75-
* @param Boolean $permanent Whether the redirect is permanent or not
75+
* @param bool $permanent Whether the redirect is permanent or not
7676
* @param string|null $scheme The URL scheme (null to keep the current one)
77-
* @param integer|null $httpPort The HTTP port (null to keep the current one for the same scheme or the configured port in the container)
78-
* @param integer|null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the configured port in the container)
77+
* @param int |null $httpPort The HTTP port (null to keep the current one for the same scheme or the configured port in the container)
78+
* @param int |null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the configured port in the container)
7979
*
8080
* @return Response A Response instance
8181
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TemplateController extends ContainerAware
2727
* @param string $template The template name
2828
* @param int|null $maxAge Max age for client caching
2929
* @param int|null $sharedAge Max age for shared (proxy) caching
30-
* @param Boolean|null $private Whether or not caching should apply for client caches only
30+
* @param bool|null $private Whether or not caching should apply for client caches only
3131
*
3232
* @return Response A Response instance
3333
*/

src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
4646
* Forwards the Request to the backend and returns the Response.
4747
*
4848
* @param Request $request A Request instance
49-
* @param Boolean $raw Whether to catch exceptions or not
49+
* @param bool $raw Whether to catch exceptions or not
5050
* @param Response $entry A Response instance (the stale entry if present, null otherwise)
5151
*
5252
* @return Response A Response instance

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@ public function getEnvironment()
112112
*/
113113
public function getDebug()
114114
{
115-
return (Boolean) $this->container->getParameter('kernel.debug');
115+
return (bool) $this->container->getParameter('kernel.debug');
116116
}
117117
}

0 commit comments

Comments
 (0)