lenevor / syscodes

src/components/Debug/GDebug.php

Indentation +387 added lines, -387 removed lines

@@ -41,406 +41,406 @@
  */
 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 $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 $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\Debug\Util\System|null  $system
-	 * 
-	 * @return void
-	 */
-	public function __construct(System $system = null)
-	{
-		$this->system    = $system ?: new System;
-		$this->benchmark = new Benchmark;
-	}
-
-	/**
-	 * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
-	 * error, display it if display_errors is on, and fire an event that allows custom actions 
-	 * to be taken at this point.
-	 *
-	 * @param  \Throwable  $exception
-	 *
-	 * @return string
-	 */
-	public function handleException(Throwable $exception)
-	{	
-		// 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 $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 $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\Debug\Util\System|null  $system
+     * 
+     * @return void
+     */
+    public function __construct(System $system = null)
+    {
+        $this->system    = $system ?: new System;
+        $this->benchmark = new Benchmark;
+    }
+
+    /**
+     * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
+     * error, display it if display_errors is on, and fire an event that allows custom actions 
+     * to be taken at this point.
+     *
+     * @param  \Throwable  $exception
+     *
+     * @return string
+     */
+    public function handleException(Throwable $exception)
+    {	
+        // 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;
-	}
-
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @param  bool|int  $exit
-	 * 
-	 * @return bool
-	 */
-	public function allowQuit($exit = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->allowQuit;
-		}
-
-		return $this->allowQuit = (bool) $exit;
-	}
-
-	/**
-	 * Lenevor Exception push output directly to the client it the data  
-	 * if they are true, but if it is false, the output will be returned 
-	 * by exception.
-	 * 
-	 * @param  bool|int  $send
-	 *
-	 * @return bool
-	 */
-	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;
+    }
+
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @param  bool|int  $exit
+     * 
+     * @return bool
+     */
+    public function allowQuit($exit = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->allowQuit;
+        }
+
+        return $this->allowQuit = (bool) $exit;
+    }
+
+    /**
+     * Lenevor Exception push output directly to the client it the data  
+     * if they are true, but if it is false, the output will be returned 
+     * by exception.
+     * 
+     * @param  bool|int  $send
+     *
+     * @return bool
+     */
+    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 $this
-	 */
-	protected function writeToOutputBuffer($output)
-	{
-		if ($this->sendHttpCode() && Misc::sendHeaders()) {
-			$this->system->setHttpResponseCode($this->sendHttpCode());
-		}
+    /**
+     * Generate output to the browser.
+     * 
+     * @param  string  $output
+     * 
+     * @return $this
+     */
+    protected function writeToOutputBuffer($output)
+    {
+        if ($this->sendHttpCode() && Misc::sendHeaders()) {
+            $this->system->setHttpResponseCode($this->sendHttpCode());
+        }
 		
-		echo $output;
+        echo $output;
 		
-		return $this;
-	}
-
-	/**
-	 * Error handler
-	 *
-	 * This will catch the php native error and treat it as a exception which will 
-	 * provide a full back trace on all errors.
-	 *
-	 * @param  int  $level
-	 * @param  string  $message
-	 * @param  string|null  $file
-	 * @param  int|null  $line
-	 *
-	 * @throws \ErrorException
-	 */
-	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;
-	}
-
-	/**
-	 * Pushes a handler to the end of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Handler
-	 */
-	public function pushHandler($handler)
-	{
-		return $this->prependHandler($handler);
-	}
-
-	/**
-	 * Appends a handler to the end of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return $this
-	 */
-	public function appendHandler($handler)
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Prepends a handler to the start of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return $this
-	 */
-	public function prependHandler($handler)
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Create a CallbackHandler from callable and throw if handler is invalid.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Handler
-	 * 
-	 * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\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\\Contracts\\Debug\\Handler"
-			);
-		}
-
-		return $handler;
-	}
-
-	/**
-	 * Returns an array with all handlers, in the order they were added to the stack.
-	 * 
-	 * @return array
-	 */
-	public function getHandlers()
-	{
-		return $this->handlerStack;
-	}
-
-	/**
-	 * Clears all handlers in the handlerStack, including the default PleasingPage handler.
-	 * 
-	 * @return $this
-	 */
-	public function clearHandlers()
-	{
-		$this->handlerStack = [];
-
-		return $this;
-	}
-
-	/**
-	 * Removes the last handler in the stack and returns it.
-	 * 
-	 * @return array|null
-	 */
-	public function popHandler()
-	{
-		return array_pop($this->handlerStack);
-	}
-
-	/**
-	 * Gets supervisor already specified.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return \Syscodes\Debug\Engine\Supervisor
-	 */
-	protected function getSupervisor(Throwable $exception)
-	{
-		return new Supervisor($exception);
-	}
-
-	/**
-	 * Unregisters all handlers registered by this Debug instance.
-	 * 
-	 * @return void
-	 */
-	public function off()
-	{
-		$this->system->restoreExceptionHandler();
-		$this->system->restoreErrorHandler();
-	}
+        return $this;
+    }
+
+    /**
+     * Error handler
+     *
+     * This will catch the php native error and treat it as a exception which will 
+     * provide a full back trace on all errors.
+     *
+     * @param  int  $level
+     * @param  string  $message
+     * @param  string|null  $file
+     * @param  int|null  $line
+     *
+     * @throws \ErrorException
+     */
+    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;
+    }
+
+    /**
+     * Pushes a handler to the end of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Contracts\Debug\Handler
+     */
+    public function pushHandler($handler)
+    {
+        return $this->prependHandler($handler);
+    }
+
+    /**
+     * Appends a handler to the end of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return $this
+     */
+    public function appendHandler($handler)
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Prepends a handler to the start of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return $this
+     */
+    public function prependHandler($handler)
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Create a CallbackHandler from callable and throw if handler is invalid.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Contracts\Debug\Handler
+     * 
+     * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\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\\Contracts\\Debug\\Handler"
+            );
+        }
+
+        return $handler;
+    }
+
+    /**
+     * Returns an array with all handlers, in the order they were added to the stack.
+     * 
+     * @return array
+     */
+    public function getHandlers()
+    {
+        return $this->handlerStack;
+    }
+
+    /**
+     * Clears all handlers in the handlerStack, including the default PleasingPage handler.
+     * 
+     * @return $this
+     */
+    public function clearHandlers()
+    {
+        $this->handlerStack = [];
+
+        return $this;
+    }
+
+    /**
+     * Removes the last handler in the stack and returns it.
+     * 
+     * @return array|null
+     */
+    public function popHandler()
+    {
+        return array_pop($this->handlerStack);
+    }
+
+    /**
+     * Gets supervisor already specified.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return \Syscodes\Debug\Engine\Supervisor
+     */
+    protected function getSupervisor(Throwable $exception)
+    {
+        return new Supervisor($exception);
+    }
+
+    /**
+     * Unregisters all handlers registered by this Debug instance.
+     * 
+     * @return void
+     */
+    public function off()
+    {
+        $this->system->restoreExceptionHandler();
+        $this->system->restoreErrorHandler();
+    }
 	
-	/**
-	 * Registers this instance as an error handler.
-	 * 
-	 * @return void
-	 */
-	public function on() 
-	{
-		// 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]);
-	}
-
-	/**
-	 * Lenevor Exception will by default send HTTP code 500, but you may wish
-	 * to use 502, 503, or another 5xx family code.
-	 * 
-	 * @param  bool|int  $code
-	 * 
-	 * @return int|false
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function sendHttpCode($code = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendHttpCode;
-		}
+    /**
+     * Registers this instance as an error handler.
+     * 
+     * @return void
+     */
+    public function on() 
+    {
+        // 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]);
+    }
+
+    /**
+     * Lenevor Exception will by default send HTTP code 500, but you may wish
+     * to use 502, 503, or another 5xx family code.
+     * 
+     * @param  bool|int  $code
+     * 
+     * @return int|false
+     * 
+     * @throws \InvalidArgumentException
+     */
+    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;
-	}
-
-	/**
-	 * This will catch errors that are generated at the shutdown level of execution.
-	 *
-	 * @return void
-	 *
-	 * @throws \ErrorException
-	 */
-	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->errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
-		}
-	}
+        return $this->sendHttpCode = $code;
+    }
+
+    /**
+     * This will catch errors that are generated at the shutdown level of execution.
+     *
+     * @return void
+     *
+     * @throws \ErrorException
+     */
+    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->errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
+        }
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 					$this->system->endOutputBuffering();
 				}
 
-				if (Misc::sendHeaders() && $handlerContentType)	{
+				if (Misc::sendHeaders() && $handlerContentType) {
 					header("Content-Type: {$handlerContentType}");
 				}
 			}
@@ -314,7 +314,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\\Contracts\\Debug\\Handler"
 			);
 		}

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();	
 		}

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) {

src/components/Debug/Exceptions/Handlers/PleasingPageHandler.php

Indentation +407 added lines, -407 removed lines

@@ -41,429 +41,429 @@
  */
 class PleasingPageHandler extends MainHandler
 {
-	/**
-	 * The brand main of handler.
-	 * 
-	 * @var string $brand
-	 */
-	protected $brand = 'Lenevor Debug';
-
-	/**
-	 * A string identifier for a known IDE/text editor, or a closure
-	 * that resolves a string that can be used to open a given file
-	 * in an editor.
-	 * 
-	 * @var mixed $editor
-	 */
-	protected $editor;
-
-	/**
-	 * A list of known editor strings.
-	 * 
-	 * @var array $editors
-	 */
-	protected $editors = [
-		"vscode"   => "vscode://file/%file:%line",
-		"sublime"  => "subl://open?url=file://%file&line=%line",
-		"phpstorm" => "phpstorm://open?file://%file&line=%line",
-		"textmate" => "txmt://open?url=file://%file&line=%line",
-		"atom"     => "atom://core/open/file?filename=%file&line=%line",
-	];
+    /**
+     * The brand main of handler.
+     * 
+     * @var string $brand
+     */
+    protected $brand = 'Lenevor Debug';
+
+    /**
+     * A string identifier for a known IDE/text editor, or a closure
+     * that resolves a string that can be used to open a given file
+     * in an editor.
+     * 
+     * @var mixed $editor
+     */
+    protected $editor;
+
+    /**
+     * A list of known editor strings.
+     * 
+     * @var array $editors
+     */
+    protected $editors = [
+        "vscode"   => "vscode://file/%file:%line",
+        "sublime"  => "subl://open?url=file://%file&line=%line",
+        "phpstorm" => "phpstorm://open?file://%file&line=%line",
+        "textmate" => "txmt://open?url=file://%file&line=%line",
+        "atom"     => "atom://core/open/file?filename=%file&line=%line",
+    ];
 	
-	/**
-	 * The page title main of handler.
-	 * 
-	 * @var string $pageTitle
-	 */
-	protected $pageTitle = 'Lenevor Debug! There was an error.';
+    /**
+     * The page title main of handler.
+     * 
+     * @var string $pageTitle
+     */
+    protected $pageTitle = 'Lenevor Debug! There was an error.';
 	
-	/**
-	 * Fast lookup cache for known resource locations.
-	 * 
-	 * @var array $resourceCache
-	 */
-	protected $resourceCache = [];
+    /**
+     * Fast lookup cache for known resource locations.
+     * 
+     * @var array $resourceCache
+     */
+    protected $resourceCache = [];
 	
-	/**
-	 * The path to the directory containing the html error template directories.
-	 * 
-	 * @var array $searchPaths
-	 */
-	protected $searchPaths = [];
-
-	/**
-	 * Gets the table of data.
-	 * 
-	 * @var array $tables
-	 */
-	protected $tables = [];
+    /**
+     * The path to the directory containing the html error template directories.
+     * 
+     * @var array $searchPaths
+     */
+    protected $searchPaths = [];
+
+    /**
+     * Gets the table of data.
+     * 
+     * @var array $tables
+     */
+    protected $tables = [];
 	
-	/**
-	 * The template handler system.
-	 * 
-	 * @var string $template
-	 */
-	protected $template;	
+    /**
+     * The template handler system.
+     * 
+     * @var string $template
+     */
+    protected $template;	
 	
-	/**
-	 * Constructor. The PleasingPageHandler class.
-	 * 
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->template      = new TemplateHandler;
-		$this->searchPaths[] = dirname(__DIR__).DIRECTORY_SEPARATOR.'Resources';
-	}
-
-	/**
-	 * Adds an editor resolver, identified by a string name, and that may be a 
-	 * string path, or a callable resolver.
-	 * 
-	 * @param  string            $identifier
-	 * @param  string|\Callable  $resolver
-	 * 
-	 * @return void
-	 */
-	public function addEditor($identifier, $resolver)
-	{
-		$this->editors[$identifier] = $resolver;
-	}
-
-	/**
-	 * Adds an entry to the list of tables displayed in the template.
-	 * The expected data is a simple associative array. Any nested arrays
-	 * will be flattened with print_r.
-	 * 
-	 * @param  \Syscodes\Contracts\Debug\Table  $table
-	 * 
-	 * @return array
-	 */
-	public function addTables(Table $table)
-	{
-		$this->tables[] = $table;
-	}
+    /**
+     * Constructor. The PleasingPageHandler class.
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->template      = new TemplateHandler;
+        $this->searchPaths[] = dirname(__DIR__).DIRECTORY_SEPARATOR.'Resources';
+    }
+
+    /**
+     * Adds an editor resolver, identified by a string name, and that may be a 
+     * string path, or a callable resolver.
+     * 
+     * @param  string            $identifier
+     * @param  string|\Callable  $resolver
+     * 
+     * @return void
+     */
+    public function addEditor($identifier, $resolver)
+    {
+        $this->editors[$identifier] = $resolver;
+    }
+
+    /**
+     * Adds an entry to the list of tables displayed in the template.
+     * The expected data is a simple associative array. Any nested arrays
+     * will be flattened with print_r.
+     * 
+     * @param  \Syscodes\Contracts\Debug\Table  $table
+     * 
+     * @return array
+     */
+    public function addTables(Table $table)
+    {
+        $this->tables[] = $table;
+    }
 	
-	/**
-	 * Gathers the variables that will be made available to the view.
-	 * 
-	 * @return  array
-	 */
-	protected function collectionVars()
-	{
-		$supervisor = $this->getSupervisor();
-		$style      = file_get_contents($this->getResource('css/debug.base.css'));
-		$jscript    = file_get_contents($this->getResource('js/debug.base.js'));
-		$tables     = array_merge($this->getDefaultTables(), $this->tables);
+    /**
+     * Gathers the variables that will be made available to the view.
+     * 
+     * @return  array
+     */
+    protected function collectionVars()
+    {
+        $supervisor = $this->getSupervisor();
+        $style      = file_get_contents($this->getResource('css/debug.base.css'));
+        $jscript    = file_get_contents($this->getResource('js/debug.base.js'));
+        $tables     = array_merge($this->getDefaultTables(), $this->tables);
 		
-		return [ 
-			'class'             => explode('\\', $supervisor->getExceptionName()),
-			'stylesheet'        => preg_replace('#[\r\n\t ]+#', ' ', $style),
-			'javascript'        => preg_replace('#[\r\n\t ]+#', ' ', $jscript),
-			'header'            => $this->getResource('views/header.php'),
-			'sidebar'           => $this->getResource('views/sidebar.php'),
-			'frame_description' => $this->getResource('views/frame_description.php'),
-			'frame_list'        => $this->getResource('views/frame_list.php'),
-			'details_panel'     => $this->getResource('views/details_panel.php'),
-			'code_source'       => $this->getResource('views/code_source.php'),
-			'details_content'   => $this->getResource('views/details_content.php'),
-			'footer'            => $this->getResource('views/footer.php'),
-			'plain_exception'   => Formatter::formatExceptionAsPlainText($this->getSupervisor()),
-			'handler'           => $this,
-			'handlers'          => $this->getDebug()->getHandlers(),
-			'debug'             => $this->getDebug(),
-			'code'              => $this->getExceptionCode(),
-			'message'           => $supervisor->getExceptionMessage(),
-			'frames'            => $this->getExceptionFrames(),
-			'tables'            => $this->getProcessTables($tables),
-		];
-	}
+        return [ 
+            'class'             => explode('\\', $supervisor->getExceptionName()),
+            'stylesheet'        => preg_replace('#[\r\n\t ]+#', ' ', $style),
+            'javascript'        => preg_replace('#[\r\n\t ]+#', ' ', $jscript),
+            'header'            => $this->getResource('views/header.php'),
+            'sidebar'           => $this->getResource('views/sidebar.php'),
+            'frame_description' => $this->getResource('views/frame_description.php'),
+            'frame_list'        => $this->getResource('views/frame_list.php'),
+            'details_panel'     => $this->getResource('views/details_panel.php'),
+            'code_source'       => $this->getResource('views/code_source.php'),
+            'details_content'   => $this->getResource('views/details_content.php'),
+            'footer'            => $this->getResource('views/footer.php'),
+            'plain_exception'   => Formatter::formatExceptionAsPlainText($this->getSupervisor()),
+            'handler'           => $this,
+            'handlers'          => $this->getDebug()->getHandlers(),
+            'debug'             => $this->getDebug(),
+            'code'              => $this->getExceptionCode(),
+            'message'           => $supervisor->getExceptionMessage(),
+            'frames'            => $this->getExceptionFrames(),
+            'tables'            => $this->getProcessTables($tables),
+        ];
+    }
 	
-	/**
-	 * The way in which the data sender (usually the server) can tell the recipient
-	 * (the browser, in general) what type of data is being sent in this case, html format tagged.
-	 * 
-	 * @return string
-	 */
-	public function contentType()
-	{
-		return 'text/html;charset=UTF-8';
-	}
-
-	/**
-	 * Gets the brand of project.
-	 * 
-	 * @return string
-	 */
-	public function getBrand()
-	{
-		return $this->brand;
-	}
-
-	/**
-	 * Returns the default tables.
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Table[]
-	 */
-	protected function getDefaultTables()
-	{
-		return [
-			new ArrayTable('GET Data', $_GET),
-			new ArrayTable('POST Data', $_POST),
-			new ArrayTable('Files', $_FILES),
-			new ArrayTable('Cookie', $_COOKIE),
-			new ArrayTable('Session', isset($_SESSION) ? $_SESSION : []),
-			new ArrayTable('Server/Request Data', $_SERVER),
-			new ArrayTable(__('exception.environmentVars'), $_ENV),
-		];
-	}
-
-	/**
-	 * Get the code of the exception that is currently being handled.
-	 * 
-	 * @return string
-	 */
-	protected function getExceptionCode()
-	{
-		$exception = $this->getException();
-		$code      = $exception->getCode();
-
-		if ($exception instanceof ErrorException) {
-			$code = Misc::translateErrorCode($exception->getSeverity());
-		}
-
-		return (string) $code;
-	}
-
-	/**
-	 * Get the stack trace frames of the exception that is currently being handled.
-	 * 
-	 * @return \Syscodes\Debug\Engine\Supervisor;
-	 */
-	protected function getExceptionFrames()
-	{
-		$frames = $this->getSupervisor()->getFrames();
+    /**
+     * The way in which the data sender (usually the server) can tell the recipient
+     * (the browser, in general) what type of data is being sent in this case, html format tagged.
+     * 
+     * @return string
+     */
+    public function contentType()
+    {
+        return 'text/html;charset=UTF-8';
+    }
+
+    /**
+     * Gets the brand of project.
+     * 
+     * @return string
+     */
+    public function getBrand()
+    {
+        return $this->brand;
+    }
+
+    /**
+     * Returns the default tables.
+     * 
+     * @return \Syscodes\Contracts\Debug\Table[]
+     */
+    protected function getDefaultTables()
+    {
+        return [
+            new ArrayTable('GET Data', $_GET),
+            new ArrayTable('POST Data', $_POST),
+            new ArrayTable('Files', $_FILES),
+            new ArrayTable('Cookie', $_COOKIE),
+            new ArrayTable('Session', isset($_SESSION) ? $_SESSION : []),
+            new ArrayTable('Server/Request Data', $_SERVER),
+            new ArrayTable(__('exception.environmentVars'), $_ENV),
+        ];
+    }
+
+    /**
+     * Get the code of the exception that is currently being handled.
+     * 
+     * @return string
+     */
+    protected function getExceptionCode()
+    {
+        $exception = $this->getException();
+        $code      = $exception->getCode();
+
+        if ($exception instanceof ErrorException) {
+            $code = Misc::translateErrorCode($exception->getSeverity());
+        }
+
+        return (string) $code;
+    }
+
+    /**
+     * Get the stack trace frames of the exception that is currently being handled.
+     * 
+     * @return \Syscodes\Debug\Engine\Supervisor;
+     */
+    protected function getExceptionFrames()
+    {
+        $frames = $this->getSupervisor()->getFrames();
 		
-		return $frames;
-	}
+        return $frames;
+    }
 	
-	/**
-	 * Gets the page title web.
-	 * 
-	 * @return string
-	 */
-	public function getPageTitle()
-	{
-		return $this->pageTitle;
-	}
-
-	/**
-	 * Processes an array of tables making sure everything is allright.
-	 * 
-	 * @param  \Syscodes\Contracts\Debug\Table[]  $tables
-	 * 
-	 * @return array
-	 */
-	protected function getProcessTables(array $tables)
-	{
-		$processTables = [];
-
-		foreach ($tables as $table) {
-			if ( ! $table instanceof Table) {
-				continue;
-			}
-
-			$label = $table->getLabel();
-
-			try {
-				$data = $table->getData();
-
-				if ( ! (is_array($data) || $data instanceof Traversable)) {
-					$data = [];
-				}
-			} catch (Exception $e) {
-				$data = [];
-			}
-
-			$processTables[$label] = $data;
-		}
-
-		return $processTables;
-	}
-
-	/**
-	 * Finds a resource, by its relative path, in all available search paths.
-	 *
-	 * @param  string  $resource
-	 * 
-	 * @return string
-	 * 
-	 * @throws \RuntimeException
-	 */
-	protected function getResource($resource)
-	{
-		if (isset($this->resourceCache[$resource])) {
-			return $this->resourceCache[$resource];
-		}
-
-		foreach ($this->searchPaths as $path) {
-			$fullPath = $path.DIRECTORY_SEPARATOR.$resource;
-
-			if (is_file($fullPath)) {
-				// Cache:
-				$this->resourceCache[$resource] = $fullPath;
-
-				return $fullPath;
-			}
-		}
-
-		throw new RuntimeException( 
-				"Could not find resource '{$resource}' in any resource paths.". 
-				"(searched: ".join(", ", $this->searchPaths).")");
-	}
+    /**
+     * Gets the page title web.
+     * 
+     * @return string
+     */
+    public function getPageTitle()
+    {
+        return $this->pageTitle;
+    }
+
+    /**
+     * Processes an array of tables making sure everything is allright.
+     * 
+     * @param  \Syscodes\Contracts\Debug\Table[]  $tables
+     * 
+     * @return array
+     */
+    protected function getProcessTables(array $tables)
+    {
+        $processTables = [];
+
+        foreach ($tables as $table) {
+            if ( ! $table instanceof Table) {
+                continue;
+            }
+
+            $label = $table->getLabel();
+
+            try {
+                $data = $table->getData();
+
+                if ( ! (is_array($data) || $data instanceof Traversable)) {
+                    $data = [];
+                }
+            } catch (Exception $e) {
+                $data = [];
+            }
+
+            $processTables[$label] = $data;
+        }
+
+        return $processTables;
+    }
+
+    /**
+     * Finds a resource, by its relative path, in all available search paths.
+     *
+     * @param  string  $resource
+     * 
+     * @return string
+     * 
+     * @throws \RuntimeException
+     */
+    protected function getResource($resource)
+    {
+        if (isset($this->resourceCache[$resource])) {
+            return $this->resourceCache[$resource];
+        }
+
+        foreach ($this->searchPaths as $path) {
+            $fullPath = $path.DIRECTORY_SEPARATOR.$resource;
+
+            if (is_file($fullPath)) {
+                // Cache:
+                $this->resourceCache[$resource] = $fullPath;
+
+                return $fullPath;
+            }
+        }
+
+        throw new RuntimeException( 
+                "Could not find resource '{$resource}' in any resource paths.". 
+                "(searched: ".join(", ", $this->searchPaths).")");
+    }
 	
-	/**
-	 * Given an exception and status code will display the error to the client.
-	 * 
-	 * @return int|null
-	 */
-	public function handle()
-	{	
-		$templatePath = $this->getResource('debug.layout.php');
-
-		$vars = $this->collectionVars();
+    /**
+     * Given an exception and status code will display the error to the client.
+     * 
+     * @return int|null
+     */
+    public function handle()
+    {	
+        $templatePath = $this->getResource('debug.layout.php');
+
+        $vars = $this->collectionVars();
 		
-		if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
+        if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
 		
-		$this->template->setVariables($vars);
-		$this->template->render($templatePath);
+        $this->template->setVariables($vars);
+        $this->template->render($templatePath);
 		
-		return MainHandler::QUIT;
-	}
-
-	/**
-	 * Set the editor to use to open referenced files, by a string identifier or callable
-	 * that will be executed for every file reference. Should return a string.
-	 * 
-	 * @example  $debug->setEditor(function($file, $line) { return "file:///{$file}"; });
-	 * @example  $debug->setEditor('vscode');
-	 * 
-	 * @param  string  $editor
-	 * 
-	 * @return void
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function setEditor($editor)
-	{
-		if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
-			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
-				implode(', ', array_keys($this->editors))
-			);
-		}
-
-		$this->editor = $editor;
-	}
-
-	/**
-	 * Given a string file path, and an integer file line,
-	 * executes the editor resolver and returns.
-	 * 
-	 * @param  string  $file
-	 * @param  int	   $line
-	 * 
-	 * @return string|bool
-	 * 
-	 * @throws \UnexpectedValueException
-	 */
-	public function getEditorAtHref($file, $line)
-	{
-		$editor = $this->getEditor($file, $line);
-
-		if (empty($editor))	{
-			return false;
-		}
-
-		if ( ! isset($editor['url']) || ! is_string($editor['url'])) {
-			throw new UnexpectedValueException(__METHOD__.'should always resolve to a string or a valid editor array');
-		}
-
-		$editor['url'] = str_replace("%file", rawurldecode($file), $editor['url']);
-		$editor['url'] = str_replace("%line", rawurldecode($line), $editor['url']);
-
-		return $editor['url'];
-	}
-
-	/**
-	 * The editor must be a valid callable function/closure.
-	 * 
-	 * @param  string  $file
-	 * @param  int	   $line
-	 * 
-	 * @return array
-	 */
-	protected function getEditor($file, $line)
-	{
-		if ( ! $this->editor || ( ! is_string($this->editor) && ! is_callable($this->editor))) {
-			return [];
-		}
-
-		if (is_string($this->editor) && isset($this->editors[$this->editor]) && ! is_callable($this->editors[$this->editor])) {
-			return ['url' => $this->editors[$this->editor]];
-		}
-
-		if (is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor]))) {
-			if (is_callable($this->editor)) {
-				$callback = call_user_func($this->editor, $filePath, $line);
-			} else {
-				$callback = call_user_func($this->editors[$this->editor], $filePath, $line);
-			}
-
-			if (empty($callback)) {
-				return [];
-			}
-
-			if (is_string($callback)) {
-				return ['url' => $callback];
-			}
+        return MainHandler::QUIT;
+    }
+
+    /**
+     * Set the editor to use to open referenced files, by a string identifier or callable
+     * that will be executed for every file reference. Should return a string.
+     * 
+     * @example  $debug->setEditor(function($file, $line) { return "file:///{$file}"; });
+     * @example  $debug->setEditor('vscode');
+     * 
+     * @param  string  $editor
+     * 
+     * @return void
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function setEditor($editor)
+    {
+        if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
+            throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
+                implode(', ', array_keys($this->editors))
+            );
+        }
+
+        $this->editor = $editor;
+    }
+
+    /**
+     * Given a string file path, and an integer file line,
+     * executes the editor resolver and returns.
+     * 
+     * @param  string  $file
+     * @param  int	   $line
+     * 
+     * @return string|bool
+     * 
+     * @throws \UnexpectedValueException
+     */
+    public function getEditorAtHref($file, $line)
+    {
+        $editor = $this->getEditor($file, $line);
+
+        if (empty($editor))	{
+            return false;
+        }
+
+        if ( ! isset($editor['url']) || ! is_string($editor['url'])) {
+            throw new UnexpectedValueException(__METHOD__.'should always resolve to a string or a valid editor array');
+        }
+
+        $editor['url'] = str_replace("%file", rawurldecode($file), $editor['url']);
+        $editor['url'] = str_replace("%line", rawurldecode($line), $editor['url']);
+
+        return $editor['url'];
+    }
+
+    /**
+     * The editor must be a valid callable function/closure.
+     * 
+     * @param  string  $file
+     * @param  int	   $line
+     * 
+     * @return array
+     */
+    protected function getEditor($file, $line)
+    {
+        if ( ! $this->editor || ( ! is_string($this->editor) && ! is_callable($this->editor))) {
+            return [];
+        }
+
+        if (is_string($this->editor) && isset($this->editors[$this->editor]) && ! is_callable($this->editors[$this->editor])) {
+            return ['url' => $this->editors[$this->editor]];
+        }
+
+        if (is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor]))) {
+            if (is_callable($this->editor)) {
+                $callback = call_user_func($this->editor, $filePath, $line);
+            } else {
+                $callback = call_user_func($this->editors[$this->editor], $filePath, $line);
+            }
+
+            if (empty($callback)) {
+                return [];
+            }
+
+            if (is_string($callback)) {
+                return ['url' => $callback];
+            }
 			
-			return ['url' => isset($callback['url']) ? $callback['url'] : $callback];
-		}
+            return ['url' => isset($callback['url']) ? $callback['url'] : $callback];
+        }
 		
-		return [];
-	}
-
-	/**
-	 * Registered the editor.
-	 * 
-	 * @return string
-	 */
-	public function getEditorcode()
-	{
-		return $this->editor;
-	}
+        return [];
+    }
+
+    /**
+     * Registered the editor.
+     * 
+     * @return string
+     */
+    public function getEditorcode()
+    {
+        return $this->editor;
+    }
 	
-	/**
-	 * Sets the brand of project.
-	 * 
-	 * @param  string  $brand
-	 * 
-	 * @return void
-	 */
-	public function setBrand($brand)
-	{
-		$this->brand = (string) $brand;
-	}
+    /**
+     * Sets the brand of project.
+     * 
+     * @param  string  $brand
+     * 
+     * @return void
+     */
+    public function setBrand($brand)
+    {
+        $this->brand = (string) $brand;
+    }
 	
-	/**
-	 * Sets the page title web.
-	 * 
-	 * @param  string  $title
-	 * 
-	 * @return void
-	 */
-	public function setPageTitle($title)
-	{
-		$this->pageTitle = (string) $title;
-	}
+    /**
+     * Sets the page title web.
+     * 
+     * @param  string  $title
+     * 
+     * @return void
+     */
+    public function setPageTitle($title)
+    {
+        $this->pageTitle = (string) $title;
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -357,7 +357,7 @@ 
 	public function setEditor($editor)
 	{
 		if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
-			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
+			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: ".
 				implode(', ', array_keys($this->editors))
 			);
 		}
@@ -380,7 +380,7 @@ 
 	{
 		$editor = $this->getEditor($file, $line);
 
-		if (empty($editor))	{
+		if (empty($editor)) {
 			return false;
 		}
 

Braces +3 added lines, -1 removed lines

@@ -333,7 +333,9 @@
 
 		$vars = $this->collectionVars();
 		
-		if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
+		if (empty($vars['message'])) {
+		    $vars['message'] = __('exception.noMessage');
+		}
 		
 		$this->template->setVariables($vars);
 		$this->template->render($templatePath);

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

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $comments = $this->comments;
 
         if ($filter !== null) {
-            $comments = array_filter($comments, function ($comment) use ($filter) {
+            $comments = array_filter($comments, function($comment) use ($filter) {
                 return $comment['context'] == $filter;
             });
         }

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

Indentation +142 added lines, -142 removed lines

@@ -31,152 +31,152 @@
  */
 class Supervisor
 {
-	/**
-	 * Get exception. 
-	 * 
-	 * @var \Throwable $exception
-	 */
-	protected $exception;
-
-	/**
-	 * The frame execute errors.
-	 * 
-	 * @var string $frames
-	 */
-	protected $frames;
-
-	/**
-	 * Constructor. The Supervisor class instance.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return string
-	 */
-	public function __construct($exception)
-	{
-		$this->exception = $exception;
-	}
+    /**
+     * Get exception. 
+     * 
+     * @var \Throwable $exception
+     */
+    protected $exception;
+
+    /**
+     * The frame execute errors.
+     * 
+     * @var string $frames
+     */
+    protected $frames;
+
+    /**
+     * Constructor. The Supervisor class instance.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return string
+     */
+    public function __construct($exception)
+    {
+        $this->exception = $exception;
+    }
 	
-	/**
-	 * Returns an iterator for the inspected exception's frames.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return array 
-	 */
-	public function getFrames()
-	{
-		if ($this->frames === null) {
-			$frames = $this->getTrace($this->exception);	
-
-			// Fill empty line/file info for call_user_func_array usages 
-			foreach ($frames as $k => $frame) {
-				if (empty($frame['file'])) {
-					// Default values when file and line are missing
-					$file = '[PHP internal Code]';
-					$line = 0;
-					$next_frame = ! empty($frames[$k + 1]) ? $frames[$k + 1] : [];
-					$frames[$k]['file'] = $file;
-					$frames[$k]['line'] = $line;
-				}
-			}
+    /**
+     * Returns an iterator for the inspected exception's frames.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return array 
+     */
+    public function getFrames()
+    {
+        if ($this->frames === null) {
+            $frames = $this->getTrace($this->exception);	
+
+            // Fill empty line/file info for call_user_func_array usages 
+            foreach ($frames as $k => $frame) {
+                if (empty($frame['file'])) {
+                    // Default values when file and line are missing
+                    $file = '[PHP internal Code]';
+                    $line = 0;
+                    $next_frame = ! empty($frames[$k + 1]) ? $frames[$k + 1] : [];
+                    $frames[$k]['file'] = $file;
+                    $frames[$k]['line'] = $line;
+                }
+            }
 			
-			// Find latest non-error handling frame index ($i) used to remove error handling frames
-			$i = 0;
-
-			foreach ($frames as $k => $frame) {
-				if ($frame['file'] == $this->exception->getFile() && $frame['line'] == $this->exception->getLine()) {
-					$i = $k;
-				}
-			}
-			// Remove error handling frames
-			if ($i > 0) {
-				array_splice($frames, 0, $i);
-			}
+            // Find latest non-error handling frame index ($i) used to remove error handling frames
+            $i = 0;
+
+            foreach ($frames as $k => $frame) {
+                if ($frame['file'] == $this->exception->getFile() && $frame['line'] == $this->exception->getLine()) {
+                    $i = $k;
+                }
+            }
+            // Remove error handling frames
+            if ($i > 0) {
+                array_splice($frames, 0, $i);
+            }
 	
-			$firstFrame = $this->getFrameFromException($this->exception);	
-			array_unshift($frames, $firstFrame);
-
-			$this->frames = new Collection($frames);
-		}
-
-		return $this->frames;
-	}
-
-	/**
-	 * Given an exception, generates an array in the format generated by Exception::getTrace().
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return array
-	 */
-	protected function getFrameFromException(Throwable $exception)
-	{
-		return [
-			'file'  => $exception->getFile(),
-			'line'  => $exception->getLine(),
-			'class' => get_class($exception),
-			'code'  => $exception->getCode(),
-			'args'  => [
-				$exception->getMessage(),
-			],
-		];
-	}
-
-	/**
-	 * Gets exception already specified.
-	 * 
-	 * @return \Throwable
-	 */
-	public function getException()
-	{
-		return $this->exception;
-	}
-
-	/**
-	 * Gets the message of exception.
-	 * 
-	 * @return string
-	 */
-	public function getExceptionMessage()
-	{
-		return $this->exception->getMessage();
-	}
-
-	/**
-	 * Gets the class name of exception.
-	 * 
-	 * @return string
-	 */
-	public function getExceptionName()
-	{
-		return getClass($this->exception);
-	}
+            $firstFrame = $this->getFrameFromException($this->exception);	
+            array_unshift($frames, $firstFrame);
+
+            $this->frames = new Collection($frames);
+        }
+
+        return $this->frames;
+    }
+
+    /**
+     * Given an exception, generates an array in the format generated by Exception::getTrace().
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return array
+     */
+    protected function getFrameFromException(Throwable $exception)
+    {
+        return [
+            'file'  => $exception->getFile(),
+            'line'  => $exception->getLine(),
+            'class' => get_class($exception),
+            'code'  => $exception->getCode(),
+            'args'  => [
+                $exception->getMessage(),
+            ],
+        ];
+    }
+
+    /**
+     * Gets exception already specified.
+     * 
+     * @return \Throwable
+     */
+    public function getException()
+    {
+        return $this->exception;
+    }
+
+    /**
+     * Gets the message of exception.
+     * 
+     * @return string
+     */
+    public function getExceptionMessage()
+    {
+        return $this->exception->getMessage();
+    }
+
+    /**
+     * Gets the class name of exception.
+     * 
+     * @return string
+     */
+    public function getExceptionName()
+    {
+        return getClass($this->exception);
+    }
 	
-	/**
-	 * Gets the backtrace from an exception.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return array
-	 */
-	protected function getTrace($exception)
-	{
-		$traces = $exception->getTrace();
-
-		if ( ! $exception instanceof ErrorException) {
-			return $traces;
-		}
-
-		if ( ! extension_loaded('xdebug') || ! xdebug_is_enabled()) {
-			return [];
-		}
+    /**
+     * Gets the backtrace from an exception.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return array
+     */
+    protected function getTrace($exception)
+    {
+        $traces = $exception->getTrace();
+
+        if ( ! $exception instanceof ErrorException) {
+            return $traces;
+        }
+
+        if ( ! extension_loaded('xdebug') || ! xdebug_is_enabled()) {
+            return [];
+        }
 		
-		// Use xdebug to get the full stack trace and remove the shutdown handler stack trace
-		$stack = array_reverse(xdebug_get_function_stack());
-		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		$traces = array_diff_key($stack, $trace);
+        // Use xdebug to get the full stack trace and remove the shutdown handler stack trace
+        $stack = array_reverse(xdebug_get_function_stack());
+        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $traces = array_diff_key($stack, $trace);
 		
-		return $traces;
-	}
+        return $traces;
+    }
 }
\ No newline at end of file

src/components/Debug/Exceptions/Util/TemplateHandler.php

Indentation +240 added lines, -240 removed lines

@@ -32,283 +32,283 @@
  */
 class TemplateHandler
 {
-	/**
-	 * Benchmark instance.
-	 * 
-	 * @var string $benchmark
-	 */
-	protected $benchmark;
+    /**
+     * Benchmark instance.
+     * 
+     * @var string $benchmark
+     */
+    protected $benchmark;
 
-	/**
-	 * Nesting level of the output buffering mechanism.
-	 *
-	 * @var string $obLevel
-	 */
-	public $obLevel;
+    /**
+     * Nesting level of the output buffering mechanism.
+     *
+     * @var string $obLevel
+     */
+    public $obLevel;
 	
-	/**
-	 * The functions of system what control errors and exceptions.
-	 * 
-	 * @var string $system
-	 */
-	protected $system;
+    /**
+     * The functions of system what control errors and exceptions.
+     * 
+     * @var string $system
+     */
+    protected $system;
 	
-	/**
-	 * An array of variables to be passed to all templates.
-	 * 
-	 * @var array $variables
-	 */
-	protected $variables = [];
+    /**
+     * An array of variables to be passed to all templates.
+     * 
+     * @var array $variables
+     */
+    protected $variables = [];
 
-	/**
-	 * Constructor. The TemplateHandler class instance.
-	 * 
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->system    = new System;
-		$this->benchmark = new Benchmark;
-		$this->obLevel   = $this->system->getOutputBufferLevel();
-	}
+    /**
+     * Constructor. The TemplateHandler class instance.
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->system    = new System;
+        $this->benchmark = new Benchmark;
+        $this->obLevel   = $this->system->getOutputBufferLevel();
+    }
 
-	/**
-	 * Clean Path: This makes nicer looking paths for the error output.
-	 *
-	 * @param  string  $file
-	 *
-	 * @return string
-	 */
-	public function cleanPath($file)
-	{
-		if (strpos($file, APP_PATH) === 0) {
-			$file = 'APP_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(APP_PATH));
-		} elseif (strpos($file, SYS_PATH) === 0) {
-			$file = 'SYS_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SYS_PATH));
-		} elseif (strpos($file, CON_PATH) === 0) {
-			$file = 'CON_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(CON_PATH));
-		} elseif (strpos($file, RES_PATH) === 0) {
-			$file = 'RES_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(RES_PATH));
-		}
+    /**
+     * Clean Path: This makes nicer looking paths for the error output.
+     *
+     * @param  string  $file
+     *
+     * @return string
+     */
+    public function cleanPath($file)
+    {
+        if (strpos($file, APP_PATH) === 0) {
+            $file = 'APP_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(APP_PATH));
+        } elseif (strpos($file, SYS_PATH) === 0) {
+            $file = 'SYS_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SYS_PATH));
+        } elseif (strpos($file, CON_PATH) === 0) {
+            $file = 'CON_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(CON_PATH));
+        } elseif (strpos($file, RES_PATH) === 0) {
+            $file = 'RES_PATH'.DIRECTORY_SEPARATOR.substr($file, strlen(RES_PATH));
+        }
 
-		return $file;
-	}
+        return $file;
+    }
 
-	/**
-	 * Display memory usage in real-world units. Intended for use
-	 * with memory_get_usage, etc.
-	 *
-	 * @param  int  $bytes
-	 *
-	 * @return string
-	 */
-	public function displayMemory(int $bytes)
-	{
-		if ($bytes < 1024) {
-			return $bytes.'B';
-		} else if ($bytes < 1048576) {
-			return round($bytes/1024, 2).'KB';
-		}
+    /**
+     * Display memory usage in real-world units. Intended for use
+     * with memory_get_usage, etc.
+     *
+     * @param  int  $bytes
+     *
+     * @return string
+     */
+    public function displayMemory(int $bytes)
+    {
+        if ($bytes < 1024) {
+            return $bytes.'B';
+        } else if ($bytes < 1048576) {
+            return round($bytes/1024, 2).'KB';
+        }
 
-		return round($bytes/1048576, 2).'MB';
-	}
+        return round($bytes/1048576, 2).'MB';
+    }
 	
-	/**
-	 * Format the given value into a human readable string.
-	 * 
-	 * @param  mixed  $value
-	 * 
-	 * @return string
-	 */
-	public function dump($value)
-	{
-		return htmlspecialchars(print_r($value, true));
-	}
+    /**
+     * Format the given value into a human readable string.
+     * 
+     * @param  mixed  $value
+     * 
+     * @return string
+     */
+    public function dump($value)
+    {
+        return htmlspecialchars(print_r($value, true));
+    }
 	
-	/**
-	 * Format the args of the given Frame as a human readable html string.
-	 * 
-	 * @param  \Syscodes\Debug\FrameHandler\Frame  $frame
-	 * 
-	 * @return string  The rendered html
-	 */
-	public function dumpArgs(Frame $frame)
-	{
-		$html      = '';
-		$numFrames = count($frame->getArgs());
+    /**
+     * Format the args of the given Frame as a human readable html string.
+     * 
+     * @param  \Syscodes\Debug\FrameHandler\Frame  $frame
+     * 
+     * @return string  The rendered html
+     */
+    public function dumpArgs(Frame $frame)
+    {
+        $html      = '';
+        $numFrames = count($frame->getArgs());
 		
-		if ($numFrames > 0) {
-			$html = '<ol class="linenums">';
+        if ($numFrames > 0) {
+            $html = '<ol class="linenums">';
 			
-			foreach ($frame->getArgs() as $j => $frameArg) {
-				$html .= '<li>'.$this->dump($frameArg).'</li>';
-			}
+            foreach ($frame->getArgs() as $j => $frameArg) {
+                $html .= '<li>'.$this->dump($frameArg).'</li>';
+            }
 			
-			$html .= '</ol>';
-		}
+            $html .= '</ol>';
+        }
 		
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Escapes a string for output in an HTML document.
-	 * 
-	 * @param  string  $text
-	 * 
-	 * @return string
-	 */
-	public function escape($text)
-	{
-		$flags = ENT_QUOTES;
+    /**
+     * Escapes a string for output in an HTML document.
+     * 
+     * @param  string  $text
+     * 
+     * @return string
+     */
+    public function escape($text)
+    {
+        $flags = ENT_QUOTES;
 		
-		// HHVM has all constants defined, but only ENT_IGNORE
-		// works at the moment
-		if (defined("ENT_SUBSTITUTE") && ! defined("HHVM_VERSION")) {
-			$flags |= ENT_SUBSTITUTE;
-		} else {
-			$flags |= ENT_IGNORE;
-		}
+        // HHVM has all constants defined, but only ENT_IGNORE
+        // works at the moment
+        if (defined("ENT_SUBSTITUTE") && ! defined("HHVM_VERSION")) {
+            $flags |= ENT_SUBSTITUTE;
+        } else {
+            $flags |= ENT_IGNORE;
+        }
 		
-		$text = str_replace(chr(9), '    ', $text);
+        $text = str_replace(chr(9), '    ', $text);
 		
-		return htmlspecialchars($text, $flags, "UTF-8");
-	}
+        return htmlspecialchars($text, $flags, "UTF-8");
+    }
 
-	/**
-	 * Returns all variables for this helper.
-	 * 
-	 * @return array
-	 */
-	public function getVariables()
-	{
-		return $this->variables;
-	}
+    /**
+     * Returns all variables for this helper.
+     * 
+     * @return array
+     */
+    public function getVariables()
+    {
+        return $this->variables;
+    }
 
-	/**
-	 * Creates a syntax-highlighted version of a PHP file.
-	 *
-	 * @param  string  $file
-	 * @param  int     $lineNumber
-	 * @param  int     $lines
-	 *
-	 * @return bool|string
-	 * 
-	 * @throws \Exception
-	 */
-	public function highlightFile($file, $lineNumber, $lines = 15)
-	{
-		if (empty ($file) || ! is_readable($file)) {
-			return false;
-		}
+    /**
+     * Creates a syntax-highlighted version of a PHP file.
+     *
+     * @param  string  $file
+     * @param  int     $lineNumber
+     * @param  int     $lines
+     *
+     * @return bool|string
+     * 
+     * @throws \Exception
+     */
+    public function highlightFile($file, $lineNumber, $lines = 15)
+    {
+        if (empty ($file) || ! is_readable($file)) {
+            return false;
+        }
 
-		// Set our highlight colors:
-		if (function_exists('ini_set')) {
-			ini_set('highlight.comment', '#C5C5C5');
-			ini_set('highlight.default', '#5399BA');
-			ini_set('highlight.html', '#06B');
-			ini_set('highlight.keyword', '#7081A5;');
-			ini_set('highlight.string', '#d8A134');
-		}
+        // Set our highlight colors:
+        if (function_exists('ini_set')) {
+            ini_set('highlight.comment', '#C5C5C5');
+            ini_set('highlight.default', '#5399BA');
+            ini_set('highlight.html', '#06B');
+            ini_set('highlight.keyword', '#7081A5;');
+            ini_set('highlight.string', '#d8A134');
+        }
 
-		try {
-			$origin = file_get_contents($file);
-		} catch (Exception $e) {
-			return false;
-		}
+        try {
+            $origin = file_get_contents($file);
+        } catch (Exception $e) {
+            return false;
+        }
 
-		$origin  = str_replace(["\r\n", "\r"], "\n", $origin);
-		$origin  = explode("\n", highlight_string($origin , true));
-		$origin  = str_replace('<br />', "\n", $origin [1]);
+        $origin  = str_replace(["\r\n", "\r"], "\n", $origin);
+        $origin  = explode("\n", highlight_string($origin , true));
+        $origin  = str_replace('<br />', "\n", $origin [1]);
 
-		$origin  = explode("\n", str_replace("\r\n", "\n", $origin));
+        $origin  = explode("\n", str_replace("\r\n", "\n", $origin));
 
-		// Get just the part to show
-		$start = $lineNumber - (int)round($lines / 2);
-		$start = $start < 0 ? 0 : $start;
+        // Get just the part to show
+        $start = $lineNumber - (int)round($lines / 2);
+        $start = $start < 0 ? 0 : $start;
 
-		// Get just the lines we need to display, while keeping line numbers...
-		$origin  = array_splice($origin, $start, $lines, true);
+        // Get just the lines we need to display, while keeping line numbers...
+        $origin  = array_splice($origin, $start, $lines, true);
 
-		// Used to format the line number in the source
-		$format = '% '.strlen($start + $lines).'d';
+        // Used to format the line number in the source
+        $format = '% '.strlen($start + $lines).'d';
 
-		$out = '';
-		// Because the highlighting may have an uneven number
-		// of open and close span tags on one line, we need
-		// to ensure we can close them all to get the lines
-		// showing correctly.
-		$spans = 1;
+        $out = '';
+        // Because the highlighting may have an uneven number
+        // of open and close span tags on one line, we need
+        // to ensure we can close them all to get the lines
+        // showing correctly.
+        $spans = 1;
 
-		foreach ($origin as $n => $row) {
-			$spans += substr_count($row, '<span') - substr_count($row, '</span');
-			$row = str_replace(["\r", "\n"], ['', ''], $row);
+        foreach ($origin as $n => $row) {
+            $spans += substr_count($row, '<span') - substr_count($row, '</span');
+            $row = str_replace(["\r", "\n"], ['', ''], $row);
 
-			if (($n+$start+1) == $lineNumber) {
-				preg_match_all('#<[^>]+>#', $row, $tags);
-				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
-						$n + $start + 1,
-						strip_tags($row),
-						implode('', $tags[0])
-				);
-			} else {
-				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start +1, $row) ."\n";
-			}
-		}
+            if (($n+$start+1) == $lineNumber) {
+                preg_match_all('#<[^>]+>#', $row, $tags);
+                $out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
+                        $n + $start + 1,
+                        strip_tags($row),
+                        implode('', $tags[0])
+                );
+            } else {
+                $out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start +1, $row) ."\n";
+            }
+        }
 
-		$out .= str_repeat('</span>', $spans);
+        $out .= str_repeat('</span>', $spans);
 
-		return '<pre class="code-blocks"><code>'.$out.'</code></pre>';
-	}
+        return '<pre class="code-blocks"><code>'.$out.'</code></pre>';
+    }
 
-	/**
-	 * Sets the variables to be passed to all templates rendered 
-	 * by this template helper.
-	 * 
-	 * @param  array  $variables
-	 * 
-	 * @return void
-	 */
-	public function setVariables(array $variables)
-	{
-		$this->variables = $variables;
-	}
+    /**
+     * Sets the variables to be passed to all templates rendered 
+     * by this template helper.
+     * 
+     * @param  array  $variables
+     * 
+     * @return void
+     */
+    public function setVariables(array $variables)
+    {
+        $this->variables = $variables;
+    }
 
-	/**
-	 * Convert a string to a slug version of itself.
-	 * 
-	 * @param  string  $original
-	 * 
-	 * @return string
-	 */
-	public function slug($original)
-	{
-		$slug = str_replace(" ", "-", $original);
-		$slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
+    /**
+     * Convert a string to a slug version of itself.
+     * 
+     * @param  string  $original
+     * 
+     * @return string
+     */
+    public function slug($original)
+    {
+        $slug = str_replace(" ", "-", $original);
+        $slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
 
-		return strtolower($slug);
-	}
+        return strtolower($slug);
+    }
 
-	/**
-	 * Given an exception and status code will display the error to the client.
-	 *
-	 * @param  string  $template
-	 * 
-	 * @return void
-	 */
-	public function render($template)
-	{
-		$vars = $this->getVariables();
+    /**
+     * Given an exception and status code will display the error to the client.
+     *
+     * @param  string  $template
+     * 
+     * @return void
+     */
+    public function render($template)
+    {
+        $vars = $this->getVariables();
 
-		$vars['template'] = $this;
+        $vars['template'] = $this;
 		
-		if ($this->system->getOutputBufferLevel() > $this->obLevel + 1) {
-			@$this->system->endOutputBuffering();
-		}
+        if ($this->system->getOutputBufferLevel() > $this->obLevel + 1) {
+            @$this->system->endOutputBuffering();
+        }
 
-		// Instantiate the error view and prepare the vars
-		call_user_func(function () {
-			extract(func_get_arg(1));
-			include func_get_arg(0);
-		}, $template, $vars);
-	}
+        // Instantiate the error view and prepare the vars
+        call_user_func(function () {
+            extract(func_get_arg(1));
+            include func_get_arg(0);
+        }, $template, $vars);
+    }
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -107,10 +107,10 @@ 
 		if ($bytes < 1024) {
 			return $bytes.'B';
 		} else if ($bytes < 1048576) {
-			return round($bytes/1024, 2).'KB';
+			return round($bytes / 1024, 2).'KB';
 		}
 
-		return round($bytes/1048576, 2).'MB';
+		return round($bytes / 1048576, 2).'MB';
 	}
 	
 	/**
@@ -217,17 +217,17 @@ 
 		}
 
 		$origin  = str_replace(["\r\n", "\r"], "\n", $origin);
-		$origin  = explode("\n", highlight_string($origin , true));
+		$origin  = explode("\n", highlight_string($origin, true));
 		$origin  = str_replace('<br />', "\n", $origin [1]);
 
 		$origin  = explode("\n", str_replace("\r\n", "\n", $origin));
 
 		// Get just the part to show
-		$start = $lineNumber - (int)round($lines / 2);
+		$start = $lineNumber - (int) round($lines / 2);
 		$start = $start < 0 ? 0 : $start;
 
 		// Get just the lines we need to display, while keeping line numbers...
-		$origin  = array_splice($origin, $start, $lines, true);
+		$origin = array_splice($origin, $start, $lines, true);
 
 		// Used to format the line number in the source
 		$format = '% '.strlen($start + $lines).'d';
@@ -243,7 +243,7 @@ 
 			$spans += substr_count($row, '<span') - substr_count($row, '</span');
 			$row = str_replace(["\r", "\n"], ['', ''], $row);
 
-			if (($n+$start+1) == $lineNumber) {
+			if (($n + $start + 1) == $lineNumber) {
 				preg_match_all('#<[^>]+>#', $row, $tags);
 				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
 						$n + $start + 1,
@@ -251,7 +251,7 @@ 
 						implode('', $tags[0])
 				);
 			} else {
-				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start +1, $row) ."\n";
+				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start + 1, $row)."\n";
 			}
 		}
 
@@ -283,7 +283,7 @@ 
 	public function slug($original)
 	{
 		$slug = str_replace(" ", "-", $original);
-		$slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
+		$slug = preg_replace('/[^\w\d\-\_]/i', ' ', $slug);
 
 		return strtolower($slug);
 	}
@@ -306,7 +306,7 @@ 
 		}
 
 		// Instantiate the error view and prepare the vars
-		call_user_func(function () {
+		call_user_func(function() {
 			extract(func_get_arg(1));
 			include func_get_arg(0);
 		}, $template, $vars);

src/components/Debug/Benchmark.php

Indentation +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
         $seconds  = (int) ($duration - $hours * 60 * 60 - $minutes * 60); 
         
         if ($seconds <= 0) {
-           return ' ms';
+            return ' ms';
         } elseif ($seconds > 0) {
             return ' s';
         }

src/components/Filesystem/Filesystem.php

Indentation +805 added lines, -805 removed lines

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

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();

src/components/Filesystem/FileMimeType.php

Indentation +50 added lines, -50 removed lines

@@ -30,61 +30,61 @@
  */
 class FileMimeType
 {
-	/**
-	 * Map of extensions to mime types.
-	 *
-	 * @var array $mimes
-	 */
-	public static $mimes = [];
+    /**
+     * Map of extensions to mime types.
+     *
+     * @var array $mimes
+     */
+    public static $mimes = [];
 
-	/**
-	 * Constructor with an optional verification that the path is 
-	 * really a mimes.
-	 *
-	 * @return mixed
-	 */
-	public function __construct()
-	{
-		static::$mimes = (array) require CON_PATH.'mimes.php';
-	}
+    /**
+     * Constructor with an optional verification that the path is 
+     * really a mimes.
+     *
+     * @return mixed
+     */
+    public function __construct()
+    {
+        static::$mimes = (array) require CON_PATH.'mimes.php';
+    }
 
-	/**
-	 * Attempts to determine the best mime type for the given file extension.
-	 *
-	 * @param  string  $extension
-	 *
-	 * @return string|null  The mime type found, or none if unable to determine
-	 */
-	public static function guessTypeFromExtension($extension)
-	{
-		$extension = trim(strtolower($extension), '. ');
+    /**
+     * Attempts to determine the best mime type for the given file extension.
+     *
+     * @param  string  $extension
+     *
+     * @return string|null  The mime type found, or none if unable to determine
+     */
+    public static function guessTypeFromExtension($extension)
+    {
+        $extension = trim(strtolower($extension), '. ');
 
-		if ( ! array_key_exists($extension, static::$mimes)) {
-			return null;
-		}
+        if ( ! array_key_exists($extension, static::$mimes)) {
+            return null;
+        }
 		
-		return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
-	}
+        return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
+    }
 
-	/**
-	 * Attempts to determine the best file extension for a given mime type.
-	 *
-	 * @param  string  $type
-	 *
-	 * @return string|null The extension determined, or null if unable to match
-	 */
-	public static function guessExtensionFromType($type)
-	{
-		$type = trim(strtolower($type), '. ');
+    /**
+     * Attempts to determine the best file extension for a given mime type.
+     *
+     * @param  string  $type
+     *
+     * @return string|null The extension determined, or null if unable to match
+     */
+    public static function guessExtensionFromType($type)
+    {
+        $type = trim(strtolower($type), '. ');
 
-		foreach (static::$mimes as $ext => $types) {
-			if (is_string($types) && $types == $type) {
-				return $ext;
-			} elseif (is_array($types) && in_array($type, $types)) {
-				return $ext;
-			}
-		}
+        foreach (static::$mimes as $ext => $types) {
+            if (is_string($types) && $types == $type) {
+                return $ext;
+            } elseif (is_array($types) && in_array($type, $types)) {
+                return $ext;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }
\ No newline at end of file