Merge pull request #397 from josbeir/fix-beforeredirect-type-hinting

Fix type hinting in beforeRedirect()

Author: dereuromark

src/CodeCompletion/Task/ControllerEventsTask.php

@@ -32,6 +32,7 @@ public function create(): string {
 
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
+use Psr\Http\Message\UriInterface;
 
 if (false) {
 	class Controller {
@@ -69,7 +70,7 @@ protected function events(bool $returnType): string {
 		$docBlockRedirect = <<<TXT
 		/**
 		 * @param \Cake\Event\EventInterface \$event
-		 * @param array|string \$url
+		 * @param \Psr\Http\Message\UriInterface|array|string \$url
 		 * @param \Cake\Http\Response \$response
 		 *
 		 * @return void
@@ -93,7 +94,7 @@ protected function events(bool $returnType): string {
 		{$docBlock}public function shutdown(EventInterface \$event)$type {
 		}
 
-		{$docBlockRedirect}public function beforeRedirect(EventInterface \$event, \$url, Response \$response)$type {
+		{$docBlockRedirect}public function beforeRedirect(EventInterface \$event, UriInterface|array|string \$url, Response \$response)$type {
 		}
 TXT;
 

tests/TestCase/CodeCompletion/Task/ControllerEventsTaskTest.php

@@ -31,6 +31,7 @@ public function testCollectLegacy(): void {
 
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
+use Psr\Http\Message\UriInterface;
 
 if (false) {
 	class Controller {
@@ -76,12 +77,12 @@ public function shutdown(EventInterface $event) {
 
 		/**
 		 * @param \Cake\Event\EventInterface $event
-		 * @param array|string $url
+		 * @param \Psr\Http\Message\UriInterface|array|string $url
 		 * @param \Cake\Http\Response $response
 		 *
 		 * @return void
 		 */
-		public function beforeRedirect(EventInterface $event, $url, Response $response) {
+		public function beforeRedirect(EventInterface $event, UriInterface|array|string $url, Response $response) {
 		}
 	}
 
@@ -128,12 +129,12 @@ public function shutdown(EventInterface $event) {
 
 		/**
 		 * @param \Cake\Event\EventInterface $event
-		 * @param array|string $url
+		 * @param \Psr\Http\Message\UriInterface|array|string $url
 		 * @param \Cake\Http\Response $response
 		 *
 		 * @return void
 		 */
-		public function beforeRedirect(EventInterface $event, $url, Response $response) {
+		public function beforeRedirect(EventInterface $event, UriInterface|array|string $url, Response $response) {
 		}
 	}
 }
@@ -154,6 +155,7 @@ public function testCollect() {
 
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
+use Psr\Http\Message\UriInterface;
 
 if (false) {
 	class Controller {
@@ -174,12 +176,12 @@ public function shutdown(EventInterface $event): void {
 
 		/**
 		 * @param \Cake\Event\EventInterface $event
-		 * @param array|string $url
+		 * @param \Psr\Http\Message\UriInterface|array|string $url
 		 * @param \Cake\Http\Response $response
 		 *
 		 * @return void
 		 */
-		public function beforeRedirect(EventInterface $event, $url, Response $response): void {
+		public function beforeRedirect(EventInterface $event, UriInterface|array|string $url, Response $response): void {
 		}
 	}
 
@@ -201,12 +203,12 @@ public function shutdown(EventInterface $event): void {
 
 		/**
 		 * @param \Cake\Event\EventInterface $event
-		 * @param array|string $url
+		 * @param \Psr\Http\Message\UriInterface|array|string $url
 		 * @param \Cake\Http\Response $response
 		 *
 		 * @return void
 		 */
-		public function beforeRedirect(EventInterface $event, $url, Response $response): void {
+		public function beforeRedirect(EventInterface $event, UriInterface|array|string $url, Response $response): void {
 		}
 	}
 }