From 8c789c94c1eb8c4ae0b5873c3a17ea9fda31994d Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Tue, 1 Apr 2025 14:50:04 +0200
Subject: [PATCH 1/2] fix: server params refactor broke  format

---
 src/Codeception/Module/Yii2.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Codeception/Module/Yii2.php b/src/Codeception/Module/Yii2.php
index 54c289d..30f3372 100644
--- a/src/Codeception/Module/Yii2.php
+++ b/src/Codeception/Module/Yii2.php
@@ -279,7 +279,7 @@ public function _initialize(): void
         $this->server = $_SERVER;
         // Adds the required server params. Note this is done separately from the request cycle since someone might call
         // `Url::to` before doing a request, which would instantiate the request component with incorrect server params.
-        $_SERVER = [...$_SERVER, $this->getServerParams()];
+        $_SERVER = [...$_SERVER, ...$this->getServerParams()];
     }
 
     /**

From 7779f7e208471eae076ee8462906a388f0b71d7c Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Tue, 1 Apr 2025 15:05:31 +0200
Subject: [PATCH 2/2] chore: fix phsptan config to allow bare array typehint

---
 phpstan.neon | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index fb2d525..e695b2d 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -17,6 +17,8 @@ parameters:
     checkMaybeUndefinedVariables: true
     treatPhpDocTypesAsCertain: false
     ignoreErrors:
+        - identifier: missingType.iterableValue
+          path: tests/_support/_generated/FunctionalTesterActions.php
         - identifier: return.type
           path: tests/_support/_generated/FunctionalTesterActions.php
           message: "# but returns mixed.$#"