Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-02-28 04:03:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated dependencies

Browse Source
This commit is contained in:
Alejandro Celaya
2019-11-30 17:21:36 +01:00
parent 5d76a55c46
commit e558bb17cb
11 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
use Shlinkio\Shlink\Rest\Service\ApiKeyService;
use Symfony\Component\Console as SymfonyCli;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
use Symfony\Component\Process\PhpExecutableFinder;
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use Zend\ServiceManager\Factory\InvokableFactory;
@@ -70,7 +70,7 @@ return [
Command\Visit\LocateVisitsCommand::class => [
Service\VisitService::class,
IpLocationResolverInterface::class,
Locker::class,
LockFactory::class,
GeolocationDbUpdater::class,
],
Command\Visit\UpdateDbCommand::class => [DbUpdater::class],
@@ -85,14 +85,14 @@ return [
Command\Tag\DeleteTagsCommand::class => [Service\Tag\TagService::class],
Command\Db\CreateDatabaseCommand::class => [
Locker::class,
LockFactory::class,
SymfonyCli\Helper\ProcessHelper::class,
PhpExecutableFinder::class,
Connection::class,
NoDbNameConnectionFactory::SERVICE_NAME,
],
Command\Db\MigrateDatabaseCommand::class => [
Locker::class,
LockFactory::class,
SymfonyCli\Helper\ProcessHelper::class,
PhpExecutableFinder::class,
],

4
module/CLI/src/Command/Db/AbstractDatabaseCommand.php
View File

@@ -8,7 +8,7 @@ use Shlinkio\Shlink\CLI\Command\Util\AbstractLockedCommand;
use Shlinkio\Shlink\CLI\Command\Util\LockedCommandConfig;
use Symfony\Component\Console\Helper\ProcessHelper;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
use Symfony\Component\Process\PhpExecutableFinder;
use function array_unshift;
@@ -20,7 +20,7 @@ abstract class AbstractDatabaseCommand extends AbstractLockedCommand
/** @var string */
private $phpBinary;
public function __construct(Locker $locker, ProcessHelper $processHelper, PhpExecutableFinder $phpFinder)
public function __construct(LockFactory $locker, ProcessHelper $processHelper, PhpExecutableFinder $phpFinder)
{
parent::__construct($locker);
$this->processHelper = $processHelper;

4
module/CLI/src/Command/Db/CreateDatabaseCommand.php
View File

@@ -10,7 +10,7 @@ use Symfony\Component\Console\Helper\ProcessHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
use Symfony\Component\Process\PhpExecutableFinder;
use function Functional\contains;
@@ -27,7 +27,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
private $noDbNameConn;
public function __construct(
Locker $locker,
LockFactory $locker,
ProcessHelper $processHelper,
PhpExecutableFinder $phpFinder,
Connection $conn,

2
module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php
View File

@@ -69,7 +69,7 @@ class GeneratePreviewCommand extends Command
} catch (PreviewGenerationException $e) {
$output->writeln(' <error>Error</error>');
if ($output->isVerbose()) {
$this->getApplication()->renderException($e, $output);
$this->getApplication()->renderThrowable($e, $output);
}
}
}

6
module/CLI/src/Command/Util/AbstractLockedCommand.php
View File

@@ -8,16 +8,16 @@ use Shlinkio\Shlink\CLI\Util\ExitCodes;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
use function sprintf;
abstract class AbstractLockedCommand extends Command
{
/** @var Locker */
/** @var LockFactory */
private $locker;
public function __construct(Locker $locker)
public function __construct(LockFactory $locker)
{
parent::__construct();
$this->locker = $locker;

8
module/CLI/src/Command/Visit/LocateVisitsCommand.php
View File

@@ -22,7 +22,7 @@ use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
use Throwable;
use function sprintf;
@@ -47,7 +47,7 @@ class LocateVisitsCommand extends AbstractLockedCommand
public function __construct(
VisitServiceInterface $visitService,
IpLocationResolverInterface $ipLocationResolver,
Locker $locker,
LockFactory $locker,
GeolocationDbUpdaterInterface $dbUpdater
) {
parent::__construct($locker);
@@ -87,7 +87,7 @@ class LocateVisitsCommand extends AbstractLockedCommand
} catch (Throwable $e) {
$this->io->error($e->getMessage());
if ($e instanceof Exception && $this->io->isVerbose()) {
$this->getApplication()->renderException($e, $this->io);
$this->getApplication()->renderThrowable($e, $this->io);
}
return ExitCodes::EXIT_FAILURE;
@@ -116,7 +116,7 @@ class LocateVisitsCommand extends AbstractLockedCommand
} catch (WrongIpException $e) {
$this->io->writeln(' [<fg=red>An error occurred while locating IP. Skipped</>]');
if ($this->io->isVerbose()) {
$this->getApplication()->renderException($e, $this->io);
$this->getApplication()->renderThrowable($e, $this->io);
}
throw IpCannotBeLocatedException::forError($e);

2
module/CLI/src/Command/Visit/UpdateDbCommand.php
View File

@@ -84,7 +84,7 @@ class UpdateDbCommand extends Command
$io->error($baseErrorMsg);
if ($io->isVerbose()) {
$this->getApplication()->renderException($e, $io);
$this->getApplication()->renderThrowable($e, $io);
}
return ExitCodes::EXIT_FAILURE;
}

6
module/CLI/src/Util/GeolocationDbUpdater.php
View File

@@ -9,7 +9,7 @@ use GeoIp2\Database\Reader;
use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
use Symfony\Component\Lock\Factory as Locker;
use Symfony\Component\Lock\LockFactory;
class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
{
@@ -19,10 +19,10 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
private $dbUpdater;
/** @var Reader */
private $geoLiteDbReader;
/** @var Locker */
/** @var LockFactory */
private $locker;
public function __construct(DbUpdaterInterface $dbUpdater, Reader $geoLiteDbReader, Locker $locker)
public function __construct(DbUpdaterInterface $dbUpdater, Reader $geoLiteDbReader, LockFactory $locker)
{
$this->dbUpdater = $dbUpdater;
$this->geoLiteDbReader = $geoLiteDbReader;