Updating HTTP code with PHP 8.1 features (#629)

Co-authored-by: Aleksei Gagarin <roxblnfk@ya.ru>

CHANGELOG.md

@@ -49,6 +49,10 @@
     added return type `mixed` to the method `getContext` in `Spiral\Filters\FilterInterface` interface. 
     Added return type `mixed` to the method `getValue` in `Spiral\Filters\InputInterface`.
   - [spiral/http] Config `Spiral\Config\JsonPayloadConfig` moved to the `Spiral\Bootloader\Http\JsonPayloadConfig`.
+  - [spiral/http] Added return type `array` and `mixed` parameter type of `$filler` to the method `fetch`, 
+    added return type `mixed` to the method `offsetGet`, added return type `mixed` and `mixed` parameter type 
+    of `$default` to the method `get`  in `Spiral\Http\Request\InputBag` class.
+  - [spiral/http] Added return type `bool` to the method `emit`  in `Spiral\Http\EmitterInterface` interface.
   - [spiral/config] Added return type `void` to the method `setDefaults` in `Spiral\Config\ConfiguratorInterface` interface.
   - [spiral/core] Added return type `mixed` to the method `runScope` in `Spiral\Core\ScopeInterface` interface.
   - [spiral/core] Added return type `mixed` and `array|callable|string` parameter type of `$target` 

src/Http/src/CallableHandler.php

@@ -1,16 +1,10 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http;
 
+use Closure;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -25,44 +19,41 @@ final class CallableHandler implements RequestHandlerInterface
     use JsonTrait;
 
     /** @var callable */
-    private $callable;
+    private mixed $callable;
 
-    /** @var ResponseFactoryInterface */
-    private $responseFactory;
-
-    public function __construct(callable $callable, ResponseFactoryInterface $responseFactory)
-    {
+    public function __construct(
+        callable $callable,
+        private readonly ResponseFactoryInterface $responseFactory
+    ) {
         $this->callable = $callable;
-        $this->responseFactory = $responseFactory;
     }
 
     /**
-     * @inheritdoc
      * @psalm-suppress UnusedVariable
      */
     public function handle(Request $request): Response
     {
-        $outputLevel = ob_get_level();
-        ob_start();
+        $outputLevel = \ob_get_level();
+        \ob_start();
 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
         try {
-            $result = ($this->callable)($request, $response);
+            $result = \call_user_func($this->callable, $request, $response);
         } catch (\Throwable $e) {
-            ob_get_clean();
+            \ob_get_clean();
             throw $e;
         } finally {
-            while (ob_get_level() > $outputLevel + 1) {
-                $output = ob_get_clean() . $output;
+            while (\ob_get_level() > $outputLevel + 1) {
+                $output = \ob_get_clean() . $output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            ob_get_clean() . $output
+            \ob_get_clean() . $output
         );
     }
 
@@ -73,7 +64,7 @@ public function handle(Request $request): Response
      * @param mixed    $result   Generated endpoint output.
      * @param string   $output   Buffer output.
      */
-    private function wrapResponse(Response $response, $result = null, string $output = ''): Response
+    private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response
     {
         if ($result instanceof Response) {
             if (!empty($output) && $result->getBody()->isWritable()) {
@@ -83,7 +74,7 @@ private function wrapResponse(Response $response, $result = null, string $output
             return $result;
         }
 
-        if (is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable) {
             $response = $this->writeJson($response, $result);
         } else {
             $response->getBody()->write((string)$result);

src/Http/src/Config/HttpConfig.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Config;

src/Http/src/Emitter/SapiEmitter.php

@@ -31,8 +31,6 @@ final class SapiEmitter implements EmitterInterface
      *
      * Emits the status line and headers via the header() function, and the
      * body content via the output buffer.
-     *
-     * @param ResponseInterface $response
      */
     public function emit(ResponseInterface $response): bool
     {
@@ -64,11 +62,11 @@ private function emitBody(ResponseInterface $response): void
      */
     private function assertNoPreviousOutput(): void
     {
-        if (headers_sent()) {
+        if (\headers_sent()) {
             throw new EmitterException('Unable to emit response, headers already send.');
         }
 
-        if (ob_get_level() > 0 && ob_get_length() > 0) {
+        if (\ob_get_level() > 0 && \ob_get_length() > 0) {
             throw new EmitterException('Unable to emit response, found non closed buffered output.');
         }
     }
@@ -82,15 +80,13 @@ private function assertNoPreviousOutput(): void
      * It is important to mention that this method should be called after
      * `emitHeaders()` in order to prevent PHP from changing the status code of
      * the emitted response.
-     *
-     * @param ResponseInterface $response
      */
     private function emitStatusLine(ResponseInterface $response): void
     {
         $reasonPhrase = $response->getReasonPhrase();
         $statusCode = $response->getStatusCode();
 
-        header(sprintf(
+        \header(\sprintf(
             'HTTP/%s %d%s',
             $response->getProtocolVersion(),
             $statusCode,
@@ -105,8 +101,6 @@ private function emitStatusLine(ResponseInterface $response): void
      * is an array with multiple values, ensures that each is sent
      * in such a way as to create aggregate headers (instead of replace
      * the previous).
-     *
-     * @param ResponseInterface $response
      */
     private function emitHeaders(ResponseInterface $response): void
     {
@@ -116,7 +110,7 @@ private function emitHeaders(ResponseInterface $response): void
             $name = $this->filterHeader($header);
             $first = $name === 'Set-Cookie' ? false : true;
             foreach ($values as $value) {
-                header(sprintf(
+                \header(\sprintf(
                     '%s: %s',
                     $name,
                     $value
@@ -131,6 +125,6 @@ private function emitHeaders(ResponseInterface $response): void
      */
     private function filterHeader(string $header): string
     {
-        return ucwords($header, '-');
+        return \ucwords($header, '-');
     }
 }

src/Http/src/EmitterInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http;
@@ -18,5 +11,5 @@ interface EmitterInterface
     /**
      * Emit response to the user.
      */
-    public function emit(ResponseInterface $response);
+    public function emit(ResponseInterface $response): bool;
 }

src/Http/src/Exception/ClientException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;
@@ -27,8 +20,6 @@ class ClientException extends HttpException
 
     /**
      * Code and message positions are reverted.
-     *
-     * @param int $code
      */
     public function __construct(?int $code = null, string $message = '', ?\Throwable $previous = null)
     {
@@ -37,7 +28,7 @@ public function __construct(?int $code = null, string $message = '', ?\Throwable
         }
 
         if (empty($message)) {
-            $message = "Http Error - {$code}";
+            $message = \sprintf('Http Error - %s', $code);
         }
 
         parent::__construct($message, $code, $previous);

src/Http/src/Exception/ClientException/BadRequestException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception\ClientException;

src/Http/src/Exception/ClientException/ForbiddenException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception\ClientException;

src/Http/src/Exception/ClientException/NotFoundException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception\ClientException;

src/Http/src/Exception/ClientException/ServerErrorException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception\ClientException;

src/Http/src/Exception/ClientException/UnauthorizedException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception\ClientException;

src/Http/src/Exception/DotNotFoundException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;

src/Http/src/Exception/EmitterException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;

src/Http/src/Exception/HttpException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;

src/Http/src/Exception/InputException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;

src/Http/src/Exception/PipelineException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;

src/Http/src/Exception/ResponseException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Http\Exception;