[HttpKernel] Add more parameter types.

derrabus · derrabus · commit dbcc6cbb8f9d · 2019-08-16T01:42:44.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
@@ -23,12 +23,12 @@ public function __construct(array $pools = [])
         $this->pools = $pools;
     }
 
-    public function hasPool($name)
+    public function hasPool(string $name)
     {
         return isset($this->pools[$name]);
     }
 
-    public function getPool($name)
+    public function getPool(string $name)
     {
         if (!$this->hasPool($name)) {
             throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));
@@ -37,7 +37,7 @@ public function getPool($name)
         return $this->pools[$name];
     }
 
-    public function clearPool($name)
+    public function clearPool(string $name)
     {
         if (!isset($this->pools[$name])) {
             throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
@@ -18,7 +18,7 @@
  */
 abstract class CacheWarmer implements CacheWarmerInterface
 {
-    protected function writeCacheFile($file, $content)
+    protected function writeCacheFile(string $file, $content)
     {
         $tmpFile = @tempnam(\dirname($file), basename($file));
         if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -76,7 +76,7 @@ public function __sleep(): array
     /**
      * @internal
      */
-    public static function generateUrlFormat(UrlGeneratorInterface $router, $routeName, $queryString): ?string
+    public static function generateUrlFormat(UrlGeneratorInterface $router, string $routeName, string $queryString): ?string
     {
         try {
             return $router->generate($routeName).$queryString;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -33,7 +33,7 @@ class ExceptionListener implements EventSubscriberInterface
     protected $logger;
     protected $debug;
 
-    public function __construct($controller, LoggerInterface $logger = null, $debug = false)
+    public function __construct($controller, LoggerInterface $logger = null, bool $debug = false)
     {
         $this->controller = $controller;
         $this->logger = $logger;
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -390,7 +390,7 @@ private function save(string $key, string $data): bool
         return true;
     }
 
-    public function getPath($key)
+    public function getPath(string $key)
     {
         return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
     }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php b/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php
@@ -23,7 +23,7 @@
  */
 class SubRequestHandler
 {
-    public static function handle(HttpKernelInterface $kernel, Request $request, $type, $catch): Response
+    public static function handle(HttpKernelInterface $kernel, Request $request, int $type, bool $catch): Response
     {
         // save global state related to trusted headers and proxies
         $trustedProxies = Request::getTrustedProxies();
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -113,7 +113,7 @@ public function purge()
     /**
      * {@inheritdoc}
      */
-    public function read($token)
+    public function read(string $token)
     {
         if (!$token || !file_exists($file = $this->getFilename($token))) {
             return null;
@@ -257,7 +257,7 @@ protected function readLineFromFile($file)
         return '' === $line ? null : $line;
     }
 
-    protected function createProfileFromData($token, $data, $parent = null)
+    protected function createProfileFromData(string $token, array $data, Profile $parent = null)
     {
         $profile = new Profile($token);
         $profile->setIp($data['ip']);
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
@@ -114,7 +114,7 @@ public function getMethod()
         return $this->method;
     }
 
-    public function setMethod($method)
+    public function setMethod(string $method)
     {
         $this->method = $method;
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -49,12 +49,12 @@ class TestCacheWarmer extends CacheWarmer
 {
     protected $file;
 
-    public function __construct($file)
+    public function __construct(string $file)
     {
         $this->file = $file;
     }
 
-    public function warmUp($cacheDir)
+    public function warmUp(string $cacheDir)
     {
         $this->writeCacheFile($this->file, 'content');
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\ControllerDoesNotReturnResponseException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
@@ -122,7 +123,7 @@ public function getStatusCodes()
     public function testHandleWhenAnExceptionIsHandledWithASpecificStatusCode($expectedStatusCode)
     {
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) use ($expectedStatusCode) {
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function (ExceptionEvent $event) use ($expectedStatusCode) {
             $event->allowCustomResponseCode();
             $event->setResponse(new Response('', $expectedStatusCode));
         });
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -641,7 +641,7 @@ protected function getKernel(array $methods = [], array $bundles = [])
         return $kernel;
     }
 
-    protected function getKernelForTest(array $methods = [], $debug = false)
+    protected function getKernelForTest(array $methods = [], bool $debug = false)
     {
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
             ->setConstructorArgs(['test', $debug])
@@ -661,7 +661,7 @@ public function terminate()
         $this->terminateCalled = true;
     }
 
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    public function handle(Request $request, int $type = self::MASTER_REQUEST, bool $catch = true)
     {
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -53,11 +53,13 @@ public function testChildren()
         $parentProfile->setIp('127.0.0.1');
         $parentProfile->setUrl('http://foo.bar/parent');
         $parentProfile->setStatusCode(200);
+        $parentProfile->setMethod('GET');
 
         $childProfile = new Profile('token_child');
         $childProfile->setIp('127.0.0.1');
         $childProfile->setUrl('http://foo.bar/child');
         $childProfile->setStatusCode(200);
+        $childProfile->setMethod('GET');
 
         $parentProfile->addChild($childProfile);
 
@@ -86,6 +88,7 @@ public function testStoreSpecialCharsInUrl()
         $profile->setUrl('http://foo.bar/\'');
         $profile->setIp('127.0.0.1');
         $profile->setStatusCode(200);
+        $profile->setMethod('GET');
 
         $this->storage->write($profile);
         $this->assertNotFalse($this->storage->read('simple_quote'), '->write() accepts single quotes in URL');
@@ -94,6 +97,7 @@ public function testStoreSpecialCharsInUrl()
         $profile->setUrl('http://foo.bar/"');
         $profile->setIp('127.0.0.1');
         $profile->setStatusCode(200);
+        $profile->setMethod('GET');
 
         $this->storage->write($profile);
         $this->assertNotFalse($this->storage->read('double_quote'), '->write() accepts double quotes in URL');
@@ -102,6 +106,7 @@ public function testStoreSpecialCharsInUrl()
         $profile->setUrl('http://foo.bar/\\');
         $profile->setIp('127.0.0.1');
         $profile->setStatusCode(200);
+        $profile->setMethod('GET');
 
         $this->storage->write($profile);
         $this->assertNotFalse($this->storage->read('backslash'), '->write() accepts backslash in URL');
@@ -110,6 +115,7 @@ public function testStoreSpecialCharsInUrl()
         $profile->setUrl('http://foo.bar/,');
         $profile->setIp('127.0.0.1');
         $profile->setStatusCode(200);
+        $profile->setMethod('GET');
 
         $this->storage->write($profile);
         $this->assertNotFalse($this->storage->read('comma'), '->write() accepts comma in URL');
@@ -121,6 +127,7 @@ public function testStoreDuplicateToken()
         $profile->setUrl('http://example.com/');
         $profile->setIp('127.0.0.1');
         $profile->setStatusCode(200);
+        $profile->setMethod('GET');
 
         $this->assertTrue($this->storage->write($profile), '->write() returns true when the token is unique');
 

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ public function __construct(array $pools = [])`
`23`	`23`	`$this->pools = $pools;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function hasPool($name)`
	`26`	`+ public function hasPool(string $name)`
`27`	`27`	`{`
`28`	`28`	`return isset($this->pools[$name]);`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function getPool($name)`
	`31`	`+ public function getPool(string $name)`
`32`	`32`	`{`
`33`	`33`	`if (!$this->hasPool($name)) {`
`34`	`34`	`throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));`
`@@ -37,7 +37,7 @@ public function getPool($name)`
`37`	`37`	`return $this->pools[$name];`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function clearPool($name)`
	`40`	`+ public function clearPool(string $name)`
`41`	`41`	`{`
`42`	`42`	`if (!isset($this->pools[$name])) {`
`43`	`43`	`throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`abstract class CacheWarmer implements CacheWarmerInterface`
`20`	`20`	`{`
`21`		`- protected function writeCacheFile($file, $content)`
	`21`	`+ protected function writeCacheFile(string $file, $content)`
`22`	`22`	`{`
`23`	`23`	`$tmpFile = @tempnam(\dirname($file), basename($file));`
`24`	`24`	`if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function __sleep(): array`
`76`	`76`	`/**`
`77`	`77`	`* @internal`
`78`	`78`	`*/`
`79`		`- public static function generateUrlFormat(UrlGeneratorInterface $router, $routeName, $queryString): ?string`
	`79`	`+ public static function generateUrlFormat(UrlGeneratorInterface $router, string $routeName, string $queryString): ?string`
`80`	`80`	`{`
`81`	`81`	`try {`
`82`	`82`	`return $router->generate($routeName).$queryString;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class ExceptionListener implements EventSubscriberInterface`
`33`	`33`	`protected $logger;`
`34`	`34`	`protected $debug;`
`35`	`35`
`36`		`- public function __construct($controller, LoggerInterface $logger = null, $debug = false)`
	`36`	`+ public function __construct($controller, LoggerInterface $logger = null, bool $debug = false)`
`37`	`37`	`{`
`38`	`38`	`$this->controller = $controller;`
`39`	`39`	`$this->logger = $logger;`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ private function save(string $key, string $data): bool`
`390`	`390`	`return true;`
`391`	`391`	`}`
`392`	`392`
`393`		`- public function getPath($key)`
	`393`	`+ public function getPath(string $key)`
`394`	`394`	`{`
`395`	`395`	`return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);`
`396`	`396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class SubRequestHandler`
`25`	`25`	`{`
`26`		`- public static function handle(HttpKernelInterface $kernel, Request $request, $type, $catch): Response`
	`26`	`+ public static function handle(HttpKernelInterface $kernel, Request $request, int $type, bool $catch): Response`
`27`	`27`	`{`
`28`	`28`	`// save global state related to trusted headers and proxies`
`29`	`29`	`$trustedProxies = Request::getTrustedProxies();`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function purge()`
`113`	`113`	`/**`
`114`	`114`	`* {@inheritdoc}`
`115`	`115`	`*/`
`116`		`- public function read($token)`
	`116`	`+ public function read(string $token)`
`117`	`117`	`{`
`118`	`118`	`if (!$token \|\| !file_exists($file = $this->getFilename($token))) {`
`119`	`119`	`return null;`
`@@ -257,7 +257,7 @@ protected function readLineFromFile($file)`
`257`	`257`	`return '' === $line ? null : $line;`
`258`	`258`	`}`
`259`	`259`
`260`		`- protected function createProfileFromData($token, $data, $parent = null)`
	`260`	`+ protected function createProfileFromData(string $token, array $data, Profile $parent = null)`
`261`	`261`	`{`
`262`	`262`	`$profile = new Profile($token);`
`263`	`263`	`$profile->setIp($data['ip']);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function getMethod()`
`114`	`114`	`return $this->method;`
`115`	`115`	`}`
`116`	`116`
`117`		`- public function setMethod($method)`
	`117`	`+ public function setMethod(string $method)`
`118`	`118`	`{`
`119`	`119`	`$this->method = $method;`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,12 @@ class TestCacheWarmer extends CacheWarmer`
`49`	`49`	`{`
`50`	`50`	`protected $file;`
`51`	`51`
`52`		`- public function __construct($file)`
	`52`	`+ public function __construct(string $file)`
`53`	`53`	`{`
`54`	`54`	`$this->file = $file;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function warmUp($cacheDir)`
	`57`	`+ public function warmUp(string $cacheDir)`
`58`	`58`	`{`
`59`	`59`	`$this->writeCacheFile($this->file, 'content');`
`60`	`60`	`}`