Improved coding styles

composer.json

@@ -46,6 +46,7 @@
     "require-dev": {
         "filp/whoops": "^2.0",
         "phpunit/phpunit": "^6.0",
+        "slevomat/coding-standard": "^4.0",
         "squizlabs/php_codesniffer": "^3.1",
         "symfony/var-dumper": "^3.0",
         "vlucas/phpdotenv": "^2.2",

config/autoload/app_options.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;
 
 return [

config/autoload/dependencies.global.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
+use Zend\Expressive\Helper;
 use Zend\Expressive\Middleware;
 use Zend\Expressive\Plates;
 use Zend\Expressive\Router;
 use Zend\Expressive\Template;
-use Zend\Expressive\Helper;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\Stratigility\Middleware\ErrorHandler;
 

config/autoload/entity-manager.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;
 
 return [

config/autoload/logger.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 

config/autoload/middleware-pipeline.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;

config/autoload/phpwkhtmltopdf.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'phpwkhtmltopdf' => [

config/autoload/preview-generation.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'preview_generation' => [

config/autoload/router.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Zend\Expressive\Router\FastRouteRouter;
 
 return [

config/autoload/templates.global.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 return [
 

config/autoload/translator.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;
 
 return [

config/autoload/url-shortener.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 

config/autoload/zend-expressive.global.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 return [
 

config/cli-config.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Interop\Container\ContainerInterface;

config/config.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Acelaya\ExpressiveErrorHandler;
 use Shlinkio\Shlink\CLI;
 use Shlinkio\Shlink\Common;

config/container.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Dotenv\Dotenv;
 use Zend\ServiceManager\ServiceManager;
 

data/migrations/Version20160819142757.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace ShlinkMigrations;
 

data/migrations/Version20160820191203.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace ShlinkMigrations;
 

module/CLI/config/cli.config.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\CLI\Command;
 use Shlinkio\Shlink\Common;
 
@@ -22,7 +24,7 @@ return [
             Command\Tag\CreateTagCommand::class,
             Command\Tag\RenameTagCommand::class,
             Command\Tag\DeleteTagsCommand::class,
-        ]
+        ],
     ],
 
 ];

module/CLI/config/dependencies.config.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use Shlinkio\Shlink\CLI\Command;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
@@ -46,12 +47,12 @@ return [
         Command\Shortcode\GeneratePreviewCommand::class => [
             Service\ShortUrlService::class,
             PreviewGenerator::class,
-            'translator'
+            'translator',
         ],
         Command\Visit\ProcessVisitsCommand::class => [
             Service\VisitService::class,
             IpLocationResolver::class,
-            'translator'
+            'translator',
         ],
         Command\Config\GenerateCharsetCommand::class => ['translator'],
         Command\Config\GenerateSecretCommand::class => ['translator'],

module/CLI/config/translator.config.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'translator' => [

module/CLI/src/Command/Api/DisableKeyCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;

module/CLI/src/Command/Api/GenerateKeyCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;

module/CLI/src/Command/Api/ListKeysCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

module/CLI/src/Command/Config/GenerateCharsetCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;
 
 use Shlinkio\Shlink\Core\Service\UrlShortener;

module/CLI/src/Command/Config/GenerateSecretCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;
 
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;

module/CLI/src/Command/Install/InstallCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Install;
 
 use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;

module/CLI/src/Command/Shortcode/GeneratePreviewCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;

module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;

module/CLI/src/Command/Shortcode/GetVisitsCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Shlinkio\Shlink\Common\Util\DateRange;

module/CLI/src/Command/Shortcode/ListShortcodesCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;

module/CLI/src/Command/Shortcode/ResolveUrlCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;

module/CLI/src/Command/Tag/CreateTagCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;

module/CLI/src/Command/Tag/DeleteTagsCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;

module/CLI/src/Command/Tag/ListTagsCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Shlinkio\Shlink\Core\Entity\Tag;

module/CLI/src/Command/Tag/RenameTagCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;

module/CLI/src/Command/Visit/ProcessVisitsCommand.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;

module/CLI/src/ConfigProvider.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI;
 
 use Zend\Config\Factory;

module/CLI/src/Factory/ApplicationFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Factory;
 
 use Interop\Container\ContainerInterface;

module/CLI/src/Factory/InstallApplicationFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Factory;
 
 use Interop\Container\ContainerInterface;

module/CLI/src/Install/ConfigCustomizerPluginManager.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install;
 
 use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;

module/CLI/src/Install/ConfigCustomizerPluginManagerInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install;
 
 use Psr\Container\ContainerInterface;

module/CLI/src/Install/Plugin/AbstractConfigCustomizerPlugin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Symfony\Component\Console\Exception\RuntimeException;

module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;

module/CLI/src/Install/Plugin/ConfigCustomizerPluginInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;

module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Acelaya\ZsmAnnotatedServices\Annotation as DI;

module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin\Factory;
 
 use Interop\Container\ContainerInterface;

module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;

module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
@@ -42,7 +44,7 @@ class UrlShortenerConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
                 'Character set for generated short codes (leave empty to autogenerate one)',
                 null,
                 true
-            ) ?: str_shuffle(UrlShortener::DEFAULT_CHARS)
+            ) ?: str_shuffle(UrlShortener::DEFAULT_CHARS),
         ]);
     }
 }

module/CLI/src/Model/CustomizableAppConfig.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Model;
 
 use Zend\Stdlib\ArraySerializableInterface;

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

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use PHPUnit\Framework\TestCase;

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

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use PHPUnit\Framework\TestCase;

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

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Config/GenerateCharsetCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Config;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Install/InstallCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Install;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Shortcode/GeneratePreviewCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit\Framework\TestCase;
@@ -63,7 +65,7 @@ class GeneratePreviewCommandTest extends TestCase
         $this->previewGenerator->generatePreview('http://baz.com/something')->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
-            'command' => 'shortcode:process-previews'
+            'command' => 'shortcode:process-previews',
         ]);
     }
 
@@ -83,7 +85,7 @@ class GeneratePreviewCommandTest extends TestCase
                                                                  ->shouldBeCalledTimes(count($items));
 
         $this->commandTester->execute([
-            'command' => 'shortcode:process-previews'
+            'command' => 'shortcode:process-previews',
         ]);
         $output = $this->commandTester->getDisplay();
         $this->assertEquals(count($items), substr_count($output, 'Error'));

module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit\Framework\TestCase;
@@ -27,7 +29,7 @@ class GenerateShortcodeCommandTest extends TestCase
         $this->urlShortener = $this->prophesize(UrlShortener::class);
         $command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
             'schema' => 'http',
-            'hostname' => 'foo.com'
+            'hostname' => 'foo.com',
         ]);
         $app = new Application();
         $app->add($command);
@@ -44,7 +46,7 @@ class GenerateShortcodeCommandTest extends TestCase
 
         $this->commandTester->execute([
             'command' => 'shortcode:generate',
-            'longUrl' => 'http://domain.com/foo/bar'
+            'longUrl' => 'http://domain.com/foo/bar',
         ]);
         $output = $this->commandTester->getDisplay();
         $this->assertTrue(strpos($output, 'http://foo.com/abc123') > 0);
@@ -60,7 +62,7 @@ class GenerateShortcodeCommandTest extends TestCase
 
         $this->commandTester->execute([
             'command' => 'shortcode:generate',
-            'longUrl' => 'http://domain.com/invalid'
+            'longUrl' => 'http://domain.com/invalid',
         ]);
         $output = $this->commandTester->getDisplay();
         $this->assertTrue(

module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Tag/CreateTagCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Tag/DeleteTagsCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Tag/ListTagsCommandTest.php

@@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Tag\ListTagsCommand;
-use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
 use Symfony\Component\Console\Application;

module/CLI/test/Command/Tag/RenameTagCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/ConfigProviderTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Factory;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Factory/InstallApplicationFactoryTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Factory;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Install/Plugin/DatabaseConfigCustomizerPluginTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin\Factory;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;

module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;

module/Common/config/dependencies.config.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;

module/Common/functions/functions.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common;
 
 /**

module/Common/src/ConfigProvider.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common;
 
 use Zend\Config\Factory;

module/Common/src/Entity/AbstractEntity.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

module/Common/src/Exception/ExceptionInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;
 
 interface ExceptionInterface

module/Common/src/Exception/InvalidArgumentException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface

module/Common/src/Exception/PreviewGenerationException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;
 
 class PreviewGenerationException extends RuntimeException

module/Common/src/Exception/RuntimeException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;
 
 class RuntimeException extends \RuntimeException implements ExceptionInterface

module/Common/src/Exception/WrongIpException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;
 
 class WrongIpException extends RuntimeException

module/Common/src/Factory/CacheFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Doctrine\Common\Cache;

module/Common/src/Factory/DottedAccessConfigAbstractFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Interop\Container\ContainerInterface;

module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Interop\Container\ContainerInterface;

module/Common/src/Factory/EntityManagerFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Doctrine\Common\Cache\ArrayCache;

module/Common/src/Factory/LoggerFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Cascade\Cascade;

module/Common/src/Factory/TranslatorFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;
 
 use Interop\Container\ContainerInterface;

module/Common/src/Image/ImageBuilder.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Image;
 
 use mikehaertl\wkhtmlto\Image;

module/Common/src/Image/ImageBuilderFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Image;
 
 use Interop\Container\ContainerInterface;

module/Common/src/Image/ImageBuilderInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Image;
 
 use Zend\ServiceManager\ServiceLocatorInterface;

module/Common/src/Image/ImageFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Image;
 
 use Interop\Container\ContainerInterface;

module/Common/src/Middleware/LocaleMiddleware.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Middleware;
 
 use Interop\Http\ServerMiddleware\DelegateInterface;

module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Paginator\Adapter;
 
 use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
@@ -32,7 +34,7 @@ class PaginableRepositoryAdapter implements AdapterInterface
         $orderBy = null
     ) {
         $this->paginableRepository = $paginableRepository;
-        $this->searchTerm = trim(strip_tags($searchTerm));
+        $this->searchTerm = $searchTerm !== null ? trim(strip_tags($searchTerm)) : null;
         $this->orderBy = $orderBy;
         $this->tags = $tags;
     }

module/Common/src/Paginator/Util/PaginatorUtilsTrait.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Paginator\Util;
 
 use Zend\Paginator\Paginator;

module/Common/src/Repository/PaginableRepositoryInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Repository;
 
 interface PaginableRepositoryInterface

module/Common/src/Response/QrCodeResponse.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Response;
 
 use Endroid\QrCode\QrCode;

module/Common/src/Service/IpLocationResolver.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Service;
 
 use GuzzleHttp\Client;
@@ -27,7 +29,7 @@ class IpLocationResolver implements IpLocationResolverInterface
     {
         try {
             $response = $this->httpClient->get(sprintf(self::SERVICE_PATTERN, $ipAddress));
-            return json_decode($response->getBody(), true);
+            return json_decode((string) $response->getBody(), true);
         } catch (GuzzleException $e) {
             throw WrongIpException::fromIpAddress($ipAddress, $e);
         }

module/Common/src/Service/IpLocationResolverInterface.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Service;
 
 interface IpLocationResolverInterface

module/Common/src/Service/PreviewGenerator.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Service;
 
 use mikehaertl\wkhtmlto\Image;