Deprecate usage of PSR-7 in API

thephpleague · Jun 10, 2024 · 432681a · 432681a
1 parent 913a797
commit 432681a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/components/CHANGELOG.md b/components/CHANGELOG.md
@@ -12,10 +12,11 @@ All Notable changes to `League\Uri\Components` will be documented in this file
 ### Fixed
 
 - Adding `SensitiveParameter` attribute in the `UserInfo` and the `Authority` class.
+- Remove Usage of PSR-7 `UriInterface` in `UrlSearchParams` class
 
 ### Deprecated
 
-- None
+- Usage of PSR-7 `UriFactoryInterface` is deprecated in `Modifier` class
 
 ### Removed
 

diff --git a/components/Components/URLSearchParams.php b/components/Components/URLSearchParams.php
@@ -25,7 +25,6 @@
 use League\Uri\KeyValuePair\Converter;
 use League\Uri\QueryString;
 use League\Uri\Uri;
-use Psr\Http\Message\UriInterface as Psr7UriInterface;
 use Stringable;
 
 use function array_is_list;
@@ -202,7 +201,6 @@ public static function fromAssociative(object|array $associative): self
     public static function fromUri(Stringable|string $uri): self
     {
         $query = match (true) {
-            $uri instanceof Psr7UriInterface,
             $uri instanceof UriInterface => $uri->getQuery(),
             default => Uri::new($uri)->getQuery(),
         };

diff --git a/components/Modifier.php b/components/Modifier.php
@@ -43,6 +43,12 @@ final public function __construct(protected readonly Psr7UriInterface|UriInterfa
     {
     }
 
+    /**
+     * @param Stringable|string $uri
+     * @param UriFactoryInterface|null $uriFactory Deprecated, will be removed in the next major release
+     *
+     * @return static
+     */
     public static function from(Stringable|string $uri, ?UriFactoryInterface $uriFactory = null): static
     {
         return new static(match (true) {

diff --git a/uri/BaseUri.php b/uri/BaseUri.php
@@ -51,6 +51,10 @@ class BaseUri implements Stringable, JsonSerializable, UriAccess
     protected readonly Psr7UriInterface|UriInterface|null $origin;
     protected readonly ?string $nullValue;
 
+    /**
+     * @param Psr7UriInterface|UriInterface $uri
+     * @param UriFactoryInterface|null $uriFactory Deprecated, will be removed in the next major release
+     */
     final protected function __construct(
         protected readonly Psr7UriInterface|UriInterface $uri,
         protected readonly ?UriFactoryInterface $uriFactory

diff --git a/uri/CHANGELOG.md b/uri/CHANGELOG.md
@@ -15,7 +15,7 @@ All Notable changes to `League\Uri` will be documented in this file
 
 ### Deprecated
 
-- None
+- Usage of PSR-7 `UriFactoryInterface` is deprecated in `BaseUri` class
 
 ### Removed