Some code style fixes
This commit is contained in:
parent
beb127c06c
commit
6ef8caca00
@ -17,7 +17,7 @@ class Config {
|
|||||||
/**
|
/**
|
||||||
* Config object
|
* Config object
|
||||||
*
|
*
|
||||||
* @var Aviat\Ion\Type\ArrayType
|
* @var \Aviat\Ion\Type\ArrayType
|
||||||
*/
|
*/
|
||||||
protected $map = [];
|
protected $map = [];
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ class Config {
|
|||||||
{
|
{
|
||||||
$this->map->set($key, $value);
|
$this->map->set($key, $value);
|
||||||
}
|
}
|
||||||
else throw
|
else throw
|
||||||
new InvalidArgumentException("Key must be integer, string, or array, and cannot be empty");
|
new InvalidArgumentException("Key must be integer, string, or array, and cannot be empty");
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
|
@ -198,7 +198,7 @@ class Controller {
|
|||||||
*
|
*
|
||||||
* @param string $template
|
* @param string $template
|
||||||
* @param array $data
|
* @param array $data
|
||||||
* @param HtmlView $view
|
* @param HtmlView|null $view
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
protected function outputHTML($template, array $data = [], $view = NULL)
|
protected function outputHTML($template, array $data = [], $view = NULL)
|
||||||
|
@ -74,9 +74,10 @@ class UrlGenerator extends RoutingBase {
|
|||||||
// Remove any optional parameters from the route
|
// Remove any optional parameters from the route
|
||||||
// and replace them with existing route parameters, if they exist
|
// and replace them with existing route parameters, if they exist
|
||||||
$path_segments = explode('/', $path);
|
$path_segments = explode('/', $path);
|
||||||
|
$segment_count = count($path_segments);
|
||||||
$segments = $this->segments();
|
$segments = $this->segments();
|
||||||
|
|
||||||
for ($i = 0; $i < count($path_segments); $i++)
|
for ($i = 0; $i < $segment_count; $i++)
|
||||||
{
|
{
|
||||||
if ( ! array_key_exists($i + 1, $segments))
|
if ( ! array_key_exists($i + 1, $segments))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user