eh

Author: JoshuaEstes

src/SonsOfPHP/Component/Cache/Adapter/FilesystemAdapter.php

@@ -33,7 +33,9 @@ public function __construct(
         }
 
         if (!is_dir($this->directory)) {
-            @mkdir($this->directory, $this->defaultPermission, true);
+            if (!mkdir($this->directory, $this->defaultPermission, true) && !is_dir($this->directory)) {
+                throw new \RuntimeException(sprintf('Directory "%s" could not be created', $this->directory));
+            }
         }
 
         $this->directory .= \DIRECTORY_SEPARATOR;
@@ -134,7 +136,12 @@ private function getFile(string $key): string
     {
         $hash = str_replace('/', '-', base64_encode(hash('xxh128', self::class . $key, true)));
         $dir = $this->directory . strtoupper($hash[0] . \DIRECTORY_SEPARATOR . $hash[1] . \DIRECTORY_SEPARATOR);
-        @mkdir($dir, $this->defaultPermission, true);
+
+        if (!is_dir($dir)) {
+            if (!mkdir($dir, $this->defaultPermission, true) && !is_dir($dir)) {
+                throw new \RuntimeException(sprintf('Cache directory "%s" could not be created', $dir));
+            }
+        }
 
         return $dir . substr($hash, 2, 20);
     }

src/SonsOfPHP/Component/HttpMessage/Message.php

@@ -100,12 +100,8 @@ public function withHeader(string $name, $value): MessageInterface
             $value = [$value];
         }
 
-        $that->normalizedHeaders[$name] = $value;
-
-        array_walk($value, function (&$val, $key): void {
-            $val = strtolower($val);
-        });
-        $that->headers[strtolower($name)] = $value;
+        $that->headers[$name] = $value;
+        $that->normalizedHeaders[strtolower($name)] = $value;
 
         return $that;
     }
@@ -128,13 +124,13 @@ public function withAddedHeader(string $name, $value): MessageInterface
         }
 
         $that = clone $this;
-        $that->normalizedHeaders[$name][] = $value;
 
-        $values = $value;
-        array_walk($values, function (&$val, $key): void {
-            $val = strtolower($val);
-        });
-        $that->headers[strtolower($name)][] = $value;
+        $normalizedName = strtolower($name);
+        $existingValues = $that->normalizedHeaders[$normalizedName] ?? [];
+        $mergedValues = array_merge($existingValues, $value);
+
+        $that->headers[$name] = $mergedValues;
+        $that->normalizedHeaders[$normalizedName] = $mergedValues;
 
         return $that;
     }

src/SonsOfPHP/Component/HttpMessage/Response.php

@@ -14,10 +14,20 @@
  */
 class Response extends Message implements ResponseInterface
 {
-    private int $statusCode;
+    private int $statusCode = 200;
 
     private string $reasonPhrase = '';
 
+    public function __construct(int $statusCode = 200, string $reasonPhrase = '')
+    {
+        if (!Status::tryFrom($statusCode) instanceof Status) {
+            throw new InvalidArgumentException(sprintf('The status code "%d" is invalid', $statusCode));
+        }
+
+        $this->statusCode = $statusCode;
+        $this->reasonPhrase = $reasonPhrase;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -35,7 +45,7 @@ public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterf
             throw new InvalidArgumentException(sprintf('The status code "%d" is invalid', $code));
         }
 
-        if (isset($this->statusCode) && $this->statusCode === $code && $this->reasonPhrase === $reasonPhrase) {
+        if ($this->statusCode === $code && $this->reasonPhrase === $reasonPhrase) {
             return $this;
         }
 

src/SonsOfPHP/Component/HttpMessage/Status.php

@@ -82,23 +82,28 @@ enum Status: int
     case NOT_EXTENDED                    = 510;
     case NETWORK_AUTHENTICATION_REQUIRED = 511;
 
-    //public function isInformational(): bool
-    //{
-    //}
+    public function isInformational(): bool
+    {
+        return $this->value >= 100 && $this->value < 200;
+    }
 
-    //public function isSuccessful(): bool
-    //{
-    //}
+    public function isSuccessful(): bool
+    {
+        return $this->value >= 200 && $this->value < 300;
+    }
 
-    //public function isRedirection(): bool
-    //{
-    //}
+    public function isRedirection(): bool
+    {
+        return $this->value >= 300 && $this->value < 400;
+    }
 
-    //public function isClientError(): bool
-    //{
-    //}
+    public function isClientError(): bool
+    {
+        return $this->value >= 400 && $this->value < 500;
+    }
 
-    //public function isServerError(): bool
-    //{
-    //}
+    public function isServerError(): bool
+    {
+        return $this->value >= 500 && $this->value < 600;
+    }
 }

src/SonsOfPHP/Component/HttpMessage/Uri.php

@@ -44,7 +44,7 @@ public function __construct(
             $this->path     = $parts['path'] ?? null;
             $this->fragment = $parts['fragment'] ?? null;
 
-            if (isset($parts['query']) && ($parts['query'] !== '' && $parts['query'] !== '0')) {
+            if (isset($parts['query']) && $parts['query'] !== '') {
                 parse_str($parts['query'], $this->queryParams);
             }
         }
@@ -124,8 +124,6 @@ public function getPath(): string
      */
     public function getQuery(): string
     {
-        //return http_build_query($this->queryParams, '', null, \PHP_QUERY_RFC3986);
-
         $query = '';
         foreach ($this->queryParams as $key => $value) {
             if (is_array($value)) {
@@ -256,8 +254,6 @@ public function withQuery(string $query): UriInterface
         parse_str($query, $output);
 
         $that = clone $this;
-
-        //$that->query = $query;
         $that->queryParams = $output;
 
         return $that;

src/SonsOfPHP/Component/Logger/Handler/FileHandler.php

@@ -42,6 +42,17 @@ private function open(): void
             return;
         }
 
+        $dir = dirname($this->filename);
+        if (!is_dir($dir)) {
+            if (!mkdir($dir, 0o777, true) && !is_dir($dir)) {
+                throw new RuntimeException(sprintf('Log directory "%s" could not be created', $dir));
+            }
+        }
+
+        if (!is_writable($dir)) {
+            throw new RuntimeException(sprintf('Log directory "%s" is not writable', $dir));
+        }
+
         if (false === $this->handle = fopen($this->filename, 'a')) {
             throw new RuntimeException(sprintf('"%s" could not be opened', $this->filename));
         }