From 34dd6c4d4525230eb6abd28ac55c2a04657c2e6c Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Thu, 5 Jan 2023 21:24:52 +0100 Subject: [PATCH 1/4] fix debug_kit version string for 5.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46df28e418..290533d03b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require-dev": { "cakephp/bake": "dev-cake5", "cakephp/cakephp-codesniffer": "^5.0", - "cakephp/debug_kit": "dev-cake5", + "cakephp/debug_kit": "5.x-dev", "josegonzalez/dotenv": "^3.2", "phpunit/phpunit": "^9.5.19" }, From a6b33d7737fd5d0ac23b9a421ae1eb7318827982 Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Thu, 5 Jan 2023 21:39:42 +0100 Subject: [PATCH 2/4] fix psalm --- src/Application.php | 1 + src/Controller/ErrorController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Application.php b/src/Application.php index 91376fb2f9..bcd7cb56f1 100644 --- a/src/Application.php +++ b/src/Application.php @@ -33,6 +33,7 @@ * * This defines the bootstrapping logic and middleware layers you * want to use in your application. + * @extends \Cake\Http\BaseApplication<\App\Application> */ class Application extends BaseApplication { diff --git a/src/Controller/ErrorController.php b/src/Controller/ErrorController.php index 27dfde5012..acec6abece 100644 --- a/src/Controller/ErrorController.php +++ b/src/Controller/ErrorController.php @@ -48,7 +48,7 @@ public function beforeFilter(EventInterface $event) /** * beforeRender callback. * - * @param \Cake\Event\EventInterface $event Event. + * @param \Cake\Event\EventInterface<\Cake\Controller\Controller> $event Event. * @return \Cake\Http\Response|null|void */ public function beforeRender(EventInterface $event) From 73fe3b32d54275dcf8ffadb26ab44400580f86f3 Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Thu, 5 Jan 2023 21:44:11 +0100 Subject: [PATCH 3/4] fix cs --- src/Application.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Application.php b/src/Application.php index bcd7cb56f1..382ca5607a 100644 --- a/src/Application.php +++ b/src/Application.php @@ -33,6 +33,7 @@ * * This defines the bootstrapping logic and middleware layers you * want to use in your application. + * * @extends \Cake\Http\BaseApplication<\App\Application> */ class Application extends BaseApplication From 6e0763b77432d5c8ce54810301f2a3538467cff4 Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Fri, 6 Jan 2023 13:49:37 +0100 Subject: [PATCH 4/4] adjust cakephp/bake version for cake5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 290533d03b..9e3ec51f5e 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "mobiledetect/mobiledetectlib": "^3.74" }, "require-dev": { - "cakephp/bake": "dev-cake5", + "cakephp/bake": "3.x-dev", "cakephp/cakephp-codesniffer": "^5.0", "cakephp/debug_kit": "5.x-dev", "josegonzalez/dotenv": "^3.2",