lenevor / syscodes

src/components/Debug/Exceptions/Resources/views/header.php

Braces +5 added lines, -2 removed lines

@@ -4,9 +4,12 @@
 		<?php foreach ($class as $i => $name) : ?>
 			<?php if ($i == count($class) - 1): ?>
 		<h1><?= $template->escape($name) ?></h1> 
-			<?php else: ?>
+			<?php else {
+    : ?>
 		<?= $template->escape($name).' \\' ?>
-			<?php endif; ?>
+			<?php endif;
+}
+?>
 		<?php endforeach; ?>
 		<?php if ($code): ?>
 		<span class="subtitle" title="Exception Code">(<?= $template->escape($code) ?>)</span>

src/components/Debug/Exceptions/FrameHandler/Collection.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     public function __construct(array $frames)
     {
-        $this->frames = array_map(function ($frame) {
+        $this->frames = array_map(function($frame) {
             return new Frame($frame);
         }, $frames);
     }

src/components/Debug/FatalExceptions/FlattenException.php

Indentation +7 added lines, -7 removed lines

@@ -219,13 +219,13 @@
         return $this->file;
     }
 
-     /**
-     * Sets the file path.
-     * 
-     * @param  string  $file
-     * 
-     * @return $this
-     */
+        /**
+         * Sets the file path.
+         * 
+         * @param  string  $file
+         * 
+         * @return $this
+         */
     public function setFile($file)
     {
         $this->file = $file;

src/components/Events/EventServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function register()
     {
-        $this->app->singleton('events', function ($app) {
+        $this->app->singleton('events', function($app) {
             return new Dispatcher($app);
         });
     }

src/components/Collections/Arr.php

Spacing +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
 	{
 		$result = [];
 
-		array_walk_recursive($array, function ($value) use (&$result) {
+		array_walk_recursive($array, function($value) use (&$result) {
 			$result[] = $value;
 		});
 
@@ -370,7 +370,7 @@ 
 				$array[$key] = [];
 			}
 
-			$array =& $array[$key];
+			$array = & $array[$key];
 		}
 
 		$array[array_shift($keys)] = $value;

Braces +9 added lines, -3 removed lines

@@ -232,7 +232,9 @@ 
 	public static function first($array, callable $callback, $default = null)
 	{
 		foreach ($array as $key => $value) { 
-			if (call_user_func($callback, $key, $value)) return $value;
+			if (call_user_func($callback, $key, $value)) {
+			    return $value;
+			}
 		}
 
 		return value($default);
@@ -294,9 +296,13 @@ 
 	 */
 	public static function has($array, $key)
 	{
-		if (empty($array) || is_null($key)) return false;
+		if (empty($array) || is_null($key)) {
+		    return false;
+		}
 		
-		if (array_key_exists($key, $array)) return true;
+		if (array_key_exists($key, $array)) {
+		    return true;
+		}
 		
 		foreach (explode('.', $key) as $segment) {
 			if ( ! is_array($array) || ! static::exists($array, $segment)) {

Indentation +394 added lines, -394 removed lines

@@ -32,39 +32,39 @@ 
  */
 class Arr
 {
-	/**
-	 * Determine whether the value is accessible in a array.
-	 *
-	 * @param  mixed  $value The default value
-	 *
-	 * @return bool
-	 *
-	 * @uses   instanceof ArrayAccess
-	 */
-	public static function access($value) 
-	{
-		return is_array($value) || $value instanceof ArrayAccess;
-	}
-
-	/**
-	 * Add an element to an array using "dot" notation if it doesn't exist.
-	 *
-	 * @param  array  $array  The search array 
-	 * @param  string  $key  The key exist
-	 * @param  mixed  $value  The default value
-	 *
-	 * @return array 
-	 */
-	public static function add($array, $key, $value)
-	{
-		if (is_null(static::get($array, $key))) {
-			static::set($array, $key, $value);
-		}
-
-		return $array;
-	}
-
-	/**
+    /**
+     * Determine whether the value is accessible in a array.
+     *
+     * @param  mixed  $value The default value
+     *
+     * @return bool
+     *
+     * @uses   instanceof ArrayAccess
+     */
+    public static function access($value) 
+    {
+        return is_array($value) || $value instanceof ArrayAccess;
+    }
+
+    /**
+     * Add an element to an array using "dot" notation if it doesn't exist.
+     *
+     * @param  array  $array  The search array 
+     * @param  string  $key  The key exist
+     * @param  mixed  $value  The default value
+     *
+     * @return array 
+     */
+    public static function add($array, $key, $value)
+    {
+        if (is_null(static::get($array, $key))) {
+            static::set($array, $key, $value);
+        }
+
+        return $array;
+    }
+
+    /**
      * Collapse the collection items into a single array.
      * 
      * @return static
@@ -74,389 +74,389 @@ 
         $results = [];
 
         foreach ($array as $values) {
-			if ($values instanceof Collection) {
-				$values = $values->all();
-			} elseif ( ! is_array($values)) {
-				continue;
-			}
+            if ($values instanceof Collection) {
+                $values = $values->all();
+            } elseif ( ! is_array($values)) {
+                continue;
+            }
 
-			$results[] = $values;
+            $results[] = $values;
         }
 
         return array_merge([], ...$results);
     }
 
-	/**
-	 * Divide an array into two arrays. One with keys and the other with values.
-	 *
-	 * @param  array  $array
-	 *
-	 * @return array
-	 */
-	public static function divide($array)
-	{
-		return [array_keys($array), array_values($array)];
-	}
-
-	/**
-	 * Get all of the given array except for a specified array of items.
-	 *
-	 * @param  array  $array
-	 * @param  string|array  $keys
-	 *
-	 * @return array
-	 */
-	public static function except($array, $keys)
-	{
-		static::erase($array, $keys);
-
-		return $array;
-	}
+    /**
+     * Divide an array into two arrays. One with keys and the other with values.
+     *
+     * @param  array  $array
+     *
+     * @return array
+     */
+    public static function divide($array)
+    {
+        return [array_keys($array), array_values($array)];
+    }
+
+    /**
+     * Get all of the given array except for a specified array of items.
+     *
+     * @param  array  $array
+     * @param  string|array  $keys
+     *
+     * @return array
+     */
+    public static function except($array, $keys)
+    {
+        static::erase($array, $keys);
+
+        return $array;
+    }
 	
-	/**
-	 * Determine if the given key exists in the provided array.
-	 *
-	 * @param  ArrayAccess|array  $array  The search array
-	 * @param  string|int  $key  The key exist
-	 *
-	 * @return bool
-	 *
-	 * @uses   instaceof ArrayAccess
-	 */
-	public static function exists($array, $key) 
-	{
-		if ($array instanceof ArrayAccess) {
-			return $array->offsetExists($key);
-		}
+    /**
+     * Determine if the given key exists in the provided array.
+     *
+     * @param  ArrayAccess|array  $array  The search array
+     * @param  string|int  $key  The key exist
+     *
+     * @return bool
+     *
+     * @uses   instaceof ArrayAccess
+     */
+    public static function exists($array, $key) 
+    {
+        if ($array instanceof ArrayAccess) {
+            return $array->offsetExists($key);
+        }
 		
-		return array_key_exists($key, $array);
-	}
-
-	/**
-	 * Unsets dot-notated key from an array.
-	 *
-	 * @param  array  $array  The search array
-	 * @param  mixed  $keys  The dot-notated key or array of keys
-	 *
-	 * @return mixed
-	 */
-	public static function erase(&$array, $keys)
-	{
-		$original = &$array;
-
-		$keys = (array) $keys;
-
-		if (count($keys) === 0) {
-			return;
-		}
-
-		foreach ($keys as $key) {
-			if (static::exists($array, $key)) {
-				unset($array[$key]);
-
-				continue;
-			}
+        return array_key_exists($key, $array);
+    }
+
+    /**
+     * Unsets dot-notated key from an array.
+     *
+     * @param  array  $array  The search array
+     * @param  mixed  $keys  The dot-notated key or array of keys
+     *
+     * @return mixed
+     */
+    public static function erase(&$array, $keys)
+    {
+        $original = &$array;
+
+        $keys = (array) $keys;
+
+        if (count($keys) === 0) {
+            return;
+        }
+
+        foreach ($keys as $key) {
+            if (static::exists($array, $key)) {
+                unset($array[$key]);
+
+                continue;
+            }
 			
-			$parts = explode('.', $key);
+            $parts = explode('.', $key);
 
-			// Clean up after each pass
-			$array = &$original;
+            // Clean up after each pass
+            $array = &$original;
 	
-			// traverse the array into the second last key
-			while (count($parts) > 1) {
-				$part = array_shift($parts);
+            // traverse the array into the second last key
+            while (count($parts) > 1) {
+                $part = array_shift($parts);
 	
-				if (isset($array[$part]) && is_array($array[$part])) {
-					$array = &$array[$key];
-				} else {
-					continue 2;
-				}
-			}
-
-			unset($array[array_shift($parts)]);
-		}
-	}
-
-	/**
-	 * Flatten a multi-dimensional array into a single level.
-	 * 
-	 * @param  array  $array
-	 * 
-	 * @return array
-	 */
-	public static function flatten($array)
-	{
-		$result = [];
-
-		array_walk_recursive($array, function ($value) use (&$result) {
-			$result[] = $value;
-		});
-
-		return $result;
-	}
+                if (isset($array[$part]) && is_array($array[$part])) {
+                    $array = &$array[$key];
+                } else {
+                    continue 2;
+                }
+            }
+
+            unset($array[array_shift($parts)]);
+        }
+    }
+
+    /**
+     * Flatten a multi-dimensional array into a single level.
+     * 
+     * @param  array  $array
+     * 
+     * @return array
+     */
+    public static function flatten($array)
+    {
+        $result = [];
+
+        array_walk_recursive($array, function ($value) use (&$result) {
+            $result[] = $value;
+        });
+
+        return $result;
+    }
 	
-	/**
-	 * Fetch a flattened array of a nested array element.
-	 * 
-	 * @param  array  $array
-	 * @param  string  $key
-	 * 
-	 * @return array
-	 */
-	public static function fetch($array, $key)
-	{
-		foreach (explode('.', $key) as $segment) {
-			$results = array();
+    /**
+     * Fetch a flattened array of a nested array element.
+     * 
+     * @param  array  $array
+     * @param  string  $key
+     * 
+     * @return array
+     */
+    public static function fetch($array, $key)
+    {
+        foreach (explode('.', $key) as $segment) {
+            $results = array();
 			
-			foreach ($array as $value) {
-				if (array_key_exists($segment, $value = (array) $value)) {
-					$results[] = $value[$segment];
-				}
-			}
+            foreach ($array as $value) {
+                if (array_key_exists($segment, $value = (array) $value)) {
+                    $results[] = $value[$segment];
+                }
+            }
 			
-			$array = array_values($results);
-		}
+            $array = array_values($results);
+        }
 		
-		return array_values($results);
-	}
-
-	/**
-	 * Return the first element in an array passing a given truth test.
-	 *
-	 * @param  array  $array 
-	 * @param  \Closure  $callback
-	 * @param  mixed  $default
-	 *
-	 * @return mixed
-	 */
-	public static function first($array, callable $callback, $default = null)
-	{
-		foreach ($array as $key => $value) { 
-			if (call_user_func($callback, $key, $value)) return $value;
-		}
-
-		return value($default);
-	}	
-
-	/**
-	 * Get an item from an array using "dot" notation.
-	 *
-	 * @param  \ArrayAccess|array  $array  The search array
-	 * @param  string  $key  The dot-notated key or array of keys
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public static function get($array, $key, $default = null)
-	{
-		if ( ! static::access($array)) {
-			return value($default);
-		}
-
-		if (static::exists($array, $key)) {
-			return $array[$key];
-		}
-
-		foreach (explode('.', $key) as $segm) {
-			if (static::access($array) && static::exists($array, $segm)) {
-				$array = $array[$segm];
-			} else {
-				return value($default);
-			}
-		}
-
-		return $array;		
-	}
-
-	/**
-	 * Return the last element in an array passing a given truth test.
-	 *
-	 * @param  array  $array 
-	 * @param  \Closure  $callback
-	 * @param  mixed  $default 
-	 *
-	 * @return mixed
-	 *
-	 * @uses   \Syscodes\Support\Arr::first
-	 */
-	public static function last($array, $callback, $default = null)
-	{
-		return static::first(array_reverse($array), $callback, $default);
-	}
-
-	/**
-	 * Check if an item exists in an array using "dot" notation.
-	 * 
-	 * @param  array  $array
-	 * @param  string  $key
-	 * 
-	 * @return bool
-	 */
-	public static function has($array, $key)
-	{
-		if (empty($array) || is_null($key)) return false;
+        return array_values($results);
+    }
+
+    /**
+     * Return the first element in an array passing a given truth test.
+     *
+     * @param  array  $array 
+     * @param  \Closure  $callback
+     * @param  mixed  $default
+     *
+     * @return mixed
+     */
+    public static function first($array, callable $callback, $default = null)
+    {
+        foreach ($array as $key => $value) { 
+            if (call_user_func($callback, $key, $value)) return $value;
+        }
+
+        return value($default);
+    }	
+
+    /**
+     * Get an item from an array using "dot" notation.
+     *
+     * @param  \ArrayAccess|array  $array  The search array
+     * @param  string  $key  The dot-notated key or array of keys
+     * @param  mixed  $default  The default value
+     *
+     * @return mixed
+     */
+    public static function get($array, $key, $default = null)
+    {
+        if ( ! static::access($array)) {
+            return value($default);
+        }
+
+        if (static::exists($array, $key)) {
+            return $array[$key];
+        }
+
+        foreach (explode('.', $key) as $segm) {
+            if (static::access($array) && static::exists($array, $segm)) {
+                $array = $array[$segm];
+            } else {
+                return value($default);
+            }
+        }
+
+        return $array;		
+    }
+
+    /**
+     * Return the last element in an array passing a given truth test.
+     *
+     * @param  array  $array 
+     * @param  \Closure  $callback
+     * @param  mixed  $default 
+     *
+     * @return mixed
+     *
+     * @uses   \Syscodes\Support\Arr::first
+     */
+    public static function last($array, $callback, $default = null)
+    {
+        return static::first(array_reverse($array), $callback, $default);
+    }
+
+    /**
+     * Check if an item exists in an array using "dot" notation.
+     * 
+     * @param  array  $array
+     * @param  string  $key
+     * 
+     * @return bool
+     */
+    public static function has($array, $key)
+    {
+        if (empty($array) || is_null($key)) return false;
 		
-		if (array_key_exists($key, $array)) return true;
+        if (array_key_exists($key, $array)) return true;
 		
-		foreach (explode('.', $key) as $segment) {
-			if ( ! is_array($array) || ! static::exists($array, $segment)) {
-				return false;
-			}
+        foreach (explode('.', $key) as $segment) {
+            if ( ! is_array($array) || ! static::exists($array, $segment)) {
+                return false;
+            }
 			
-			$array = $array[$segment];
-		}
+            $array = $array[$segment];
+        }
 		
-		return true;
-	}
-
-	/**
-	 * Get a subset of the items from the given array.
-	 * 
-	 * @param  array  $array
-	 * @param  array|string  $keys
-	 * 
-	 * @return array
-	 */
-	public static function only($array, $keys)
-	{
-		return array_intersect_key($array, array_flip($array), $keys);
-	}
-
-	/**
-	 * Sets a value in an array using "dot" notation.
-	 *
-	 * @param  array  $array  The search array
-	 * @param  string  $key  The dot-notated key or array of keys
-	 * @param  mixed  $value  The default value
-	 *
-	 * @return mixed
-	 */
-	public static function set(& $array, $key, $value = null)
-	{
-		$keys = explode('.', $key);
-
-		while (count($keys) > 1) {
-			$key = array_shift($keys);
-
-			if ( ! static::exists($array, $key)) {
-				$array[$key] = [];
-			}
-
-			$array =& $array[$key];
-		}
-
-		$array[array_shift($keys)] = $value;
-
-		return $array;
-	}
-
-	/**
-	 * Push an item onto the beginning of an array.
-	 * 
-	 * @param  mixed  $array
-	 * @param  mixed  $value
-	 * @param  mixed  key
-	 * 
-	 * @return array
-	 */
-	public static function prepend($array, $value, $key = null)
-	{
-		if (func_num_args() == 2) {
-			array_unshift($array, $value);
-		} else {
-			$array = [$key => $value] + $array;
-		}
-
-		return $array;
-	}
-
-	/**
-	 * Get a value from the array, and remove it.
-	 * 
-	 * @param  array  $array
-	 * @param  string  $key
-	 * @param  mixed  $default
-	 * 
-	 * @return mixed
-	 */
-	public static function pull(&$array, $key, $default = null)
-	{
-		$value = static::get($array, $key, $default);
-
-		static::erase($array, $key);
-
-		return $value;
-	}
+        return true;
+    }
+
+    /**
+     * Get a subset of the items from the given array.
+     * 
+     * @param  array  $array
+     * @param  array|string  $keys
+     * 
+     * @return array
+     */
+    public static function only($array, $keys)
+    {
+        return array_intersect_key($array, array_flip($array), $keys);
+    }
+
+    /**
+     * Sets a value in an array using "dot" notation.
+     *
+     * @param  array  $array  The search array
+     * @param  string  $key  The dot-notated key or array of keys
+     * @param  mixed  $value  The default value
+     *
+     * @return mixed
+     */
+    public static function set(& $array, $key, $value = null)
+    {
+        $keys = explode('.', $key);
+
+        while (count($keys) > 1) {
+            $key = array_shift($keys);
+
+            if ( ! static::exists($array, $key)) {
+                $array[$key] = [];
+            }
+
+            $array =& $array[$key];
+        }
+
+        $array[array_shift($keys)] = $value;
+
+        return $array;
+    }
+
+    /**
+     * Push an item onto the beginning of an array.
+     * 
+     * @param  mixed  $array
+     * @param  mixed  $value
+     * @param  mixed  key
+     * 
+     * @return array
+     */
+    public static function prepend($array, $value, $key = null)
+    {
+        if (func_num_args() == 2) {
+            array_unshift($array, $value);
+        } else {
+            $array = [$key => $value] + $array;
+        }
+
+        return $array;
+    }
+
+    /**
+     * Get a value from the array, and remove it.
+     * 
+     * @param  array  $array
+     * @param  string  $key
+     * @param  mixed  $default
+     * 
+     * @return mixed
+     */
+    public static function pull(&$array, $key, $default = null)
+    {
+        $value = static::get($array, $key, $default);
+
+        static::erase($array, $key);
+
+        return $value;
+    }
 	
-	/**
-	 * Pluck an array of values from an array.
-	 * 
-	 * @param  iterable  $array
-	 * @param  string|array|int|null  $value
-	 * @param  string|array|null  $key
-	 * 
-	 * @return array
-	 */
-	public static function pluck($array, $value, $key = null)
-	{
-		$results = [];
-
-		foreach ($array as $item) {
-			$itemValue = is_object($item) ? $item->{$value} : $item[$value];
+    /**
+     * Pluck an array of values from an array.
+     * 
+     * @param  iterable  $array
+     * @param  string|array|int|null  $value
+     * @param  string|array|null  $key
+     * 
+     * @return array
+     */
+    public static function pluck($array, $value, $key = null)
+    {
+        $results = [];
+
+        foreach ($array as $item) {
+            $itemValue = is_object($item) ? $item->{$value} : $item[$value];
 			
-			// If the key is "null", we will just append the value to the array and keep
-			// looping. Otherwise we will key the array using the value of the key we
-			// received from the developer. Then we'll return the final array form.
-			if (is_null($key)) {
-				$results[] = $itemValue;
-			} else {
-				$itemKey = is_object($item) ? $item->{$key} : $item[$key];
+            // If the key is "null", we will just append the value to the array and keep
+            // looping. Otherwise we will key the array using the value of the key we
+            // received from the developer. Then we'll return the final array form.
+            if (is_null($key)) {
+                $results[] = $itemValue;
+            } else {
+                $itemKey = is_object($item) ? $item->{$key} : $item[$key];
 				
-				$results[$itemKey] = $itemValue;
-			}
-		}
+                $results[$itemKey] = $itemValue;
+            }
+        }
 		
-		return $results;
-	}
-
-	/**
-	 * Convert the array into a query string.
-	 * 
-	 * @param  array  $array
-	 * 
-	 * @return array
-	 */
-	public static function query($array)
-	{
-		return http_build_query($array, null, '&', PHP_QUERY_RFC3986);
-	}
-
-	/**
-	 * Filter the array using the given callback.
-	 * 
-	 * @param  array  $array
-	 * @param  \Callable  $callback
-	 * 
-	 * @return array
-	 */
-	public static function where($array, Callable $callback)
-	{
-		return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
-	}
-
-	/**
-	 * If the given value is not an array and not null, wrap it in one.
-	 * 
-	 * @param  mixed  $value
-	 * 
-	 * @return array
-	 */
-	public static function wrap($value)
-	{
-		if (is_null($value)) {
-			return [];
-		}
-
-		return is_array($value) ? $value : [$value];
-	}
+        return $results;
+    }
+
+    /**
+     * Convert the array into a query string.
+     * 
+     * @param  array  $array
+     * 
+     * @return array
+     */
+    public static function query($array)
+    {
+        return http_build_query($array, null, '&', PHP_QUERY_RFC3986);
+    }
+
+    /**
+     * Filter the array using the given callback.
+     * 
+     * @param  array  $array
+     * @param  \Callable  $callback
+     * 
+     * @return array
+     */
+    public static function where($array, Callable $callback)
+    {
+        return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
+    }
+
+    /**
+     * If the given value is not an array and not null, wrap it in one.
+     * 
+     * @param  mixed  $value
+     * 
+     * @return array
+     */
+    public static function wrap($value)
+    {
+        if (is_null($value)) {
+            return [];
+        }
+
+        return is_array($value) ? $value : [$value];
+    }
 }
\ No newline at end of file

src/components/Collections/Collection.php

Indentation +5 added lines, -5 removed lines

@@ -275,11 +275,11 @@
         return new static(array_combine($keys, $items));
     }
 
-     /**
-     * Reset the keys of the collection.
-     * 
-     * @return static
-     */
+        /**
+         * Reset the keys of the collection.
+         * 
+         * @return static
+         */
     public function keys()
     {
         return new static(array_keys($this->items));

Spacing +2 added lines, -2 removed lines

@@ -516,7 +516,7 @@ 
             return array_search($value, $this->items, $strict);
         }
 
-        foreach($this->items as $key => $item) {
+        foreach ($this->items as $key => $item) {
             if ($value($item, $key)) {
                 return $key;
             }
@@ -676,7 +676,7 @@ 
     {
         if (is_array($items)) {
             return $items;
-        } elseif($items instanceof Arrayable) {
+        } elseif ($items instanceof Arrayable) {
             return $items->toArray();
         } elseif ($items instanceof Jsonable) {
             return json_decode($items->toJson(), true);

src/components/Filesystem/Filesystem.php

Spacing +2 added lines, -2 removed lines

@@ -243,7 +243,7 @@ 
 			$__path = $path;
 			$__data = $data;
 
-			return (static function () use ($__path, $__data) {
+			return (static function() use ($__path, $__data) {
 				extract($__data, EXTR_SKIP);
 
 				return require $__path;
@@ -269,7 +269,7 @@ 
 			$__path = $path;
 			$__data = $data;
 
-			return (static function () use ($__path, $__data) {
+			return (static function() use ($__path, $__data) {
 				extract($__data, EXTR_SKIP);
 
 				return require_once $__path;

Braces +18 added lines, -6 removed lines

@@ -488,7 +488,9 @@ 
 	 */
 	public function copyDirectory($directory, $destination, $options = null)
 	{
-		if ( ! $this->isDirectory($directory)) return false;
+		if ( ! $this->isDirectory($directory)) {
+		    return false;
+		}
 
 		$options = $options ?: FilesystemIterator::SKIP_DOTS;
 		
@@ -508,13 +510,17 @@ 
             // 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 ( ! $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;
+				if ( ! $this->copy($iterator->getPathname(), $target)) {
+				    return false;
+				}
 			}
 		}
 
@@ -532,7 +538,9 @@ 
 	 */
 	public function deleteDirectory($directory, $keep = false)
 	{
-		if ( ! $this->isDirectory($directory)) return false;
+		if ( ! $this->isDirectory($directory)) {
+		    return false;
+		}
 
 		$iterators = new filesystemIterator($directory);
 
@@ -551,7 +559,9 @@ 
 			}
 		}
 
-		if ( ! $keep) @rmdir($directory);
+		if ( ! $keep) {
+		    @rmdir($directory);
+		}
 
 		return true;
 	}
@@ -580,7 +590,9 @@ 
 	 */
 	public function moveDirectory($from, $to, $overwrite = false)
 	{
-		if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) return false;
+		if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+		    return false;
+		}
 
 		if (false === @rename($from, $to)) {
 			$error = error_get_last();

Indentation +821 added lines, -821 removed lines

@@ -35,842 +35,842 @@
  */
 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  
-	 * @param  bool  $force  
-	 *
-	 * @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  
+     * @param  bool  $force  
+     *
+     * @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  
-	 * 
-	 * @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  
+     * 
+     * @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  
-	 * 
-	 * @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  
-	 * 
-	 * @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  
-	 *
-	 * @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);
-	}
+            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  
+     * 
+     * @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  
+     * 
+     * @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  
+     *
+     * @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);
+    }
 	
-	/**
-	 * Write the contents of a file, replacing it atomically if it already exists.
-	 * 
-	 * @param  string  $path
-	 * @param  string  $content
-	 * 
-	 * @return void
-	 */
-	public function replace($path, $content)
-	{
-		$this->clearstatcache($path);
+    /**
+     * Write the contents of a file, replacing it atomically if it already exists.
+     * 
+     * @param  string  $path
+     * @param  string  $content
+     * 
+     * @return void
+     */
+    public function replace($path, $content)
+    {
+        $this->clearstatcache($path);
 		
-		$path = realpath($path) ?: $path;
+        $path = realpath($path) ?: $path;
 		
-		$tempPath = tempnam(dirname($path), basename($path));
+        $tempPath = tempnam(dirname($path), basename($path));
 		
-		$this->perms($tempPath, 0777 - umask());
+        $this->perms($tempPath, 0777 - umask());
 		
-		$this->put($tempPath, $content);
+        $this->put($tempPath, $content);
 		
-		$this->move($tempPath, $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;
-	}
+        $this->move($tempPath, $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/Cache/Types/CacheKey.php

Indentation +7 added lines, -7 removed lines

@@ -46,13 +46,13 @@
      */
     protected $keyName;
 
-     /**
-     * Constructor. Create a new cache key instance.
-     * 
-     * @param  string  $key
-     * 
-     * @return string 
-     */
+        /**
+         * Constructor. Create a new cache key instance.
+         * 
+         * @param  string  $key
+         * 
+         * @return string 
+         */
     public function __construct($key)
     {
         $this->keyName = $this->getFixKeyChars($key);

src/components/Cache/Store/FileStore.php

Indentation +5 added lines, -5 removed lines

@@ -310,11 +310,11 @@
         return $this->files;
     }
 
-     /**
-     * Get the cache key prefix.
-     *
-     * @return string
-     */
+        /**
+         * Get the cache key prefix.
+         *
+         * @return string
+         */
     public function getPrefix()
     {
         return '';