lenevor / syscodes

src/components/Http/Contributors/Files.php

Indentation +12 added lines, -12 removed lines

@@ -43,22 +43,22 @@
     }
 
     /**
-	 * {@inheritdoc}
-	 */
-	public function replace(array $files = [])
-	{
-		$this->parameters = [];
+     * {@inheritdoc}
+     */
+    public function replace(array $files = [])
+    {
+        $this->parameters = [];
         $this->add($files);
-	}
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function add(array $files = [])
-	{
+    /**
+     * {@inheritdoc}
+     */
+    public function add(array $files = [])
+    {
         foreach ($files as $key => $file)
         {
             $this->set($key, $file);
         }
-	}
+    }
 }
\ No newline at end of file

src/components/Http/Contributors/Status.php

Indentation +86 added lines, -86 removed lines

@@ -30,96 +30,96 @@
  */
 class Status 
 {
-	/**
-	 * The HTTP status code.
-	 *
-	 * @var int $status
-	 */
-	protected $status = 200;
+    /**
+     * The HTTP status code.
+     *
+     * @var int $status
+     */
+    protected $status = 200;
 
-	/**
-	 * An array of status codes and messages.
-	 *
-	 * @var array $statusCode
-	 */
-	public $statusCodes = [
-		// 1xx: Informational
-		100 => 'Continue',
-		101 => 'Switching Protocols',
-		102 => 'Processing',
+    /**
+     * An array of status codes and messages.
+     *
+     * @var array $statusCode
+     */
+    public $statusCodes = [
+        // 1xx: Informational
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
 
-		// 2xx: Success
-		200 => 'OK',
-		201 => 'Created',
-		202 => 'Accepted',
-		203 => 'Non-Authoritative Information',
-		204 => 'No Content',
-		205 => 'Reset Content',
-		206 => 'Partial Content',
-		207 => 'Multi-Status',
-		208 => 'Already Reported',
-		226 => 'IM Used',
+        // 2xx: Success
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status',
+        208 => 'Already Reported',
+        226 => 'IM Used',
 
-		// 3xx: Redirection
-		300 => 'Multiple Choices',
-		301 => 'Moved Permanently',
-		302 => 'Found',
-		303 => 'See Other',
-		304 => 'Not Modified',
-		305 => 'Use Proxy',
-		307 => 'Temporary Redirect',
-		308 => 'Permanent Redirect',
+        // 3xx: Redirection
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
 
-		// 4xx: Client error
-		400 => 'Bad Request',
-		401 => 'Unauthorized',
-		402 => 'Payment Required',
-		403 => 'Forbidden',
-		404 => 'Not Found',
-		405 => 'Method Not Allowed',
-		406 => 'Not Acceptable',
-		407 => 'Proxy Authentication Required',
-		408 => 'Request Timeout',
-		409 => 'Conflict',
-		410 => 'Gone',
-		411 => 'Length Required',
-		412 => 'Precondition Failed',
-		413 => 'Request Entity Too Large',
-		414 => 'Request-URI Too Long',
-		415 => 'Unsupported Media Type',
-		416 => 'Requested Range Not Satisfiable',
-		417 => 'Expectation Failed',
-		418 => 'I\'m a Teapot',
-		// 419 (Authentication Timeout) is a non-standard status code with unknown origin
-		421 => 'Misdirected Request',
-		422 => 'Unprocessable Entity',
-		423 => 'Locked',
-		424 => 'Failed Dependency',
-		426 => 'Upgrade Required',
-		428 => 'Precondition Required',
-		429 => 'Too Many Requests',
-		431 => 'Request Header Fields Too Large',
-		451 => 'Unavailable For Legal Reasons',
+        // 4xx: Client error
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a Teapot',
+        // 419 (Authentication Timeout) is a non-standard status code with unknown origin
+        421 => 'Misdirected Request',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        451 => 'Unavailable For Legal Reasons',
 
-		// 5xx: Server error
-		500 => 'Internal Server Error',
-		501 => 'Not Implemented',
-		502 => 'Bad Gateway',
-		503 => 'Service Unavailable',
-		504 => 'Gateway Timeout',
-		505 => 'HTTP Version Not Supported',
-		506 => 'Variant Also Negotiates',
-		507 => 'Insufficient Storage',
-		508 => 'Loop Detected',
-		509 => 'Bandwidth Limit Exceeded',
-		510 => 'Not Extended',
-		511 => 'Network Authentication Required'
-	];
+        // 5xx: Server error
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        509 => 'Bandwidth Limit Exceeded',
+        510 => 'Not Extended',
+        511 => 'Network Authentication Required'
+    ];
 
-	/**
-	 * Gets string of status code.
-	 * 
-	 * @var string $statusText
-	 */
-	protected $statusText;
+    /**
+     * Gets string of status code.
+     * 
+     * @var string $statusText
+     */
+    protected $statusText;
 }
\ No newline at end of file

src/components/Http/Contributors/Inputs.php

Indentation +36 added lines, -36 removed lines

@@ -34,31 +34,31 @@ 
 final class Inputs extends Parameters
 {
     /**
-	 * {@inheritdoc}
-	 */
-	public function all(string $key = null)
-	{
-		return parent::all($key);
+     * {@inheritdoc}
+     */
+    public function all(string $key = null)
+    {
+        return parent::all($key);
     }
     
     /**
-	 * {@inheritdoc}
-	 */
-	public function replace(array $inputs = [])
-	{
-		$this->parameters = [];
+     * {@inheritdoc}
+     */
+    public function replace(array $inputs = [])
+    {
+        $this->parameters = [];
         $this->add($inputs);
-	}
+    }
 
-	/**
-	 * Adds input values.
+    /**
+     * Adds input values.
      * 
      * @param  array  $inputs
      * 
      * @return mixed
-	 */
-	public function add(array $inputs = [])
-	{
+     */
+    public function add(array $inputs = [])
+    {
         foreach ($inputs as $key => $file)
         {
             $this->set($key, $file);
@@ -66,15 +66,15 @@ 
     }
     
     /**
-	 * Gets a string input value by name.
-	 *
-	 * @param  string  $key
-	 * @param  string|null  $default  (null by default)
-	 *
-	 * @return string|null
-	 */
-	public function get($key, $default = null)
-	{
+     * Gets a string input value by name.
+     *
+     * @param  string  $key
+     * @param  string|null  $default  (null by default)
+     *
+     * @return string|null
+     */
+    public function get($key, $default = null)
+    {
         if (null !== $default && ! is_scalar($default) && ! (is_object($default)) && ! method_exist($default, '__toString'))
         {
             throw new BadRequestHttpException(sprintf('Passing a non-string value as 2nd argument to "%s()" is deprecated, pass a string or null instead', __METHOD__));
@@ -91,20 +91,20 @@ 
     }
     
     /**
-	 * Sets an input by name.
-	 *
-	 * @param  string  $key
-	 * @param  string|array|null  $value 
-	 *
-	 * @return mixed
-	 */
-	public function set($key, $value)
-	{
+     * Sets an input by name.
+     *
+     * @param  string  $key
+     * @param  string|array|null  $value 
+     *
+     * @return mixed
+     */
+    public function set($key, $value)
+    {
         if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exist($value, '__toString'))
         {
             throw new BadRequestHttpException(sprintf('Passing "%s" as a 2nd Argument to "%s()" is deprecated, pass a string, array, or null instead', get_debug_type($value), __METHOD__));
         }
 
-		$this->parameters[$key] = $value;
-	}
+        $this->parameters[$key] = $value;
+    }
 }
\ No newline at end of file

src/components/Http/Contributors/Headers.php

Indentation +220 added lines, -220 removed lines

@@ -34,255 +34,255 @@
  */
 class Headers implements IteratorAggregate, Countable
 {
-	/**
-	 * An array of HTTP headers.
-	 * 
-	 * @var array $herders
-	 */
-	protected $headers = [];
+    /**
+     * An array of HTTP headers.
+     * 
+     * @var array $herders
+     */
+    protected $headers = [];
 	
-	/**
-	 * Specifies the directives for the caching mechanisms in both
-	 * the requests and the responses.
-	 * 
-	 * @var array $cacheControl
-	 */
-	protected $cacheControl = [];
+    /**
+     * Specifies the directives for the caching mechanisms in both
+     * the requests and the responses.
+     * 
+     * @var array $cacheControl
+     */
+    protected $cacheControl = [];
 	
-	/**
-	 * Constructor. The Headers class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $headers = [])
-	{
-		foreach ($headers as $key => $values)
-		{
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Constructor. The Headers class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function __construct(array $headers = [])
+    {
+        foreach ($headers as $key => $values)
+        {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @return array
-	 */
-	public function all()
-	{
-		return $this->headers;
-	}
+    /**
+     * Returns all the headers.
+     * 
+     * @return array
+     */
+    public function all()
+    {
+        return $this->headers;
+    }
 	
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array An array of parameter keys
-	 */
-	public function keys()
-	{
-		return array_keys($this->all());
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array An array of parameter keys
+     */
+    public function keys()
+    {
+        return array_keys($this->all());
+    }
 	
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = [])
-	{
-		$this->headers = [];
-		$this->add($headers);
-	}
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = [])
+    {
+        $this->headers = [];
+        $this->add($headers);
+    }
 	
-	/**
-	 * Adds multiple header to the queue.
-	 * 
-	 * @param  array  $headers  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function add(array $headers)
-	{
-		foreach ($headers as $key => $values)
-		{
-			$this->set($key, $values);
-		}
+    /**
+     * Adds multiple header to the queue.
+     * 
+     * @param  array  $headers  The header name
+     * 
+     * @return mixed
+     */
+    public function add(array $headers)
+    {
+        foreach ($headers as $key => $values)
+        {
+            $this->set($key, $values);
+        }
 		
-		return $this;
-	}
+        return $this;
+    }
 	
-	/**
-	 * Returns the headers, with original capitalizations.
-	 * 
-	 * @return array An array of headers
-	 */
-	public function allPreserveCase()
-	{
-		$headers = [];
+    /**
+     * Returns the headers, with original capitalizations.
+     * 
+     * @return array An array of headers
+     */
+    public function allPreserveCase()
+    {
+        $headers = [];
 		
-		foreach ($this->all() as $name => $value)
-		{
-			$headers[$name] = $value;
-		}
+        foreach ($this->all() as $name => $value)
+        {
+            $headers[$name] = $value;
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 	
-	/**
-	 * Gets a header value by name.
-	 *
-	 * @param  string  $key  The header name, or null for all headers
-	 * @param  string|null  $default  The default value
-	 * @param  bool  $option  Whether to return the option value or all header values (true by default)
-	 *
-	 * @return mixed
-	 */
-	public function get($key, $default =  null, $option = true)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Gets a header value by name.
+     *
+     * @param  string  $key  The header name, or null for all headers
+     * @param  string|null  $default  The default value
+     * @param  bool  $option  Whether to return the option value or all header values (true by default)
+     *
+     * @return mixed
+     */
+    public function get($key, $default =  null, $option = true)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 		
-		$headers = $this->all();
+        $headers = $this->all();
 		
-		if ( ! array_key_exists($key, $headers))
-		{
-			if (null === $default)
-			{
-				return $option ? null : [];
-			}
+        if ( ! array_key_exists($key, $headers))
+        {
+            if (null === $default)
+            {
+                return $option ? null : [];
+            }
 			
-			return $option ? $default : [$default];
-		}
+            return $option ? $default : [$default];
+        }
 		
-		if ($option)
-		{
-			return count($headers[$key]) ? $headers[$key][0] : $default;
-		}
+        if ($option)
+        {
+            return count($headers[$key]) ? $headers[$key][0] : $default;
+        }
 		
-		return $headers[$key];
-	}
+        return $headers[$key];
+    }
 
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten (true by default) / overwritten when it is false
-	 *
-	 * @return $this
-	 */
-	public function set($key, $values, $replace = true)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten (true by default) / overwritten when it is false
+     *
+     * @return $this
+     */
+    public function set($key, $values, $replace = true)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 
-		if (is_array($values))
-		{
-			$values = array_values($values);
+        if (is_array($values))
+        {
+            $values = array_values($values);
 
-			if (true === $replace || ! isset($this->headers[$key]))
-			{
-				$this->headers[$key] = $values;
-			}
-			else
-			{
-				$this->headers[$key] = array_merge($this->headers[$key], $values);
-			}
-		}
-		else
-		{
-			if (true === $replace || ! isset($this->headers[$key]))
-			{
-				$this->headers[$key] = [$values];
-			}
-			else
-			{
-				$this->headers[$key][] = $values;
-			}
-		}
+            if (true === $replace || ! isset($this->headers[$key]))
+            {
+                $this->headers[$key] = $values;
+            }
+            else
+            {
+                $this->headers[$key] = array_merge($this->headers[$key], $values);
+            }
+        }
+        else
+        {
+            if (true === $replace || ! isset($this->headers[$key]))
+            {
+                $this->headers[$key] = [$values];
+            }
+            else
+            {
+                $this->headers[$key][] = $values;
+            }
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Returns true if the HTTP header is defined.
-	 * 
-	 * @param  string  $key  The HTTP header
-	 * 
-	 * @return bool  true if the parameter exists, false otherwise
-	 */
-	public function has($key)
-	{
-		return array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
-	}
+    /**
+     * Returns true if the HTTP header is defined.
+     * 
+     * @param  string  $key  The HTTP header
+     * 
+     * @return bool  true if the parameter exists, false otherwise
+     */
+    public function has($key)
+    {
+        return array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
+    }
 
-	/**
-	 * Removes a header.
-	 * 
-	 * @param  string  $name  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function remove($key)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Removes a header.
+     * 
+     * @param  string  $name  The header name
+     * 
+     * @return mixed
+     */
+    public function remove($key)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 
-		unset($this->headers[$key]);
+        unset($this->headers[$key]);
 
-		if ('cache-control' === $key)
-		{
-			$this->cacheControl = [];
-		}
-	}
+        if ('cache-control' === $key)
+        {
+            $this->cacheControl = [];
+        }
+    }
 	
-	/**
-	 * Returns an iterator for headers.
-	 * 
-	 * @return \ArrayIterator An \ArrayIterator instance
-	 */
-	public function getIterator()
-	{
-		return new ArrayIterator($this->headers);
-	}
+    /**
+     * Returns an iterator for headers.
+     * 
+     * @return \ArrayIterator An \ArrayIterator instance
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->headers);
+    }
 	
-	/**
-	 * Returns the number of headers.
-	 * 
-	 * @return int The number of headers
-	 */
-	public function count()
-	{
-		return count($this->headers);
-	}
+    /**
+     * Returns the number of headers.
+     * 
+     * @return int The number of headers
+     */
+    public function count()
+    {
+        return count($this->headers);
+    }
 	
-	/**
-	 * Returns the headers as a string.
-	 * 
-	 * @return string The headers
-	 */
-	public function __toString()
-	{
-		if ( ! $headers = $this->all())
-		{
-			return '';
-		}
+    /**
+     * Returns the headers as a string.
+     * 
+     * @return string The headers
+     */
+    public function __toString()
+    {
+        if ( ! $headers = $this->all())
+        {
+            return '';
+        }
 		
-		ksort($headers);
-		$max     = max(array_map('strlen', array_keys($headers))) + 1;
-		$content = '';
+        ksort($headers);
+        $max     = max(array_map('strlen', array_keys($headers))) + 1;
+        $content = '';
 		
-		foreach ($headers as $name => $values)
-		{
-			$name = ucwords($name, '-');
+        foreach ($headers as $name => $values)
+        {
+            $name = ucwords($name, '-');
 			
-			foreach ($values as $value)
-			{
-				$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
-			}
-		}
+            foreach ($values as $value)
+            {
+                $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
+            }
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 	 *
 	 * @return mixed
 	 */
-	public function get($key, $default =  null, $option = true)
+	public function get($key, $default = null, $option = true)
 	{
 		$key = str_replace('_', '-', strtolower($key));
 		

Braces +3 added lines, -6 removed lines

@@ -185,19 +185,16 @@
 			if (true === $replace || ! isset($this->headers[$key]))
 			{
 				$this->headers[$key] = $values;
-			}
-			else
+			} else
 			{
 				$this->headers[$key] = array_merge($this->headers[$key], $values);
 			}
-		}
-		else
+		} else
 		{
 			if (true === $replace || ! isset($this->headers[$key]))
 			{
 				$this->headers[$key] = [$values];
-			}
-			else
+			} else
 			{
 				$this->headers[$key][] = $values;
 			}

src/components/Http/Contributors/Parameters.php

Indentation +132 added lines, -132 removed lines

@@ -34,158 +34,158 @@
  */
 class Parameters implements IteratorAggregate, Countable
 {
-	/**
-	 * Array parameters from the Server global.
-	 *
-	 * @var array $parameters
-	 */
-	protected $parameters = [];
+    /**
+     * Array parameters from the Server global.
+     *
+     * @var array $parameters
+     */
+    protected $parameters = [];
 
-	/**
-	 * Parameter Object Constructor.
-	 *
-	 * @param  array  $parameters
-	 *
-	 * @return array
-	 */
-	public function __construct(array $parameters = [])
-	{
-		$this->parameters = $parameters;
-	}
+    /**
+     * Parameter Object Constructor.
+     *
+     * @param  array  $parameters
+     *
+     * @return array
+     */
+    public function __construct(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
 
-	/**
-	 * Returns the parameters.
-	 * 
-	 * @return array
-	 */
-	public function all()
-	{
-		return $this->parameters;
-	}
+    /**
+     * Returns the parameters.
+     * 
+     * @return array
+     */
+    public function all()
+    {
+        return $this->parameters;
+    }
 
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array
-	 */
-	public function keys()
-	{
-		return array_keys($this->parameters);
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array
+     */
+    public function keys()
+    {
+        return array_keys($this->parameters);
+    }
 
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return array
-	 */
-	public function replace(array $parameters = [])
-	{
-		$this->parameters = $parameters;
-	}
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return array
+     */
+    public function replace(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
 
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return array
-	 */
-	public function add(array $parameters = [])
-	{
-		$this->parameters = array_replace($this->parameters, $parameters);
-	}
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return array
+     */
+    public function add(array $parameters = [])
+    {
+        $this->parameters = array_replace($this->parameters, $parameters);
+    }
 
-	/**
-	 * Get a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string|null  $default  (null by default) 
-	 *
-	 * @return mixed
-	 */
-	public function get($key, $default = null)
-	{
-		if (Arr::exists($this->parameters, $key))
-		{
-			return $this->parameters[$key];
-		}
+    /**
+     * Get a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string|null  $default  (null by default) 
+     *
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        if (Arr::exists($this->parameters, $key))
+        {
+            return $this->parameters[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Check if a parameter array item exists.
-	 *
-	 * @param  string  $key
-	 *
-	 * @return mixed
-	 */
-	public function has($key)
-	{
-		return Arr::exists($this->parameters, $key);
-	}
+    /**
+     * Check if a parameter array item exists.
+     *
+     * @param  string  $key
+     *
+     * @return mixed
+     */
+    public function has($key)
+    {
+        return Arr::exists($this->parameters, $key);
+    }
 
-	/**
-	 * Set a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string  $value 
-	 *
-	 * @return mixed
-	 */
-	public function set($key, $value)
-	{
-		$this->parameters[$key] = $value;
-	}
+    /**
+     * Set a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string  $value 
+     *
+     * @return mixed
+     */
+    public function set($key, $value)
+    {
+        $this->parameters[$key] = $value;
+    }
 
-	/**
-	 * Remove a parameter array item.
-	 *
-	 * @param  string  $key 
-	 *
-	 * @return void
-	 */
-	public function remove($key)
-	{
-		if ($this->has($key))
-		{
-			unset($this->parameters[$key]);
-		}
-	}
+    /**
+     * Remove a parameter array item.
+     *
+     * @param  string  $key 
+     *
+     * @return void
+     */
+    public function remove($key)
+    {
+        if ($this->has($key))
+        {
+            unset($this->parameters[$key]);
+        }
+    }
 
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| IteratorAggregate Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Retrieve an external iterator.
-	 * 
-	 * @see    \IteratorAggregate::getIterator
-	 * 
-	 * @return new \ArrayIterator
-	 */
-	public function getIterator()
-	{
-		return new ArrayIterator($this->parameters);
-	}
+    /**
+     * Retrieve an external iterator.
+     * 
+     * @see    \IteratorAggregate::getIterator
+     * 
+     * @return new \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->parameters);
+    }
 	
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| Countable Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Returns the number of parameters.
-	 * 
-	 * @return int The number of parameters
-	 */
-	public function count()
-	{
-		return count($this->parameters);
-	}
+    /**
+     * Returns the number of parameters.
+     * 
+     * @return int The number of parameters
+     */
+    public function count()
+    {
+        return count($this->parameters);
+    }
 }
\ No newline at end of file

src/components/Translation/Translator.php

Indentation +5 added lines, -5 removed lines

@@ -62,11 +62,11 @@
      */
     protected $locale;
 
-     /**
-     * Boolean value whether the intl libraries exist on the system.
-     * 
-     * @var bool $intlSupport
-     */
+        /**
+         * Boolean value whether the intl libraries exist on the system.
+         * 
+         * @var bool $intlSupport
+         */
     protected $intlSupport = false;
 
     /**

src/components/Translation/TranslationServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function register()
     {
-        $this->app->singleton('translator', function () {
+        $this->app->singleton('translator', function() {
             
             $locale = $this->app['config']['app.locale'];
             

src/components/Console/Cli.php

Spacing +3 added lines, -3 removed lines

@@ -210,7 +210,7 @@ 
  			throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
  		}
 
- 		if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background))
+ 		if ($background !== null && ! Arr::exists(static::$backgroundColors, $background))
  		{
  			throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
  		}
@@ -356,11 +356,11 @@ 
 
 			$first = true;
 
-			array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
+			array_walk($lines, function(&$line, $index) use ($pad_left, &$first) {
 
 				if ( ! $first)
 				{
-					$line = str_repeat(' ', $pad_left) . $line;
+					$line = str_repeat(' ', $pad_left).$line;
 				}
 				else
 				{

Braces +5 added lines, -10 removed lines

@@ -361,8 +361,7 @@ 
 				if ( ! $first)
 				{
 					$line = str_repeat(' ', $pad_left) . $line;
-				}
-				else
+				} else
 				{
 					$first = false;
 				}
@@ -595,8 +594,7 @@ 
 			if ($default !== null)
 			{
 				$extra_output = ' [ Default: "'.$default.'" ]';
-			}
-			elseif ($options !== [])
+			} elseif ($options !== [])
 			{
 				$extra_output = ' [ '.implode(' | ', $options).' ]';
 			}
@@ -644,8 +642,7 @@ 
  			{
  				unset(static::$options[$name]);
  			}
- 		}
- 		else
+ 		} else
  		{
  			static::$options[$name] = $value;
  		}
@@ -674,14 +671,12 @@ 
  			}
 
  			static::write();
- 		}
- 		else
+ 		} else
  		{
  			if ($seconds = 0)
  			{
  				sleep($seconds);
- 			}
- 			else
+ 			} else
  			{
  				static::write(static::$waitMsg);
  				static::input();

Indentation +758 added lines, -758 removed lines

@@ -34,773 +34,773 @@
  */
 class Cli
 {
-	/**
- 	 * Background color identifier.
- 	 *
- 	 * @var array $backgroundColors
- 	 */
- 	protected static $backgroundColors = [
- 		'black'      => '40',
- 		'red'        => '41',
- 		'green'      => '42',
- 		'yellow'     => '43',
- 		'blue'       => '44',
- 		'magenta'    => '45',
- 		'cyan'       => '46',
- 		'light_gray' => '47'
- 	];
-
-	/**
-	 * Foreground color identifier.
- 	 *
- 	 * @var array $foregroundColors
-	 */
-	protected static $foregroundColors = [
-		'black'         => '0;30',
-		'dark_gray'     => '1;30',
-		'blue'          => '0;34',
-		'dark_blue'     => '1;34',
-		'light_blue'    => '1;34',
-		'green'         => '0;32',
-		'light_green'   => '1;32',
-		'cyan'          => '0;36', 
-		'light_cyan'    => '1;36',
-		'red'           => '0;31',
-		'light_red'     => '1;31',
-		'purple'        => '0;35',
-		'light_purple'  => '1;35',
-		'light_yellow'  => '0;33',
-		'yellow'        => '1;33',
-		'light_gray'    => '0;37',
-		'white'         => '1;37'
- 	];
-
-	/**
-	 * Indicates that you do not use any color for foreground or background.
-	 *
-	 * @var bool $noColor
-	 */
-	public static $noColor = false;
-
-	/**
-	 * String of arguments to be used in console.
-	 *
-	 * @var array $options
-	 */
-	protected static $options = [];
-
-	/**
-	 * Readline Support for command line.
-	 *
-	 * @var bool $readlineSupport
-	 */
-	public static $readlineSupport = false;
-
-	/**
-	 * List of array segments.
-	 *
-	 * @var array $segments
-	 */
-	protected static $segments = [];
-
- 	/**
- 	 * The standar STDERR is where the application writes its error messages.
- 	 *
- 	 * @var string $stderr 
- 	 */
- 	protected static $stderr;
-
- 	/**
- 	 * The estandar STDOUT is where the application records its output messages.
- 	 *
- 	 * @var string $stdout
- 	 */
- 	protected static $stdout;
-
- 	/**
-	 * Message that tells the user that he is waiting to receive an order.
-	 *
-	 * @var string $waitMsg
-	 */
-	public static $waitMsg = 'Press any key to continue...';
-
-	/**
-	 * Static constructor. Parses all the CLI params.
-	 * 
-	 * @return string
-	 * 
-	 * @uses   \Syscodes\Contracts\Core\Lenevor
-	 * 
-	 * @throws \Exception
-	 */
- 	public static function initialize(Lenevor $core)
- 	{
- 		if ( ! $core->initCli())
- 		{
-			throw new Exception('Cli class cannot be used outside of the command line');
- 		}
-
- 		// Readline is an extension for PHP that makes interactive the command console
- 		static::$readlineSupport = extension_loaded('readline');
-
- 		// clear segments & options to keep testing clean
- 		static::$options  = [];
- 		static::$segments = [];
-
- 		static::parseCommandLine();
-
- 		// Writes its error messages
- 		static::$stderr = STDERR;
-
- 		// Records its output messages
- 		static::$stdout = STDOUT;
- 	}
-
- 	/**
- 	 * Beeps a certain number of times.
-	 *
-	 * @param  int  $num  The number of times to beep
-	 *
- 	 * @return int
- 	 */
- 	public static function bell(int $num = 1)
- 	{
- 		echo str_repeat("\x07", $num);
- 	}
-
- 	/**
- 	 * Clears the screen of output.
- 	 *
- 	 * @return void
- 	 */
- 	public static function clearScreen()
- 	{
- 		static::isWindows() 
-
- 			// Windows doesn't work for this, but their terminal is tiny so shove this in
- 			? static::newLine(40)
-
- 			// Anything with a flair of Unix will handle these magic characters
- 			: fwrite(static::$stdout, chr(27)."[H".chr(27)."[2J");
- 	}
-
- 	/**
- 	 * Returns the given text with the correct color codes for a foreground and
-	 * optionally a background color.
- 	 *
- 	 * @param  string  $text  The text to color
- 	 * @param  string  $foreground  The foreground color
- 	 * @param  string  $background  The background color
- 	 * @param  string  $format  Other formatting to apply. Currently only 'underline' is understood
- 	 *
- 	 * @return string  The color coded string
- 	 *
- 	 * @throws \Syscodes\Core\Exceptions\LenevorException
- 	 */
- 	public static function color(string $text, string $foreground, string $background = null, string $format = null)
- 	{
- 		if (static::$noColor)
- 		{
- 			return $text;
- 		}
-
- 		if ( ! Arr::exists(static::$foregroundColors, $foreground))
- 		{
- 			throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
- 		}
-
- 		if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background))
- 		{
- 			throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
- 		}
-
- 		$string = "\033[".static::$foregroundColors[$foreground]."m";
-
- 		if ($background !== null)
- 		{
- 			$string .= "\033[".static::$backgroundColors[$background]."m";
- 		}
-
- 		if ($format === 'underline')
- 		{
- 			$string .= "\033[4m";
- 		}
-
- 		$string .= $text."\033[0m";
-
- 		return $string;
- 	}
-
- 	/**
- 	 * Get the number of characters in a string.
- 	 *
- 	 * @param  string  $string
- 	 *
- 	 * @return int
- 	 */
- 	public static function strlen(?string $string)
- 	{
- 		if (is_null($string))
- 		{
- 			return 0;
- 		}
-
- 		foreach (static::$foregroundColors as $color)
- 		{
- 			$string = strtr($string, ["\033[".$color.'m' => '']);
- 		}
-
- 		foreach (static::$backgroundColors as $color)
- 		{
- 			$string = strtr($string, ["\033[".$color.'m' => '']);
- 		}
-
- 		$string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
-
- 		return mb_strlen($string);
- 	}
-
- 	/**
- 	 * Outputs an error to the CLI using STDERR instead of STDOUT.
- 	 *
- 	 * @param  string|array  $text  The text to output, or array of errors
- 	 * @param  string  $foreground  The foreground color
- 	 * @param  string|null  $background  the background color
- 	 *
- 	 * @return string
- 	 */
- 	public static function error(string $text = '', string $foreground = 'light_red', string $background = null)
- 	{
-		if (is_array($text))
-		{
-			$text = implode(PHP_EOL, $text);
-		}
+    /**
+     * Background color identifier.
+     *
+     * @var array $backgroundColors
+     */
+        protected static $backgroundColors = [
+            'black'      => '40',
+            'red'        => '41',
+            'green'      => '42',
+            'yellow'     => '43',
+            'blue'       => '44',
+            'magenta'    => '45',
+            'cyan'       => '46',
+            'light_gray' => '47'
+        ];
+
+    /**
+     * Foreground color identifier.
+     *
+     * @var array $foregroundColors
+     */
+    protected static $foregroundColors = [
+        'black'         => '0;30',
+        'dark_gray'     => '1;30',
+        'blue'          => '0;34',
+        'dark_blue'     => '1;34',
+        'light_blue'    => '1;34',
+        'green'         => '0;32',
+        'light_green'   => '1;32',
+        'cyan'          => '0;36', 
+        'light_cyan'    => '1;36',
+        'red'           => '0;31',
+        'light_red'     => '1;31',
+        'purple'        => '0;35',
+        'light_purple'  => '1;35',
+        'light_yellow'  => '0;33',
+        'yellow'        => '1;33',
+        'light_gray'    => '0;37',
+        'white'         => '1;37'
+        ];
+
+    /**
+     * Indicates that you do not use any color for foreground or background.
+     *
+     * @var bool $noColor
+     */
+    public static $noColor = false;
+
+    /**
+     * String of arguments to be used in console.
+     *
+     * @var array $options
+     */
+    protected static $options = [];
+
+    /**
+     * Readline Support for command line.
+     *
+     * @var bool $readlineSupport
+     */
+    public static $readlineSupport = false;
+
+    /**
+     * List of array segments.
+     *
+     * @var array $segments
+     */
+    protected static $segments = [];
+
+        /**
+         * The standar STDERR is where the application writes its error messages.
+         *
+         * @var string $stderr 
+         */
+        protected static $stderr;
+
+        /**
+         * The estandar STDOUT is where the application records its output messages.
+         *
+         * @var string $stdout
+         */
+        protected static $stdout;
+
+        /**
+         * Message that tells the user that he is waiting to receive an order.
+         *
+         * @var string $waitMsg
+         */
+    public static $waitMsg = 'Press any key to continue...';
+
+    /**
+     * Static constructor. Parses all the CLI params.
+     * 
+     * @return string
+     * 
+     * @uses   \Syscodes\Contracts\Core\Lenevor
+     * 
+     * @throws \Exception
+     */
+        public static function initialize(Lenevor $core)
+        {
+            if ( ! $core->initCli())
+            {
+            throw new Exception('Cli class cannot be used outside of the command line');
+            }
+
+            // Readline is an extension for PHP that makes interactive the command console
+            static::$readlineSupport = extension_loaded('readline');
+
+            // clear segments & options to keep testing clean
+            static::$options  = [];
+            static::$segments = [];
+
+            static::parseCommandLine();
+
+            // Writes its error messages
+            static::$stderr = STDERR;
+
+            // Records its output messages
+            static::$stdout = STDOUT;
+        }
+
+        /**
+         * Beeps a certain number of times.
+         *
+         * @param  int  $num  The number of times to beep
+         *
+         * @return int
+         */
+        public static function bell(int $num = 1)
+        {
+            echo str_repeat("\x07", $num);
+        }
+
+        /**
+         * Clears the screen of output.
+         *
+         * @return void
+         */
+        public static function clearScreen()
+        {
+            static::isWindows() 
+
+                // Windows doesn't work for this, but their terminal is tiny so shove this in
+             ? static::newLine(40)
+
+                // Anything with a flair of Unix will handle these magic characters
+             : fwrite(static::$stdout, chr(27)."[H".chr(27)."[2J");
+        }
+
+        /**
+         * Returns the given text with the correct color codes for a foreground and
+         * optionally a background color.
+         *
+         * @param  string  $text  The text to color
+         * @param  string  $foreground  The foreground color
+         * @param  string  $background  The background color
+         * @param  string  $format  Other formatting to apply. Currently only 'underline' is understood
+         *
+         * @return string  The color coded string
+         *
+         * @throws \Syscodes\Core\Exceptions\LenevorException
+         */
+        public static function color(string $text, string $foreground, string $background = null, string $format = null)
+        {
+            if (static::$noColor)
+            {
+                return $text;
+            }
+
+            if ( ! Arr::exists(static::$foregroundColors, $foreground))
+            {
+                throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
+            }
+
+            if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background))
+            {
+                throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
+            }
+
+            $string = "\033[".static::$foregroundColors[$foreground]."m";
+
+            if ($background !== null)
+            {
+                $string .= "\033[".static::$backgroundColors[$background]."m";
+            }
+
+            if ($format === 'underline')
+            {
+                $string .= "\033[4m";
+            }
+
+            $string .= $text."\033[0m";
+
+            return $string;
+        }
+
+        /**
+         * Get the number of characters in a string.
+         *
+         * @param  string  $string
+         *
+         * @return int
+         */
+        public static function strlen(?string $string)
+        {
+            if (is_null($string))
+            {
+                return 0;
+            }
+
+            foreach (static::$foregroundColors as $color)
+            {
+                $string = strtr($string, ["\033[".$color.'m' => '']);
+            }
+
+            foreach (static::$backgroundColors as $color)
+            {
+                $string = strtr($string, ["\033[".$color.'m' => '']);
+            }
+
+            $string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
+
+            return mb_strlen($string);
+        }
+
+        /**
+         * Outputs an error to the CLI using STDERR instead of STDOUT.
+         *
+         * @param  string|array  $text  The text to output, or array of errors
+         * @param  string  $foreground  The foreground color
+         * @param  string|null  $background  the background color
+         *
+         * @return string
+         */
+        public static function error(string $text = '', string $foreground = 'light_red', string $background = null)
+        {
+        if (is_array($text))
+        {
+            $text = implode(PHP_EOL, $text);
+        }
 		
-		if ($foreground || $background)
-		{
-			$text = static::color($text, $foreground, $background);
-		}
+        if ($foreground || $background)
+        {
+            $text = static::color($text, $foreground, $background);
+        }
 		
-		fwrite(static::$stderr, $text.PHP_EOL);
-	}
-
-	/**
-	 * Attempts to determine the width of the viewable CLI window.
-	 *
-	 * @param  int  $default
-	 *
-	 * @return int
-	 */
-	public static function getWidth(int $default = 80)
-	{
-		if (static::isWindows() || (int) shell_exec('tput cols') === 0)
-		{
-			return $default;
-		}
-
-		return (int) shell_exec('tput cols');
-	}
-
-	/**
-	 * Attempts to determine the height of the viewable CLI window.
-	 *
-	 * @param  int  $default
-	 *
-	 * @return int
-	 */
-	public static function getHeight(int $default = 32)
-	{
-		if (static::isWindows())
-		{
-			return $default;
-		}
-
-		return (int) shell_exec('tput lines');
-	}
-
-	/**
-	 * Takes a string and writes it to the command line, wrapping to a maximum width. 
-	 * If no maximum width is specified, will wrap to the window's max.
-	 *
-	 * @param  string  $string  (null by default)
-	 * @param  int  $max  (0 by default)
-	 * @param  int $padLeft  (0 by default)
-	 *
-	 * @return string
-	 */
-	public static function wrap(string $string = null, int $max = 0, int $padLeft = 0)
-	{
-		if (empty($string))
-		{
-			return '';
-		}
-
-		if ($max === 0)
-		{
-			$max = static::getWidth();
-		}
-
-		if (static::getWidth() < $max)
-		{
-			$max = static::getWidth();
-		}
-
-		$max = $max - $padLeft;
-
-		$lines = wordwrap($string, $max);
-
-		if ($pad_left > 0)
-		{
-			$lines = explode(PHP_EOL, $lines);
-
-			$first = true;
-
-			array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
-
-				if ( ! $first)
-				{
-					$line = str_repeat(' ', $pad_left) . $line;
-				}
-				else
-				{
-					$first = false;
-				}
-
-			});
-
-			$lines = implode(PHP_EOL, $lines);
-		}
-
-		return $lines;
-	}
-
- 	/**
- 	 * Get input from the shell, using readline or the standard STDIN.
- 	 *
- 	 * @param  string|int  $prefix  The name of the option (int if unnamed)
- 	 *
- 	 * @return string
- 	 */
- 	public static function input($prefix = '')
- 	{
- 		if (static::$readlineSupport)
- 		{
- 			return readline($prefix);
- 		}
-
- 		echo $prefix;
-
- 		return fgets(STDIN);
- 	}
-
- 	/**
- 	 * If operating system === windows.
- 	 * 
- 	 * @return string
- 	 */
- 	public static function isWindows()
- 	{
- 		return 'win' === strtolower(substr(php_uname("s"), 0, 3));
- 	}
-
- 	/**
- 	 * Enter a number of empty lines.
- 	 * 
- 	 * @param  int  $num  Number of lines to output
- 	 *
- 	 * @return void
- 	 */
- 	public static function newLine(int $num = 1)
- 	{
- 		for ($i = 0; $i < $num; $i++)
- 		{			
- 			static::write();
- 		}
- 	}
-
- 	/**
-	 * Returns the option with the given name. You can also give the option number.
-	 *
-	 * @param  string|int  $name  The name of the option (int if unnamed)
-	 * @param  mixed  $default  The value to return if the option is not defined
-	 *
-	 * @return mixed
-	 * 
-	 * @uses   \Syscodes\Contract\Core\Lenevor
-	 */
- 	public static function option($name, $default = null)
- 	{
- 		if ( ! isset(static::$options[$name]))
- 		{
- 			return Lenevor::value($default);
- 		}
-
- 		return static::$options[$name];
-	}
-
-	/**
-	 * Parses the command line it was called from and collects all
-	 * options and valid segments.
-	 * 
-	 * @return bool
-	 */
-	protected static function parseCommandLine()
-	{
-		$options = false;
-
-		for ($i = 1; $i < $_SERVER['argc']; $i++)
-		{
-			if ( ! $options && mb_strpos($_SERVER['argv'][$i], '-') === false)
-			{
-				static::$segments[] = $_SERVER['argv'][$i];
-
-				continue;
-			}
-
-			$options = true;
-
-			$args  = str_replace('-', '', $_SERVER['argv'][$i]);
-			$value = null;
-
-			if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0)
-			{
-				$value = $_SERVER['argv'][$i + 1];
-				$i++;
-			}
-
-			static::$options[$args] = $value;
-
-			$options = false;
-		}
-	}
-
-	/**
-	 * Returns the command line string portions of the arguments, minus
-	 * any options, as a string.
-	 *
-	 * @return string
-	 */
-	public static function getURI()
-	{
-		return implode('/', static::$segments);
-	}
-
-	/**
-	 * Returns an individual segment.
-	 *
-	 * @param  int  $index
-	 * 
-	 * @return mixed|null
-	 */
-	public static function getSegment(int $index)
-	{
-		if ( ! isset(static::$segments[$index - 1]))
-		{
-			return null;
-		}
-
-		return static::$segments[$index - 1];
-	}
-
-	/**
-	 * Returns the raw array of segments found.
-	 *
-	 * @return array
-	 */
-	public static function getSegments()
-	{
-		return static::$segments;
-	}
-
- 	/**
- 	 * Asks the user for input.  This can have either 1 or 2 arguments.
-	 *
-	 * Usage:
-	 *
-	 * // Waits for any key press
-	 * Cli::prompt();
-	 *
-	 * // Takes any input
-	 * $color = Cli::prompt('What is your favorite color?');
-	 *
-	 * // Takes any input, but offers default
-	 * $color = Cli::prompt('What is your favourite color?', 'white');
-	 *
-	 * // Will only accept the options in the array
-	 * $ready = Cli::prompt('Are you ready?', array('y','n'));
-	 *
-	 * @return string The user input
-	 */
- 	public static function prompt()
- 	{
- 		$args = func_get_args();
-
-		$options = [];
-		$output  = '';
-		$default = null;
-
-		// How many we got
-		$arg_count = count($args);
-
-		// Is the last argument a boolean? True means required
-		$required = end($args) === true;
-
-		// Reduce the argument count if required was passed, we don't care about that anymore
-		$required === true and --$arg_count;
-
-		// This method can take a few crazy combinations of arguments, so lets work it out
-		switch ($arg_count)
-		{
-			case 2:
-
-				// E.g: $ready = Cli::prompt('Are you ready?', ['y','n']);
-				if (is_array($args[1]))
-				{
-					list($output, $options) = $args;
-				}
-
-				// E.g: $color = Cli::prompt('What is your favourite color?', 'white');
-				elseif (is_string($args[1]))
-				{
-					list($output, $default) = $args;
-				}
-
-			break;
-
-			case 1:
-
-				// No question (probably been asked already) so just show options
-				// E.g: $ready = Cli::prompt(array('y','n'));
-				if (is_array($args[0]))
-				{
-					$options = $args[0];
-				}
-
-				// Question without options
-				// E.g: $ready = Cli::prompt('What did you do today?');
-				elseif (is_string($args[0]))
-				{
-					$output = $args[0];
-				}
-
-			break;
-		}
-
-		// If a question has been asked with the read
-		if ($output !== '')
-		{
-			$extra_output = '';
-
-			if ($default !== null)
-			{
-				$extra_output = ' [ Default: "'.$default.'" ]';
-			}
-			elseif ($options !== [])
-			{
-				$extra_output = ' [ '.implode(' | ', $options).' ]';
-			}
-
-			fwrite(static::$stdout, $output.$extra_output.': ');
-		}
-
-		// Read the input from keyboard.
-		$input = trim(static::input()) ?: $default;
-
-		// No input provided and we require one (default will stop this being called)
-		if (empty($input) and $required === true)
-		{
-			static::write('This is required.');
-			static::newLine();
-
-			$input = forward_static_call_array([__CLASS__, 'prompt'], $args);
-		}
-
-		// If options are provided and the choice is not in the array, tell them to try again
-		if ( ! empty($options) and ! in_array($input, $options))
-		{
-			static::write('This is not a valid option. Please try again.');
-			static::newLine();
-
-			$input = forward_static_call_array([__CLASS__, 'prompt'], $args);
-		}
-
-		return $input;
- 	}
-
- 	/**
- 	 * Allows you to set a commandline option from code.
- 	 *
- 	 * @param  string|int  $name  The name of the option (int if unnamed)
-	 * @param  mixed|null  $value  The value to set, or null to delete the option
-	 *
-	 * @return mixed
-	 */
- 	public static function setOption($name, $value = null)
- 	{
- 		if ($value == null)
- 		{
- 			if (isset(static::$options[$name]))
- 			{
- 				unset(static::$options[$name]);
- 			}
- 		}
- 		else
- 		{
- 			static::$options[$name] = $value;
- 		}
- 	}
-
- 	/**
- 	 * Waits a certain number of seconds, optionally showing a wait message and
-	 * waiting for a key press.
- 	 *
- 	 * @param  int  $seconds  Number of seconds
- 	 * @param  bool  $countdown  Show a countdown or not
- 	 *
- 	 * @return string
- 	 */
- 	public static function wait(int $seconds = 0, bool $countdown = false)
- 	{
- 		if ($countdown === true)
- 		{
-			$time = $seconds;
-
- 			while ($time > 0)
- 			{
- 				fwrite(static::$stdout, $time.'... ');
- 				sleep(1);
- 				$time--;
- 			}
-
- 			static::write();
- 		}
- 		else
- 		{
- 			if ($seconds = 0)
- 			{
- 				sleep($seconds);
- 			}
- 			else
- 			{
- 				static::write(static::$waitMsg);
- 				static::input();
- 			}
- 		}
- 	}
-
- 	/**
- 	 * Outputs a string to the cli.	If you send an array it will implode them 
- 	 * with a line break.
- 	 * 
- 	 * @param  string|array  $text  The text to output, or array of lines
- 	 * @param  string|null  $foreground  The foreground color
- 	 * @param  string|null  $background  The background color
- 	 *
- 	 * @return string
- 	 */
- 	public static function write(string $text = '', string $foreground = null, string $background = null)
- 	{
- 		if (is_array($text))
- 		{
- 			$text = implode(PHP_EOL, $text);
- 		}
-
- 		if ($foreground OR $background)
- 		{
- 			$text = static::color($text, $foreground, $background);
- 		}
-
- 		fwrite(static::$stdout, $text.PHP_EOL);
- 	}
-
- 	/**
- 	 * Returns a well formatted table.
- 	 *
- 	 * @param  array  $tbody  List of rows
- 	 * @param  array  $thead  List of columns
- 	 *
- 	 * @return void
- 	 */
- 	public static function table(array $tbody, array $thead = [])
- 	{
- 		$rows = [];
-
- 		if ( ! empty($thead))
- 		{
- 			$rows[] = array_values($thead);
- 		}
-
- 		foreach ($tbody as $tr)
- 		{
- 			$rows[] = count($rows);
- 		}
-
- 		$totalRows = count($rows);
-
- 		// Store all columns lengths
- 		$allColsLengths = [];
-
- 		// Store maximum lengths by column
- 		$maxColsLengths = [];
-
- 		for ($row = 0; $row < $totalRows; $row++)
- 		{
- 			$column = 0;
-
- 			foreach ($rows[$row] as $col)
- 			{
- 				$allColsLengths[$row][$column] = static::strlen($col);
-
- 				if ( ! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column])
- 				{
- 					$maxColsLengths[$column] = $allColsLengths[$row][$column];
- 				}
-
- 				$column++;
- 			}
- 		}
-
- 		for ($row = 0; $row < $totalRows; $row++)
- 		{
- 			$column = 0;
-
- 			foreach ($rows[$row] as $col)
- 			{
- 				$diverse = $maxColsLengths[$column] - static::strlen($col);
+        fwrite(static::$stderr, $text.PHP_EOL);
+    }
+
+    /**
+     * Attempts to determine the width of the viewable CLI window.
+     *
+     * @param  int  $default
+     *
+     * @return int
+     */
+    public static function getWidth(int $default = 80)
+    {
+        if (static::isWindows() || (int) shell_exec('tput cols') === 0)
+        {
+            return $default;
+        }
+
+        return (int) shell_exec('tput cols');
+    }
+
+    /**
+     * Attempts to determine the height of the viewable CLI window.
+     *
+     * @param  int  $default
+     *
+     * @return int
+     */
+    public static function getHeight(int $default = 32)
+    {
+        if (static::isWindows())
+        {
+            return $default;
+        }
+
+        return (int) shell_exec('tput lines');
+    }
+
+    /**
+     * Takes a string and writes it to the command line, wrapping to a maximum width. 
+     * If no maximum width is specified, will wrap to the window's max.
+     *
+     * @param  string  $string  (null by default)
+     * @param  int  $max  (0 by default)
+     * @param  int $padLeft  (0 by default)
+     *
+     * @return string
+     */
+    public static function wrap(string $string = null, int $max = 0, int $padLeft = 0)
+    {
+        if (empty($string))
+        {
+            return '';
+        }
+
+        if ($max === 0)
+        {
+            $max = static::getWidth();
+        }
+
+        if (static::getWidth() < $max)
+        {
+            $max = static::getWidth();
+        }
+
+        $max = $max - $padLeft;
+
+        $lines = wordwrap($string, $max);
+
+        if ($pad_left > 0)
+        {
+            $lines = explode(PHP_EOL, $lines);
+
+            $first = true;
+
+            array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
+
+                if ( ! $first)
+                {
+                    $line = str_repeat(' ', $pad_left) . $line;
+                }
+                else
+                {
+                    $first = false;
+                }
+
+            });
+
+            $lines = implode(PHP_EOL, $lines);
+        }
+
+        return $lines;
+    }
+
+        /**
+         * Get input from the shell, using readline or the standard STDIN.
+         *
+         * @param  string|int  $prefix  The name of the option (int if unnamed)
+         *
+         * @return string
+         */
+        public static function input($prefix = '')
+        {
+            if (static::$readlineSupport)
+            {
+                return readline($prefix);
+            }
+
+            echo $prefix;
+
+            return fgets(STDIN);
+        }
+
+        /**
+         * If operating system === windows.
+         * 
+         * @return string
+         */
+        public static function isWindows()
+        {
+            return 'win' === strtolower(substr(php_uname("s"), 0, 3));
+        }
+
+        /**
+         * Enter a number of empty lines.
+         * 
+         * @param  int  $num  Number of lines to output
+         *
+         * @return void
+         */
+        public static function newLine(int $num = 1)
+        {
+            for ($i = 0; $i < $num; $i++)
+            {			
+                static::write();
+            }
+        }
+
+        /**
+         * Returns the option with the given name. You can also give the option number.
+         *
+         * @param  string|int  $name  The name of the option (int if unnamed)
+         * @param  mixed  $default  The value to return if the option is not defined
+         *
+         * @return mixed
+         * 
+         * @uses   \Syscodes\Contract\Core\Lenevor
+         */
+        public static function option($name, $default = null)
+        {
+            if ( ! isset(static::$options[$name]))
+            {
+                return Lenevor::value($default);
+            }
+
+            return static::$options[$name];
+    }
+
+    /**
+     * Parses the command line it was called from and collects all
+     * options and valid segments.
+     * 
+     * @return bool
+     */
+    protected static function parseCommandLine()
+    {
+        $options = false;
+
+        for ($i = 1; $i < $_SERVER['argc']; $i++)
+        {
+            if ( ! $options && mb_strpos($_SERVER['argv'][$i], '-') === false)
+            {
+                static::$segments[] = $_SERVER['argv'][$i];
+
+                continue;
+            }
+
+            $options = true;
+
+            $args  = str_replace('-', '', $_SERVER['argv'][$i]);
+            $value = null;
+
+            if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0)
+            {
+                $value = $_SERVER['argv'][$i + 1];
+                $i++;
+            }
+
+            static::$options[$args] = $value;
+
+            $options = false;
+        }
+    }
+
+    /**
+     * Returns the command line string portions of the arguments, minus
+     * any options, as a string.
+     *
+     * @return string
+     */
+    public static function getURI()
+    {
+        return implode('/', static::$segments);
+    }
+
+    /**
+     * Returns an individual segment.
+     *
+     * @param  int  $index
+     * 
+     * @return mixed|null
+     */
+    public static function getSegment(int $index)
+    {
+        if ( ! isset(static::$segments[$index - 1]))
+        {
+            return null;
+        }
+
+        return static::$segments[$index - 1];
+    }
+
+    /**
+     * Returns the raw array of segments found.
+     *
+     * @return array
+     */
+    public static function getSegments()
+    {
+        return static::$segments;
+    }
+
+        /**
+         * Asks the user for input.  This can have either 1 or 2 arguments.
+         *
+         * Usage:
+         *
+         * // Waits for any key press
+         * Cli::prompt();
+         *
+         * // Takes any input
+         * $color = Cli::prompt('What is your favorite color?');
+         *
+         * // Takes any input, but offers default
+         * $color = Cli::prompt('What is your favourite color?', 'white');
+         *
+         * // Will only accept the options in the array
+         * $ready = Cli::prompt('Are you ready?', array('y','n'));
+         *
+         * @return string The user input
+         */
+        public static function prompt()
+        {
+            $args = func_get_args();
+
+        $options = [];
+        $output  = '';
+        $default = null;
+
+        // How many we got
+        $arg_count = count($args);
+
+        // Is the last argument a boolean? True means required
+        $required = end($args) === true;
+
+        // Reduce the argument count if required was passed, we don't care about that anymore
+        $required === true and --$arg_count;
+
+        // This method can take a few crazy combinations of arguments, so lets work it out
+        switch ($arg_count)
+        {
+            case 2:
+
+                // E.g: $ready = Cli::prompt('Are you ready?', ['y','n']);
+                if (is_array($args[1]))
+                {
+                    list($output, $options) = $args;
+                }
+
+                // E.g: $color = Cli::prompt('What is your favourite color?', 'white');
+                elseif (is_string($args[1]))
+                {
+                    list($output, $default) = $args;
+                }
+
+            break;
+
+            case 1:
+
+                // No question (probably been asked already) so just show options
+                // E.g: $ready = Cli::prompt(array('y','n'));
+                if (is_array($args[0]))
+                {
+                    $options = $args[0];
+                }
+
+                // Question without options
+                // E.g: $ready = Cli::prompt('What did you do today?');
+                elseif (is_string($args[0]))
+                {
+                    $output = $args[0];
+                }
+
+            break;
+        }
+
+        // If a question has been asked with the read
+        if ($output !== '')
+        {
+            $extra_output = '';
+
+            if ($default !== null)
+            {
+                $extra_output = ' [ Default: "'.$default.'" ]';
+            }
+            elseif ($options !== [])
+            {
+                $extra_output = ' [ '.implode(' | ', $options).' ]';
+            }
+
+            fwrite(static::$stdout, $output.$extra_output.': ');
+        }
+
+        // Read the input from keyboard.
+        $input = trim(static::input()) ?: $default;
+
+        // No input provided and we require one (default will stop this being called)
+        if (empty($input) and $required === true)
+        {
+            static::write('This is required.');
+            static::newLine();
+
+            $input = forward_static_call_array([__CLASS__, 'prompt'], $args);
+        }
+
+        // If options are provided and the choice is not in the array, tell them to try again
+        if ( ! empty($options) and ! in_array($input, $options))
+        {
+            static::write('This is not a valid option. Please try again.');
+            static::newLine();
+
+            $input = forward_static_call_array([__CLASS__, 'prompt'], $args);
+        }
+
+        return $input;
+        }
+
+        /**
+         * Allows you to set a commandline option from code.
+         *
+         * @param  string|int  $name  The name of the option (int if unnamed)
+         * @param  mixed|null  $value  The value to set, or null to delete the option
+         *
+         * @return mixed
+         */
+        public static function setOption($name, $value = null)
+        {
+            if ($value == null)
+            {
+                if (isset(static::$options[$name]))
+                {
+                    unset(static::$options[$name]);
+                }
+            }
+            else
+            {
+                static::$options[$name] = $value;
+            }
+        }
+
+        /**
+         * Waits a certain number of seconds, optionally showing a wait message and
+         * waiting for a key press.
+         *
+         * @param  int  $seconds  Number of seconds
+         * @param  bool  $countdown  Show a countdown or not
+         *
+         * @return string
+         */
+        public static function wait(int $seconds = 0, bool $countdown = false)
+        {
+            if ($countdown === true)
+            {
+            $time = $seconds;
+
+                while ($time > 0)
+                {
+                    fwrite(static::$stdout, $time.'... ');
+                    sleep(1);
+                    $time--;
+                }
+
+                static::write();
+            }
+            else
+            {
+                if ($seconds = 0)
+                {
+                    sleep($seconds);
+                }
+                else
+                {
+                    static::write(static::$waitMsg);
+                    static::input();
+                }
+            }
+        }
+
+        /**
+         * Outputs a string to the cli.	If you send an array it will implode them 
+         * with a line break.
+         * 
+         * @param  string|array  $text  The text to output, or array of lines
+         * @param  string|null  $foreground  The foreground color
+         * @param  string|null  $background  The background color
+         *
+         * @return string
+         */
+        public static function write(string $text = '', string $foreground = null, string $background = null)
+        {
+            if (is_array($text))
+            {
+                $text = implode(PHP_EOL, $text);
+            }
+
+            if ($foreground OR $background)
+            {
+                $text = static::color($text, $foreground, $background);
+            }
+
+            fwrite(static::$stdout, $text.PHP_EOL);
+        }
+
+        /**
+         * Returns a well formatted table.
+         *
+         * @param  array  $tbody  List of rows
+         * @param  array  $thead  List of columns
+         *
+         * @return void
+         */
+        public static function table(array $tbody, array $thead = [])
+        {
+            $rows = [];
+
+            if ( ! empty($thead))
+            {
+                $rows[] = array_values($thead);
+            }
+
+            foreach ($tbody as $tr)
+            {
+                $rows[] = count($rows);
+            }
+
+            $totalRows = count($rows);
+
+            // Store all columns lengths
+            $allColsLengths = [];
+
+            // Store maximum lengths by column
+            $maxColsLengths = [];
+
+            for ($row = 0; $row < $totalRows; $row++)
+            {
+                $column = 0;
+
+                foreach ($rows[$row] as $col)
+                {
+                    $allColsLengths[$row][$column] = static::strlen($col);
+
+                    if ( ! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column])
+                    {
+                        $maxColsLengths[$column] = $allColsLengths[$row][$column];
+                    }
+
+                    $column++;
+                }
+            }
+
+            for ($row = 0; $row < $totalRows; $row++)
+            {
+                $column = 0;
+
+                foreach ($rows[$row] as $col)
+                {
+                    $diverse = $maxColsLengths[$column] - static::strlen($col);
  				
- 				if ($diverse)	
- 				{
- 					$rows[$row][$column] = $rows[$row][$column].str_repeat(' ', $diverse);
- 				}
+                    if ($diverse)	
+                    {
+                        $rows[$row][$column] = $rows[$row][$column].str_repeat(' ', $diverse);
+                    }
 
- 				$column++;
- 			} 			
- 		}
+                    $column++;
+                } 			
+            }
 
- 		$table = '';
+            $table = '';
 
- 		for ($row = 0; $row < $rows; $row++)
- 		{
- 			if (0 === $row)
- 			{
- 				$cols = '+';
+            for ($row = 0; $row < $rows; $row++)
+            {
+                if (0 === $row)
+                {
+                    $cols = '+';
 
- 				foreach ($rows[$row] as $col) 
- 				{
- 					$cols .= str_repeat('-', static::strlen($col) + 2).'+';
- 				}
+                    foreach ($rows[$row] as $col) 
+                    {
+                        $cols .= str_repeat('-', static::strlen($col) + 2).'+';
+                    }
 
- 				$table .= $cols.PHP_EOL;
- 			}
+                    $table .= $cols.PHP_EOL;
+                }
 
- 			$table .= '| '.implode('-', $rows[$row]).' |'.PHP_EOL;
+                $table .= '| '.implode('-', $rows[$row]).' |'.PHP_EOL;
 
- 			if (0 === $row && ! empty($thead) || $row + 1 === $rows)
- 			{
- 				$table .= $cols.PHP_EOL;
- 			}
- 		}
+                if (0 === $row && ! empty($thead) || $row + 1 === $rows)
+                {
+                    $table .= $cols.PHP_EOL;
+                }
+            }
 
- 		fwrite(static::$stdout, $table);
- 	}
+            fwrite(static::$stdout, $table);
+        }
 }
\ No newline at end of file

src/components/Console/Application.php

Indentation +48 added lines, -48 removed lines

@@ -35,59 +35,59 @@
  */
 class Application implements ApplicationContracts
 {
-	/**
-	 * Get the Lenevor class instance.
-	 * 
-	 * @var \Syscodes\Contracts\Core\Lenevor $core
-	 */
-	protected $core;
+    /**
+     * Get the Lenevor class instance.
+     * 
+     * @var \Syscodes\Contracts\Core\Lenevor $core
+     */
+    protected $core;
 
-	/**
-	 * Console constructor. Initialize the console of Lenevor.
-	 *
-	 * @param  \Syscodes\Contracts\Core\Lenevor  $core
-	 * 
-	 * @return void
-	 */
-	public function __construct(Lenevor $core)
-	{		
-		// Initialize the Cli
-		if ($core->initCli())
-		{
-			Cli::initialize($core);
-		}
+    /**
+     * Console constructor. Initialize the console of Lenevor.
+     *
+     * @param  \Syscodes\Contracts\Core\Lenevor  $core
+     * 
+     * @return void
+     */
+    public function __construct(Lenevor $core)
+    {		
+        // Initialize the Cli
+        if ($core->initCli())
+        {
+            Cli::initialize($core);
+        }
 
-		$this->core = $core;
-	}
+        $this->core = $core;
+    }
 
-	/**
-	 * Runs the current command discovered on the CLI.
-	 *
-	 * @return void
-	 */
-	public function run()
-	{
-		Cli::getURI();
+    /**
+     * Runs the current command discovered on the CLI.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Cli::getURI();
 
 		
-	}
+    }
 
-	/**
-	 * Displays basic information about the Console.
-	 *
-	 * @return void
-	 *
-	 * @uses   Version::PRODUCT
-	 * @uses   Version::RELEASE 
-	 */
-	public function showHeader()
-	{		
-		Cli::write(Version::PRODUCT.' '
-			.Cli::color(Version::RELEASE, 'cyan').' | '
-			.'Server Time: '.Cli::color(date('Y/m/d H:i:sa'), 'light_yellow').' | '
-			.cli::color('['.PHP_OS.']', 'light_purple')
-		);
+    /**
+     * Displays basic information about the Console.
+     *
+     * @return void
+     *
+     * @uses   Version::PRODUCT
+     * @uses   Version::RELEASE 
+     */
+    public function showHeader()
+    {		
+        Cli::write(Version::PRODUCT.' '
+            .Cli::color(Version::RELEASE, 'cyan').' | '
+            .'Server Time: '.Cli::color(date('Y/m/d H:i:sa'), 'light_yellow').' | '
+            .cli::color('['.PHP_OS.']', 'light_purple')
+        );
 
-		Cli::newLine(1);
-	}
+        Cli::newLine(1);
+    }
 }
\ No newline at end of file