- new http tests

2 files changed, 6 insertions, 4 deletions

diff --git a/tests/src/Http/HttpWorker.php b/tests/src/Http/HttpWorker.php
index 13fd6c27..ba045d87 100644
--- a/tests/src/Http/HttpWorker.php
+++ b/tests/src/Http/HttpWorker.php
@@ -91,10 +91,12 @@ class HttpWorker
         $request->protocol = $context['protocol'];
         $request->method = $context['method'];
         $request->uri = $context['uri'];
-        $request->attributes = $context['attributes'];
+        $request->attributes = $context['attributes'] ?? [];
         $request->headers = $context['headers'];
-        $request->cookies = $context['cookies'];
-        $request->uploads = $context['uploads'];
+        $request->cookies = $context['cookies'] ?? [];
+        $request->uploads = $context['uploads'] ?? [];
+
+        $request->query = [];
         parse_str($context['rawQuery'], $request->query);
 
         // indicates that body was parsed
diff --git a/tests/src/Http/PSR7Worker.php b/tests/src/Http/PSR7Worker.php
index b985d288..e8900bcc 100644
--- a/tests/src/Http/PSR7Worker.php
+++ b/tests/src/Http/PSR7Worker.php
@@ -70,7 +70,7 @@ class PSR7Worker
             return null;
         }
 
-        $_SERVER = $this->configureServer($httpRequest['ctx']);
+        $_SERVER = $this->configureServer($httpRequest);
 
         return $this->mapRequest($httpRequest, $_SERVER);
     }