Merge 5eb1d7b into 1a5a6cd

.github/workflows/tests.yml

@@ -27,7 +27,7 @@ jobs:
           coverage: xdebug
 
       - name: Install dependencies with Composer
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Coding standards
         if: matrix.analysis

CONTRIBUTING.md

@@ -2,21 +2,21 @@
 
 ## Pull Requests
 
-1. Fork this repository
-2. Create a new branch for each feature or improvement
-3. Send a pull request from each feature branch to the **master** branch
+1. Fork this repository.
+2. Create a new branch for each feature or improvement.
+3. Send a pull request from each feature branch to the **master** branch.
 
 It is very important to separate new features or improvements into separate 
 feature branches, and to send a pull request for each branch. This allows me to 
 review and pull in new features or improvements individually.
 
 ## Style Guide
 
-All pull requests must adhere to the [PSR-2 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md).
+All pull requests must adhere to the [PSR-12 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md).
 
 ## Unit Testing
 
 All pull requests must be accompanied by passing unit tests and complete code 
-coverage. The Slim Framework uses phpunit for testing.
+coverage. The Slim Framework uses PHPUnit for testing.
 
-[Learn about PHPUnit](https://github.com/sebastianbergmann/phpunit/)
+[Learn about PHPUnit](https://github.com/sebastianbergmann/phpunit/).

src/Factory/RequestFactory.php

@@ -23,32 +23,18 @@
 
 class RequestFactory implements RequestFactoryInterface
 {
-    /**
-     * @var StreamFactoryInterface|StreamFactory
-     */
-    protected $streamFactory;
+    protected StreamFactoryInterface $streamFactory;
 
-    /**
-     * @var UriFactoryInterface|UriFactory
-     */
-    protected $uriFactory;
+    protected UriFactoryInterface $uriFactory;
 
     /**
      * @param StreamFactoryInterface|null $streamFactory
      * @param UriFactoryInterface|null    $uriFactory
      */
     public function __construct(?StreamFactoryInterface $streamFactory = null, ?UriFactoryInterface $uriFactory = null)
     {
-        if (!isset($streamFactory)) {
-            $streamFactory = new StreamFactory();
-        }
-
-        if (!isset($uriFactory)) {
-            $uriFactory = new UriFactory();
-        }
-
-        $this->streamFactory = $streamFactory;
-        $this->uriFactory = $uriFactory;
+        $this->streamFactory = $streamFactory ?? new StreamFactory();
+        $this->uriFactory = $uriFactory ?? new UriFactory();
     }
 
     /**

src/Factory/ServerRequestFactory.php

@@ -30,32 +30,18 @@
 
 class ServerRequestFactory implements ServerRequestFactoryInterface
 {
-    /**
-     * @var StreamFactoryInterface|StreamFactory
-     */
-    protected $streamFactory;
+    protected StreamFactoryInterface $streamFactory;
 
-    /**
-     * @var UriFactoryInterface|UriFactory
-     */
-    protected $uriFactory;
+    protected UriFactoryInterface $uriFactory;
 
     /**
      * @param StreamFactoryInterface|null $streamFactory
      * @param UriFactoryInterface|null    $uriFactory
      */
     public function __construct(?StreamFactoryInterface $streamFactory = null, ?UriFactoryInterface $uriFactory = null)
     {
-        if (!isset($streamFactory)) {
-            $streamFactory = new StreamFactory();
-        }
-
-        if (!isset($uriFactory)) {
-            $uriFactory = new UriFactory();
-        }
-
-        $this->streamFactory = $streamFactory;
-        $this->uriFactory = $uriFactory;
+        $this->streamFactory = $streamFactory ?? new StreamFactory();
+        $this->uriFactory = $uriFactory ?? new UriFactory();
     }
 
     /**

src/Header.php

@@ -18,20 +18,11 @@
 
 class Header
 {
-    /**
-     * @var string
-     */
-    private $originalName;
+    private string $originalName;
 
-    /**
-     * @var string
-     */
-    private $normalizedName;
+    private string $normalizedName;
 
-    /**
-     * @var array
-     */
-    private $values;
+    private array $values;
 
     /**
      * Header constructor.

src/Headers.php

@@ -28,19 +28,13 @@
 
 class Headers implements HeadersInterface
 {
-    /**
-     * @var array
-     */
-    protected $globals;
+    protected array $globals;
 
-    /**
-     * @var Header[]
-     */
-    protected $headers;
+    protected array $headers;
 
     /**
-     * @param array $headers
-     * @param array $globals
+     * @param array      $headers
+     * @param array|null $globals
      */
     final public function __construct(array $headers = [], ?array $globals = null)
     {

src/Request.php

@@ -13,7 +13,6 @@
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
 use Slim\Psr7\Interfaces\HeadersInterface;
 
@@ -51,30 +50,18 @@ class Request extends Message implements ServerRequestInterface
      */
     protected $queryParams;
 
-    /**
-     * @var array
-     */
-    protected $cookies;
+    protected array $cookies;
 
-    /**
-     * @var array
-     */
-    protected $serverParams;
+    protected array $serverParams;
 
-    /**
-     * @var array
-     */
-    protected $attributes;
+    protected array $attributes;
 
     /**
      * @var null|array|object
      */
     protected $parsedBody;
 
-    /**
-     * @var UploadedFileInterface[]
-     */
-    protected $uploadedFiles;
+    protected array $uploadedFiles;
 
     /**
      * @param string           $method        The request method

src/Stream.php

@@ -48,10 +48,7 @@ class Stream implements StreamInterface
      */
     protected $stream;
 
-    /**
-     * @var array|null
-     */
-    protected $meta;
+    protected ?array $meta;
 
     /**
      * @var bool|null
@@ -80,18 +77,15 @@ class Stream implements StreamInterface
 
     protected bool $finished = false;
 
-    /**
-     * @var StreamInterface | null
-     */
-    protected $cache;
+    protected ?StreamInterface $cache;
 
     /**
-     * @param  resource $stream  A PHP resource handle.
-     * @param  StreamInterface $cache A stream to cache $stream (useful for non-seekable streams)
+     * @param  resource         $stream A PHP resource handle.
+     * @param  ?StreamInterface $cache  A stream to cache $stream (useful for non-seekable streams)
      *
      * @throws InvalidArgumentException If argument is not a resource.
      */
-    public function __construct($stream, StreamInterface $cache = null)
+    public function __construct($stream, ?StreamInterface $cache = null)
     {
         $this->attach($stream);
 

src/UploadedFile.php

@@ -34,29 +34,20 @@ class UploadedFile implements UploadedFileInterface
 {
     /**
      * The client-provided full path to the file
-     *
-     * @var string
      */
-    protected $file;
+    protected string $file;
 
     /**
      * The client-provided file name.
-     *
-     * @var string|null
      */
-    protected $name;
+    protected ?string $name;
 
     /**
      * The client-provided media type of the file.
-     *
-     * @var string|null
      */
-    protected $type;
+    protected ?string $type;
 
-    /**
-     * @var int|null
-     */
-    protected $size;
+    protected ?int $size;
 
     /**
      * A valid PHP UPLOAD_ERR_xxx code for the file upload.

src/Uri.php

@@ -47,10 +47,7 @@ class Uri implements UriInterface
 
     protected string $host = '';
 
-    /**
-     * @var null|int
-     */
-    protected $port;
+    protected ?int $port;
 
     protected string $path = '';
 
@@ -65,14 +62,14 @@ class Uri implements UriInterface
     protected string $fragment = '';
 
     /**
-     * @param string $scheme   Uri scheme.
-     * @param string $host     Uri host.
-     * @param int    $port     Uri port number.
-     * @param string $path     Uri path.
-     * @param string $query    Uri query string.
-     * @param string $fragment Uri fragment.
-     * @param string $user     Uri user.
-     * @param string $password Uri password.
+     * @param string   $scheme   Uri scheme.
+     * @param string   $host     Uri host.
+     * @param int|null $port     Uri port number.
+     * @param string   $path     Uri path.
+     * @param string   $query    Uri query string.
+     * @param string   $fragment Uri fragment.
+     * @param string   $user     Uri user.
+     * @param string   $password Uri password.
      */
     public function __construct(
         string $scheme,
@@ -290,9 +287,9 @@ protected function hasStandardPort(): bool
     /**
      * Filter Uri port.
      *
-     * @param  null|int $port The Uri port number.
+     * @param  int|null $port The Uri port number.
      *
-     * @return null|int
+     * @return int|null
      *
      * @throws InvalidArgumentException If the port is invalid.
      */

tests/Assets/HeaderStack.php

@@ -56,7 +56,7 @@ public static function push(array $header)
      *
      * @return string[][]
      */
-    public static function stack()
+    public static function stack(): array
     {
         return self::$data;
     }
@@ -68,7 +68,7 @@ public static function stack()
      *
      * @return bool
      */
-    public static function has($header)
+    public static function has($header): bool
     {
         foreach (self::$data as $item) {
             if ($item['header'] === $header) {
@@ -84,7 +84,7 @@ public static function has($header)
      *
      * @param string $header
      */
-    public static function remove($header)
+    public static function remove($header): void
     {
         foreach (self::$data as $key => $item) {
             if (false !== strpos($item['header'], "$header:")) {

tests/BodyTest.php

@@ -52,7 +52,7 @@ protected function tearDown(): void
      *
      * @return resource
      */
-    public function resourceFactory($mode = 'r+')
+    public function resourceFactory(string $mode = 'r+')
     {
         $stream = fopen('php://temp', $mode);
         fwrite($stream, $this->text);

tests/Factory/RequestFactoryTest.php

@@ -19,19 +19,12 @@
 
 class RequestFactoryTest extends RequestFactoryTestCase
 {
-    /**
-     * @return RequestFactory
-     */
-    protected function createRequestFactory()
+    protected function createRequestFactory(): RequestFactory
     {
         return new RequestFactory();
     }
 
-    /**
-     * @param string $uri
-     * @return UriInterface
-     */
-    protected function createUri($uri)
+    protected function createUri($uri): UriInterface
     {
         return (new UriFactory())->createUri($uri);
     }