From b1f15e52a09a406a49597d084c611776ef736c1d Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Tue, 12 Sep 2017 14:39:22 +0100 Subject: [PATCH 1/2] Fix tests for PHP7.2 --- app/Providers/AppServiceProvider.php | 2 +- helpers.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 88d47aec..6de8d60e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -42,7 +42,7 @@ class AppServiceProvider extends ServiceProvider $tag = Tag::firstOrCreate(['tag' => $tag]); $tagsToAdd[] = $tag->id; } - if (count($tagsToAdd > 0)) { + if (count($tagsToAdd) > 0) { $note->tags()->attach($tagsToAdd); } }); diff --git a/helpers.php b/helpers.php index d70efc56..aeec0625 100644 --- a/helpers.php +++ b/helpers.php @@ -16,6 +16,7 @@ if (! function_exists('normalize_url')) { $newUrl = ''; $url = parse_url($url); $defaultSchemes = ['http' => 80, 'https' => 443]; + if (isset($url['scheme'])) { $url['scheme'] = strtolower($url['scheme']); // Strip scheme default ports @@ -27,10 +28,12 @@ if (! function_exists('normalize_url')) { } $newUrl .= "{$url['scheme']}://"; } + if (isset($url['host'])) { $url['host'] = mb_strtolower($url['host']); $newUrl .= $url['host']; } + if (isset($url['port'])) { $newUrl .= ":{$url['port']}"; } @@ -63,10 +66,14 @@ if (! function_exists('normalize_url')) { } $url['path'] = preg_replace_callback( array_map( - create_function('$str', 'return "/%" . strtoupper($str) . "/x";'), + function ($str) { + return "/%" . strtoupper($str) . "/x"; + }, $u ), - create_function('$matches', 'return chr(hexdec($matches[0]));'), + function ($matches) { + return chr(hexdec($matches[0])); + }, $url['path'] ); // Remove directory index From 4057abb7e7d73a6e9d081efef32f3d282f22d508 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Tue, 12 Sep 2017 15:07:50 +0100 Subject: [PATCH 2/2] Get rid of useless example tests --- tests/Browser/ExampleTest.php | 23 ----------------------- tests/Feature/ExampleTest.php | 21 --------------------- tests/Unit/ExampleTest.php | 19 ------------------- 3 files changed, 63 deletions(-) delete mode 100644 tests/Browser/ExampleTest.php delete mode 100644 tests/Feature/ExampleTest.php delete mode 100644 tests/Unit/ExampleTest.php diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php deleted file mode 100644 index a0099346..00000000 --- a/tests/Browser/ExampleTest.php +++ /dev/null @@ -1,23 +0,0 @@ -browse(function (Browser $browser) { - $browser->visit('/') - ->assertSee('Built with love'); - }); - } -} diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php deleted file mode 100644 index f31e495c..00000000 --- a/tests/Feature/ExampleTest.php +++ /dev/null @@ -1,21 +0,0 @@ -get('/'); - - $response->assertStatus(200); - } -} diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php deleted file mode 100644 index e9fe19c6..00000000 --- a/tests/Unit/ExampleTest.php +++ /dev/null @@ -1,19 +0,0 @@ -assertTrue(true); - } -}