Merge #19887 - Migrate psr/http-message to v2

MauricioFauth · MauricioFauth · commit 069b861937f5 · 2025-10-18T16:46:58.000-03:00
Pull-request: #19887 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
diff --git a/composer.json b/composer.json
@@ -66,7 +66,7 @@
         "phpmyadmin/sql-parser": "^6.0-dev",
         "psr/container": "^2.0",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.1",
+        "psr/http-message": "^2",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "slim/psr7": "^1.6.1",
diff --git a/composer.lock b/composer.lock
diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\Http;
 
 use Fig\Http\Message\RequestMethodInterface;
+use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
@@ -21,166 +22,157 @@ final public function __construct(private ServerRequestInterface $serverRequest)
     {
     }
 
-    /** @inheritDoc */
-    public function getProtocolVersion()
+    public function getProtocolVersion(): string
     {
         return $this->serverRequest->getProtocolVersion();
     }
 
     /** @inheritDoc */
-    public function withProtocolVersion($version)
+    public function withProtocolVersion($version): MessageInterface
     {
         $serverRequest = $this->serverRequest->withProtocolVersion($version);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->serverRequest->getHeaders();
     }
 
-    /** @inheritDoc */
-    public function hasHeader($name)
+    public function hasHeader(string $name): bool
     {
         return $this->serverRequest->hasHeader($name);
     }
 
     /** @inheritDoc */
-    public function getHeader($name)
+    public function getHeader(string $name): array
     {
         return $this->serverRequest->getHeader($name);
     }
 
-    /** @inheritDoc */
-    public function getHeaderLine($name)
+    public function getHeaderLine(string $name): string
     {
         return $this->serverRequest->getHeaderLine($name);
     }
 
     /** @inheritDoc */
-    public function withHeader($name, $value)
+    public function withHeader(string $name, $value): MessageInterface
     {
         $serverRequest = $this->serverRequest->withHeader($name, $value);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function withAddedHeader($name, $value)
+    public function withAddedHeader(string $name, $value): MessageInterface
     {
         $serverRequest = $this->serverRequest->withAddedHeader($name, $value);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function withoutHeader($name)
+    public function withoutHeader(string $name): MessageInterface
     {
         $serverRequest = $this->serverRequest->withoutHeader($name);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function getBody()
+    public function getBody(): StreamInterface
     {
         return $this->serverRequest->getBody();
     }
 
-    /** @inheritDoc */
-    public function withBody(StreamInterface $body)
+    public function withBody(StreamInterface $body): MessageInterface
     {
         $serverRequest = $this->serverRequest->withBody($body);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function getRequestTarget()
+    public function getRequestTarget(): string
     {
         return $this->serverRequest->getRequestTarget();
     }
 
     /** @inheritDoc */
-    public function withRequestTarget($requestTarget)
+    public function withRequestTarget($requestTarget): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withRequestTarget($requestTarget);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function getMethod()
+    public function getMethod(): string
     {
         return $this->serverRequest->getMethod();
     }
 
     /** @inheritDoc */
-    public function withMethod($method)
+    public function withMethod($method): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withMethod($method);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function getUri()
+    public function getUri(): UriInterface
     {
         return $this->serverRequest->getUri();
     }
 
     /** @inheritDoc */
-    public function withUri(UriInterface $uri, $preserveHost = false)
+    public function withUri(UriInterface $uri, $preserveHost = false): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withUri($uri, $preserveHost);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function getServerParams()
+    public function getServerParams(): array
     {
         return $this->serverRequest->getServerParams();
     }
 
     /** @inheritDoc */
-    public function getCookieParams()
+    public function getCookieParams(): array
     {
         return $this->serverRequest->getCookieParams();
     }
 
     /** @inheritDoc */
-    public function withCookieParams(array $cookies)
+    public function withCookieParams(array $cookies): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withCookieParams($cookies);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function getQueryParams()
+    public function getQueryParams(): array
     {
         return $this->serverRequest->getQueryParams();
     }
 
     /** @inheritDoc */
-    public function withQueryParams(array $query)
+    public function withQueryParams(array $query): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withQueryParams($query);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function getUploadedFiles()
+    public function getUploadedFiles(): array
     {
         return $this->serverRequest->getUploadedFiles();
     }
 
     /** @inheritDoc */
-    public function withUploadedFiles(array $uploadedFiles)
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withUploadedFiles($uploadedFiles);
 
@@ -194,15 +186,15 @@ public function getParsedBody()
     }
 
     /** @inheritDoc */
-    public function withParsedBody($data)
+    public function withParsedBody($data): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withParsedBody($data);
 
         return new static($serverRequest);
     }
 
     /** @inheritDoc */
-    public function getAttributes()
+    public function getAttributes(): array
     {
         return $this->serverRequest->getAttributes();
     }
@@ -214,15 +206,14 @@ public function getAttribute($name, $default = null)
     }
 
     /** @inheritDoc */
-    public function withAttribute($name, $value)
+    public function withAttribute($name, $value): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withAttribute($name, $value);
 
         return new static($serverRequest);
     }
 
-    /** @inheritDoc */
-    public function withoutAttribute($name)
+    public function withoutAttribute(string $name): ServerRequestInterface
     {
         $serverRequest = $this->serverRequest->withoutAttribute($name);
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`namespace PhpMyAdmin\Http;`
`6`	`6`
`7`	`7`	`use Fig\Http\Message\RequestMethodInterface;`
	`8`	`+use Psr\Http\Message\MessageInterface;`
`8`	`9`	`use Psr\Http\Message\ServerRequestInterface;`
`9`	`10`	`use Psr\Http\Message\StreamInterface;`
`10`	`11`	`use Psr\Http\Message\UriInterface;`
`@@ -21,166 +22,157 @@ final public function __construct(private ServerRequestInterface $serverRequest)`
`21`	`22`	`{`
`22`	`23`	`}`
`23`	`24`
`24`		`- /** @inheritDoc */`
`25`		`- public function getProtocolVersion()`
	`25`	`+ public function getProtocolVersion(): string`
`26`	`26`	`{`
`27`	`27`	`return $this->serverRequest->getProtocolVersion();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/** @inheritDoc */`
`31`		`- public function withProtocolVersion($version)`
	`31`	`+ public function withProtocolVersion($version): MessageInterface`
`32`	`32`	`{`
`33`	`33`	`$serverRequest = $this->serverRequest->withProtocolVersion($version);`
`34`	`34`
`35`	`35`	`return new static($serverRequest);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/** @inheritDoc */`
`39`		`- public function getHeaders()`
	`39`	`+ public function getHeaders(): array`
`40`	`40`	`{`
`41`	`41`	`return $this->serverRequest->getHeaders();`
`42`	`42`	`}`
`43`	`43`
`44`		`- /** @inheritDoc */`
`45`		`- public function hasHeader($name)`
	`44`	`+ public function hasHeader(string $name): bool`
`46`	`45`	`{`
`47`	`46`	`return $this->serverRequest->hasHeader($name);`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`/** @inheritDoc */`
`51`		`- public function getHeader($name)`
	`50`	`+ public function getHeader(string $name): array`
`52`	`51`	`{`
`53`	`52`	`return $this->serverRequest->getHeader($name);`
`54`	`53`	`}`
`55`	`54`
`56`		`- /** @inheritDoc */`
`57`		`- public function getHeaderLine($name)`
	`55`	`+ public function getHeaderLine(string $name): string`
`58`	`56`	`{`
`59`	`57`	`return $this->serverRequest->getHeaderLine($name);`
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`/** @inheritDoc */`
`63`		`- public function withHeader($name, $value)`
	`61`	`+ public function withHeader(string $name, $value): MessageInterface`
`64`	`62`	`{`
`65`	`63`	`$serverRequest = $this->serverRequest->withHeader($name, $value);`
`66`	`64`
`67`	`65`	`return new static($serverRequest);`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`/** @inheritDoc */`
`71`		`- public function withAddedHeader($name, $value)`
	`69`	`+ public function withAddedHeader(string $name, $value): MessageInterface`
`72`	`70`	`{`
`73`	`71`	`$serverRequest = $this->serverRequest->withAddedHeader($name, $value);`
`74`	`72`
`75`	`73`	`return new static($serverRequest);`
`76`	`74`	`}`
`77`	`75`
`78`		`- /** @inheritDoc */`
`79`		`- public function withoutHeader($name)`
	`76`	`+ public function withoutHeader(string $name): MessageInterface`
`80`	`77`	`{`
`81`	`78`	`$serverRequest = $this->serverRequest->withoutHeader($name);`
`82`	`79`
`83`	`80`	`return new static($serverRequest);`
`84`	`81`	`}`
`85`	`82`
`86`		`- /** @inheritDoc */`
`87`		`- public function getBody()`
	`83`	`+ public function getBody(): StreamInterface`
`88`	`84`	`{`
`89`	`85`	`return $this->serverRequest->getBody();`
`90`	`86`	`}`
`91`	`87`
`92`		`- /** @inheritDoc */`
`93`		`- public function withBody(StreamInterface $body)`
	`88`	`+ public function withBody(StreamInterface $body): MessageInterface`
`94`	`89`	`{`
`95`	`90`	`$serverRequest = $this->serverRequest->withBody($body);`
`96`	`91`
`97`	`92`	`return new static($serverRequest);`
`98`	`93`	`}`
`99`	`94`
`100`		`- /** @inheritDoc */`
`101`		`- public function getRequestTarget()`
	`95`	`+ public function getRequestTarget(): string`
`102`	`96`	`{`
`103`	`97`	`return $this->serverRequest->getRequestTarget();`
`104`	`98`	`}`
`105`	`99`
`106`	`100`	`/** @inheritDoc */`
`107`		`- public function withRequestTarget($requestTarget)`
	`101`	`+ public function withRequestTarget($requestTarget): ServerRequestInterface`
`108`	`102`	`{`
`109`	`103`	`$serverRequest = $this->serverRequest->withRequestTarget($requestTarget);`
`110`	`104`
`111`	`105`	`return new static($serverRequest);`
`112`	`106`	`}`
`113`	`107`
`114`		`- /** @inheritDoc */`
`115`		`- public function getMethod()`
	`108`	`+ public function getMethod(): string`
`116`	`109`	`{`
`117`	`110`	`return $this->serverRequest->getMethod();`
`118`	`111`	`}`
`119`	`112`
`120`	`113`	`/** @inheritDoc */`
`121`		`- public function withMethod($method)`
	`114`	`+ public function withMethod($method): ServerRequestInterface`
`122`	`115`	`{`
`123`	`116`	`$serverRequest = $this->serverRequest->withMethod($method);`
`124`	`117`
`125`	`118`	`return new static($serverRequest);`
`126`	`119`	`}`
`127`	`120`
`128`		`- /** @inheritDoc */`
`129`		`- public function getUri()`
	`121`	`+ public function getUri(): UriInterface`
`130`	`122`	`{`
`131`	`123`	`return $this->serverRequest->getUri();`
`132`	`124`	`}`
`133`	`125`
`134`	`126`	`/** @inheritDoc */`
`135`		`- public function withUri(UriInterface $uri, $preserveHost = false)`
	`127`	`+ public function withUri(UriInterface $uri, $preserveHost = false): ServerRequestInterface`
`136`	`128`	`{`
`137`	`129`	`$serverRequest = $this->serverRequest->withUri($uri, $preserveHost);`
`138`	`130`
`139`	`131`	`return new static($serverRequest);`
`140`	`132`	`}`
`141`	`133`
`142`	`134`	`/** @inheritDoc */`
`143`		`- public function getServerParams()`
	`135`	`+ public function getServerParams(): array`
`144`	`136`	`{`
`145`	`137`	`return $this->serverRequest->getServerParams();`
`146`	`138`	`}`
`147`	`139`
`148`	`140`	`/** @inheritDoc */`
`149`		`- public function getCookieParams()`
	`141`	`+ public function getCookieParams(): array`
`150`	`142`	`{`
`151`	`143`	`return $this->serverRequest->getCookieParams();`
`152`	`144`	`}`
`153`	`145`
`154`	`146`	`/** @inheritDoc */`
`155`		`- public function withCookieParams(array $cookies)`
	`147`	`+ public function withCookieParams(array $cookies): ServerRequestInterface`
`156`	`148`	`{`
`157`	`149`	`$serverRequest = $this->serverRequest->withCookieParams($cookies);`
`158`	`150`
`159`	`151`	`return new static($serverRequest);`
`160`	`152`	`}`
`161`	`153`
`162`	`154`	`/** @inheritDoc */`
`163`		`- public function getQueryParams()`
	`155`	`+ public function getQueryParams(): array`
`164`	`156`	`{`
`165`	`157`	`return $this->serverRequest->getQueryParams();`
`166`	`158`	`}`
`167`	`159`
`168`	`160`	`/** @inheritDoc */`
`169`		`- public function withQueryParams(array $query)`
	`161`	`+ public function withQueryParams(array $query): ServerRequestInterface`
`170`	`162`	`{`
`171`	`163`	`$serverRequest = $this->serverRequest->withQueryParams($query);`
`172`	`164`
`173`	`165`	`return new static($serverRequest);`
`174`	`166`	`}`
`175`	`167`
`176`	`168`	`/** @inheritDoc */`
`177`		`- public function getUploadedFiles()`
	`169`	`+ public function getUploadedFiles(): array`
`178`	`170`	`{`
`179`	`171`	`return $this->serverRequest->getUploadedFiles();`
`180`	`172`	`}`
`181`	`173`
`182`	`174`	`/** @inheritDoc */`
`183`		`- public function withUploadedFiles(array $uploadedFiles)`
	`175`	`+ public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface`
`184`	`176`	`{`
`185`	`177`	`$serverRequest = $this->serverRequest->withUploadedFiles($uploadedFiles);`
`186`	`178`
`@@ -194,15 +186,15 @@ public function getParsedBody()`
`194`	`186`	`}`
`195`	`187`
`196`	`188`	`/** @inheritDoc */`
`197`		`- public function withParsedBody($data)`
	`189`	`+ public function withParsedBody($data): ServerRequestInterface`
`198`	`190`	`{`
`199`	`191`	`$serverRequest = $this->serverRequest->withParsedBody($data);`
`200`	`192`
`201`	`193`	`return new static($serverRequest);`
`202`	`194`	`}`
`203`	`195`
`204`	`196`	`/** @inheritDoc */`
`205`		`- public function getAttributes()`
	`197`	`+ public function getAttributes(): array`
`206`	`198`	`{`
`207`	`199`	`return $this->serverRequest->getAttributes();`
`208`	`200`	`}`
`@@ -214,15 +206,14 @@ public function getAttribute($name, $default = null)`
`214`	`206`	`}`
`215`	`207`
`216`	`208`	`/** @inheritDoc */`
`217`		`- public function withAttribute($name, $value)`
	`209`	`+ public function withAttribute($name, $value): ServerRequestInterface`
`218`	`210`	`{`
`219`	`211`	`$serverRequest = $this->serverRequest->withAttribute($name, $value);`
`220`	`212`
`221`	`213`	`return new static($serverRequest);`
`222`	`214`	`}`
`223`	`215`
`224`		`- /** @inheritDoc */`
`225`		`- public function withoutAttribute($name)`
	`216`	`+ public function withoutAttribute(string $name): ServerRequestInterface`
`226`	`217`	`{`
`227`	`218`	`$serverRequest = $this->serverRequest->withoutAttribute($name);`
`228`	`219`