jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Fix tests for PHP7.2

Browse source
This commit is contained in:
Jonny Barnes 2017-09-12 14:39:22 +01:00
parent 119908b1c2
commit b1f15e52a0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Providers/AppServiceProvider.php
View file

@ -42,7 +42,7 @@ class AppServiceProvider extends ServiceProvider
$tag = Tag::firstOrCreate(['tag' => $tag]); $tag = Tag::firstOrCreate(['tag' => $tag]);
$tagsToAdd[] = $tag->id; $tagsToAdd[] = $tag->id;
} }
if (count($tagsToAdd > 0)) { if (count($tagsToAdd) > 0) {
$note->tags()->attach($tagsToAdd); $note->tags()->attach($tagsToAdd);
} }
}); });

11
helpers.php
View file

@ -16,6 +16,7 @@ if (! function_exists('normalize_url')) {
$newUrl = ''; $newUrl = '';
$url = parse_url($url); $url = parse_url($url);
$defaultSchemes = ['http' => 80, 'https' => 443]; $defaultSchemes = ['http' => 80, 'https' => 443];
if (isset($url['scheme'])) { if (isset($url['scheme'])) {
$url['scheme'] = strtolower($url['scheme']); $url['scheme'] = strtolower($url['scheme']);
// Strip scheme default ports // Strip scheme default ports
@ -27,10 +28,12 @@ if (! function_exists('normalize_url')) {
} }
$newUrl .= "{$url['scheme']}://"; $newUrl .= "{$url['scheme']}://";
} }
if (isset($url['host'])) { if (isset($url['host'])) {
$url['host'] = mb_strtolower($url['host']); $url['host'] = mb_strtolower($url['host']);
$newUrl .= $url['host']; $newUrl .= $url['host'];
} }
if (isset($url['port'])) { if (isset($url['port'])) {
$newUrl .= ":{$url['port']}"; $newUrl .= ":{$url['port']}";
} }
@ -63,10 +66,14 @@ if (! function_exists('normalize_url')) {
} }
$url['path'] = preg_replace_callback( $url['path'] = preg_replace_callback(
array_map( array_map(
create_function('$str', 'return "/%" . strtoupper($str) . "/x";'), function ($str) {
return "/%" . strtoupper($str) . "/x";
},
$u $u
), ),
create_function('$matches', 'return chr(hexdec($matches[0]));'), function ($matches) {
return chr(hexdec($matches[0]));
},
$url['path'] $url['path']
); );
// Remove directory index // Remove directory index