From fb022eae686612d1a02f7bc351937f244fc80ebb Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 10 Nov 2020 18:13:24 +0100 Subject: [PATCH] #867 Changed use of deprecated functions by their replacements --- module/Core/src/Action/AbstractTrackingAction.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/module/Core/src/Action/AbstractTrackingAction.php b/module/Core/src/Action/AbstractTrackingAction.php index 08a35855..b121ae3a 100644 --- a/module/Core/src/Action/AbstractTrackingAction.php +++ b/module/Core/src/Action/AbstractTrackingAction.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace Shlinkio\Shlink\Core\Action; use Fig\Http\Message\RequestMethodInterface; +use GuzzleHttp\Psr7\Query; use League\Uri\Uri; use Mezzio\Router\Middleware\ImplicitHeadMiddleware; use Psr\Http\Message\ResponseInterface; @@ -23,8 +24,6 @@ use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; use function array_key_exists; use function array_merge; -use function GuzzleHttp\Psr7\build_query; -use function GuzzleHttp\Psr7\parse_query; abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMethodInterface { @@ -68,13 +67,13 @@ abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMet private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string { $uri = Uri::createFromString($shortUrl->getLongUrl()); - $hardcodedQuery = parse_query($uri->getQuery() ?? ''); + $hardcodedQuery = Query::parse($uri->getQuery() ?? ''); if ($disableTrackParam !== null) { unset($currentQuery[$disableTrackParam]); } $mergedQuery = array_merge($hardcodedQuery, $currentQuery); - return (string) (empty($mergedQuery) ? $uri : $uri->withQuery(build_query($mergedQuery))); + return (string) (empty($mergedQuery) ? $uri : $uri->withQuery(Query::build($mergedQuery))); } private function shouldTrackRequest(ServerRequestInterface $request, array $query, ?string $disableTrackParam): bool