lenevor / syscodes

src/components/Debug/ExceptionHandler.php

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
 
         $caughtLength = $this->caughtLength = 0;
 
-        ob_start(function ($buffer) {
+        ob_start(function($buffer) {
 
             $this->caughtBuffer = $buffer;
 
@@ -173,7 +173,7 @@ 
 
         if (isset($this->caughtBuffer[0]))
         {
-            ob_start(function ($buffer) {
+            ob_start(function($buffer) {
 
                 if ($this->caughtLength)
                 {
@@ -488,7 +488,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)

Braces +10 added lines, -20 removed lines

@@ -200,8 +200,7 @@ 
         {
             ($this->handler)($exception);
             $caughtLength = $this->caughtLength;
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ( ! $caughtLength)
             {
@@ -358,8 +357,7 @@ 
 
                 $content .= "</table>\n</div>\n";
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($this->debug)
             {
@@ -368,8 +366,7 @@ 
                     $e->getClass(),
                     $this->escapeHtml($e->getMessage())
                 );
-            }
-            else
+            } else
             {
                 $title = 'Whoops, looks like something went wrong';
             }
@@ -501,14 +498,12 @@ 
             }
 
             $data = strstr($frmt[0], ['%f' => $file, '%l' => $line]);
-        }
-        else
+        } else
         {
             try
             {
                 $data = $frmt->format($file, $line);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', 
                         $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
@@ -535,24 +530,19 @@ 
             if ($value[0] === 'object')
             {
                 $formatValue = sprintf('<em>(Object)</em>%s', $this->formatClass($value[1]));
-            }
-            elseif ($value[0] === 'array')
+            } elseif ($value[0] === 'array')
             {
                 $formatValue = sprintf('<em>(array)</em>%s', is_array($value[1]) ? $this->formatArgs($value[1]) : $value[1]);
-            }
-            elseif ($value[0] === 'null')
+            } elseif ($value[0] === 'null')
             {
                 $formatValue = '<em>Null</em>';
-            }
-            elseif ($value[0] === 'boolean')
+            } elseif ($value[0] === 'boolean')
             {
                 $formatValue = '<em>'.strtolower(var_export($value[1], true)).'</em>';
-            }
-            elseif ($value[0] === 'resource')
+            } elseif ($value[0] === 'resource')
             {
                 $formatValue = '<em>resource</em>';
-            }
-            else
+            } else
             {
                 $formatValue = str_replace("\n", '', $this->escapeHtml(var_export($value[1], true)));
             }

src/components/Debug/GDebug.php

Indentation +409 added lines, -409 removed lines

@@ -42,428 +42,428 @@
  */
 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 +1 added lines, -1 removed lines

@@ -332,7 +332,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 +2 added lines, -4 removed lines

@@ -146,8 +146,7 @@ 
 			}
 	
 			$Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally
+		} finally
 		{
 			// Returns the contents of the output buffer
 			$output = $this->system->CleanOutputBuffer();	
@@ -262,8 +261,7 @@ 
 			if ($this->throwExceptions)
 			{
 				throw $exception;
-			}
-			else
+			} else
 			{
 				$this->handleException($exception);
 			}

src/components/Debug/FatalExceptions/FatalThrowableError.php

Braces +2 added lines, -4 removed lines

@@ -56,12 +56,10 @@
         if ($exception instanceof ParseError)
         {
             $severity = E_PARSE;
-        }
-        elseif ($exception instanceof TypeError)
+        } elseif ($exception instanceof TypeError)
         {
             $severity = E_RECOVERABLE_ERROR;
-        }
-        else
+        } else
         {
             $severity = E_ERROR;
         }

src/components/Debug/FatalExceptions/FlattenException.php

Indentation +7 added lines, -7 removed lines

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

Braces +9 added lines, -18 removed lines

@@ -487,43 +487,34 @@
             if ($value instanceof \__PHP_Incomplete_Class)
             {
                 $result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
-            }
-            elseif (is_object($value))
+            } elseif (is_object($value))
             {
                 $result[$key] = ['object', get_class($value)];
-            }
-            elseif (is_array($value))
+            } elseif (is_array($value))
             {
                 if ($level > 10)
                 {
                     $result[$key] = ['array', '*DEEP NESTED ARRAY*'];
-                }
-                else 
+                } else 
                 {
                     $result[$key] = ['array', $this->flattenArgs($value, $level + 1, $count)];
                 }
-            }
-            elseif ($value === null)
+            } elseif ($value === null)
             {
                 $result[$key] = ['null', null];
-            }
-            elseif (is_bool($value))
+            } elseif (is_bool($value))
             {
                 $result[$key] = ['boolean', $value];
-            }
-            elseif (is_int($value))
+            } elseif (is_int($value))
             {
                 $result[$key] = ['integer', $value];
-            }
-            elseif (is_float($value))
+            } elseif (is_float($value))
             {
                 $result[$key] = ['float', $value];
-            }
-            elseif (is_resource($value))
+            } elseif (is_resource($value))
             {
                 $result[$key] = ['resource', get_resource_type($value)];
-            }
-            else
+            } else
             {
                 $result[$key] = ['string', (string) $value];
             }

src/components/Debug/FatalExceptions/FatalErrorException.php

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
             }
 
             $this->setTrace($trace);
-        }
-        elseif (null !== $traceOffset)
+        } elseif (null !== $traceOffset)
         {
             if (function_exists('xdebug_get_function_stack'))
             {
@@ -94,12 +93,10 @@ 
                         {
                             $frame['type'] = '::';
                         }
-                    }
-                    elseif ('dynamic' === $frame['type'])
+                    } elseif ('dynamic' === $frame['type'])
                     {
                         $frame['type'] = '->';
-                    }
-                    elseif ('static' === $frame['type'])
+                    } elseif ('static' === $frame['type'])
                     {
                         $frame['type'] = '::';
                     }
@@ -107,8 +104,7 @@ 
                     if ( ! $traceArgs)
                     {
                         unset($frame['params'], $frame['args']);
-                    }
-                    elseif (isset($frame['params']) && ! $frame['args'])
+                    } elseif (isset($frame['params']) && ! $frame['args'])
                     {
                         $frame['args'] = $frame['params'];
                         unset($frame['params']);
@@ -117,8 +113,7 @@ 
                 
                 unset($frame);
                 $trace = array_reverse($trace);
-            }
-            else
+            } else
             {
                 $trace = [];
             }

src/components/Events/EventServiceProvider.php

Spacing +1 added lines, -1 removed lines

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

src/components/Events/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
             return $this->createClassListener($listener, $wilcard);
         }
 
-        return function ($event, $payload) use ($listener, $wilcard) {
+        return function($event, $payload) use ($listener, $wilcard) {
 
             if ($wilcard)
             {
@@ -158,7 +158,7 @@ 
      */
     public function createClassListener($listener, $wilcard = false)
     {
-        return function ($event, $payload) use ($listener, $wilcard) {
+        return function($event, $payload) use ($listener, $wilcard) {
 
             if ($wilcard)
             {

Braces +3 added lines, -6 removed lines

@@ -98,8 +98,7 @@ 
             if (Str::contains($event, '*'))
             {
                 $this->setupWilcardListen($event, $listener);
-            }
-            else
+            } else
             {
                 $this->listeners[$event][$priority][] = $this->makeListener($listener);
 
@@ -336,8 +335,7 @@ 
         if (is_object($event))
         {
             list($payload, $event) = [[$event], getClass($event, false)];
-        }
-        elseif ( ! is_array($payload))
+        } elseif ( ! is_array($payload))
         {
             $payload = [$payload];
         }
@@ -422,8 +420,7 @@ 
         if (Str::contains($event, '*'))
         {
             unset($this->wilcards[$event]);
-        }
-        else
+        } else
         {
             unset($this->listeners[$event], $this->sorted[$event]);
         }

src/components/Collections/Arr.php

Indentation +398 added lines, -398 removed lines

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

Spacing +2 added lines, -2 removed lines

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

Braces +13 added lines, -11 removed lines

@@ -80,8 +80,7 @@ 
 			if ($values instanceof Collection)
 			{
 				$values = $values->all();
-			}
-			elseif ( ! is_array($values))
+			} elseif ( ! is_array($values))
 			{
 				continue;
 			}
@@ -180,8 +179,7 @@ 
 				if (isset($array[$part]) && is_array($array[$part])) 
 				{
 					$array = &$array[$key];
-				}
-				else
+				} else
 				{
 					continue 2;
 				}
@@ -250,7 +248,9 @@ 
 	{
 		foreach ($array as $key => $value)
 		{ 
-			if (call_user_func($callback, $key, $value)) return $value;
+			if (call_user_func($callback, $key, $value)) {
+			    return $value;
+			}
 		}
 
 		return value($default);
@@ -282,8 +282,7 @@ 
 			if (static::access($array) && static::exists($array, $segm))
 			{
 				$array = $array[$segm];
-			}
-			else
+			} else
 			{
 				return value($default);
 			}
@@ -318,9 +317,13 @@ 
 	 */
 	public static function has($array, $key)
 	{
-		if (empty($array) || is_null($key)) return false;
+		if (empty($array) || is_null($key)) {
+		    return false;
+		}
 		
-		if (array_key_exists($key, $array)) return true;
+		if (array_key_exists($key, $array)) {
+		    return true;
+		}
 		
 		foreach (explode('.', $key) as $segment)
 		{
@@ -392,8 +395,7 @@ 
 		if (func_num_args() == 2)
 		{
 			array_unshift($array, $value);
-		}
-		else
+		} else
 		{
 			$array = [$key => $value] + $array;
 		}

src/components/Collections/Collection.php

Indentation +5 added lines, -5 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -524,7 +524,7 @@ 
             return array_search($value, $this->items, $strict);
         }
 
-        foreach($this->items as $key => $item)
+        foreach ($this->items as $key => $item)
         {
             if ($value($item, $key))
             {
@@ -692,7 +692,7 @@ 
         {
             return $items;
         }
-        elseif($items instanceof Arrayable)
+        elseif ($items instanceof Arrayable)
         {
             return $items->toArray();
         }

Braces +5 added lines, -10 removed lines

@@ -203,8 +203,7 @@ 
         if (is_null($callback))
         {
             return count($this->items) > 0 ? head($this->items) : null;
-        }
-        else
+        } else
         {
             return Arr::first($this->items, $callback, $default);
         }
@@ -691,16 +690,13 @@ 
         if (is_array($items))
         {
             return $items;
-        }
-        elseif($items instanceof Arrayable)
+        } elseif($items instanceof Arrayable)
         {
             return $items->toArray();
-        }
-        elseif ($items instanceof Jsonable)
+        } elseif ($items instanceof Jsonable)
         {
             return json_decode($items->toJson(), true);
-        }
-        elseif ($items instanceof Collection)
+        } elseif ($items instanceof Collection)
         {
             return $items->all();
         }
@@ -783,8 +779,7 @@ 
         if (is_null($offset))
         {
             $this->items[] = $value;
-        }
-        else
+        } else
         {
             $this->items[$offset] = $value;
         }