OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/35' into develop

Browse Source
This commit is contained in:
Alejandro Celaya 2016-08-08 09:39:15 +02:00
commit 93713689d7
12 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/CLI/config/cli.config.php
View File

@ -5,11 +5,11 @@ return [
'cli' => [ 'cli' => [
'commands' => [ 'commands' => [
Command\GenerateShortcodeCommand::class, Command\Shortcode\GenerateShortcodeCommand::class,
Command\ResolveUrlCommand::class, Command\Shortcode\ResolveUrlCommand::class,
Command\ListShortcodesCommand::class, Command\Shortcode\ListShortcodesCommand::class,
Command\GetVisitsCommand::class, Command\Shortcode\GetVisitsCommand::class,
Command\ProcessVisitsCommand::class, Command\Visit\ProcessVisitsCommand::class,
Command\Config\GenerateCharsetCommand::class, Command\Config\GenerateCharsetCommand::class,
Command\Config\GenerateSecretCommand::class, Command\Config\GenerateSecretCommand::class,
Command\Api\GenerateKeyCommand::class, Command\Api\GenerateKeyCommand::class,

11
module/CLI/config/dependencies.config.php
View File

@ -10,12 +10,11 @@ return [
'factories' => [ 'factories' => [
Application::class => ApplicationFactory::class, Application::class => ApplicationFactory::class,
Command\GenerateShortcodeCommand::class => AnnotatedFactory::class, Command\Shortcode\GenerateShortcodeCommand::class => AnnotatedFactory::class,
Command\ResolveUrlCommand::class => AnnotatedFactory::class, Command\Shortcode\ResolveUrlCommand::class => AnnotatedFactory::class,
Command\ListShortcodesCommand::class => AnnotatedFactory::class, Command\Shortcode\ListShortcodesCommand::class => AnnotatedFactory::class,
Command\GetVisitsCommand::class => AnnotatedFactory::class, Command\Shortcode\GetVisitsCommand::class => AnnotatedFactory::class,
Command\ProcessVisitsCommand::class => AnnotatedFactory::class, Command\Visit\ProcessVisitsCommand::class => AnnotatedFactory::class,
Command\ProcessVisitsCommand::class => AnnotatedFactory::class,
Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class, Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class,
Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class, Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class,
Command\Api\GenerateKeyCommand::class => AnnotatedFactory::class, Command\Api\GenerateKeyCommand::class => AnnotatedFactory::class,

4
module/CLI/src/Command/GenerateShortcodeCommand.php → module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Shlinkio\Shlink\CLI\Command; namespace Shlinkio\Shlink\CLI\Command\Shortcode;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject; use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Shlinkio\Shlink\Core\Exception\InvalidUrlException; use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
@ -31,7 +31,7 @@ class GenerateShortcodeCommand extends Command
/** /**
* GenerateShortcodeCommand constructor. * GenerateShortcodeCommand constructor.
* @param UrlShortenerInterface|UrlShortener $urlShortener * @param UrlShortenerInterface $urlShortener
* @param TranslatorInterface $translator * @param TranslatorInterface $translator
* @param array $domainConfig * @param array $domainConfig
* *

4
module/CLI/src/Command/GetVisitsCommand.php → module/CLI/src/Command/Shortcode/GetVisitsCommand.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Shlinkio\Shlink\CLI\Command; namespace Shlinkio\Shlink\CLI\Command\Shortcode;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject; use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Shlinkio\Shlink\Common\Util\DateRange; use Shlinkio\Shlink\Common\Util\DateRange;
@ -28,7 +28,7 @@ class GetVisitsCommand extends Command
/** /**
* GetVisitsCommand constructor. * GetVisitsCommand constructor.
* @param VisitsTrackerInterface|VisitsTracker $visitsTracker * @param VisitsTrackerInterface $visitsTracker
* @param TranslatorInterface $translator * @param TranslatorInterface $translator
* *
* @Inject({VisitsTracker::class, "translator"}) * @Inject({VisitsTracker::class, "translator"})

4
module/CLI/src/Command/ListShortcodesCommand.php → module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Shlinkio\Shlink\CLI\Command; namespace Shlinkio\Shlink\CLI\Command\Shortcode;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject; use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter; use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
@ -30,7 +30,7 @@ class ListShortcodesCommand extends Command
/** /**
* ListShortcodesCommand constructor. * ListShortcodesCommand constructor.
* @param ShortUrlServiceInterface|ShortUrlService $shortUrlService * @param ShortUrlServiceInterface $shortUrlService
* @param TranslatorInterface $translator * @param TranslatorInterface $translator
* *
* @Inject({ShortUrlService::class, "translator"}) * @Inject({ShortUrlService::class, "translator"})

4
module/CLI/src/Command/ResolveUrlCommand.php → module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Shlinkio\Shlink\CLI\Command; namespace Shlinkio\Shlink\CLI\Command\Shortcode;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject; use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException; use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
@ -26,7 +26,7 @@ class ResolveUrlCommand extends Command
/** /**
* ResolveUrlCommand constructor. * ResolveUrlCommand constructor.
* @param UrlShortenerInterface|UrlShortener $urlShortener * @param UrlShortenerInterface $urlShortener
* @param TranslatorInterface $translator * @param TranslatorInterface $translator
* *
* @Inject({UrlShortener::class, "translator"}) * @Inject({UrlShortener::class, "translator"})

6
module/CLI/src/Command/ProcessVisitsCommand.php → module/CLI/src/Command/Visit/ProcessVisitsCommand.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Shlinkio\Shlink\CLI\Command; namespace Shlinkio\Shlink\CLI\Command\Visit;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject; use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Shlinkio\Shlink\Common\Exception\WrongIpException; use Shlinkio\Shlink\Common\Exception\WrongIpException;
@ -32,8 +32,8 @@ class ProcessVisitsCommand extends Command
/** /**
* ProcessVisitsCommand constructor. * ProcessVisitsCommand constructor.
* @param VisitServiceInterface|VisitService $visitService * @param VisitServiceInterface $visitService
* @param IpLocationResolverInterface|IpLocationResolver $ipLocationResolver * @param IpLocationResolverInterface $ipLocationResolver
* @param TranslatorInterface $translator * @param TranslatorInterface $translator
* *
* @Inject({VisitService::class, IpLocationResolver::class, "translator"}) * @Inject({VisitService::class, IpLocationResolver::class, "translator"})

2
module/CLI/test/Command/GenerateShortcodeCommandTest.php
View File

@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\CLI\Command\GenerateShortcodeCommand; use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
use Shlinkio\Shlink\Core\Exception\InvalidUrlException; use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
use Shlinkio\Shlink\Core\Service\UrlShortener; use Shlinkio\Shlink\Core\Service\UrlShortener;
use Symfony\Component\Console\Application; use Symfony\Component\Console\Application;

2
module/CLI/test/Command/GetVisitsCommandTest.php
View File

@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\CLI\Command\GetVisitsCommand; use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
use Shlinkio\Shlink\Common\Util\DateRange; use Shlinkio\Shlink\Common\Util\DateRange;
use Shlinkio\Shlink\Core\Entity\Visit; use Shlinkio\Shlink\Core\Entity\Visit;
use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;

2
module/CLI/test/Command/ListShortcodesCommandTest.php
View File

@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\CLI\Command\ListShortcodesCommand; use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface; use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
use Symfony\Component\Console\Application; use Symfony\Component\Console\Application;

2
module/CLI/test/Command/ProcessVisitsCommandTest.php
View File

@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\CLI\Command\ProcessVisitsCommand; use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;
use Shlinkio\Shlink\Common\Service\IpLocationResolver; use Shlinkio\Shlink\Common\Service\IpLocationResolver;
use Shlinkio\Shlink\Core\Entity\Visit; use Shlinkio\Shlink\Core\Entity\Visit;
use Shlinkio\Shlink\Core\Service\VisitService; use Shlinkio\Shlink\Core\Service\VisitService;

2
module/CLI/test/Command/ResolveUrlCommandTest.php
View File

@ -3,7 +3,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Shlinkio\Shlink\CLI\Command\ResolveUrlCommand; use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException; use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
use Shlinkio\Shlink\Core\Service\UrlShortener; use Shlinkio\Shlink\Core\Service\UrlShortener;
use Symfony\Component\Console\Application; use Symfony\Component\Console\Application;