lenevor / syscodes

src/components/Filesystem/Filesystem.php

Indentation +804 added lines, -804 removed lines

@@ -35,819 +35,819 @@
  */
 class Filesystem 
 {
-	/**
-	 * Enable locking for file reading and writing.
-	 *
-	 * @var null|bool $lock
-	 */
-	public $lock = null;
-
-	/**
-	 * Holds the file handler resource if the file is opened.
-	 *
-	 * @var resource $handler
-	 */
-	protected $handler;
-
-	/**
-	 * The files size in bytes.
-	 *
-	 * @var float $size
-	 */
-	protected $size;
-
-	/**
-	 * Append given data string to this file.
-	 *
-	 * @param  string  $path
-	 * @param  string  $data
-	 *
-	 * @return bool
-	 */
-	public function append($path, $data)
-	{
-		return file_put_contents($path, $data, FILE_APPEND);
-	}
-
-	/**
-	 * Copy a file to a new location.
-	 *
-	 * @param  string  $path
-	 * @param  string  $target
-	 * 
-	 * @return bool
-	 */
-	public function copy($path, $target)
-	{
-		return copy($path, $target);
-	}
-
-	/**
-	 * Get the contents of a file.
-	 *
-	 * @param  string  $path
-	 * @param  bool  $lock  (false by default)
-	 * @param  bool  $force  (false by default)
-	 *
-	 * @return string
-	 *
-	 * @throws FileNotFoundException
-	 */
-	public function get($path, $lock = false, $force = false)
-	{
-		if ($this->isFile($path)) {
-			return $lock ? $this->read($path, $force) : file_get_contents($path);
-		}
-
-		throw new FileNotFoundException($path);
-	}
-
-	/**
-	 * Get contents of a file with shared access.
-	 *
-	 * @param  string  $path
-	 * @param  bool  $force  
-	 *
-	 * @return string
-	 */
-	protected function read($path, $force = false)
-	{
-		$contents = '';
-
-		$this->open($path, 'rb', $force);
+    /**
+     * Enable locking for file reading and writing.
+     *
+     * @var null|bool $lock
+     */
+    public $lock = null;
+
+    /**
+     * Holds the file handler resource if the file is opened.
+     *
+     * @var resource $handler
+     */
+    protected $handler;
+
+    /**
+     * The files size in bytes.
+     *
+     * @var float $size
+     */
+    protected $size;
+
+    /**
+     * Append given data string to this file.
+     *
+     * @param  string  $path
+     * @param  string  $data
+     *
+     * @return bool
+     */
+    public function append($path, $data)
+    {
+        return file_put_contents($path, $data, FILE_APPEND);
+    }
+
+    /**
+     * Copy a file to a new location.
+     *
+     * @param  string  $path
+     * @param  string  $target
+     * 
+     * @return bool
+     */
+    public function copy($path, $target)
+    {
+        return copy($path, $target);
+    }
+
+    /**
+     * Get the contents of a file.
+     *
+     * @param  string  $path
+     * @param  bool  $lock  (false by default)
+     * @param  bool  $force  (false by default)
+     *
+     * @return string
+     *
+     * @throws FileNotFoundException
+     */
+    public function get($path, $lock = false, $force = false)
+    {
+        if ($this->isFile($path)) {
+            return $lock ? $this->read($path, $force) : file_get_contents($path);
+        }
+
+        throw new FileNotFoundException($path);
+    }
+
+    /**
+     * Get contents of a file with shared access.
+     *
+     * @param  string  $path
+     * @param  bool  $force  
+     *
+     * @return string
+     */
+    protected function read($path, $force = false)
+    {
+        $contents = '';
+
+        $this->open($path, 'rb', $force);
 		
-		if ($this->handler) {
-			try {
-				if (flock($this->handler, LOCK_SH)) {
-					$this->clearStatCache($path);
+        if ($this->handler) {
+            try {
+                if (flock($this->handler, LOCK_SH)) {
+                    $this->clearStatCache($path);
 
-					$contents = fread($this->handler, $this->getSize($path) ?: 1);
+                    $contents = fread($this->handler, $this->getSize($path) ?: 1);
 					
-					while ( ! feof($this->handler)) {
-						$contents .= fgets($this->handler, 4096);
-					}
-
-					flock($this->handler, LOCK_UN);
-				}
-			} finally {
-				$this->close();
-			}
-		}
-
-		return trim($contents);
-	}
-
-	/**
-	 * Opens the current file with a given $mode.
-	 *
-	 * @param  string  $path
-	 * @param  string  $mode  A valid 'fopen' mode string (r|w|a ...)
-	 * @param  bool  $force  
-	 *
-	 * @return bool
-	 */
-	public function open($path, $mode, $force = false)
-	{
-		if ( ! $force && is_resource($this->handler)) {
-			return true;
-		}
-
-		if ($this->exists($path) === false) {
-			if ($this->create($path) === false) {
-				return false;
-			}
-		}
-
-		$this->handler = fopen($path, $mode);
-
-		return is_resource($this->handler);
-	}
-
-	/**
-	 * Creates the file.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return bool
-	 */
-	public function create($path)
-	{
-		if (($this->isDirectory($path)) && ($this->isWritable($path)) || ( ! $this->exists($path))) {
-			if (touch($path)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determine if a file exists.
-	 *
-	 * @param  string  $path
-	 *
-	 * @return bool
-	 */
-	public function exists($path)
-	{
-		$this->clearStatCache($path);
-
-		return file_exists($path);
-	}
-
-	/**
-	 * Clear PHP's internal stat cache.
-	 *
-	 * @param  string  $path
-	 * @param  bool  $all  Clear all cache or not
-	 *
-	 * @return void
-	 */
-	public function clearStatCache($path, $all = false)
-	{
-		if ($all === false) {
-			clearstatcache(true, $path);
-		}
-
-		clearstatcache();
-	}
-
-	/**
-	 * Get the returned value of a file.
-	 * 
-	 * @param  string  $path
-	 * @param  array  $data
-	 * 
-	 * @return mixed
-	 * 
-	 * @throws \Syscodes\Filesystem\Exceptions\FileNotFoundException
-	 */
-	public function getRequire($path, array $data = [])
-	{
-		if ($this->isFile($path)) {
-			$__path = $path;
-			$__data = $data;
-
-			return (static function () use ($__path, $__data) {
-				extract($__data, EXTR_SKIP);
-
-				return require $__path;
-			})();
-		}
-
-		throw new FileNotFoundException($path);
-	}
-
-	/**
-	 * Require the given file once.
-	 * 
-	 * @param  string  $path
-	 * @param  array  $data
-	 * 
-	 * @return mixed
-	 * 
-	 * @throws \Syscodes\Filesystem\Exceptions\FileNotFoundException
-	 */
-	public function getRequireOnce($path, array $data = [])
-	{
-		if ($this->isFile($path)) {
-			$__path = $path;
-			$__data = $data;
-
-			return (static function () use ($__path, $__data) {
-				extract($__data, EXTR_SKIP);
-
-				return require_once $__path;
-			})();
-		}
-
-		throw new FileNotFoundException($path);
-	}
-
-	/**
-	 * Retrieve the file size.
-	 *
-	 * Implementations SHOULD return the value stored in the "size" key of
-	 * the file in the $_FILES array if available, as PHP calculates this
-	 * based on the actual size transmitted.
-	 *
-	 * @param  string  $path
-	 * @param  string  $unit  ('b' by default)
-	 * 
-	 * @return int|null  The file size in bytes or null if unknown
-	 */
-	public function getSize($path, $unit = 'b')
-	{
-		if ($this->exists($path)) {
-			if (is_null($this->size)) {
-				$this->size = filesize($path);
-			}
-
-			switch (strtolower($unit)) {
-				case 'kb':
-					return number_format($this->size / 1024, 3);
-					break;
-				case 'mb':
-					return number_format(($this->size / 1024) / 1024, 3);     
-					break;
-			}
-
-			return $this->size;
-		}
-	}
+                    while ( ! feof($this->handler)) {
+                        $contents .= fgets($this->handler, 4096);
+                    }
+
+                    flock($this->handler, LOCK_UN);
+                }
+            } finally {
+                $this->close();
+            }
+        }
+
+        return trim($contents);
+    }
+
+    /**
+     * Opens the current file with a given $mode.
+     *
+     * @param  string  $path
+     * @param  string  $mode  A valid 'fopen' mode string (r|w|a ...)
+     * @param  bool  $force  
+     *
+     * @return bool
+     */
+    public function open($path, $mode, $force = false)
+    {
+        if ( ! $force && is_resource($this->handler)) {
+            return true;
+        }
+
+        if ($this->exists($path) === false) {
+            if ($this->create($path) === false) {
+                return false;
+            }
+        }
+
+        $this->handler = fopen($path, $mode);
+
+        return is_resource($this->handler);
+    }
+
+    /**
+     * Creates the file.
+     * 
+     * @param  string  $path
+     * 
+     * @return bool
+     */
+    public function create($path)
+    {
+        if (($this->isDirectory($path)) && ($this->isWritable($path)) || ( ! $this->exists($path))) {
+            if (touch($path)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if a file exists.
+     *
+     * @param  string  $path
+     *
+     * @return bool
+     */
+    public function exists($path)
+    {
+        $this->clearStatCache($path);
+
+        return file_exists($path);
+    }
+
+    /**
+     * Clear PHP's internal stat cache.
+     *
+     * @param  string  $path
+     * @param  bool  $all  Clear all cache or not
+     *
+     * @return void
+     */
+    public function clearStatCache($path, $all = false)
+    {
+        if ($all === false) {
+            clearstatcache(true, $path);
+        }
+
+        clearstatcache();
+    }
+
+    /**
+     * Get the returned value of a file.
+     * 
+     * @param  string  $path
+     * @param  array  $data
+     * 
+     * @return mixed
+     * 
+     * @throws \Syscodes\Filesystem\Exceptions\FileNotFoundException
+     */
+    public function getRequire($path, array $data = [])
+    {
+        if ($this->isFile($path)) {
+            $__path = $path;
+            $__data = $data;
+
+            return (static function () use ($__path, $__data) {
+                extract($__data, EXTR_SKIP);
+
+                return require $__path;
+            })();
+        }
+
+        throw new FileNotFoundException($path);
+    }
+
+    /**
+     * Require the given file once.
+     * 
+     * @param  string  $path
+     * @param  array  $data
+     * 
+     * @return mixed
+     * 
+     * @throws \Syscodes\Filesystem\Exceptions\FileNotFoundException
+     */
+    public function getRequireOnce($path, array $data = [])
+    {
+        if ($this->isFile($path)) {
+            $__path = $path;
+            $__data = $data;
+
+            return (static function () use ($__path, $__data) {
+                extract($__data, EXTR_SKIP);
+
+                return require_once $__path;
+            })();
+        }
+
+        throw new FileNotFoundException($path);
+    }
+
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this
+     * based on the actual size transmitted.
+     *
+     * @param  string  $path
+     * @param  string  $unit  ('b' by default)
+     * 
+     * @return int|null  The file size in bytes or null if unknown
+     */
+    public function getSize($path, $unit = 'b')
+    {
+        if ($this->exists($path)) {
+            if (is_null($this->size)) {
+                $this->size = filesize($path);
+            }
+
+            switch (strtolower($unit)) {
+                case 'kb':
+                    return number_format($this->size / 1024, 3);
+                    break;
+                case 'mb':
+                    return number_format(($this->size / 1024) / 1024, 3);     
+                    break;
+            }
+
+            return $this->size;
+        }
+    }
 	
-	/**
-	 * Returns the file's group.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return int|bool  The file group, or false in case of an error
-	 */
-	public function group($path)
-	{
-		if ($this->exists($path)) {
-			return filegroup($path);
-		}
-
-		return false;
-	}
+    /**
+     * Returns the file's group.
+     *
+     * @param  string  $path
+     * 
+     * @return int|bool  The file group, or false in case of an error
+     */
+    public function group($path)
+    {
+        if ($this->exists($path)) {
+            return filegroup($path);
+        }
+
+        return false;
+    }
 	
-	/**
-	 * Returns true if the file is executable.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return bool  True if file is executable, false otherwise
-	 */
-	public function exec($path)
-	{
-		return is_executable($path);
-	}
-
-	/**
-	 * Determine if the given path is a directory.
-	 *
-	 * @param  string  $directory
-	 *
-	 * @return bool
-	 */
-	public function isDirectory($directory)
-	{
-		return is_dir($directory);
-	}
-
-	/**
-	 * Determine if the given path is a file.
-	 *
-	 * @param  string  $file
-	 *
-	 * @return bool
-	 */
-	public function isFile($file)
-	{
-		return is_file($file);
-	}
-
-	/**
-	 * Determine if the given path is writable.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return bool
-	 */
-	public function isWritable($path)
-	{
-		return is_writable($path);
-	}
-
-	/**
-	 * Returns if true the file is readable.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return bool  True if file is readable, false otherwise
-	 */
-	public function isReadable($path)
-	{
-		return is_readable($path);
-	}
-
-	/**
-	 * Returns last access time.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return int|bool  Timestamp of last access time, or false in case of an error
-	 */
-	public function lastAccess($path)
-	{
-		if ($this->exists($path)) {
-			return fileatime($path);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns last modified time.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return int|bool  Timestamp of last modified time, or false in case of an error
-	 */
-	public function lastModified($path)
-	{
-		if ($this->exists($path)) {
-			return filemtime($path);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get all of the directories within a given directory.
-	 * 
-	 * @param  string  $directory
-	 * 
-	 * @return array
-	 */
-	public function directories($directory)
-	{
-		$directories = [];
-
-		$iterators = new FilesystemIterator($directory);
-
-		foreach ($iterators as $iterator) {
-			$directories[] = trim($iterator->getPathname(), '/').'/';
-		}
-
-		return $directories;
-	}
-
-	/**
-	 * Delete the file at a given path.
-	 * 
-	 * @param  string  $paths
-	 * 
-	 * @return bool
-	 */
-	public function delete($paths)
-	{
-		if (is_resource($this->handler)) {
-			fclose($this->handler);
-			$this->handler = null;
-		}
-
-		$paths = is_array($paths) ? $paths : func_get_args();
-
-		$success = true;
-
-		foreach ($paths as $path) {
-			try {
-				if ( ! @unlink($path)) {
-					return $success = false;
-				}
-			} catch (ErrorException $e) {
-				return $success = false;
-			}
-		}
-
-		return $success;
-	}
-
-	/**
-	 * Create a directory.
-	 *
-	 * @param  string  $path
-	 * @param  int  $mode
-	 * @param  bool  $recursive
-	 * @param  bool  $force
-	 *
-	 * @return bool
-	 * 
-	 * @throws FileException
-	 */
-	public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
-	{
-		if ($force) {
-			return @mkdir($path, $mode, $recursive);
-		}
-
-		mkdir($path, $mode, $recursive);
-	}
-
-	/**
-	 * Copy a directory from one location to another.
-	 * 
-	 * @param  string  $directory
-	 * @param  string  $destination
-	 * @param  int  $options  (null by default)
-	 * 
-	 * @return bool
-	 */
-	public function copyDirectory($directory, $destination, $options = null)
-	{
-		if ( ! $this->isDirectory($directory)) return false;
-
-		$options = $options ?: FilesystemIterator::SKIP_DOTS;
+    /**
+     * Returns true if the file is executable.
+     *
+     * @param  string  $path
+     * 
+     * @return bool  True if file is executable, false otherwise
+     */
+    public function exec($path)
+    {
+        return is_executable($path);
+    }
+
+    /**
+     * Determine if the given path is a directory.
+     *
+     * @param  string  $directory
+     *
+     * @return bool
+     */
+    public function isDirectory($directory)
+    {
+        return is_dir($directory);
+    }
+
+    /**
+     * Determine if the given path is a file.
+     *
+     * @param  string  $file
+     *
+     * @return bool
+     */
+    public function isFile($file)
+    {
+        return is_file($file);
+    }
+
+    /**
+     * Determine if the given path is writable.
+     * 
+     * @param  string  $path
+     * 
+     * @return bool
+     */
+    public function isWritable($path)
+    {
+        return is_writable($path);
+    }
+
+    /**
+     * Returns if true the file is readable.
+     *
+     * @param  string  $path
+     * 
+     * @return bool  True if file is readable, false otherwise
+     */
+    public function isReadable($path)
+    {
+        return is_readable($path);
+    }
+
+    /**
+     * Returns last access time.
+     *
+     * @param  string  $path
+     * 
+     * @return int|bool  Timestamp of last access time, or false in case of an error
+     */
+    public function lastAccess($path)
+    {
+        if ($this->exists($path)) {
+            return fileatime($path);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns last modified time.
+     *
+     * @param  string  $path
+     * 
+     * @return int|bool  Timestamp of last modified time, or false in case of an error
+     */
+    public function lastModified($path)
+    {
+        if ($this->exists($path)) {
+            return filemtime($path);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all of the directories within a given directory.
+     * 
+     * @param  string  $directory
+     * 
+     * @return array
+     */
+    public function directories($directory)
+    {
+        $directories = [];
+
+        $iterators = new FilesystemIterator($directory);
+
+        foreach ($iterators as $iterator) {
+            $directories[] = trim($iterator->getPathname(), '/').'/';
+        }
+
+        return $directories;
+    }
+
+    /**
+     * Delete the file at a given path.
+     * 
+     * @param  string  $paths
+     * 
+     * @return bool
+     */
+    public function delete($paths)
+    {
+        if (is_resource($this->handler)) {
+            fclose($this->handler);
+            $this->handler = null;
+        }
+
+        $paths = is_array($paths) ? $paths : func_get_args();
+
+        $success = true;
+
+        foreach ($paths as $path) {
+            try {
+                if ( ! @unlink($path)) {
+                    return $success = false;
+                }
+            } catch (ErrorException $e) {
+                return $success = false;
+            }
+        }
+
+        return $success;
+    }
+
+    /**
+     * Create a directory.
+     *
+     * @param  string  $path
+     * @param  int  $mode
+     * @param  bool  $recursive
+     * @param  bool  $force
+     *
+     * @return bool
+     * 
+     * @throws FileException
+     */
+    public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
+    {
+        if ($force) {
+            return @mkdir($path, $mode, $recursive);
+        }
+
+        mkdir($path, $mode, $recursive);
+    }
+
+    /**
+     * Copy a directory from one location to another.
+     * 
+     * @param  string  $directory
+     * @param  string  $destination
+     * @param  int  $options  (null by default)
+     * 
+     * @return bool
+     */
+    public function copyDirectory($directory, $destination, $options = null)
+    {
+        if ( ! $this->isDirectory($directory)) return false;
+
+        $options = $options ?: FilesystemIterator::SKIP_DOTS;
 		
-		// If the destination directory does not actually exist, we will go ahead and
-		// create it recursively, which just gets the destination prepared to copy
-		// the files over. Once we make the directory we'll proceed the copying.
-		if ( ! $this->isdirectory($destination)) {
-			$this->makeDirectory($destination, 0777, true);
-		}
+        // If the destination directory does not actually exist, we will go ahead and
+        // create it recursively, which just gets the destination prepared to copy
+        // the files over. Once we make the directory we'll proceed the copying.
+        if ( ! $this->isdirectory($destination)) {
+            $this->makeDirectory($destination, 0777, true);
+        }
 
-		$iterators = new FilesystemIterator($directory, $options);
+        $iterators = new FilesystemIterator($directory, $options);
 
-		foreach ($iterators as $iterator) {
-			$target = $destination.DIRECTORY_SEPARATOR.$iterator->getBasename();
+        foreach ($iterators as $iterator) {
+            $target = $destination.DIRECTORY_SEPARATOR.$iterator->getBasename();
 			
-			// As we spin through items, we will check to see if the current file is actually
+            // As we spin through items, we will check to see if the current file is actually
             // a directory or a file. When it is actually a directory we will need to call
             // back into this function recursively to keep copying these nested folders.
-			if ($iterator->isDir()) {
-				if ( ! $this->copyDirectory($iterator->getPathname(), $target, $options)) return false;
-			}
-			// If the current items is just a regular file, we will just copy this to the new
-			// location and keep looping. If for some reason the copy fails we'll bail out
-			// and return false, so the developer is aware that the copy process failed.
-			else {
-				if ( ! $this->copy($iterator->getPathname(), $target)) return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Recursively delete a directory and optionally you can keep 
-	 * the directory if you wish.
-	 * 
-	 * @param  string  $directory
-	 * @param  bool  $keep
-	 * 
-	 * @return bool
-	 */
-	public function deleteDirectory($directory, $keep = false)
-	{
-		if ( ! $this->isDirectory($directory)) return false;
-
-		$iterators = new filesystemIterator($directory);
-
-		foreach ($iterators as $iterator) {
-			// If the item is a directory, we can just recurse into the function and delete 
-			// that sub-directory otherwise we'll just delete the file and keep iterating 
-			// through each file until the directory is cleaned.
-			if ($iterator->isDir() && ! $iterator->isLink()) {
-				$this->deleteDirectory($iterator->getPathname());
-			}
-			// If the item is just a file, we can go ahead and delete it since we're
-			// just looping through and waxing all of the files in this directory
-			// and calling directories recursively, so we delete the real path.
-			else {
-				$this->delete($iterator->getPathname());
-			}
-		}
-
-		if ( ! $keep) @rmdir($directory);
-
-		return true;
-	}
-
-	/**
-	 * Empty the specified directory of all files and folders.
-	 * 
-	 * 
-	 * @param  string  $directory
-	 * 
-	 * @return bool
-	 */
-	public function cleanDirectory($directory)
-	{
-		return $this->deleteDirectory($directory, true);
-	}
-
-	/**
-	 * Moves a file to a new location.
-	 * 
-	 * @param  string  $from
-	 * @param  string  $to
-	 * @param  bool  $overwrite  (false by default)
-	 * 
-	 * @return bool
-	 */
-	public function moveDirectory($from, $to, $overwrite = false)
-	{
-		if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) return false;
-
-		if (false === @rename($from, $to)) {
-			$error = error_get_last();
-
-			throw new FileUnableToMoveException($from, $to, strip_tags($error['message']));
-		}
-
-		$this->perms($to, 0777 & ~umask());
-	}
-
-	/**
-	 * Attempts to determine the file extension based on the trusted
-	 * getType() method. If the mime type is unknown, will return null.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string|null
-	 */
-	public function guessExtension($path)
-	{
-		return FileMimeType::guessExtensionFromType($this->getMimeType($path));
-	}
-
-	/**
-	 * Retrieve the media type of the file. 
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string|null
-	 */
-	public function getMimeType($path)
-	{
-		$finfo    = finfo_open(FILEINFO_MIME_TYPE);
-		$mimeType = finfo_file($finfo, $path);
-
-		finfo_close($finfo);
-
-		return $mimeType;
-	}
-
-	/**
-	 * Move a file to a new location.
-	 *
-	 * @param  string  $path
-	 * @param  string  $target
-	 *
-	 * @return bool
-	 */
-	public function move($path, $target)
-	{
-		if ($this->exists($path)) {
-			return rename($path, $target);
-		}
-	}
-
-	/**
-	 * Extract the file name from a file path.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	public function name($path)
-	{
-		return pathinfo($path, PATHINFO_FILENAME);
-	}
-
-	/**
-	 * Extract the trailing name component from a file path.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	public function basename($path)
-	{
-		return pathinfo($path, PATHINFO_BASENAME);
-	}
-
-	/**
-	 * Extract the parent directory from a file path.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	public function dirname($path)
-	{
-		return pathinfo($path, PATHINFO_DIRNAME);
-	}
-
-	/**
-	 * Extract the file extension from a file path.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	public function extension($path)
-	{
-		return pathinfo($path, PATHINFO_EXTENSION);
-	}
-
-	/**
-	 *  Find path names matching a given pattern.
-	 * 
-	 * @param  string  $pattern
-	 * @param  int  $flags  (0 by default)
-	 * 
-	 * @return array
-	 */
-	public function glob($pattern, $flags = 0)
-	{
-		return glob($pattern, $flags);
-	}
-
-	/**
-	 * Returns the file's owner.
-	 *
-	 * @param  string  $path
-	 * 
-	 * @return int|bool  The file owner, or false in case of an error
-	 */
-	public function owner($path)
-	{
-		if ($this->exists($path)) {
-			return fileowner($path);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the "chmod" (permissions) of the file.
-	 *
-	 * @param  string  $path
-	 * @param  int|null  $mode  (null by default)
-	 * 
-	 * @return mixed  Permissions for the file, or false in case of an error
-	 */
-	public function perms($path, $mode = null)
-	{
-		if ($mode) {
-			chmod($path, $mode);
-		}
-
-		return substr(sprintf('%o', fileperms($path)), -4);
-	}
-
-	/**
-	 * Prepend to a file.
-	 * 
-	 * @param  string  $path
-	 * @param  string  $data
-	 * 
-	 * @return int
-	 */
-	public function prepend($path, $data)
-	{
-		if ($this->exists($path)) {
-			$this->put($path, $data.$this->get($path));
-		}
-
-		return $this->put($path, $data);
-	}
-
-	/**
-	 * Write the content of a file.
-	 *
-	 * @param  string  $path
-	 * @param  string  $contents
-	 * @param  bool  $lock  (false by default)
-	 *
-	 * @return int
-	 */
-	public function put($path, $contents, $lock = false)
-	{
-		return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
-	}
-
-	/**
-	 * Get the file type of a given file.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	public function type($path)
-	{
-		return filetype($path);
-	}
-
-	/**
-	 * Searches for a given text and replaces the text if found.
-	 *
-	 * @param  string  $path
-	 * @param  string  $search
-	 * @param  string  $replace
-	 *
-	 * @return bool
-	 */
-	public function replaceText($path, $search, $replace)
-	{
-		if ( ! $this->open($path, 'r+')) {
-			return false;
-		}
-
-		if ($this->lock !== null) {
-			if (flock($this->handler, LOCK_EX) === false)
-			{
-				return false;
-			}
-		}
-
-		$replaced = $this->write($path, str_replace($search, $replace, $this->get($path)), true);
-
-		if ($this->lock !== null) {
-			flock($this->handler, LOCK_UN);
-		}
-
-		$this->close();
-
-		return $replaced;
-	}	
-
-	/**
-	 * Closes the current file if it is opened.
-	 *
-	 * @return bool
-	 */
-	public function close()
-	{
-		if ( ! is_resource($this->handler)) {
-			return true;
-		}
-
-		return fclose($this->handler);
-	}
-
-	/**
-	 * Write given data to this file.
-	 *
-	 * @param  string  $path
-	 * @param  string  $data  Data to write to this File
-	 * @param  bool  $force  The file to open
-	 *
-	 * @return bool
-	 */
-	public function write($path, $data, $force = false)
-	{
-		$success = false;
-
-		if ($this->open($path, 'w', $force) === true) {
-			if ($this->lock !== null) {
-				if (flock($this->handler, LOCK_EX) === false) {
-					return false;
-				}
-			}
-
-			if (fwrite($this->handler, $data) !== false) {
-				$success = true;
-			}
-
-			if ($this->lock !== null) {
-				flock($this->handler, LOCK_UN);
-			}
-		}
-
-		return $success;
-	}
+            if ($iterator->isDir()) {
+                if ( ! $this->copyDirectory($iterator->getPathname(), $target, $options)) return false;
+            }
+            // If the current items is just a regular file, we will just copy this to the new
+            // location and keep looping. If for some reason the copy fails we'll bail out
+            // and return false, so the developer is aware that the copy process failed.
+            else {
+                if ( ! $this->copy($iterator->getPathname(), $target)) return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Recursively delete a directory and optionally you can keep 
+     * the directory if you wish.
+     * 
+     * @param  string  $directory
+     * @param  bool  $keep
+     * 
+     * @return bool
+     */
+    public function deleteDirectory($directory, $keep = false)
+    {
+        if ( ! $this->isDirectory($directory)) return false;
+
+        $iterators = new filesystemIterator($directory);
+
+        foreach ($iterators as $iterator) {
+            // If the item is a directory, we can just recurse into the function and delete 
+            // that sub-directory otherwise we'll just delete the file and keep iterating 
+            // through each file until the directory is cleaned.
+            if ($iterator->isDir() && ! $iterator->isLink()) {
+                $this->deleteDirectory($iterator->getPathname());
+            }
+            // If the item is just a file, we can go ahead and delete it since we're
+            // just looping through and waxing all of the files in this directory
+            // and calling directories recursively, so we delete the real path.
+            else {
+                $this->delete($iterator->getPathname());
+            }
+        }
+
+        if ( ! $keep) @rmdir($directory);
+
+        return true;
+    }
+
+    /**
+     * Empty the specified directory of all files and folders.
+     * 
+     * 
+     * @param  string  $directory
+     * 
+     * @return bool
+     */
+    public function cleanDirectory($directory)
+    {
+        return $this->deleteDirectory($directory, true);
+    }
+
+    /**
+     * Moves a file to a new location.
+     * 
+     * @param  string  $from
+     * @param  string  $to
+     * @param  bool  $overwrite  (false by default)
+     * 
+     * @return bool
+     */
+    public function moveDirectory($from, $to, $overwrite = false)
+    {
+        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) return false;
+
+        if (false === @rename($from, $to)) {
+            $error = error_get_last();
+
+            throw new FileUnableToMoveException($from, $to, strip_tags($error['message']));
+        }
+
+        $this->perms($to, 0777 & ~umask());
+    }
+
+    /**
+     * Attempts to determine the file extension based on the trusted
+     * getType() method. If the mime type is unknown, will return null.
+     * 
+     * @param  string  $path
+     * 
+     * @return string|null
+     */
+    public function guessExtension($path)
+    {
+        return FileMimeType::guessExtensionFromType($this->getMimeType($path));
+    }
+
+    /**
+     * Retrieve the media type of the file. 
+     * 
+     * @param  string  $path
+     * 
+     * @return string|null
+     */
+    public function getMimeType($path)
+    {
+        $finfo    = finfo_open(FILEINFO_MIME_TYPE);
+        $mimeType = finfo_file($finfo, $path);
+
+        finfo_close($finfo);
+
+        return $mimeType;
+    }
+
+    /**
+     * Move a file to a new location.
+     *
+     * @param  string  $path
+     * @param  string  $target
+     *
+     * @return bool
+     */
+    public function move($path, $target)
+    {
+        if ($this->exists($path)) {
+            return rename($path, $target);
+        }
+    }
+
+    /**
+     * Extract the file name from a file path.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    public function name($path)
+    {
+        return pathinfo($path, PATHINFO_FILENAME);
+    }
+
+    /**
+     * Extract the trailing name component from a file path.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    public function basename($path)
+    {
+        return pathinfo($path, PATHINFO_BASENAME);
+    }
+
+    /**
+     * Extract the parent directory from a file path.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    public function dirname($path)
+    {
+        return pathinfo($path, PATHINFO_DIRNAME);
+    }
+
+    /**
+     * Extract the file extension from a file path.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    public function extension($path)
+    {
+        return pathinfo($path, PATHINFO_EXTENSION);
+    }
+
+    /**
+     *  Find path names matching a given pattern.
+     * 
+     * @param  string  $pattern
+     * @param  int  $flags  (0 by default)
+     * 
+     * @return array
+     */
+    public function glob($pattern, $flags = 0)
+    {
+        return glob($pattern, $flags);
+    }
+
+    /**
+     * Returns the file's owner.
+     *
+     * @param  string  $path
+     * 
+     * @return int|bool  The file owner, or false in case of an error
+     */
+    public function owner($path)
+    {
+        if ($this->exists($path)) {
+            return fileowner($path);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the "chmod" (permissions) of the file.
+     *
+     * @param  string  $path
+     * @param  int|null  $mode  (null by default)
+     * 
+     * @return mixed  Permissions for the file, or false in case of an error
+     */
+    public function perms($path, $mode = null)
+    {
+        if ($mode) {
+            chmod($path, $mode);
+        }
+
+        return substr(sprintf('%o', fileperms($path)), -4);
+    }
+
+    /**
+     * Prepend to a file.
+     * 
+     * @param  string  $path
+     * @param  string  $data
+     * 
+     * @return int
+     */
+    public function prepend($path, $data)
+    {
+        if ($this->exists($path)) {
+            $this->put($path, $data.$this->get($path));
+        }
+
+        return $this->put($path, $data);
+    }
+
+    /**
+     * Write the content of a file.
+     *
+     * @param  string  $path
+     * @param  string  $contents
+     * @param  bool  $lock  (false by default)
+     *
+     * @return int
+     */
+    public function put($path, $contents, $lock = false)
+    {
+        return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
+    }
+
+    /**
+     * Get the file type of a given file.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    public function type($path)
+    {
+        return filetype($path);
+    }
+
+    /**
+     * Searches for a given text and replaces the text if found.
+     *
+     * @param  string  $path
+     * @param  string  $search
+     * @param  string  $replace
+     *
+     * @return bool
+     */
+    public function replaceText($path, $search, $replace)
+    {
+        if ( ! $this->open($path, 'r+')) {
+            return false;
+        }
+
+        if ($this->lock !== null) {
+            if (flock($this->handler, LOCK_EX) === false)
+            {
+                return false;
+            }
+        }
+
+        $replaced = $this->write($path, str_replace($search, $replace, $this->get($path)), true);
+
+        if ($this->lock !== null) {
+            flock($this->handler, LOCK_UN);
+        }
+
+        $this->close();
+
+        return $replaced;
+    }	
+
+    /**
+     * Closes the current file if it is opened.
+     *
+     * @return bool
+     */
+    public function close()
+    {
+        if ( ! is_resource($this->handler)) {
+            return true;
+        }
+
+        return fclose($this->handler);
+    }
+
+    /**
+     * Write given data to this file.
+     *
+     * @param  string  $path
+     * @param  string  $data  Data to write to this File
+     * @param  bool  $force  The file to open
+     *
+     * @return bool
+     */
+    public function write($path, $data, $force = false)
+    {
+        $success = false;
+
+        if ($this->open($path, 'w', $force) === true) {
+            if ($this->lock !== null) {
+                if (flock($this->handler, LOCK_EX) === false) {
+                    return false;
+                }
+            }
+
+            if (fwrite($this->handler, $data) !== false) {
+                $success = true;
+            }
+
+            if ($this->lock !== null) {
+                flock($this->handler, LOCK_UN);
+            }
+        }
+
+        return $success;
+    }
 }
\ No newline at end of file

src/components/Routing/Route.php

Indentation +645 added lines, -645 removed lines

@@ -40,663 +40,663 @@
  */
 class Route 
 {
-	use Concerns\RouteCondition,
-	    Concerns\RouteDependencyResolver;
+    use Concerns\RouteCondition,
+        Concerns\RouteDependencyResolver;
 	
-	/**
-	 * Action that the route will use when called.
-	 *
-	 * @var \Closure|string|array $action
-	 */
-	public $action;
-
-	/**
-	 * The container instance used by the route.
-	 * 
-	 * @var \Syscodes\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * The controller instance.
-	 * 
-	 * @var string $controller
-	 */
-	public $controller;
-
-	/**
-	 * The default values for the route.
-	 * 
-	 * @var array $defaults
-	 */
-	public $defaults = [];
-
-	/**
-	 * Variable of HTTP method.
-	 *  
-	 * @var array|string $method
-	 */
-	public $method;
-
-	/**
-	 * The array of matched parameters.
-	 * 
-	 * @var array $parameters
-	 */
-	public $parameters = [];
-
-	/**
-	 * The parameter names for the route.
-	 * 
-	 * @var string|null $parameterNames
-	 */
-	public $parameterNames;
-
-	/**
-	* Patterns that should be replaced.
-	*
-	* @var array $patterns 
-	*/
-	public $patterns = [
-		'~/~'                    =>  '\/',               // Slash
-		'~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
-		'~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
-		'~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
-		'~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
-		'~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
-		'~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
-		'~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
-	];
-
-	/**
-	 * The URI pattern the route responds to.
-	 *
-	 * @var array $uri
-	 */
-	public $uri = [];
-
-	/**
-	 * Contains the arguments of the current route.
-	 *
-	 * @var array $where
-	 */
-	public $wheres = [];
-
-	/**
-	 * Constructor. Initialize route.
-	 *
-	 * @param  array|string|null  $method  (null by default)
-	 * @param  string|null  $uri  (null by default)
-	 * @param  \Closure|string|null  $action  (null by default)
-	 *
-	 * @return void
-	 */
-	public function __construct($method = null, $uri = null, $action = null)
-	{
-		$this->uri = $uri;
-
-		// Set the method
-		$this->parseMethod($method);
-
-		// Set the action
-		$this->parseAction($action);
-
-		if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
-			$this->prefix($prefix);
-		}
-	}
-
-	// Getters
-
-	/**
-	 * Get the action of the current route.
-	 *
-	 * @return \Closure|string|array
-	 */
-	public function getAction()
-	{
-		return $this->action;
-	}
-
-	/**
-	 * Get the arguments of the current route.
-	 *
-	 * @return array
-	 */
-	public function getArguments()
-	{
-		return $this->wheres;
-	}
-
-	/**
-	 * Get the controller instance for the route.
-	 * 
-	 * @return mixed
-	 */
-	public function getController()
-	{
-		if ( ! $this->controller) {
-			$class = $this->parseControllerCallback()[0];
+    /**
+     * Action that the route will use when called.
+     *
+     * @var \Closure|string|array $action
+     */
+    public $action;
+
+    /**
+     * The container instance used by the route.
+     * 
+     * @var \Syscodes\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * The controller instance.
+     * 
+     * @var string $controller
+     */
+    public $controller;
+
+    /**
+     * The default values for the route.
+     * 
+     * @var array $defaults
+     */
+    public $defaults = [];
+
+    /**
+     * Variable of HTTP method.
+     *  
+     * @var array|string $method
+     */
+    public $method;
+
+    /**
+     * The array of matched parameters.
+     * 
+     * @var array $parameters
+     */
+    public $parameters = [];
+
+    /**
+     * The parameter names for the route.
+     * 
+     * @var string|null $parameterNames
+     */
+    public $parameterNames;
+
+    /**
+     * Patterns that should be replaced.
+     *
+     * @var array $patterns 
+     */
+    public $patterns = [
+        '~/~'                    =>  '\/',               // Slash
+        '~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
+        '~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
+        '~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
+        '~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
+        '~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
+        '~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
+        '~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
+    ];
+
+    /**
+     * The URI pattern the route responds to.
+     *
+     * @var array $uri
+     */
+    public $uri = [];
+
+    /**
+     * Contains the arguments of the current route.
+     *
+     * @var array $where
+     */
+    public $wheres = [];
+
+    /**
+     * Constructor. Initialize route.
+     *
+     * @param  array|string|null  $method  (null by default)
+     * @param  string|null  $uri  (null by default)
+     * @param  \Closure|string|null  $action  (null by default)
+     *
+     * @return void
+     */
+    public function __construct($method = null, $uri = null, $action = null)
+    {
+        $this->uri = $uri;
+
+        // Set the method
+        $this->parseMethod($method);
+
+        // Set the action
+        $this->parseAction($action);
+
+        if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
+            $this->prefix($prefix);
+        }
+    }
+
+    // Getters
+
+    /**
+     * Get the action of the current route.
+     *
+     * @return \Closure|string|array
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    /**
+     * Get the arguments of the current route.
+     *
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->wheres;
+    }
+
+    /**
+     * Get the controller instance for the route.
+     * 
+     * @return mixed
+     */
+    public function getController()
+    {
+        if ( ! $this->controller) {
+            $class = $this->parseControllerCallback()[0];
  
-			$this->controller = $this->container->make(ltrim($class, '\\'));
-		}
-
-		return $this->controller;
-	}
-
-	/**
-	 * Get the controller method used for the route.
-	 * 
-	 * @return string
-	 */
-	public function getControllerMethod()
-	{
-		return $this->parseControllerCallback()[1];
-	}
-
-	/**
-	 * Get the request method of the current route.
-	 *
-	 * @return array|string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->action['as'] ?? null;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return array
-	 */
-	public function getRoute()
-	{
-		return $this->uri;
-	}
-
-	/**
-	 * Get or set the domain for the route.
-	 * 
-	 * @param  string|null  $domain  (null by default)
-	 * 
-	 * @return $this
-	 */
-	public function domain($domain = null)
-	{
-		if (is_null($domain)) {
-			return $this->getDomain();
-		}
-
-		$this->action['domain'] = $this->parseRoute($domain);
-
-		return $this;
-	}
-
-	/**
-	 * Get the domain defined for the route.
-	 * 
-	 * @return string|null
-	 */
-	public function getDomain()
-	{
-		return isset($this->action['domain'])
-				? str_replace(['http://', 'https://'], '', $this->action['domain'])
-				: null;
-	}
-
-	/**
-	 * Parse the controller.
-	 * 
-	 * @return array
-	 */
-	public function parseControllerCallback()
-	{
-		return Str::parseCallback($this->action['uses']);
-	}
+            $this->controller = $this->container->make(ltrim($class, '\\'));
+        }
+
+        return $this->controller;
+    }
+
+    /**
+     * Get the controller method used for the route.
+     * 
+     * @return string
+     */
+    public function getControllerMethod()
+    {
+        return $this->parseControllerCallback()[1];
+    }
+
+    /**
+     * Get the request method of the current route.
+     *
+     * @return array|string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->action['as'] ?? null;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return array
+     */
+    public function getRoute()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Get or set the domain for the route.
+     * 
+     * @param  string|null  $domain  (null by default)
+     * 
+     * @return $this
+     */
+    public function domain($domain = null)
+    {
+        if (is_null($domain)) {
+            return $this->getDomain();
+        }
+
+        $this->action['domain'] = $this->parseRoute($domain);
+
+        return $this;
+    }
+
+    /**
+     * Get the domain defined for the route.
+     * 
+     * @return string|null
+     */
+    public function getDomain()
+    {
+        return isset($this->action['domain'])
+                ? str_replace(['http://', 'https://'], '', $this->action['domain'])
+                : null;
+    }
+
+    /**
+     * Parse the controller.
+     * 
+     * @return array
+     */
+    public function parseControllerCallback()
+    {
+        return Str::parseCallback($this->action['uses']);
+    }
 	
-	/**
-	 * Checks whether the route's action is a controller.
-	 * 
-	 * @return bool
-	 */
-	public function isControllerAction()
-	{
-		return is_string($this->action['uses']);
-	}
-
-	/**
-	 * Get the dispatcher for the route's controller.
-	 * 
-	 * @return \Syscodes\Controller\ControllerDispatcher
-	 */
-	private function controllerDispatcher()
-	{
-		return new ControllerDispatcher($this->container);
-	}
-
-	// Setters
+    /**
+     * Checks whether the route's action is a controller.
+     * 
+     * @return bool
+     */
+    public function isControllerAction()
+    {
+        return is_string($this->action['uses']);
+    }
+
+    /**
+     * Get the dispatcher for the route's controller.
+     * 
+     * @return \Syscodes\Controller\ControllerDispatcher
+     */
+    private function controllerDispatcher()
+    {
+        return new ControllerDispatcher($this->container);
+    }
+
+    // Setters
 	
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	public function runResolver()
-	{
-		$this->container = $this->container ?: new Container;
-
-		try {
-			if ($this->isControllerAction()) {
-				return $this->runResolverController();
-			}
-
-			return $this->runResolverCallable();
-		} catch (HttpResponseException $e) {
-			return $e->getResponse();
-		}
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 *  
-	 * @return mixed
-	 */
-	protected function runResolverCallable()
-	{
-		$callable = $this->action['uses'];
-
-		return $callable(...array_values($this->resolveMethodDependencies(
-			$this->parametersWithouNulls(), new ReflectionFunction($this->action['uses'])
-		)));
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	protected function runResolverController()
-	{
-		return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
-	}
-
-	/**
-	 * Set the action.
-	 *
-	 * @param  \Closure|string  $action
-	 *
-	 * @return $this
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseAction($action)
-	{
-		if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
-			throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
-		}
-
-		$this->action = RouteAction::parse($this->uri, $action);
-
-		return $this;
-	}
-
-	/**
-	 * Set the method of the current route.
-	 *
-	 * @param  array  $method
-	 *
-	 * @return string $this
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseMethod($method)
-	{
-		if ($method === null || empty($method)) {
-			throw new InvalidArgumentException(__('route.methodNotProvided'));
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    public function runResolver()
+    {
+        $this->container = $this->container ?: new Container;
+
+        try {
+            if ($this->isControllerAction()) {
+                return $this->runResolverController();
+            }
+
+            return $this->runResolverCallable();
+        } catch (HttpResponseException $e) {
+            return $e->getResponse();
+        }
+    }
+
+    /**
+     * Run the route action and return the response.
+     *  
+     * @return mixed
+     */
+    protected function runResolverCallable()
+    {
+        $callable = $this->action['uses'];
+
+        return $callable(...array_values($this->resolveMethodDependencies(
+            $this->parametersWithouNulls(), new ReflectionFunction($this->action['uses'])
+        )));
+    }
+
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    protected function runResolverController()
+    {
+        return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
+    }
+
+    /**
+     * Set the action.
+     *
+     * @param  \Closure|string  $action
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function parseAction($action)
+    {
+        if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
+            throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
+        }
+
+        $this->action = RouteAction::parse($this->uri, $action);
+
+        return $this;
+    }
+
+    /**
+     * Set the method of the current route.
+     *
+     * @param  array  $method
+     *
+     * @return string $this
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function parseMethod($method)
+    {
+        if ($method === null || empty($method)) {
+            throw new InvalidArgumentException(__('route.methodNotProvided'));
 			
-		}
-
-		foreach ($method as $httpMethod) {
-			if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
-				throw new InvalidArgumentException(__('route.methodNotAllowed'));				
-			}
-		}
-
-	    $this->method = $method;
-
-	    return $this;
-	}
-
-	/**
-	 * Set the route.
-	 *
-	 * @param  string|array|null  $uri
-	 *
-	 * @return string
-	 *
-	 * @throws  \InvalidArgumentException
-	 */
-	public function parseRoute($uri)
-	{
-		if ($uri === null) {
-			throw new InvalidArgumentException(__('route.uriNotProvided'));
-		}	
-
-		$this->uri = $this->parseRoutePath($uri);
-
-		return $this;
-	}
-
-	/**
-	 * Replace word patterns with regex in route uri.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function parseRoutePath($uri)
-	{
-		$uri = trim($uri, '\/?');
-		$uri = trim($uri, '\/');
+        }
+
+        foreach ($method as $httpMethod) {
+            if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
+                throw new InvalidArgumentException(__('route.methodNotAllowed'));				
+            }
+        }
+
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Set the route.
+     *
+     * @param  string|array|null  $uri
+     *
+     * @return string
+     *
+     * @throws  \InvalidArgumentException
+     */
+    public function parseRoute($uri)
+    {
+        if ($uri === null) {
+            throw new InvalidArgumentException(__('route.uriNotProvided'));
+        }	
+
+        $this->uri = $this->parseRoutePath($uri);
+
+        return $this;
+    }
+
+    /**
+     * Replace word patterns with regex in route uri.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function parseRoutePath($uri)
+    {
+        $uri = trim($uri, '\/?');
+        $uri = trim($uri, '\/');
 		
-		preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
+        preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
 		
-		foreach ($matches[1] as $match) {
-			if (strpos($match, ':') === false) {
-				continue;
-			}
+        foreach ($matches[1] as $match) {
+            if (strpos($match, ':') === false) {
+                continue;
+            }
 			
-			$pattern  = array_keys($this->patterns);
-			$replace  = array_values($this->patterns);
-			$segments = explode(':', trim($match, '{}?'));
+            $pattern  = array_keys($this->patterns);
+            $replace  = array_values($this->patterns);
+            $segments = explode(':', trim($match, '{}?'));
 			
-			$uri = strpos($match, ':') !== false
-					? preg_replace($pattern, $replace, $uri)
-					: str_replace($match, '{'.$segments[0].'}', $uri);
-		}
+            $uri = strpos($match, ':') !== false
+                    ? preg_replace($pattern, $replace, $uri)
+                    : str_replace($match, '{'.$segments[0].'}', $uri);
+        }
 		
-		return $uri;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 * 
-	 * @param  string  $prefix
-	 * 
-	 * @return $this
-	 */
-	public function prefix($prefix)
-	{
-		if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
-			$this->action['prefix'] = $newPrefix;
-		}
+        return $uri;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     * 
+     * @param  string  $prefix
+     * 
+     * @return $this
+     */
+    public function prefix($prefix)
+    {
+        if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
+            $this->action['prefix'] = $newPrefix;
+        }
 		
-		$uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
+        $uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
 		
-		return $this->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
-	}
-
-	/**
-	 * Set the action array for the route.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return $this
-	 */
-	public function setAction(array $action)
-	{
-		$this->action = $action;
-
-		if (isset($this->action['domain'])) {
-			$this->domain($this->action['domain']);
-		}
+        return $this->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
+    }
+
+    /**
+     * Set the action array for the route.
+     * 
+     * @param  array  $action
+     * 
+     * @return $this
+     */
+    public function setAction(array $action)
+    {
+        $this->action = $action;
+
+        if (isset($this->action['domain'])) {
+            $this->domain($this->action['domain']);
+        }
 		
-		return $this;
-	}
-
-	/**
-	 * Set the name.
-	 *
-	 * @param  string  $name
-	 *
-	 * @return $this
-	 */
-	public function name($name)
-	{
-		$this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
-
-		return $this;
-	}
-
-	/**
-	 * Determine whether the route's name matches the given patterns.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function named(...$patterns)
-	{
-		if (is_null($routeName = $this->getName())) {
-			return false;
-		}
-
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $routeName)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set a default value for the route.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed   $value
-	 * 
-	 * @return $this
-	 */
-	public function defaults($key, $value)
-	{
-		$this->defaults[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Set a default values for the route.
-	 * 
-	 * @param  string  $defaults
-	 * 
-	 * @return $this
-	 */
-	public function setDefaults(array $defaults)
-	{
-		$this->defaults = $defaults;
-
-		return $this;
-	}
-
-	/**
-	 * Set the where.
-	 *
-	 * @param  array|string  $name
-	 * @param  string|null  $expression  (null by default)
-	 *
-	 * @return $this
-	 */
-	public function where($name, string $expression = null)
-	{
-		$wheres = is_array($name) ? $name : [$name => $expression];
+        return $this;
+    }
+
+    /**
+     * Set the name.
+     *
+     * @param  string  $name
+     *
+     * @return $this
+     */
+    public function name($name)
+    {
+        $this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
+
+        return $this;
+    }
+
+    /**
+     * Determine whether the route's name matches the given patterns.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function named(...$patterns)
+    {
+        if (is_null($routeName = $this->getName())) {
+            return false;
+        }
+
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $routeName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set a default value for the route.
+     * 
+     * @param  string  $key
+     * @param  mixed   $value
+     * 
+     * @return $this
+     */
+    public function defaults($key, $value)
+    {
+        $this->defaults[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set a default values for the route.
+     * 
+     * @param  string  $defaults
+     * 
+     * @return $this
+     */
+    public function setDefaults(array $defaults)
+    {
+        $this->defaults = $defaults;
+
+        return $this;
+    }
+
+    /**
+     * Set the where.
+     *
+     * @param  array|string  $name
+     * @param  string|null  $expression  (null by default)
+     *
+     * @return $this
+     */
+    public function where($name, string $expression = null)
+    {
+        $wheres = is_array($name) ? $name : [$name => $expression];
 		
-		foreach ($wheres as $name => $expression) {
-			$this->wheres[$name] = $expression;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Bind the route to a given request for execution.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return $this
-	 */
-	public function bind(Request $request)
-	{
-		$this->parameters = (new RouteParamBinding($this))->parameters($request);
-
-		return $this;
-	}
-
-	/**
-	 * Get all of the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameterNames()
-	{
-		if (isset($this->parameterNames)) {
-			return $this->parameterNames;
-		}
-
-		return $this->parameterNames = $this->compileParamNames();
-	}
-
-	/**
-	 * Get the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	protected function compileParamNames()
-	{
-		preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
-
-		return array_map(function ($match) {
-			return trim($match, '?');
-		}, $matches[0]);
-	}
-
-	/**
-	 * Get a given parameter from the route.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $default  (null by default)
-	 * 
-	 * @return array
-	 */
-	public function parameter($name, $default = null)
-	{
-		return Arr::get($this->parameters(), $name, $default);
-	}
-
-	/**
-	 * Set a parameter to the given value.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $value
-	 * 
-	 * @return array
-	 */
-	public function setParameter($name, $value)
-	{
-		$this->parameters();
-
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Get the key / value list of parameters without null values.
-	 * 
-	 * @return array
-	 */
-	public function parametersWithouNulls()
-	{
-		return array_filter($this->parameters(), function ($parameter) {
-			return ! is_null($parameter);
-		});
-	}
-
-	/**
-	 * Get the key / value list of parameters for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameters()
-	{
-		if (isset($this->parameters)) {
-			return $this->parameters;
-		}
-
-		throw new LogicException('The route is not bound.');
-	}
-
-	/**
-	 * Determine if the route only responds to HTTP requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpOnly()
-	{
-		return in_array('http', $this->action, true);
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpsOnly()
-	{
-		return $this->secure();
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function secure()
-	{
-		return in_array('https', $this->action, true);
-	}
-
-	/**
-	 * Set the container instance on the route.
-	 * 
-	 * @param  \Syscodes\Container\Container  $container
-	 * 
-	 * @return $this
-	 */
-	public function setContainer(Container $container)
-	{
-		$this->container = $container;
-
-		return $this;
-	}
-
-	/**
-	 * Dynamically access route parameters.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		return $this->parameter($key);
-	}
+        foreach ($wheres as $name => $expression) {
+            $this->wheres[$name] = $expression;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Bind the route to a given request for execution.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return $this
+     */
+    public function bind(Request $request)
+    {
+        $this->parameters = (new RouteParamBinding($this))->parameters($request);
+
+        return $this;
+    }
+
+    /**
+     * Get all of the parameter names for the route.
+     * 
+     * @return array
+     */
+    public function parameterNames()
+    {
+        if (isset($this->parameterNames)) {
+            return $this->parameterNames;
+        }
+
+        return $this->parameterNames = $this->compileParamNames();
+    }
+
+    /**
+     * Get the parameter names for the route.
+     * 
+     * @return array
+     */
+    protected function compileParamNames()
+    {
+        preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
+
+        return array_map(function ($match) {
+            return trim($match, '?');
+        }, $matches[0]);
+    }
+
+    /**
+     * Get a given parameter from the route.
+     * 
+     * @param  string  $name
+     * @param  mixed  $default  (null by default)
+     * 
+     * @return array
+     */
+    public function parameter($name, $default = null)
+    {
+        return Arr::get($this->parameters(), $name, $default);
+    }
+
+    /**
+     * Set a parameter to the given value.
+     * 
+     * @param  string  $name
+     * @param  mixed  $value
+     * 
+     * @return array
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameters();
+
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Get the key / value list of parameters without null values.
+     * 
+     * @return array
+     */
+    public function parametersWithouNulls()
+    {
+        return array_filter($this->parameters(), function ($parameter) {
+            return ! is_null($parameter);
+        });
+    }
+
+    /**
+     * Get the key / value list of parameters for the route.
+     * 
+     * @return array
+     */
+    public function parameters()
+    {
+        if (isset($this->parameters)) {
+            return $this->parameters;
+        }
+
+        throw new LogicException('The route is not bound.');
+    }
+
+    /**
+     * Determine if the route only responds to HTTP requests.
+     * 
+     * @return bool
+     */
+    public function httpOnly()
+    {
+        return in_array('http', $this->action, true);
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function httpsOnly()
+    {
+        return $this->secure();
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function secure()
+    {
+        return in_array('https', $this->action, true);
+    }
+
+    /**
+     * Set the container instance on the route.
+     * 
+     * @param  \Syscodes\Container\Container  $container
+     * 
+     * @return $this
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * Dynamically access route parameters.
+     * 
+     * @param  string  $key
+     * 
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        return $this->parameter($key);
+    }
 }
\ No newline at end of file