Increased MSI to 64%

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Factory;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Symfony\Component\Console\Application;
@@ -29,7 +31,7 @@ class ApplicationFactoryTest extends TestCase
      */
     public function serviceIsCreated()
     {
-        $instance = $this->factory->__invoke($this->createServiceManager(), '');
+        $instance = ($this->factory)($this->createServiceManager(), '');
         $this->assertInstanceOf(Application::class, $instance);
     }
 
@@ -40,21 +42,24 @@ class ApplicationFactoryTest extends TestCase
     {
         $sm = $this->createServiceManager([
             'commands' => [
-                'foo',
-                'bar',
-                'baz',
+                'foo' => 'foo',
+                'bar' => 'bar',
+                'baz' => 'baz',
             ],
         ]);
-        $sm->setService('foo', $this->prophesize(Command::class)->reveal());
-        $sm->setService('baz', $this->prophesize(Command::class)->reveal());
+        $sm->setService('foo', $this->createCommandMock('foo')->reveal());
+        $sm->setService('bar', $this->createCommandMock('bar')->reveal());
 
         /** @var Application $instance */
-        $instance = $this->factory->__invoke($sm, '');
+        $instance = ($this->factory)($sm, '');
         $this->assertInstanceOf(Application::class, $instance);
-        $this->assertCount(2, $instance->all());
+
+        $this->assertTrue($instance->has('foo'));
+        $this->assertTrue($instance->has('bar'));
+        $this->assertFalse($instance->has('baz'));
     }
 
-    protected function createServiceManager($config = [])
+    private function createServiceManager(array $config = []): ServiceManager
     {
         return new ServiceManager(['services' => [
             'config' => [
@@ -64,4 +69,17 @@ class ApplicationFactoryTest extends TestCase
             Translator::class => Translator::factory([]),
         ]]);
     }
+
+    private function createCommandMock(string $name): ObjectProphecy
+    {
+        $command = $this->prophesize(Command::class);
+        $command->getName()->willReturn($name);
+        $command->getDefinition()->willReturn($name);
+        $command->isEnabled()->willReturn(true);
+        $command->getAliases()->willReturn([]);
+        $command->setApplication(Argument::type(Application::class))->willReturn(function () {
+        });
+
+        return $command;
+    }
 }

module/Common/src/Factory/CacheFactory.php

@@ -45,11 +45,7 @@ class CacheFactory implements FactoryInterface
         return $adapter;
     }
 
-    /**
-     * @param ContainerInterface $container
-     * @return Cache\CacheProvider
-     */
-    protected function getAdapter(ContainerInterface $container)
+    private function getAdapter(ContainerInterface $container): Cache\CacheProvider
     {
         // Try to get the adapter from config
         $config = $container->get('config');
@@ -61,11 +57,7 @@ class CacheFactory implements FactoryInterface
         return env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
     }
 
-    /**
-     * @param array $cacheConfig
-     * @return Cache\CacheProvider
-     */
-    protected function resolveCacheAdapter(array $cacheConfig)
+    private function resolveCacheAdapter(array $cacheConfig): Cache\CacheProvider
     {
         switch ($cacheConfig['adapter']) {
             case Cache\ArrayCache::class:

module/Common/src/Image/ImageFactory.php

@@ -27,9 +27,9 @@ class ImageFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $config = $container->get('config')['phpwkhtmltopdf'];
-        $image = new Image(isset($config['images']) ? $config['images'] : null);
+        $image = new Image($config['images'] ?? null);
 
-        if (isset($options) && isset($options['url'])) {
+        if ($options['url'] ?? null) {
             $image->setPage($options['url']);
         }
 

module/Common/src/Middleware/LocaleMiddleware.php

@@ -45,11 +45,7 @@ class LocaleMiddleware implements MiddlewareInterface
         return $delegate->handle($request);
     }
 
-    /**
-     * @param string $locale
-     * @return string
-     */
-    protected function normalizeLocale($locale)
+    private function normalizeLocale(string $locale): string
     {
         $parts = explode('_', $locale);
         if (count($parts) > 1) {

module/Common/src/Response/PixelResponse.php

@@ -27,7 +27,7 @@ class PixelResponse extends Response
     private function createBody(): StreamInterface
     {
         $body = new Stream('php://temp', 'wb+');
-        $body->write((string) base64_decode(self::BASE_64_IMAGE));
+        $body->write(base64_decode(self::BASE_64_IMAGE));
         $body->rewind();
         return $body;
     }

module/Common/src/Util/ResponseUtilsTrait.php

@@ -9,28 +9,15 @@ use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 use Zend\Stdlib\ArrayUtils;
 use const FILEINFO_MIME;
-use function basename;
 
 trait ResponseUtilsTrait
 {
-    protected function generateDownloadFileResponse(string $filePath): ResponseInterface
-    {
-        return $this->generateBinaryResponse($filePath, [
-            'Content-Disposition' => 'attachment; filename=' . basename($filePath),
-            'Content-Transfer-Encoding' => 'Binary',
-            'Content-Description' => 'File Transfer',
-            'Pragma' => 'public',
-            'Expires' => '0',
-            'Cache-Control' => 'must-revalidate',
-        ]);
-    }
-
-    protected function generateImageResponse(string $imagePath): ResponseInterface
+    private function generateImageResponse(string $imagePath): ResponseInterface
     {
         return $this->generateBinaryResponse($imagePath);
     }
 
-    protected function generateBinaryResponse(string $path, array $extraHeaders = []): ResponseInterface
+    private function generateBinaryResponse(string $path, array $extraHeaders = []): ResponseInterface
     {
         $body = new Stream($path);
         return new Response($body, 200, ArrayUtils::merge([

module/Common/test/Exception/WrongIpExceptionTest.php

@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Common\Exception;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Common\Exception\WrongIpException;
+
+class WrongIpExceptionTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function fromIpAddressProperlyCreatesExceptionWithoutPrev()
+    {
+        $e = WrongIpException::fromIpAddress('1.2.3.4');
+
+        $this->assertEquals('Provided IP "1.2.3.4" is invalid', $e->getMessage());
+        $this->assertEquals(0, $e->getCode());
+        $this->assertNull($e->getPrevious());
+    }
+    /**
+     * @test
+     */
+    public function fromIpAddressProperlyCreatesExceptionWithPrev()
+    {
+        $prev = new Exception('Previous error');
+        $e = WrongIpException::fromIpAddress('1.2.3.4', $prev);
+
+        $this->assertEquals('Provided IP "1.2.3.4" is invalid', $e->getMessage());
+        $this->assertEquals(0, $e->getCode());
+        $this->assertSame($prev, $e->getPrevious());
+    }
+}

module/Common/test/IpGeolocation/GeoLite2/DbUpdaterTest.php

@@ -55,6 +55,7 @@ class DbUpdaterTest extends TestCase
         $request = $this->httpClient->request(Argument::cetera())->willThrow(ClientException::class);
 
         $this->expectException(RuntimeException::class);
+        $this->expectExceptionCode(0);
         $this->expectExceptionMessage(
             'An error occurred while trying to download a fresh copy of the GeoLite2 database'
         );
@@ -73,6 +74,7 @@ class DbUpdaterTest extends TestCase
         $request = $this->httpClient->request(Argument::cetera())->willReturn(new Response());
 
         $this->expectException(RuntimeException::class);
+        $this->expectExceptionCode(0);
         $this->expectExceptionMessage(
             'An error occurred while trying to extract the GeoLite2 database from __invalid__/GeoLite2-City.tar.gz'
         );
@@ -91,6 +93,7 @@ class DbUpdaterTest extends TestCase
         $copy = $this->filesystem->copy(Argument::cetera())->willThrow($e);
 
         $this->expectException(RuntimeException::class);
+        $this->expectExceptionCode(0);
         $this->expectExceptionMessage('An error occurred while trying to copy GeoLite2 db file to destination');
         $request->shouldBeCalledOnce();
         $copy->shouldBeCalledOnce();

module/Common/test/IpGeolocation/GeoLite2LocationResolverTest.php

@@ -41,6 +41,7 @@ class GeoLite2LocationResolverTest extends TestCase
 
         $this->expectException(WrongIpException::class);
         $this->expectExceptionMessage($message);
+        $this->expectExceptionCode(0);
         $cityMethod->shouldBeCalledOnce();
 
         $this->resolver->resolveIpLocation($ipAddress);

module/Common/test/Response/PixelResponseTest.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Common\Response;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Common\Response\PixelResponse;
+
+class PixelResponseTest extends TestCase
+{
+    /**
+     * @var PixelResponse
+     */
+    private $resp;
+
+    public function setUp()
+    {
+        $this->resp = new PixelResponse();
+    }
+
+    /**
+     * @test
+     */
+    public function responseHasGifTypeAndIsNotEmpty()
+    {
+        $this->assertEquals('image/gif', $this->resp->getHeaderLine('Content-Type'));
+        $this->assertNotEmpty((string) $this->resp->getBody());
+    }
+}