Skip to content

Migrate to guzzlehttp/psr7 v2 compat (PHP 8.4) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cb-freddysart merged 1 commit into from
Apr 30, 2026
+4 −5
Merged

Migrate to guzzlehttp/psr7 v2 compat (PHP 8.4) #4

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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"symfony/yaml": "^3.2|^4.3|^5.0",
"nesbot/carbon": "^2.0",
"illuminate/collections": "^10.0 || ^11.0 || ^12.0",
"guzzlehttp/psr7": "^1.7.0",
"guzzlehttp/psr7": "^1.7.0 || ^2.0",
"psr/cache": "^1.0",
"league/flysystem-memory": "^1.0",
"cache/filesystem-adapter": "^1.0",
Expand Down
7 changes: 3 additions & 4 deletions src/DataStore/DefaultDataStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
namespace Okta\DataStore;

use Cache\Adapter\Common\CacheItem;
use function GuzzleHttp\Psr7\build_query;
use function GuzzleHttp\Psr7\parse_query;
use GuzzleHttp\Psr7\Query;
use Http\Client\Common\Plugin\AuthenticationPlugin;
use Http\Client\Common\PluginClient;
use Http\Client\HttpClient;
Expand Down Expand Up @@ -383,7 +382,7 @@ private function getQueryString(array $options)
*/
private function appendQueryValues($currentQuery, $queryDictionary)
{
$currentQueryParts = parse_query($currentQuery);
$currentQueryParts = Query::parse($currentQuery);

if ($currentQuery == '') {
$result = [];
Expand All @@ -399,7 +398,7 @@ private function appendQueryValues($currentQuery, $queryDictionary)
}

$result = array_replace_recursive($currentQueryParts, $result);
return build_query($result);
return Query::build($result);
}

/**
Expand Down
Loading