Skip to content
This repository has been archived by the owner on Nov 30, 2022. It is now read-only.

Deprecation supports and fixes #1207

Merged
merged 1 commit into from
Sep 9, 2022
Merged

Deprecation supports and fixes #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Http/Middleware/VerifyShopify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Objects/Values/ShopDomain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Services/ApiHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
},
Expand Down
1 change: 1 addition & 0 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down