From 54645bf24fdd193a3afa6f9fad57db3bb89f9499 Mon Sep 17 00:00:00 2001 From: Tyler King Date: Fri, 9 Sep 2022 10:49:41 -0230 Subject: [PATCH] Adds deprecation supports and fixes. * Fixes deprecation notices for PHP8 * Adds deprecation logging support to tests being run --- src/Http/Middleware/VerifyShopify.php | 4 ++-- src/Objects/Values/ShopDomain.php | 2 +- src/Services/ApiHelper.php | 4 ++-- tests/TestCase.php | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Http/Middleware/VerifyShopify.php b/src/Http/Middleware/VerifyShopify.php index 4cd8d635..a4387f26 100644 --- a/src/Http/Middleware/VerifyShopify.php +++ b/src/Http/Middleware/VerifyShopify.php @@ -333,8 +333,8 @@ protected function getHmacFromRequest(Request $request): array DataSource::HEADER()->toNative() => $request->header('X-Shop-Signature'), // Headers: Referer DataSource::REFERER()->toNative() => function () use ($request): ?string { - $url = parse_url($request->header('referer'), PHP_URL_QUERY); - parse_str($url, $refererQueryParams); + $url = parse_url($request->header('referer', ''), PHP_URL_QUERY); + parse_str($url ?? '', $refererQueryParams); if (! $refererQueryParams || ! isset($refererQueryParams['hmac'])) { return null; } diff --git a/src/Objects/Values/ShopDomain.php b/src/Objects/Values/ShopDomain.php index 23f56665..941dcee7 100644 --- a/src/Objects/Values/ShopDomain.php +++ b/src/Objects/Values/ShopDomain.php @@ -53,7 +53,7 @@ public static function fromRequest(Request $request): ShopDomainValue // Headers: Referer DataSource::REFERER()->toNative() => function () use ($request): ?string { - $url = parse_url($request->header('referer'), PHP_URL_QUERY); + $url = parse_url($request->header('referer', ''), PHP_URL_QUERY); if (! $url) { return null; } diff --git a/src/Services/ApiHelper.php b/src/Services/ApiHelper.php index 3ef65ee9..ef14d31a 100644 --- a/src/Services/ApiHelper.php +++ b/src/Services/ApiHelper.php @@ -549,8 +549,8 @@ private function getShopDomain(Session $session = null): NullableShopDomain }, // Headers: Referer DataSource::REFERER()->toNative() => function (): ?string { - $url = parse_url(Request::server('HTTP_REFERER'), PHP_URL_QUERY); - parse_str($url, $refererQueryParams); + $url = parse_url(Request::server('HTTP_REFERER', ''), PHP_URL_QUERY); + parse_str($url ?? '', $refererQueryParams); return Arr::get($refererQueryParams, 'shop'); }, diff --git a/tests/TestCase.php b/tests/TestCase.php index 93d75995..a2b8a2ce 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -96,6 +96,7 @@ protected function getEnvironmentSetUp($app): void 'prefix' => '', ]); $app['config']->set('auth.providers.users.model', UserStub::class); + $app['config']->set('logging.deprecations', 'errorlog'); } protected function setupDatabase($app): void