v4-development sync

src/Pecee/Http/Input/IInputItem.php

@@ -15,7 +15,7 @@ interface IInputItem
 
     public function getValue();
 
-    public function setValue(string $value): self;
+    public function setValue($value): self;
 
     public function __toString(): string;
 

src/Pecee/Http/Input/InputFile.php

@@ -261,16 +261,16 @@ class InputFile implements IInputItem
         return $this->getTmpName();
     }
 
-    public function getValue(): ?string
+    public function getValue()
     {
         return $this->getFilename();
     }
 
     /**
-     * @param string $value
+     * @param mixed $value
      * @return static
      */
-    public function setValue(string $value): IInputItem
+    public function setValue($value): IInputItem
     {
         $this->filename = $value;
 

src/Pecee/Http/Input/InputHandler.php

@@ -92,22 +92,29 @@ class InputHandler
         /* Parse get requests */
         if (\count($_FILES) !== 0) {
             $this->originalFile = $_FILES;
-            $this->file = $this->parseFiles();
+            $this->file = $this->parseFiles($this->originalFile);
         }
     }
 
     /**
      * @return array
      */
-    public function parseFiles(): array
+    public function parseFiles(array $files, $parentKey = null): array
     {
         $list = [];
 
-        foreach ($_FILES as $key => $value) {
+        foreach ($files as $key => $value) {
+
+            // Parse multi dept file array
+            if(isset($value['name']) === false && \is_array($value) === true) {
+                $list[$key] = $this->parseFiles($value, $key);
+                continue;
+            }
 
             // Handle array input
             if (\is_array($value['name']) === false) {
-                $values['index'] = $key;
+                $values['index'] = $parentKey ?? $key;
+
                 try {
                     $list[$key] = InputFile::createFromArray($values + $value);
                 } catch (InvalidArgumentException $e) {
@@ -237,11 +244,27 @@ class InputHandler
         return $element;
     }
 
+    protected function getValueFromArray(array $array): array
+    {
+        $output = [];
+        /* @var $item InputItem */
+        foreach ($array as $key => $item) {
+
+            if ($item instanceof IInputItem) {
+                $item = $item->getValue();
+            }
+
+            $output[$key] = \is_array($item) ? $this->getValueFromArray($item) : $item;
+        }
+
+        return $output;
+    }
+
     /**
      * Get input element value matching index
      *
      * @param string $index
-     * @param string|object|null $defaultValue
+     * @param string|mixed|null $defaultValue
      * @param array ...$methods
      * @return string|array
      */
@@ -249,18 +272,18 @@ class InputHandler
     {
         $input = $this->find($index, ...$methods);
 
+        if ($input instanceof IInputItem) {
+            $input = $input->getValue();
+        }
+
         /* Handle collection */
         if (\is_array($input) === true) {
-            $output = [];
-            /* @var $item InputItem */
-            foreach ($input as $item) {
-                $output[] = \is_array($item) ? $item : $item->getValue();
-            }
+            $output = $this->getValueFromArray($input);
 
             return (\count($output) === 0) ? $defaultValue : $output;
         }
 
-        return ($input === null || (\is_string($input->getValue()) && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
+        return ($input === null || (\is_string($input) && trim($input) === '')) ? $defaultValue : $input;
     }
 
     /**
@@ -319,7 +342,7 @@ class InputHandler
     public function all(array $filter = []): array
     {
         $output = $this->originalParams + $this->originalPost + $this->originalFile;
-        $output = (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
+        $output = (\count($filter) > 0) ? \array_intersect_key($output, \array_flip($filter)) : $output;
 
         foreach ($filter as $filterKey) {
             if (array_key_exists($filterKey, $output) === false) {
@@ -380,6 +403,7 @@ class InputHandler
     public function setOriginalPost(array $post): self
     {
         $this->originalPost = $post;
+
         return $this;
     }
 
@@ -400,6 +424,7 @@ class InputHandler
     public function setOriginalParams(array $params): self
     {
         $this->originalParams = $params;
+
         return $this;
     }
 
@@ -420,6 +445,7 @@ class InputHandler
     public function setOriginalFile(array $file): self
     {
         $this->originalFile = $file;
+
         return $this;
     }
 

src/Pecee/Http/Input/InputItem.php

@@ -62,10 +62,10 @@ class InputItem implements IInputItem, \IteratorAggregate
 
     /**
      * Set input value
-     * @param string $value
+     * @param mixed $value
      * @return static
      */
-    public function setValue(string $value): IInputItem
+    public function setValue($value): IInputItem
     {
         $this->value = $value;
 

src/Pecee/Http/Request.php

@@ -19,6 +19,10 @@ class Request
     public const REQUEST_TYPE_DELETE = 'delete';
     public const REQUEST_TYPE_HEAD = 'head';
 
+    public const CONTENT_TYPE_JSON = 'application/json';
+    public const CONTENT_TYPE_FORM_DATA = 'multipart/form-data';
+    public const CONTENT_TYPE_X_FORM_ENCODED = 'application/x-www-form-urlencoded';
+
     /**
      * All request-types
      * @var string[]
@@ -57,6 +61,12 @@ class Request
      */
     protected $headers = [];
 
+    /**
+     * Request ContentType
+     * @var string
+     */
+    protected $contentType;
+
     /**
      * Request host
      * @var string
@@ -117,7 +127,9 @@ class Request
         $this->setHost($this->getHeader('http-host'));
 
         // Check if special IIS header exist, otherwise use default.
-        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
+        $this->setUrl(new Url($this->getFirstHeader(['unencoded-url', 'request-uri',])));
+
+        $this->setContentType(strtolower($this->getHeader('content-type')));
 
         $this->method = strtolower($this->getHeader('request-method'));
         $this->inputHandler = new InputHandler($this);
@@ -282,6 +294,50 @@ class Request
         return $header ?? $defaultValue;
     }
 
+    /**
+     * Will try to find first header from list of headers.
+     *
+     * @param array $headers
+     * @param null $defaultValue
+     * @return mixed|null
+     */
+    public function getFirstHeader(array $headers, $defaultValue = null)
+    {
+        foreach($headers as $header) {
+            $header = $this->getHeader($header);
+            if($header !== null) {
+                return $header;
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    /**
+     * Get request content-type
+     * @return string|null
+     */
+    public function getContentType(): ?string
+    {
+        return $this->contentType;
+    }
+
+    /**
+     * Set request content-type
+     * @param string $contentType
+     * @return $this
+     */
+    protected function setContentType(string $contentType): self
+    {
+        if(strpos($contentType, ';') > 0) {
+            $this->contentType = substr($contentType, 0, strpos($contentType, ';'));
+        } else {
+            $this->contentType = $contentType;
+        }
+
+        return $this;
+    }
+
     /**
      * Get input class
      * @return InputHandler
@@ -298,7 +354,7 @@ class Request
      *
      * @return bool
      */
-    public function isFormatAccepted($format): bool
+    public function isFormatAccepted(string $format): bool
     {
         return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) !== false);
     }
@@ -438,7 +494,6 @@ class Request
     public function setLoadedRoutes(array $routes): self
     {
         $this->loadedRoutes = $routes;
-
         return $this;
     }
 
@@ -451,7 +506,6 @@ class Request
     public function addLoadedRoute(ILoadableRoute $route): self
     {
         $this->loadedRoutes[] = $route;
-
         return $this;
     }
 
@@ -474,7 +528,6 @@ class Request
     public function setHasPendingRewrite(bool $boolean): self
     {
         $this->hasPendingRewrite = $boolean;
-
         return $this;
     }
 
@@ -493,4 +546,4 @@ class Request
         return $this->data[$name] ?? null;
     }
 
-}
+}

src/Pecee/Http/Url.php

@@ -371,7 +371,7 @@ class Url implements \JsonSerializable
      */
     public function getParam(string $name, ?string $defaultValue = null): ?string
     {
-        return isset($this->getParams()[$name]) ?? $defaultValue;
+        return (isset($this->getParams()[$name]) === true) ? $this->getParams()[$name] : $defaultValue;
     }
 
     /**