4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 4eb258bb2f - Show all commits

View File

@ -88,7 +88,7 @@ class UrlGenerator extends RoutingBase {
}
$path = implode('/', $path_segments);
$scheme = (isset($_SERVER['HTTPS'])) ? 'https:' : 'http';
$scheme = (isset($_SERVER['HTTPS'])) ? 'https:' : 'http:';
return "{$scheme}//{$this->host}/{$path}";
}

View File

@ -28,13 +28,13 @@ class UrlGeneratorTest extends AnimeClientTestCase {
'args' => [
'images'
],
'expected' => '//localhost/assets/images',
'expected' => 'http://localhost/assets/images',
],
'multiple arguments' => [
'args' => [
'images', 'anime', 'foo.png'
],
'expected' => '//localhost/assets/images/anime/foo.png'
'expected' => 'http://localhost/assets/images/anime/foo.png'
]
];
}