Merge pull request #48 from lcobucci/dependabot/composer/lcobucci/cod…

…ing-standard-tw-5.0

Update lcobucci/coding-standard requirement from ^4.0 to ^5.0

composer.json

@@ -29,7 +29,7 @@
         "infection/infection": "^0.16",
         "jms/serializer": "^3.8",
         "laminas/laminas-diactoros": "^2.3",
-        "lcobucci/coding-standard": "^4.0",
+        "lcobucci/coding-standard": "^5.0",
         "league/plates": "^3.3",
         "middlewares/negotiation": "^2.0",
         "phpstan/extension-installer": "^1.0",

src/ContentTypeMiddleware.php

@@ -10,6 +10,7 @@
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function strpos;
 use function substr;
 
@@ -18,9 +19,7 @@ final class ContentTypeMiddleware implements MiddlewareInterface
     private MiddlewareInterface $negotiator;
     private StreamFactoryInterface $streamFactory;
 
-    /**
-     * @var Formatter[]
-     */
+    /** @var Formatter[] */
     private array $formatters;
 
     /**

src/Formatter.php

@@ -8,8 +8,6 @@
 
 interface Formatter
 {
-    /**
-     * @throws ContentCouldNotBeFormatted
-     */
+    /** @throws ContentCouldNotBeFormatted */
     public function format(UnformattedResponse $response, StreamFactoryInterface $streamFactory): ResponseInterface;
 }

src/Formatter/JmsSerializer.php

@@ -6,6 +6,7 @@
 use JMS\Serializer\SerializerInterface;
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
 use Throwable;
+
 use function sprintf;
 
 final class JmsSerializer extends ContentOnly
@@ -19,9 +20,7 @@ public function __construct(SerializerInterface $serializer, string $format)
         $this->format     = $format;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function formatContent($content, array $attributes = []): string
     {
         try {

src/Formatter/Json.php

@@ -5,8 +5,10 @@
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
 use Throwable;
+
 use function json_encode;
 use function sprintf;
+
 use const JSON_HEX_AMP;
 use const JSON_HEX_APOS;
 use const JSON_HEX_QUOT;
@@ -25,9 +27,7 @@ public function __construct(int $flags = self::DEFAULT_FLAGS)
         $this->flags = $flags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function formatContent($content, array $attributes = []): string
     {
         try {

src/Formatter/Plates.php

@@ -20,9 +20,7 @@ public function __construct(Engine $engine, string $attributeName = self::DEFAUL
         $this->attributeName = $attributeName;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function formatContent($content, array $attributes = []): string
     {
         try {

src/Formatter/StringCast.php

@@ -4,14 +4,13 @@
 namespace Lcobucci\ContentNegotiation\Formatter;
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
+
 use function is_object;
 use function method_exists;
 
 final class StringCast extends ContentOnly
 {
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function formatContent($content, array $attributes = []): string
     {
         if (is_object($content) && ! method_exists($content, '__toString')) {

src/Formatter/Twig.php

@@ -22,9 +22,7 @@ public function __construct(
         $this->attributeName = $attributeName;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function formatContent($content, array $attributes = []): string
     {
         try {

src/UnformattedResponse.php

@@ -10,14 +10,10 @@ final class UnformattedResponse implements ResponseInterface
 {
     private ResponseInterface $decoratedResponse;
 
-    /**
-     * @var mixed
-     */
+    /** @var mixed */
     private $unformattedContent;
 
-    /**
-     * @var array<string, mixed>
-     */
+    /** @var array<string, mixed> */
     private array $attributes;
 
     /**
@@ -34,9 +30,7 @@ public function __construct(
         $this->attributes         = $attributes;
     }
 
-    /**
-     * @return mixed
-     */
+    /** @return mixed */
     public function getUnformattedContent()
     {
         return $this->unformattedContent;
@@ -47,9 +41,7 @@ public function getProtocolVersion(): string
         return $this->decoratedResponse->getProtocolVersion();
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withProtocolVersion($version)
     {
         return new self(
@@ -59,41 +51,31 @@ public function withProtocolVersion($version)
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function getHeaders(): array
     {
         return $this->decoratedResponse->getHeaders();
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function hasHeader($name): bool
     {
         return $this->decoratedResponse->hasHeader($name);
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function getHeader($name)
     {
         return $this->decoratedResponse->getHeader($name);
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function getHeaderLine($name): string
     {
         return $this->decoratedResponse->getHeaderLine($name);
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withHeader($name, $value)
     {
         return new self(
@@ -103,9 +85,7 @@ public function withHeader($name, $value)
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withAddedHeader($name, $value)
     {
         return new self(
@@ -115,9 +95,7 @@ public function withAddedHeader($name, $value)
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withoutHeader($name)
     {
         return new self(
@@ -132,9 +110,7 @@ public function getBody(): StreamInterface
         return $this->decoratedResponse->getBody();
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withBody(StreamInterface $body)
     {
         return new self(
@@ -149,9 +125,7 @@ public function getStatusCode(): int
         return $this->decoratedResponse->getStatusCode();
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function withStatus($code, $reasonPhrase = '')
     {
         return new self(

tests/ContentTypeMiddlewareTest.php

@@ -16,6 +16,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function array_map;
 
 /**
@@ -183,7 +184,7 @@ private function createResponse(array $attributes = []): UnformattedResponse
 
     private function createRequestHandler(ResponseInterface $response): RequestHandlerInterface
     {
-        return new class($response) implements RequestHandlerInterface
+        return new class ($response) implements RequestHandlerInterface
         {
             private ResponseInterface $response;
 

tests/Formatter/JmsSerializerTest.php

@@ -15,9 +15,7 @@
  */
 final class JmsSerializerTest extends TestCase
 {
-    /**
-     * @var SerializerInterface|MockObject
-     */
+    /** @var SerializerInterface&MockObject */
     private SerializerInterface $serializer;
 
     /**

tests/Formatter/JsonTest.php

@@ -9,7 +9,9 @@
 use Lcobucci\ContentNegotiation\Tests\PersonDto;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
+
 use function acos;
+
 use const JSON_UNESCAPED_SLASHES;
 
 /**

tests/Formatter/NaiveTemplateEngine.php

@@ -5,6 +5,7 @@
 
 use Lcobucci\ContentNegotiation\Formatter\ContentOnly;
 use SplFileObject;
+
 use function array_keys;
 use function array_map;
 use function assert;

tests/Formatter/PlatesTest.php

@@ -8,6 +8,7 @@
 use Lcobucci\ContentNegotiation\Tests\PersonDto;
 use League\Plates\Engine;
 use PHPUnit\Framework\TestCase;
+
 use function dirname;
 
 /**

tests/Formatter/TwigTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
+
 use function dirname;
 
 /**

tests/PersonDto.php

@@ -6,7 +6,6 @@
 final class PersonDto
 {
     public int $id;
-
     public string $name;
 
     public function __construct(int $id, string $name)