Merge pull request #454 from acelaya/feature/ip-geolocation-module

Feature/ip geolocation module

composer.json

@@ -74,7 +74,8 @@
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
             "Shlinkio\\Shlink\\Common\\": "module/Common/src",
-            "Shlinkio\\Shlink\\EventDispatcher\\": "module/EventDispatcher/src"
+            "Shlinkio\\Shlink\\EventDispatcher\\": "module/EventDispatcher/src",
+            "Shlinkio\\Shlink\\IpGeolocation\\": "module/IpGeolocation/src/"
         },
         "files": [
             "module/Common/functions/functions.php",
@@ -94,7 +95,8 @@
                 "module/Common/test",
                 "module/Common/test-db"
             ],
-            "ShlinkioTest\\Shlink\\EventDispatcher\\": "module/EventDispatcher/test"
+            "ShlinkioTest\\Shlink\\EventDispatcher\\": "module/EventDispatcher/test",
+            "ShlinkioTest\\Shlink\\IpGeolocation\\": "module/IpGeolocation/test"
         }
     },
     "scripts": {

config/config.php

@@ -17,6 +17,7 @@ return (new ConfigAggregator\ConfigAggregator([
     Expressive\Swoole\ConfigProvider::class,
     ExpressiveErrorHandler\ConfigProvider::class,
     Common\ConfigProvider::class,
+    IpGeolocation\ConfigProvider::class,
     Core\ConfigProvider::class,
     CLI\ConfigProvider::class,
     Rest\ConfigProvider::class,

module/CLI/config/dependencies.config.php

@@ -7,10 +7,10 @@ use Doctrine\DBAL\Connection;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdater;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console as SymfonyCli;
 use Symfony\Component\Lock\Factory as Locker;

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

@@ -10,13 +10,13 @@ use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

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

@@ -5,7 +5,7 @@ namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;

module/CLI/src/ConfigProvider.php

@@ -3,13 +3,12 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI;
 
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
 
 class ConfigProvider
 {
     public function __invoke()
     {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
     }
 }

module/CLI/src/Util/GeolocationDbUpdater.php

@@ -7,7 +7,7 @@ use Cake\Chronos\Chronos;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock\Factory as Locker;
 use Throwable;
 

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

@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -16,6 +15,7 @@ use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\Paginator\Adapter\ArrayAdapter;

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

@@ -10,14 +10,14 @@ use Shlinkio\Shlink\CLI\Command\Visit\LocateVisitsCommand;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Service\VisitService;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpApiLocationResolver;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;

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

@@ -9,7 +9,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\UpdateDbCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 

module/CLI/test/Util/GeolocationDbUpdaterTest.php

@@ -12,7 +12,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock;
 use Throwable;
 

module/Common/config/dependencies.config.php

@@ -31,13 +31,6 @@ return [
 
             Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
 
-            IpGeolocation\IpApiLocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2LocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\EmptyIpLocationResolver::class => InvokableFactory::class,
-            IpGeolocation\ChainIpLocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2\GeoLite2Options::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2\DbUpdater::class => ConfigAbstractFactory::class,
-
             Service\PreviewGenerator::class => ConfigAbstractFactory::class,
         ],
         'aliases' => [
@@ -47,8 +40,6 @@ return [
             'logger' => LoggerInterface::class,
             Logger::class => 'Logger_Shlink',
             LoggerInterface::class => 'Logger_Shlink',
-
-            IpGeolocation\IpLocationResolverInterface::class => IpGeolocation\ChainIpLocationResolver::class,
         ],
         'abstract_factories' => [
             Factory\DottedAccessConfigAbstractFactory::class,
@@ -75,20 +66,6 @@ return [
         Middleware\LocaleMiddleware::class => ['translator'],
         Middleware\CloseDbConnectionMiddleware::class => ['em'],
 
-        IpGeolocation\IpApiLocationResolver::class => ['httpClient'],
-        IpGeolocation\GeoLite2LocationResolver::class => [Reader::class],
-        IpGeolocation\ChainIpLocationResolver::class => [
-            IpGeolocation\GeoLite2LocationResolver::class,
-            IpGeolocation\IpApiLocationResolver::class,
-            IpGeolocation\EmptyIpLocationResolver::class,
-        ],
-        IpGeolocation\GeoLite2\GeoLite2Options::class => ['config.geolite2'],
-        IpGeolocation\GeoLite2\DbUpdater::class => [
-            GuzzleClient::class,
-            Filesystem::class,
-            IpGeolocation\GeoLite2\GeoLite2Options::class,
-        ],
-
         Service\PreviewGenerator::class => [
             Image\ImageBuilder::class,
             Filesystem::class,

module/Common/functions/functions.php

@@ -3,6 +3,9 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common;
 
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
 use function getenv;
 use function json_decode as spl_json_decode;
 use function json_last_error;
@@ -59,3 +62,11 @@ function json_decode(string $json, int $depth = 512, int $options = 0): array
 
     return $data;
 }
+
+/**
+ * Loads configuration files which match provided glob pattern, and returns the merged result as array
+ */
+function loadConfigFromGlob(string $globPattern): array
+{
+    return Factory::fromFiles(Glob::glob($globPattern, Glob::GLOB_BRACE));
+}

module/Common/src/ConfigProvider.php

@@ -3,13 +3,10 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common;
 
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
-
 class ConfigProvider
 {
-    public function __invoke()
+    public function __invoke(): array
     {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
     }
 }

module/Core/config/event_dispatcher.config.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core;
 
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 
 return [

module/Core/src/ConfigProvider.php

@@ -3,13 +3,12 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core;
 
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
 
 class ConfigProvider
 {
     public function __invoke()
     {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
     }
 }

module/Core/src/Entity/VisitLocation.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Entity;
 
 use Shlinkio\Shlink\Common\Entity\AbstractEntity;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Core\Visit\Model\VisitLocationInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
 class VisitLocation extends AbstractEntity implements VisitLocationInterface
 {

module/Core/src/EventDispatcher/LocateShortUrlVisit.php

@@ -8,10 +8,10 @@ use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 use function sprintf;
 

module/Core/src/Service/VisitService.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Service;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
 class VisitService implements VisitServiceInterface
 {

module/Core/test-db/Repository/VisitRepositoryTest.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Repository;
 
 use Cake\Chronos\Chronos;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use ShlinkioTest\Shlink\Common\DbTest\DatabaseTestCase;
 
 use function Functional\map;

module/Core/test/Entity/VisitLocationTest.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Entity;
 
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
 class VisitLocationTest extends TestCase
 {

module/Core/test/EventDispatcher/LocateShortUrlVisitTest.php

@@ -11,8 +11,6 @@ use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -21,6 +19,8 @@ use Shlinkio\Shlink\Core\EventDispatcher\LocateShortUrlVisit;
 use Shlinkio\Shlink\Core\EventDispatcher\ShortUrlVisited;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Visit\Model\UnknownVisitLocation;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 class LocateShortUrlVisitTest extends TestCase
 {

module/Core/test/Service/VisitServiceTest.php

@@ -7,7 +7,6 @@ use Doctrine\ORM\EntityManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
@@ -15,6 +14,7 @@ use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
 use Shlinkio\Shlink\Core\Service\VisitService;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
 use function array_shift;
 use function count;

module/EventDispatcher/src/ConfigProvider.php

@@ -3,13 +3,12 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\EventDispatcher;
 
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
 
 class ConfigProvider
 {
     public function __invoke()
     {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
     }
 }

module/IpGeolocation/config/dependencies.config.php

@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\IpGeolocation;
+
+use GeoIp2\Database\Reader;
+use GuzzleHttp\Client as GuzzleClient;
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+
+    'dependencies' => [
+        'factories' => [
+            Resolver\IpApiLocationResolver::class => ConfigAbstractFactory::class,
+            Resolver\GeoLite2LocationResolver::class => ConfigAbstractFactory::class,
+            Resolver\EmptyIpLocationResolver::class => InvokableFactory::class,
+            Resolver\ChainIpLocationResolver::class => ConfigAbstractFactory::class,
+
+            GeoLite2\GeoLite2Options::class => ConfigAbstractFactory::class,
+            GeoLite2\DbUpdater::class => ConfigAbstractFactory::class,
+        ],
+        'aliases' => [
+            Resolver\IpLocationResolverInterface::class => Resolver\ChainIpLocationResolver::class,
+        ],
+    ],
+
+    ConfigAbstractFactory::class => [
+        Resolver\IpApiLocationResolver::class => [GuzzleClient::class],
+        Resolver\GeoLite2LocationResolver::class => [Reader::class],
+        Resolver\ChainIpLocationResolver::class => [
+            Resolver\GeoLite2LocationResolver::class,
+            Resolver\IpApiLocationResolver::class,
+            Resolver\EmptyIpLocationResolver::class,
+        ],
+
+        GeoLite2\GeoLite2Options::class => ['config.geolite2'],
+        GeoLite2\DbUpdater::class => [
+            GuzzleClient::class,
+            Filesystem::class,
+            GeoLite2\GeoLite2Options::class,
+        ],
+    ],
+
+];

module/IpGeolocation/src/ConfigProvider.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\IpGeolocation;
+
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
+
+class ConfigProvider
+{
+    public function __invoke(): array
+    {
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
+    }
+}

module/IpGeolocation/src/GeoLite2/DbUpdater.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
+namespace Shlinkio\Shlink\IpGeolocation\GeoLite2;
 
 use Fig\Http\Message\RequestMethodInterface as RequestMethod;
 use GuzzleHttp\ClientInterface;

module/IpGeolocation/src/GeoLite2/DbUpdaterInterface.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
+namespace Shlinkio\Shlink\IpGeolocation\GeoLite2;
 
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
 

module/IpGeolocation/src/GeoLite2/GeoLite2Options.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
+namespace Shlinkio\Shlink\IpGeolocation\GeoLite2;
 
 use Zend\Stdlib\AbstractOptions;
 

module/IpGeolocation/src/Model/Location.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation\Model;
+namespace Shlinkio\Shlink\IpGeolocation\Model;
 
 final class Location
 {

module/IpGeolocation/src/Resolver/ChainIpLocationResolver.php

@@ -1,9 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation;
+namespace Shlinkio\Shlink\IpGeolocation\Resolver;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 class ChainIpLocationResolver implements IpLocationResolverInterface
 {

module/IpGeolocation/src/Resolver/EmptyIpLocationResolver.php

@@ -1,9 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation;
+namespace Shlinkio\Shlink\IpGeolocation\Resolver;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 class EmptyIpLocationResolver implements IpLocationResolverInterface
 {

module/IpGeolocation/src/Resolver/GeoLite2LocationResolver.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation;
+namespace Shlinkio\Shlink\IpGeolocation\Resolver;
 
 use GeoIp2\Database\Reader;
 use GeoIp2\Exception\AddressNotFoundException;
@@ -9,6 +9,8 @@ use GeoIp2\Model\City;
 use GeoIp2\Record\Subdivision;
 use MaxMind\Db\Reader\InvalidDatabaseException;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 use function Functional\first;
 

module/IpGeolocation/src/Resolver/IpApiLocationResolver.php

@@ -1,12 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation;
+namespace Shlinkio\Shlink\IpGeolocation\Resolver;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 use function Shlinkio\Shlink\Common\json_decode;
 use function sprintf;

module/IpGeolocation/src/Resolver/IpLocationResolverInterface.php

@@ -1,9 +1,10 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\IpGeolocation;
+namespace Shlinkio\Shlink\IpGeolocation\Resolver;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model;
 
 interface IpLocationResolverInterface
 {

module/IpGeolocation/test/ConfigProviderTest.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\IpGeolocation;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\IpGeolocation\ConfigProvider;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+
+class ConfigProviderTest extends TestCase
+{
+    /** @var ConfigProvider */
+    private $configProvider;
+
+    public function setUp(): void
+    {
+        $this->configProvider = new ConfigProvider();
+    }
+
+    /** @test */
+    public function configIsReturned(): void
+    {
+        $config = $this->configProvider->__invoke();
+
+        $this->assertArrayHasKey('dependencies', $config);
+        $this->assertArrayHasKey(ConfigAbstractFactory::class, $config);
+    }
+}

module/IpGeolocation/test/GeoLite2/DbUpdaterTest.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\IpGeolocation\GeoLite2;
+namespace ShlinkioTest\Shlink\IpGeolocation\GeoLite2;
 
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
@@ -9,8 +9,8 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdater;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\GeoLite2Options;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2Options;
 use Symfony\Component\Filesystem\Exception as FilesystemException;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\Diactoros\Response;
@@ -31,7 +31,7 @@ class DbUpdaterTest extends TestCase
         $this->httpClient = $this->prophesize(ClientInterface::class);
         $this->filesystem = $this->prophesize(Filesystem::class);
         $this->options = new GeoLite2Options([
-            'temp_dir' => __DIR__ . '/../../../test-resources',
+            'temp_dir' => __DIR__ . '/../../test-resources',
             'db_location' => 'db_location',
             'download_from' => '',
         ]);

module/IpGeolocation/test/Resolver/ChainIpLocationResolverTest.php

@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\IpGeolocation;
+namespace ShlinkioTest\Shlink\IpGeolocation\Resolver;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\ChainIpLocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\ChainIpLocationResolver;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 class ChainIpLocationResolverTest extends TestCase
 {

module/IpGeolocation/test/Resolver/EmptyIpLocationResolverTest.php

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\IpGeolocation;
+namespace ShlinkioTest\Shlink\IpGeolocation\Resolver;
 
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Common\IpGeolocation\EmptyIpLocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\EmptyIpLocationResolver;
 
 use function Functional\map;
 use function range;

module/IpGeolocation/test/Resolver/GeoLite2LocationResolverTest.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\IpGeolocation;
+namespace ShlinkioTest\Shlink\IpGeolocation\Resolver;
 
 use GeoIp2\Database\Reader;
 use GeoIp2\Exception\AddressNotFoundException;
@@ -10,8 +10,8 @@ use MaxMind\Db\Reader\InvalidDatabaseException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2LocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\GeoLite2LocationResolver;
 
 class GeoLite2LocationResolverTest extends TestCase
 {

module/IpGeolocation/test/Resolver/IpApiLocationResolverTest.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\IpGeolocation;
+namespace ShlinkioTest\Shlink\IpGeolocation\Resolver;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
@@ -9,8 +9,8 @@ use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpApiLocationResolver;
 
 use function json_encode;
 

phpunit.xml.dist

@@ -21,6 +21,9 @@
         <testsuite name="EventDispatcher">
             <directory>./module/EventDispatcher/test</directory>
         </testsuite>
+        <testsuite name="IpGeolocation">
+            <directory>./module/IpGeolocation/test</directory>
+        </testsuite>
     </testsuites>
 
     <filter>