Improved tests to increase MSI to 69%

composer.json

@@ -53,8 +53,8 @@
         "devster/ubench": "^2.0",
         "doctrine/data-fixtures": "^1.3",
         "filp/whoops": "^2.0",
-        "infection/infection": "^0.11.0",
+        "infection/infection": "^0.12.2",
-        "phpstan/phpstan": "^0.10.0",
+        "phpstan/phpstan": "^0.11.2",
         "phpunit/phpcov": "^6.0@dev || ^5.0",
         "phpunit/phpunit": "^8.0 || ^7.5",
         "roave/security-advisories": "dev-master",

module/CLI/test/Command/Api/ListKeysCommandTest.php

@@ -36,9 +36,7 @@ class ListKeysCommandTest extends TestCase
             new ApiKey(),
         ])->shouldBeCalledOnce();
 
-        $this->commandTester->execute([
+        $this->commandTester->execute([]);
-            'command' => ListKeysCommand::NAME,
-        ]);
         $output = $this->commandTester->getDisplay();
 
         $this->assertStringContainsString('Key', $output);
@@ -57,7 +55,6 @@ class ListKeysCommandTest extends TestCase
         ])->shouldBeCalledOnce();
 
         $this->commandTester->execute([
-            'command' => ListKeysCommand::NAME,
             '--enabledOnly' => true,
         ]);
         $output = $this->commandTester->getDisplay();

module/CLI/test/Command/ShortUrl/DeleteShortUrlCommandTest.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
+use const PHP_EOL;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -14,7 +15,7 @@ use Symfony\Component\Console\Tester\CommandTester;
 use function array_pop;
 use function sprintf;
 
-class DeleteShortCodeCommandTest extends TestCase
+class DeleteShortUrlCommandTest extends TestCase
 {
     /** @var CommandTester */
     private $commandTester;
@@ -32,10 +33,8 @@ class DeleteShortCodeCommandTest extends TestCase
         $this->commandTester = new CommandTester($command);
     }
 
-    /**
+    /** @test */
-     * @test
+    public function successMessageIsPrintedIfUrlIsProperlyDeleted(): void
-     */
-    public function successMessageIsPrintedIfUrlIsProperlyDeleted()
     {
         $shortCode = 'abc123';
         $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->will(function () {
@@ -51,10 +50,8 @@ class DeleteShortCodeCommandTest extends TestCase
         $deleteByShortCode->shouldHaveBeenCalledOnce();
     }
 
-    /**
+    /** @test */
-     * @test
+    public function invalidShortCodePrintsMessage(): void
-     */
-    public function invalidShortCodePrintsMessage()
     {
         $shortCode = 'abc123';
         $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->willThrow(
@@ -70,9 +67,13 @@ class DeleteShortCodeCommandTest extends TestCase
 
     /**
      * @test
+     * @dataProvider provideRetryDeleteAnswers
      */
-    public function deleteIsRetriedWhenThresholdIsReachedAndQuestionIsAccepted()
+    public function deleteIsRetriedWhenThresholdIsReachedAndQuestionIsAccepted(
-    {
+        array $retryAnswer,
+        int $expectedDeleteCalls,
+        string $expectedMessage
+    ): void {
         $shortCode = 'abc123';
         $deleteByShortCode = $this->service->deleteByShortCode($shortCode, Argument::type('bool'))->will(
             function (array $args) {
@@ -83,7 +84,7 @@ class DeleteShortCodeCommandTest extends TestCase
                 }
             }
         );
-        $this->commandTester->setInputs(['yes']);
+        $this->commandTester->setInputs($retryAnswer);
 
         $this->commandTester->execute(['shortCode' => $shortCode]);
         $output = $this->commandTester->getDisplay();
@@ -92,17 +93,19 @@ class DeleteShortCodeCommandTest extends TestCase
             'It was not possible to delete the short URL with short code "%s" because it has more than 10 visits.',
             $shortCode
         ), $output);
-        $this->assertStringContainsString(
+        $this->assertStringContainsString($expectedMessage, $output);
-            sprintf('Short URL with short code "%s" successfully deleted.', $shortCode),
+        $deleteByShortCode->shouldHaveBeenCalledTimes($expectedDeleteCalls);
-            $output
-        );
-        $deleteByShortCode->shouldHaveBeenCalledTimes(2);
     }
 
-    /**
+    public function provideRetryDeleteAnswers(): iterable
-     * @test
+    {
-     */
+        yield 'answering yes to retry' => [['yes'], 2, 'Short URL with short code "abc123" successfully deleted.'];
-    public function deleteIsNotRetriedWhenThresholdIsReachedAndQuestionIsDeclined()
+        yield 'answering no to retry' => [['no'], 1, 'Short URL was not deleted.'];
+        yield 'answering default to retry' => [[PHP_EOL], 1, 'Short URL was not deleted.'];
+    }
+
+    /** @test */
+    public function deleteIsNotRetriedWhenThresholdIsReachedAndQuestionIsDeclined(): void
     {
         $shortCode = 'abc123';
         $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->willThrow(

module/Rest/src/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddleware.php

@@ -58,7 +58,7 @@ class CreateShortUrlContentNegotiationMiddleware implements MiddlewareInterface
             return self::JSON;
         }
 
-        $format = strtolower((string) $query['format']);
+        $format = strtolower($query['format']);
         return $format === 'txt' ? self::PLAIN_TEXT : self::JSON;
     }
 

module/Rest/test/Middleware/BodyParserMiddlewareTest.php

@@ -26,23 +26,40 @@ class BodyParserMiddlewareTest extends TestCase
 
     /**
      * @test
+     * @dataProvider provideIgnoredRequestMethods
      */
-    public function requestsFromOtherMethodsJustFallbackToNextMiddleware()
+    public function requestsFromOtherMethodsJustFallbackToNextMiddleware(string $method): void
     {
-        $request = (new ServerRequest())->withMethod('GET');
+        $request = (new ServerRequest())->withMethod($method);
-        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $this->assertHandlingRequestJustFallsBackToNext($request);
-        /** @var MethodProphecy $process */
-        $process = $delegate->handle($request)->willReturn(new Response());
-
-        $this->middleware->process($request, $delegate->reveal());
-
-        $process->shouldHaveBeenCalledOnce();
     }
 
-    /**
+    public function provideIgnoredRequestMethods(): iterable
-     * @test
+    {
-     */
+        yield 'with GET' => ['GET'];
-    public function jsonRequestsAreJsonDecoded()
+        yield 'with HEAD' => ['HEAD'];
+        yield 'with OPTIONS' => ['OPTIONS'];
+    }
+
+    /** @test */
+    public function requestsWithNonEmptyBodyJustFallbackToNextMiddleware(): void
+    {
+        $request = (new ServerRequest())->withParsedBody(['foo' => 'bar'])->withMethod('POST');
+        $this->assertHandlingRequestJustFallsBackToNext($request);
+    }
+
+    private function assertHandlingRequestJustFallsBackToNext(ServerRequestInterface $request): void
+    {
+        $nextHandler = $this->prophesize(RequestHandlerInterface::class);
+        $handle = $nextHandler->handle($request)->willReturn(new Response());
+
+        $this->middleware->process($request, $nextHandler->reveal());
+
+        $handle->shouldHaveBeenCalledOnce();
+    }
+
+    /** @test */
+    public function jsonRequestsAreJsonDecoded(): void
     {
         $test = $this;
         $body = new Stream('php://temp', 'wr');
@@ -71,10 +88,8 @@ class BodyParserMiddlewareTest extends TestCase
         $process->shouldHaveBeenCalledOnce();
     }
 
-    /**
+    /** @test */
-     * @test
+    public function regularRequestsAreUrlDecoded(): void
-     */
-    public function regularRequestsAreUrlDecoded()
     {
         $test = $this;
         $body = new Stream('php://temp', 'wr');