bug #25016 [HttpKernel] add type-hint for the requestType (Simperfit)

nicolas-grekas · nicolas-grekas · commit 422c4468b2e2 · 2017-11-19T19:31:10.000+02:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [HttpKernel] add type-hint for the requestType | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | see sensiolabs/SensioFrameworkExtraBundle#530 | License | MIT #SymfonyConHackday2017 Commits ------- 62d933d [HttpKernel] add type-hint for the requestType
diff --git a/src/Symfony/Component/HttpKernel/Event/FilterControllerArgumentsEvent.php b/src/Symfony/Component/HttpKernel/Event/FilterControllerArgumentsEvent.php
@@ -30,7 +30,7 @@ class FilterControllerArgumentsEvent extends FilterControllerEvent
 {
     private $arguments;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, int $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)
     {
         parent::__construct($kernel, $controller, $request, $requestType);
 
diff --git a/src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php
@@ -29,7 +29,7 @@ class FilterControllerEvent extends KernelEvent
 {
     private $controller;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, int $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php
@@ -32,7 +32,7 @@ class KernelEvent extends Event
      * @param int                 $requestType The request type the kernel is currently processing; one of
      *                                         HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST
      */
-    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType)
+    public function __construct(HttpKernelInterface $kernel, Request $request, ?int $requestType)
     {
         $this->kernel = $kernel;
         $this->request = $request;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class FilterControllerArgumentsEvent extends FilterControllerEvent`
`30`	`30`	`{`
`31`	`31`	`private $arguments;`
`32`	`32`
`33`		`- public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, int $requestType)`
	`33`	`+ public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)`
`34`	`34`	`{`
`35`	`35`	`parent::__construct($kernel, $controller, $request, $requestType);`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class FilterControllerEvent extends KernelEvent`
`29`	`29`	`{`
`30`	`30`	`private $controller;`
`31`	`31`
`32`		`- public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, int $requestType)`
	`32`	`+ public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)`
`33`	`33`	`{`
`34`	`34`	`parent::__construct($kernel, $request, $requestType);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class KernelEvent extends Event`
`32`	`32`	`* @param int $requestType The request type the kernel is currently processing; one of`
`33`	`33`	`* HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST`
`34`	`34`	`*/`
`35`		`- public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType)`
	`35`	`+ public function __construct(HttpKernelInterface $kernel, Request $request, ?int $requestType)`
`36`	`36`	`{`
`37`	`37`	`$this->kernel = $kernel;`
`38`	`38`	`$this->request = $request;`