lenevor / syscodes

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/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;

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): bool
-	{
-		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): string
-	{
-		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): string
-	{
-		$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): bool
+    {
+        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): string
+    {
+        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): string
+    {
+        $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): bool
-	{
-		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): bool
-	{
-		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): bool
-	{
-		$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): void
-	{
-		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): bool
+    {
+        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): bool
+    {
+        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): bool
+    {
+        $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): void
+    {
+        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): bool
-	{
-		return is_executable($path);
-	}
-
-	/**
-	 * Determine if the given path is a directory.
-	 *
-	 * @param  string  $directory
-	 *
-	 * @return bool
-	 */
-	public function isDirectory($directory): bool
-	{
-		return is_dir($directory);
-	}
-
-	/**
-	 * Determine if the given path is a file.
-	 *
-	 * @param  string  $file
-	 *
-	 * @return bool
-	 */
-	public function isFile($file): bool
-	{
-		return is_file($file);
-	}
-
-	/**
-	 * Determine if the given path is writable.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return bool
-	 */
-	public function isWritable($path): bool
-	{
-		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): bool
-	{
-		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): array
-	{
-		$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): bool
-	{
-		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): bool
-	{
-		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): bool
-	{
-		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): bool
+    {
+        return is_executable($path);
+    }
+
+    /**
+     * Determine if the given path is a directory.
+     *
+     * @param  string  $directory
+     *
+     * @return bool
+     */
+    public function isDirectory($directory): bool
+    {
+        return is_dir($directory);
+    }
+
+    /**
+     * Determine if the given path is a file.
+     *
+     * @param  string  $file
+     *
+     * @return bool
+     */
+    public function isFile($file): bool
+    {
+        return is_file($file);
+    }
+
+    /**
+     * Determine if the given path is writable.
+     * 
+     * @param  string  $path
+     * 
+     * @return bool
+     */
+    public function isWritable($path): bool
+    {
+        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): bool
+    {
+        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): array
+    {
+        $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): bool
+    {
+        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): bool
+    {
+        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): bool
+    {
+        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): bool
-	{
-		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): bool
-	{
-		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): bool
-	{
-		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): bool
-	{
-		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): bool
-	{
-		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): int
-	{
-		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): int
-	{
-		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): string
-	{
-		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): bool
+    {
+        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): bool
+    {
+        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): bool
+    {
+        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): bool
+    {
+        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): bool
+    {
+        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): int
+    {
+        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): int
+    {
+        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): string
+    {
+        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): void
-	{
-		$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): void
+    {
+        $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(): bool
-	{
-		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): bool
-	{
-		$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(): bool
+    {
+        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): bool
+    {
+        $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

Braces +18 added lines, -6 removed lines

@@ -487,7 +487,9 @@ 
 	 */
 	public function copyDirectory($directory, $destination, $options = null): bool
 	{
-		if ( ! $this->isDirectory($directory)) return false;
+		if ( ! $this->isDirectory($directory)) {
+		    return false;
+		}
 
 		$options = $options ?: FilesystemIterator::SKIP_DOTS;
 		
@@ -507,13 +509,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;
+				}
 			}
 		}
 
@@ -531,7 +537,9 @@ 
 	 */
 	public function deleteDirectory($directory, $keep = false): bool
 	{
-		if ( ! $this->isDirectory($directory)) return false;
+		if ( ! $this->isDirectory($directory)) {
+		    return false;
+		}
 
 		$iterators = new filesystemIterator($directory);
 
@@ -550,7 +558,9 @@ 
 			}
 		}
 
-		if ( ! $keep) @rmdir($directory);
+		if ( ! $keep) {
+		    @rmdir($directory);
+		}
 
 		return true;
 	}
@@ -579,7 +589,9 @@ 
 	 */
 	public function moveDirectory($from, $to, $overwrite = false): bool
 	{
-		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();

src/components/Cache/CacheServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -40,15 +40,15 @@
      */
     public function register()
     {
-        $this->app->singleton('cache', function ($app) {
+        $this->app->singleton('cache', function($app) {
             return (new CacheManager($app))->driver();
         });
 
-        $this->app->singleton('cache.store', function ($app) {
+        $this->app->singleton('cache.store', function($app) {
             return $app['cache']->driver();
         });
 
-        $this->app->singleton('memcached.connector', function () {
+        $this->app->singleton('memcached.connector', function() {
             return new MemcachedConnector;
         });
     }

src/components/Cache/Store/ArrayStore.php

Braces +3 added lines, -1 removed lines

@@ -51,7 +51,9 @@
      */
     public function get($key)
     {
-        if ( ! isset($this->storage[$key])) return;
+        if ( ! isset($this->storage[$key])) {
+            return;
+        }
 
         $item = $this->storage[$key];
 

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     public function increment($key, $value = 1)
     {
         if ( ! is_null($existing = $this->get($key))) {
-            return take(((int) $existing) + $value, function ($incremented) use ($key) {
+            return take(((int) $existing) + $value, function($incremented) use ($key) {
                 $value = $this->serialized ? serialize($incremented) : $incremented;
                 
                 $this->storage[$key]['value'] = $value;

src/components/Redis/RedisServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -39,13 +39,13 @@
      */
     public function register()
     {
-        $this->app->singleton('redis', function ($app) {
+        $this->app->singleton('redis', function($app) {
             $config = $app['config']->get('database.redis', []);
 
             return new RedisManager($config);
         });
 
-        $this->app->bind('redis.connection', function ($app) {
+        $this->app->bind('redis.connection', function($app) {
             return $app['redis']->connection();
         });
     }

src/components/Core/Bootstrap/BootDetectEnvironment.php

Indentation +3 added lines, -3 removed lines

@@ -113,9 +113,9 @@
     protected function createEnv($app)
     {
         return Dotenv::create(
-               Environment::getRepositoryCreator(),
-               $app->environmentPath(),
-               $app->environmentFile()
+                Environment::getRepositoryCreator(),
+                $app->environmentPath(),
+                $app->environmentFile()
         );
     }
 }
\ No newline at end of file

src/components/Dotenv/Loader/Loader.php

Indentation +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
             $quote = $value[0];
 
             $regexPattern = sprintf(
-					'/^
+                    '/^
 					%1$s          # match a quote at the start of the value
 					(             # capturing sub-pattern used
 								  (?:          # we do not need to capture this

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
         if (strpos($value, '$') !== false) {
             $repository = $this->repository;
 
-            $value = preg_replace_callback('~\${([a-zA-Z0-9_]+)}~', function ($pattern) use ($repository) {
+            $value = preg_replace_callback('~\${([a-zA-Z0-9_]+)}~', function($pattern) use ($repository) {
                 $nestedVariable = $repository->get($pattern[1]);
 
                 if (is_null($nestedVariable)) {

src/components/Debug/GDebug.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 			}
 	
 			$Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally {
+		} finally {
 			// Returns the contents of the output buffer
 			$output = $this->system->CleanOutputBuffer();	
 		}

Spacing +2 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
 					$this->system->endOutputBuffering();
 				}
 
-				if (Misc::sendHeaders() && $handlerContentType)	{
+				if (Misc::sendHeaders() && $handlerContentType) {
 					header("Content-Type: {$handlerContentType}");
 				}
 			}
@@ -317,7 +317,7 @@ 
 
 		if ( ! $handler instanceof MainHandler) {
 			throw new InvalidArgumentException(
-				"Argument to " . __METHOD__ . " must be a callable, or instance of ".
+				"Argument to ".__METHOD__." must be a callable, or instance of ".
 				"Syscodes\Components\\Contracts\\Debug\\Handler"
 			);
 		}

Indentation +332 added lines, -332 removed lines

@@ -40,351 +40,351 @@
  */
 class GDebug implements DebugContract
 {
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @var bool $allowQuit
-	 */
-	protected $allowQuit = true;
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @var bool $allowQuit
+     */
+    protected $allowQuit = true;
 	
-	/**
-	 * Benchmark instance.
-	 * 
-	 * @var string|object $benchmark
-	 */
-	protected $benchmark;
-
-	/**
-	 * The handler stack.
-	 * 
-	 * @var array $handlerStack
-	 */
-	protected $handlerStack = [];
-
-	/**
-	 * The send Http code by default: 500 Internal Server Error.
-	 * 
-	 * @var bool $sendHttpCode
-	 */
-	protected $sendHttpCode = 500;
-
-	/**
-	 * The send output.
-	 * 
-	 * @var bool $sendOutput
-	 */
-	protected $sendOutput = true;
-
-	/**
-	 * The functions of system what control errors and exceptions.
-	 * 
-	 * @var string|object $system
-	 */
-	protected $system;
-
-	/**
-	 * In certain scenarios, like in shutdown handler, we can not throw exceptions.
-	 * 
-	 * @var bool $throwExceptions
-	 */
-	protected $throwExceptions = true;
-
-	/**
-	 * Constructor. The Debug class instance.
-	 * 
-	 * @param  \Syscodes\Components\Debug\Util\System|null  $system
-	 * 
-	 * @return void
-	 */
-	public function __construct(System $system = null)
-	{
-		$this->system    = $system ?: new System;
-		$this->benchmark = new Benchmark;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function handleException(Throwable $exception): string
-	{	
-		// The start benchmark
-		$this->benchmark->start('total_execution', LENEVOR_START);
-
-		$supervisor = $this->getSupervisor($exception);
-
-		// Start buffer
-		$this->system->startOutputBuferring();
-
-		$handlerResponse    = null;
-		$handlerContentType = null;
+    /**
+     * Benchmark instance.
+     * 
+     * @var string|object $benchmark
+     */
+    protected $benchmark;
+
+    /**
+     * The handler stack.
+     * 
+     * @var array $handlerStack
+     */
+    protected $handlerStack = [];
+
+    /**
+     * The send Http code by default: 500 Internal Server Error.
+     * 
+     * @var bool $sendHttpCode
+     */
+    protected $sendHttpCode = 500;
+
+    /**
+     * The send output.
+     * 
+     * @var bool $sendOutput
+     */
+    protected $sendOutput = true;
+
+    /**
+     * The functions of system what control errors and exceptions.
+     * 
+     * @var string|object $system
+     */
+    protected $system;
+
+    /**
+     * In certain scenarios, like in shutdown handler, we can not throw exceptions.
+     * 
+     * @var bool $throwExceptions
+     */
+    protected $throwExceptions = true;
+
+    /**
+     * Constructor. The Debug class instance.
+     * 
+     * @param  \Syscodes\Components\Debug\Util\System|null  $system
+     * 
+     * @return void
+     */
+    public function __construct(System $system = null)
+    {
+        $this->system    = $system ?: new System;
+        $this->benchmark = new Benchmark;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleException(Throwable $exception): string
+    {	
+        // The start benchmark
+        $this->benchmark->start('total_execution', LENEVOR_START);
+
+        $supervisor = $this->getSupervisor($exception);
+
+        // Start buffer
+        $this->system->startOutputBuferring();
+
+        $handlerResponse    = null;
+        $handlerContentType = null;
 		
-		try {
-			foreach ($this->handlerStack as $handler) {			
-				$handler->setDebug($this);
-				$handler->setException($exception);
-				$handler->setSupervisor($supervisor);
+        try {
+            foreach ($this->handlerStack as $handler) {			
+                $handler->setDebug($this);
+                $handler->setException($exception);
+                $handler->setSupervisor($supervisor);
 				
-				$handlerResponse = $handler->handle();
+                $handlerResponse = $handler->handle();
 	
-				// Collect the content type for possible sending in the headers
-				$handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
+                // Collect the content type for possible sending in the headers
+                $handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
 	
-				if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
-					break;
-				}
-			}
+                if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
+                    break;
+                }
+            }
 	
-			$Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally {
-			// Returns the contents of the output buffer
-			$output = $this->system->CleanOutputBuffer();	
-		}
-
-		// Returns the contents of the output buffer for loading time of page
-		$totalTime = $this->benchmark->getElapsedTime('total_execution');
-		$output    = str_replace('{elapsed_time}', $totalTime, $output);
-
-		if ($this->writeToOutput()) {
-			if ($Quit) {
-				while ($this->system->getOutputBufferLevel() > 0) {
-					// Cleanes the output buffer
-					$this->system->endOutputBuffering();
-				}
-
-				if (Misc::sendHeaders() && $handlerContentType)	{
-					header("Content-Type: {$handlerContentType}");
-				}
-			}
-
-			$this->writeToOutputBuffer($output);
-		}
-
-		if ($Quit) {
-			$this->system->flushOutputBuffer();
-			$this->system->stopException(1);
-		}
-
-		return $output;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function allowQuit($exit = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->allowQuit;
-		}
-
-		return $this->allowQuit = (bool) $exit;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function writeToOutput($send = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendOutput;
-		}
+            $Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
+        }
+        finally {
+            // Returns the contents of the output buffer
+            $output = $this->system->CleanOutputBuffer();	
+        }
+
+        // Returns the contents of the output buffer for loading time of page
+        $totalTime = $this->benchmark->getElapsedTime('total_execution');
+        $output    = str_replace('{elapsed_time}', $totalTime, $output);
+
+        if ($this->writeToOutput()) {
+            if ($Quit) {
+                while ($this->system->getOutputBufferLevel() > 0) {
+                    // Cleanes the output buffer
+                    $this->system->endOutputBuffering();
+                }
+
+                if (Misc::sendHeaders() && $handlerContentType)	{
+                    header("Content-Type: {$handlerContentType}");
+                }
+            }
+
+            $this->writeToOutputBuffer($output);
+        }
+
+        if ($Quit) {
+            $this->system->flushOutputBuffer();
+            $this->system->stopException(1);
+        }
+
+        return $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function allowQuit($exit = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->allowQuit;
+        }
+
+        return $this->allowQuit = (bool) $exit;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeToOutput($send = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->sendOutput;
+        }
 		
-		return $this->sendOutput = (bool) $send;
-	}
+        return $this->sendOutput = (bool) $send;
+    }
 	
-	/**
-	 * Generate output to the browser.
-	 * 
-	 * @param  string  $output
-	 * 
-	 * @return self
-	 */
-	protected function writeToOutputBuffer($output): self
-	{
-		if ($this->sendHttpCode() && Misc::sendHeaders()) {
-			$this->system->setHttpResponseCode($this->sendHttpCode());
-		}
+    /**
+     * Generate output to the browser.
+     * 
+     * @param  string  $output
+     * 
+     * @return self
+     */
+    protected function writeToOutputBuffer($output): self
+    {
+        if ($this->sendHttpCode() && Misc::sendHeaders()) {
+            $this->system->setHttpResponseCode($this->sendHttpCode());
+        }
 		
-		echo $output;
+        echo $output;
 		
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function handleError(
-		int $level, 
-		string $message, 
-		string $file = null, 
-		int $line = null
-	) {
-		if ($level & $this->system->getErrorReportingLevel()) {
-			$exception = new ErrorException($message, $level, $level, $file, $line);
-
-			if ($this->throwExceptions) {
-				throw $exception;
-			} else {
-				$this->handleException($exception);
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function pushHandler($handler)
-	{
-		return $this->prependHandler($handler);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function appendHandler($handler): self
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function prependHandler($handler): self
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Create a CallbackHandler from callable and throw if handler is invalid.
-	 * 
-	 * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Components\Contracts\Debug\Handler
-	 * 
-	 * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Components\Contracts\Debug\Handler
-	 */
-	protected function resolveHandler($handler)
-	{
-		if (is_callable($handler)) {
-			$handler = new CallbackHandler($handler);
-		}
-
-		if ( ! $handler instanceof MainHandler) {
-			throw new InvalidArgumentException(
-				"Argument to " . __METHOD__ . " must be a callable, or instance of ".
-				"Syscodes\Components\\Contracts\\Debug\\Handler"
-			);
-		}
-
-		return $handler;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getHandlers(): array
-	{
-		return $this->handlerStack;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function clearHandlers(): self
-	{
-		$this->handlerStack = [];
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function popHandler()
-	{
-		return array_pop($this->handlerStack);
-	}
-
-	/**
-	 * Gets supervisor already specified.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return \Syscodes\Components\Debug\Engine\Supervisor
-	 */
-	protected function getSupervisor(Throwable $exception)
-	{
-		return new Supervisor($exception);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function off(): void
-	{
-		$this->system->restoreExceptionHandler();
-		$this->system->restoreErrorHandler();
-	}
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleError(
+        int $level, 
+        string $message, 
+        string $file = null, 
+        int $line = null
+    ) {
+        if ($level & $this->system->getErrorReportingLevel()) {
+            $exception = new ErrorException($message, $level, $level, $file, $line);
+
+            if ($this->throwExceptions) {
+                throw $exception;
+            } else {
+                $this->handleException($exception);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function pushHandler($handler)
+    {
+        return $this->prependHandler($handler);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function appendHandler($handler): self
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prependHandler($handler): self
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Create a CallbackHandler from callable and throw if handler is invalid.
+     * 
+     * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Components\Contracts\Debug\Handler
+     * 
+     * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Components\Contracts\Debug\Handler
+     */
+    protected function resolveHandler($handler)
+    {
+        if (is_callable($handler)) {
+            $handler = new CallbackHandler($handler);
+        }
+
+        if ( ! $handler instanceof MainHandler) {
+            throw new InvalidArgumentException(
+                "Argument to " . __METHOD__ . " must be a callable, or instance of ".
+                "Syscodes\Components\\Contracts\\Debug\\Handler"
+            );
+        }
+
+        return $handler;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHandlers(): array
+    {
+        return $this->handlerStack;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clearHandlers(): self
+    {
+        $this->handlerStack = [];
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function popHandler()
+    {
+        return array_pop($this->handlerStack);
+    }
+
+    /**
+     * Gets supervisor already specified.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return \Syscodes\Components\Debug\Engine\Supervisor
+     */
+    protected function getSupervisor(Throwable $exception)
+    {
+        return new Supervisor($exception);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function off(): void
+    {
+        $this->system->restoreExceptionHandler();
+        $this->system->restoreErrorHandler();
+    }
 	
-	/**
-	 * {@inheritdoc}
-	 */
-	public function on() : void
-	{
-		// Set the exception handler
-		$this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
-		// Set the error handler
-		$this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
-		// Set the handler for shutdown to catch Parse errors
-		$this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function sendHttpCode($code = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendHttpCode;
-		}
+    /**
+     * {@inheritdoc}
+     */
+    public function on() : void
+    {
+        // Set the exception handler
+        $this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
+        // Set the error handler
+        $this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
+        // Set the handler for shutdown to catch Parse errors
+        $this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sendHttpCode($code = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->sendHttpCode;
+        }
 		
-		if ( ! $code) {
-			return $this->sendHttpCode = false;
-		}
+        if ( ! $code) {
+            return $this->sendHttpCode = false;
+        }
 		
-		if ($code === true) {
-			$code = 500;
-		}
+        if ($code === true) {
+            $code = 500;
+        }
 		
-		if ($code < 400 || 600 <= $code) {
-			throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
-		}
+        if ($code < 400 || 600 <= $code) {
+            throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
+        }
 		
-		return $this->sendHttpCode = $code;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function handleShutdown()
-	{
-		$this->throwExceptions = false;
-
-		$error = $this->system->getLastError();
-
-		// If we've got an error that hasn't been displayed, then convert
-		// it to an Exception and use the Exception handler to display it
-		// to the user
-		if ($error && Misc::isFatalError($error['type'])) {
-			$this->handleError($error['type'], $error['message'], $error['file'], $error['line']);
-		}
-	}
+        return $this->sendHttpCode = $code;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleShutdown()
+    {
+        $this->throwExceptions = false;
+
+        $error = $this->system->getLastError();
+
+        // If we've got an error that hasn't been displayed, then convert
+        // it to an Exception and use the Exception handler to display it
+        // to the user
+        if ($error && Misc::isFatalError($error['type'])) {
+            $this->handleError($error['type'], $error['message'], $error['file'], $error['line']);
+        }
+    }
 }
\ No newline at end of file

src/components/Debug/ExceptionHandler.php

Spacing +3 added lines, -3 removed lines

@@ -159,7 +159,7 @@ 
 
         $caughtLength = $this->caughtLength = 0;
 
-        ob_start(function ($buffer) {
+        ob_start(function($buffer) {
             $this->caughtBuffer = $buffer;
 
             return '';            
@@ -168,7 +168,7 @@ 
         $this->sendPhpResponse($exception);
 
         if (isset($this->caughtBuffer[0])) {
-            ob_start(function ($buffer) {
+            ob_start(function($buffer) {
                 if ($this->caughtLength) {
                     $cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
 
@@ -458,7 +458,7 @@ 
         }
 
         if (is_string($frmt)) {
-            $index  = strpos($f = $frmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l')) ?: strlen($f));
+            $index = strpos($f = $frmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l')) ?: strlen($f));
             $frmt = [substr($f, 0, $index)] + preg_split('/&([^>]++)>/', substr($f, $index), -1, PREG_SPLIT_DELIM_CAPTURE);
 
             for ($index = 1; isset($frmt[$index]); ++$index) {