[PsrHttpMessageBridge] Patch return types and fix CS

derrabus · derrabus · commit e40dd6609f92 · 2023-07-27T20:30:32.000+02:00
diff --git a/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php b/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php
@@ -41,9 +41,6 @@ public function __construct(HttpMessageFactoryInterface $httpMessageFactory)
         $this->httpMessageFactory = $httpMessageFactory;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Request $request, ArgumentMetadata $argument): bool
     {
         if ($this instanceof BaseValueResolverInterface) {
@@ -53,9 +50,6 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
         return self::SUPPORTED_TYPES[$argument->getType()] ?? false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolve(Request $request, ArgumentMetadata $argument): \Traversable
     {
         if (!isset(self::SUPPORTED_TYPES[$argument->getType()])) {
diff --git a/src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php b/src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bridge\PsrHttpMessage\EventListener;
 
 use Psr\Http\Message\ResponseInterface;
@@ -38,9 +47,6 @@ public function onKernelView(ViewEvent $event): void
         $event->setResponse($this->httpFoundationFactory->createResponse($controllerResult));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Factory/HttpFoundationFactory.php b/src/Symfony/Bridge/PsrHttpMessage/Factory/HttpFoundationFactory.php
@@ -23,8 +23,6 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
- * {@inheritdoc}
- *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class HttpFoundationFactory implements HttpFoundationFactoryInterface
@@ -39,12 +37,7 @@ public function __construct(int $responseBufferMaxLength = 16372)
         $this->responseBufferMaxLength = $responseBufferMaxLength;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return Request
-     */
-    public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false)
+    public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false): Request
     {
         $server = [];
         $uri = $psrRequest->getUri();
@@ -113,20 +106,13 @@ private function createUploadedFile(UploadedFileInterface $psrUploadedFile): Upl
 
     /**
      * Gets a temporary file path.
-     *
-     * @return string
      */
-    protected function getTemporaryPath()
+    protected function getTemporaryPath(): string
     {
         return tempnam(sys_get_temp_dir(), uniqid('symfony', true));
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return Response
-     */
-    public function createResponse(ResponseInterface $psrResponse, bool $streamed = false)
+    public function createResponse(ResponseInterface $psrResponse, bool $streamed = false): Response
     {
         $cookies = $psrResponse->getHeader('Set-Cookie');
         $psrResponse = $psrResponse->withoutHeader('Set-Cookie');
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php b/src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php
@@ -46,12 +46,7 @@ public function __construct(ServerRequestFactoryInterface $serverRequestFactory,
         $this->responseFactory = $responseFactory;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return ServerRequestInterface
-     */
-    public function createRequest(Request $symfonyRequest)
+    public function createRequest(Request $symfonyRequest): ServerRequestInterface
     {
         $uri = $symfonyRequest->server->get('QUERY_STRING', '');
         $uri = $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getBaseUrl().$symfonyRequest->getPathInfo().('' !== $uri ? '?'.$uri : '');
@@ -141,12 +136,7 @@ private function createUploadedFile(UploadedFile $symfonyUploadedFile): Uploaded
         );
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(Response $symfonyResponse)
+    public function createResponse(Response $symfonyResponse): ResponseInterface
     {
         $response = $this->responseFactory->createResponse($symfonyResponse->getStatusCode(), Response::$statusTexts[$symfonyResponse->getStatusCode()] ?? '');
 
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Factory/UploadedFile.php b/src/Symfony/Bridge/PsrHttpMessage/Factory/UploadedFile.php
@@ -49,9 +49,6 @@ public function __construct(UploadedFileInterface $psrUploadedFile, callable $ge
         $this->psrUploadedFile = $psrUploadedFile;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function move(string $directory, string $name = null): File
     {
         if (!$this->isValid() || $this->test) {
@@ -63,7 +60,7 @@ public function move(string $directory, string $name = null): File
         try {
             $this->psrUploadedFile->moveTo((string) $target);
         } catch (\RuntimeException $e) {
-            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, $e->getMessage()), 0, $e);
+            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, $e->getMessage()), 0, $e);
         }
 
         @chmod($target, 0666 & ~umask());
diff --git a/src/Symfony/Bridge/PsrHttpMessage/HttpFoundationFactoryInterface.php b/src/Symfony/Bridge/PsrHttpMessage/HttpFoundationFactoryInterface.php
@@ -25,15 +25,11 @@ interface HttpFoundationFactoryInterface
 {
     /**
      * Creates a Symfony Request instance from a PSR-7 one.
-     *
-     * @return Request
      */
-    public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false);
+    public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false): Request;
 
     /**
      * Creates a Symfony Response instance from a PSR-7 one.
-     *
-     * @return Response
      */
-    public function createResponse(ResponseInterface $psrResponse, bool $streamed = false);
+    public function createResponse(ResponseInterface $psrResponse, bool $streamed = false): Response;
 }
diff --git a/src/Symfony/Bridge/PsrHttpMessage/HttpMessageFactoryInterface.php b/src/Symfony/Bridge/PsrHttpMessage/HttpMessageFactoryInterface.php
@@ -25,15 +25,11 @@ interface HttpMessageFactoryInterface
 {
     /**
      * Creates a PSR-7 Request instance from a Symfony one.
-     *
-     * @return ServerRequestInterface
      */
-    public function createRequest(Request $symfonyRequest);
+    public function createRequest(Request $symfonyRequest): ServerRequestInterface;
 
     /**
      * Creates a PSR-7 Response instance from a Symfony one.
-     *
-     * @return ResponseInterface
      */
-    public function createResponse(Response $symfonyResponse);
+    public function createResponse(Response $symfonyResponse): ResponseInterface;
 }
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Tests/EventListener/PsrResponseListenerTest.php b/src/Symfony/Bridge/PsrHttpMessage/Tests/EventListener/PsrResponseListenerTest.php
@@ -46,10 +46,7 @@ public function testDoesNotConvertControllerResult()
         self::assertFalse($event->hasResponse());
     }
 
-    /**
-     * @param mixed $controllerResult
-     */
-    private function createEventMock($controllerResult): ViewEvent
+    private function createEventMock(mixed $controllerResult): ViewEvent
     {
         return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $controllerResult);
     }

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ public function __construct(HttpMessageFactoryInterface $httpMessageFactory)`
`41`	`41`	`$this->httpMessageFactory = $httpMessageFactory;`
`42`	`42`	`}`
`43`	`43`
`44`		`- /**`
`45`		`- * {@inheritdoc}`
`46`		`- */`
`47`	`44`	`public function supports(Request $request, ArgumentMetadata $argument): bool`
`48`	`45`	`{`
`49`	`46`	`if ($this instanceof BaseValueResolverInterface) {`
`@@ -53,9 +50,6 @@ public function supports(Request $request, ArgumentMetadata $argument): bool`
`53`	`50`	`return self::SUPPORTED_TYPES[$argument->getType()] ?? false;`
`54`	`51`	`}`
`55`	`52`
`56`		`- /**`
`57`		`- * {@inheritdoc}`
`58`		`- */`
`59`	`53`	`public function resolve(Request $request, ArgumentMetadata $argument): \Traversable`
`60`	`54`	`{`
`61`	`55`	`if (!isset(self::SUPPORTED_TYPES[$argument->getType()])) {`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,7 @@ public function __construct(ServerRequestFactoryInterface $serverRequestFactory,`
`46`	`46`	`$this->responseFactory = $responseFactory;`
`47`	`47`	`}`
`48`	`48`
`49`		`- /**`
`50`		`- * {@inheritdoc}`
`51`		`- *`
`52`		`- * @return ServerRequestInterface`
`53`		`- */`
`54`		`- public function createRequest(Request $symfonyRequest)`
	`49`	`+ public function createRequest(Request $symfonyRequest): ServerRequestInterface`
`55`	`50`	`{`
`56`	`51`	`$uri = $symfonyRequest->server->get('QUERY_STRING', '');`
`57`	`52`	`$uri = $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getBaseUrl().$symfonyRequest->getPathInfo().('' !== $uri ? '?'.$uri : '');`
`@@ -141,12 +136,7 @@ private function createUploadedFile(UploadedFile $symfonyUploadedFile): Uploaded`
`141`	`136`	`);`
`142`	`137`	`}`
`143`	`138`
`144`		`- /**`
`145`		`- * {@inheritdoc}`
`146`		`- *`
`147`		`- * @return ResponseInterface`
`148`		`- */`
`149`		`- public function createResponse(Response $symfonyResponse)`
	`139`	`+ public function createResponse(Response $symfonyResponse): ResponseInterface`
`150`	`140`	`{`
`151`	`141`	`$response = $this->responseFactory->createResponse($symfonyResponse->getStatusCode(), Response::$statusTexts[$symfonyResponse->getStatusCode()] ?? '');`
`152`	`142`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,6 @@ public function __construct(UploadedFileInterface $psrUploadedFile, callable $ge`
`49`	`49`	`$this->psrUploadedFile = $psrUploadedFile;`
`50`	`50`	`}`
`51`	`51`
`52`		`- /**`
`53`		`- * {@inheritdoc}`
`54`		`- */`
`55`	`52`	`public function move(string $directory, string $name = null): File`
`56`	`53`	`{`
`57`	`54`	`if (!$this->isValid() \|\| $this->test) {`
`@@ -63,7 +60,7 @@ public function move(string $directory, string $name = null): File`
`63`	`60`	`try {`
`64`	`61`	`$this->psrUploadedFile->moveTo((string) $target);`
`65`	`62`	`} catch (\RuntimeException $e) {`
`66`		`- throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, $e->getMessage()), 0, $e);`
	`63`	`+ throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, $e->getMessage()), 0, $e);`
`67`	`64`	`}`
`68`	`65`
`69`	`66`	`@chmod($target, 0666 & ~umask());`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,7 @@ public function testDoesNotConvertControllerResult()`
`46`	`46`	`self::assertFalse($event->hasResponse());`
`47`	`47`	`}`
`48`	`48`
`49`		`- /**`
`50`		`- * @param mixed $controllerResult`
`51`		`- */`
`52`		`- private function createEventMock($controllerResult): ViewEvent`
	`49`	`+ private function createEventMock(mixed $controllerResult): ViewEvent`
`53`	`50`	`{`
`54`	`51`	`return new ViewEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $controllerResult);`
`55`	`52`	`}`