Merge pull request #178 from utopia-php/fix-cookie-headers

Fix: Cookie headers

Author: Meldiron

composer.json

@@ -24,7 +24,7 @@
     "scripts": {
         "lint": "vendor/bin/pint --test",
         "format": "vendor/bin/pint",
-        "check": "vendor/bin/phpstan analyse -c phpstan.neon",
+        "check": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit 512M",
         "test": "vendor/bin/phpunit --configuration phpunit.xml",
         "bench": "vendor/bin/phpbench run --report=benchmark"
     },
@@ -34,9 +34,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.25",
-        "laravel/pint": "^1.2",
+        "laravel/pint": "1.*",
         "swoole/ide-helper": "4.8.3",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "1.*",
         "phpbench/phpbench": "^1.2"
     }
 }

composer.lock

@@ -36,7 +36,7 @@ public function getRawPayload(): string
      * @param  string|null  $default
      * @return string|null
      */
-    public function getServer(string $key, string $default = null): ?string
+    public function getServer(string $key, ?string $default = null): ?string
     {
         return $_SERVER[$key] ?? $default;
     }

src/Http/Adapter/FPM/Request.php

@@ -25,10 +25,10 @@ public function write(string $content): bool
      *
      * Send optional content and end
      *
-     * @param  string  $content
+     * @param  string|null  $content
      * @return void
      */
-    public function end(string $content = null): void
+    public function end(?string $content = null): void
     {
         if (!is_null($content)) {
             echo $content;

src/Http/Adapter/FPM/Response.php

@@ -43,7 +43,7 @@ public function getRawPayload(): string
      * @param  string|null  $default
      * @return string|null
      */
-    public function getServer(string $key, string $default = null): ?string
+    public function getServer(string $key, ?string $default = null): ?string
     {
         return $this->swoole->server[$key] ?? $default;
     }
@@ -359,6 +359,21 @@ protected function generateInput(): array
      */
     protected function generateHeaders(): array
     {
-        return $this->swoole->header;
+        $headers = $this->swoole->header;
+
+        if (empty($this->swoole->cookie)) {
+            return $headers;
+        }
+
+        $cookieHeaders = [];
+        foreach ($this->swoole->cookie as $key => $value) {
+            $cookieHeaders[] = "{$key}={$value}";
+        }
+
+        if (!empty($cookieHeaders)) {
+            $headers['cookie'] = \implode('; ', $cookieHeaders);
+        }
+
+        return $headers;
     }
 }

src/Http/Adapter/Swoole/Request.php

@@ -45,7 +45,7 @@ public function write(string $content): bool
      * @param  string|null  $content
      * @return void
      */
-    public function end(string $content = null): void
+    public function end(?string $content = null): void
     {
         $this->swoole->end($content);
     }

src/Http/Adapter/Swoole/Response.php

@@ -15,7 +15,7 @@ class Server extends Adapter
 {
     protected SwooleServer $server;
 
-    public function __construct(string $host, string $port = null, array $settings = [])
+    public function __construct(string $host, ?string $port = null, array $settings = [])
     {
         $this->server = new SwooleServer($host, $port);
         $this->server->set(\array_merge($settings, [
@@ -42,7 +42,7 @@ public function onStart(callable $callback)
 
     public function start()
     {
-        if(Coroutine::getCid() === -1) {
+        if (Coroutine::getCid() === -1) {
             run(fn () => $this->server->start());
         } else {
             $this->server->start();

src/Http/Adapter/Swoole/Server.php

@@ -83,7 +83,7 @@ public function getCount(): int
      *
      * @throws \Exception
      */
-    public function load(string $directory, string $root = null): void
+    public function load(string $directory, ?string $root = null): void
     {
         if (!is_readable($directory)) {
             throw new Exception("Failed to load directory: {$directory}");

src/Http/Files.php

@@ -295,7 +295,7 @@ public static function error(): Hook
      * @param  string|null  $default
      * @return string|null
      */
-    public static function getEnv(string $key, string $default = null): ?string
+    public static function getEnv(string $key, ?string $default = null): ?string
     {
         return $_SERVER[$key] ?? $default;
     }
@@ -366,7 +366,7 @@ public function getResource(string $name, string $context = 'utopia', bool $fres
         $this->resources[$context] ??= [];
 
         $resourcesCallback = &self::$resourcesCallbacks[$context] ?? [];
-        if(empty($resourcesCallback) || !\array_key_exists($name, $resourcesCallback)) {
+        if (empty($resourcesCallback) || !\array_key_exists($name, $resourcesCallback)) {
             $resourcesCallback = &self::$resourcesCallbacks['utopia'];
         }
 
@@ -514,7 +514,7 @@ public static function addRoute(string $method, string $url): Route
      *
      * @throws \Exception
     */
-    public function loadFiles(string $directory, string $root = null): void
+    public function loadFiles(string $directory, ?string $root = null): void
     {
         $this->files->load($directory, $root);
     }
@@ -576,7 +576,7 @@ public function start()
             try {
                 $this->run($request, $response, $context);
             } finally {
-                if(isset(self::$resourcesCallbacks[$context])) {
+                if (isset(self::$resourcesCallbacks[$context])) {
                     unset(self::$resourcesCallbacks[$context]);
                 }
             }
@@ -593,7 +593,7 @@ public function start()
                     $arguments = $this->getArguments($hook, 'utopia', [], []);
                     \call_user_func_array($hook->getAction(), $arguments);
                 }
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 self::setResource('error', fn () => $e);
 
                 foreach (self::$errors as $error) { // Global error hooks
@@ -793,7 +793,7 @@ public function run(Request $request, Response $response, string $context): stat
                 $arguments = $this->getArguments($hook, $context, [], []);
                 \call_user_func_array($hook->getAction(), $arguments);
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             self::setResource('error', fn () => $e, [], $context);
 
             foreach (self::$errors as $error) { // Global error hooks

src/Http/Http.php

@@ -124,7 +124,7 @@ abstract public function getRawPayload(): string;
      * @param  string|null  $default
      * @return string|null
      */
-    abstract public function getServer(string $key, string $default = null): ?string;
+    abstract public function getServer(string $key, ?string $default = null): ?string;
 
     /**
      * Set server