Development

- Optimised Input-classes.
- `get` and `getObject` methods on `Input` now supports filtering on multiple method-types when using the `$method` parameter.
- Input classes now know how to parse that stupid nested $_FILES array.
- It's now possible to change method-names on ResourceControllers.
- Removed `getValue` and `setValue` from `InputFile` classes.
- Ensured that request-method are only parsed from $_POST or $_SERVER.
- Fixed minor parameter-issues with subdomain routing.
- Added PHPDocs.
- Added even more unit-tests.
- Many small optimisations tweaks.

src/Pecee/Http/Input/InputFile.php

@@ -4,8 +4,8 @@ namespace Pecee\Http\Input;
 class InputFile implements IInputItem
 {
     public $index;
-    public $value;
     public $name;
+    public $filename;
     public $size;
     public $type;
     public $error;
@@ -21,7 +21,9 @@ class InputFile implements IInputItem
 
     /**
      * Create from array
+     *
      * @param array $values
+     * @throws \InvalidArgumentException
      * @return static
      */
     public static function createFromArray(array $values)
@@ -30,12 +32,22 @@ class InputFile implements IInputItem
             throw new \InvalidArgumentException('Index key is required');
         }
 
+        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
+
+        $values = array_merge([
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ], $values);
+
         $input = new static($values['index']);
-        $input->setError(isset($values['error']) ? $values['error'] : null);
-        $input->setName(isset($values['name']) ? $values['name'] : null);
-        $input->setSize(isset($values['size']) ? $values['size'] : null);
-        $input->setType(isset($values['type']) ? $values['type'] : null);
-        $input->setTmpName(isset($values['tmp_name']) ? $values['tmp_name'] : null);
+        $input->setError($values['error'])
+            ->setSize($values['size'])
+            ->setType($values['type'])
+            ->setTmpName($values['tmp_name'])
+            ->setFilename($values['name']);
 
         return $input;
     }
@@ -48,6 +60,11 @@ class InputFile implements IInputItem
         return $this->index;
     }
 
+    /**
+     * Set input index
+     * @param string $index
+     * @return static $this
+     */
     public function setIndex($index)
     {
         $this->index = $index;
@@ -75,6 +92,10 @@ class InputFile implements IInputItem
         return $this;
     }
 
+    /**
+     * Get mime-type of file
+     * @return string
+     */
     public function getMime()
     {
         return $this->getType();
@@ -100,12 +121,19 @@ class InputFile implements IInputItem
         return $this;
     }
 
+    /**
+     * Returns extension without "."
+     *
+     * @return string
+     */
     public function getExtension()
     {
         return pathinfo($this->getName(), PATHINFO_EXTENSION);
     }
 
     /**
+     * Get human friendly name
+     *
      * @return string
      */
     public function getName()
@@ -113,6 +141,13 @@ class InputFile implements IInputItem
         return $this->name;
     }
 
+    /**
+     * Set human friendly name.
+     * Useful for adding validation etc.
+     *
+     * @param string $name
+     * @return static $this
+     */
     public function setName($name)
     {
         $this->name = $name;
@@ -120,29 +155,63 @@ class InputFile implements IInputItem
         return $this;
     }
 
+    /**
+     * Set filename
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setFilename($name)
+    {
+        $this->filename = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get filename
+     *
+     * @return string mixed
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Move the uploaded temporary file to it's new home
+     *
+     * @param string $destination
+     * @return bool
+     */
     public function move($destination)
     {
         return move_uploaded_file($this->tmpName, $destination);
     }
 
+    /**
+     * Get file contents
+     *
+     * @return string
+     */
     public function getContents()
     {
         return file_get_contents($this->tmpName);
     }
 
-    public function setValue($value)
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
+    /**
+     * Return true if an upload error occured.
+     *
+     * @return bool
+     */
     public function hasError()
     {
         return ($this->getError() !== 0);
     }
 
     /**
+     * Get upload-error code.
+     *
      * @return string
      */
     public function getError()
@@ -152,6 +221,7 @@ class InputFile implements IInputItem
 
     /**
      * Set error
+     *
      * @param int $error
      * @return static $this
      */
@@ -162,27 +232,6 @@ class InputFile implements IInputItem
         return $this;
     }
 
-    public function toArray()
-    {
-        return [
-            'tmp_name' => $this->tmpName,
-            'type'     => $this->type,
-            'size'     => $this->size,
-            'name'     => $this->name,
-            'error'    => $this->error,
-        ];
-    }
-
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-    public function getValue()
-    {
-        return $this->getTmpName();
-    }
-
     /**
      * @return string
      */
@@ -202,4 +251,21 @@ class InputFile implements IInputItem
 
         return $this;
     }
+
+    public function __toString()
+    {
+        return $this->getTmpName();
+    }
+
+    public function toArray()
+    {
+        return [
+            'tmp_name' => $this->tmpName,
+            'type'     => $this->type,
+            'size'     => $this->size,
+            'name'     => $this->filename,
+            'error'    => $this->error,
+        ];
+    }
+
 }