Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
3 changed files with 5 additions and 4 deletions
Showing only changes of commit 6ef8caca00 - Show all commits

View File

@ -17,7 +17,7 @@ class Config {
/** /**
* Config object * Config object
* *
* @var Aviat\Ion\Type\ArrayType * @var \Aviat\Ion\Type\ArrayType
*/ */
protected $map = []; protected $map = [];

View File

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

View File

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