mirror of
https://github.com/shlinkio/shlink.git
synced 2026-03-06 23:33:13 +08:00
Compare commits
154 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
482b792adf | ||
|
|
d3a86f4fae | ||
|
|
6de1d1057b | ||
|
|
d7e68d29de | ||
|
|
b8f24c3584 | ||
|
|
26c455616b | ||
|
|
909ecc2387 | ||
|
|
a9dff56a92 | ||
|
|
ef0dd416f9 | ||
|
|
781ca39938 | ||
|
|
ccb9d5e83a | ||
|
|
91f08c9ead | ||
|
|
433a5a923d | ||
|
|
501a933d2e | ||
|
|
633f3b728f | ||
|
|
be34600494 | ||
|
|
9577a4da4b | ||
|
|
a24688b92a | ||
|
|
91442a3379 | ||
|
|
0bd9f1e19f | ||
|
|
c233e807c2 | ||
|
|
a002c60183 | ||
|
|
c522879c64 | ||
|
|
d04abd1f75 | ||
|
|
c2feffa50c | ||
|
|
e282521040 | ||
|
|
d7b7db670f | ||
|
|
5a500a00d7 | ||
|
|
9fb07f4039 | ||
|
|
cb23d38b38 | ||
|
|
af7c11665c | ||
|
|
7f4678261e | ||
|
|
a1c8c51f70 | ||
|
|
6bbe66e8f1 | ||
|
|
5f0d281255 | ||
|
|
fd468cd4e9 | ||
|
|
1f7a94794d | ||
|
|
0232f68b91 | ||
|
|
070055a8b9 | ||
|
|
a3bbd06fe3 | ||
|
|
68b4cfbae0 | ||
|
|
97a54aef06 | ||
|
|
297c88c334 | ||
|
|
fef5390a62 | ||
|
|
08d18b1dc1 | ||
|
|
16a2349d86 | ||
|
|
18d9815e88 | ||
|
|
c8346bc5f8 | ||
|
|
2d85a207d1 | ||
|
|
0df8f17e7b | ||
|
|
29645e77cf | ||
|
|
ea76092681 | ||
|
|
c12e13dfd7 | ||
|
|
566940349f | ||
|
|
391ef5c323 | ||
|
|
70264be8e7 | ||
|
|
6208f6f0d5 | ||
|
|
c422a14c5c | ||
|
|
fbeb959317 | ||
|
|
e53ffc8d43 | ||
|
|
453ca1728e | ||
|
|
d10583c7c5 | ||
|
|
a9d213990e | ||
|
|
6321cc0f2d | ||
|
|
3e5f0b2451 | ||
|
|
4ad167eb30 | ||
|
|
01a4f9f867 | ||
|
|
b93d65ddc1 | ||
|
|
9ef9da0870 | ||
|
|
ba2053bd3a | ||
|
|
1260da85a7 | ||
|
|
960c7a0835 | ||
|
|
574f407a90 | ||
|
|
abf802093c | ||
|
|
7ca22f8629 | ||
|
|
6300982b07 | ||
|
|
54cb40f6ed | ||
|
|
8256f0c757 | ||
|
|
1009f9e7c6 | ||
|
|
9c8eef12ba | ||
|
|
9260b3ac6b | ||
|
|
ff98e1fb3d | ||
|
|
f3389d3738 | ||
|
|
a138f4153d | ||
|
|
602e11d5e7 | ||
|
|
3cd14153ca | ||
|
|
095d8e73b8 | ||
|
|
b37f303e76 | ||
|
|
c8368c9098 | ||
|
|
8d0bac9478 | ||
|
|
286c24f8c0 | ||
|
|
963d26f59b | ||
|
|
e07c464de8 | ||
|
|
575509c45b | ||
|
|
563e654b99 | ||
|
|
3e268e2012 | ||
|
|
b2d9f2fc01 | ||
|
|
6717102dd2 | ||
|
|
1ba7fc81ac | ||
|
|
caf4fa7fdd | ||
|
|
5c7962966d | ||
|
|
95ec7e0afa | ||
|
|
c37660f763 | ||
|
|
486ea10c3c | ||
|
|
e0f18f8d1f | ||
|
|
a66f116d66 | ||
|
|
dd099dc39c | ||
|
|
c05aeabdee | ||
|
|
23922f6c7b | ||
|
|
69a99949e1 | ||
|
|
d56cde72a3 | ||
|
|
99ffff11c7 | ||
|
|
bb050cc1b6 | ||
|
|
3547889ad5 | ||
|
|
479e694478 | ||
|
|
2368b634e3 | ||
|
|
dcc09975a9 | ||
|
|
102f5c4e12 | ||
|
|
cc688fa3ce | ||
|
|
e7f7cbcaac | ||
|
|
f9c56d7cb1 | ||
|
|
1fe2e6f6bd | ||
|
|
c3cc88f03e | ||
|
|
584e1f5643 | ||
|
|
04c479148a | ||
|
|
c45cb7bacb | ||
|
|
17be221920 | ||
|
|
10da57572f | ||
|
|
52478ca60a | ||
|
|
62b49dcb19 | ||
|
|
a365faef9c | ||
|
|
5d2698e8a1 | ||
|
|
ec4a413a5b | ||
|
|
596d1ee797 | ||
|
|
d117f82bcb | ||
|
|
18abe9d0f9 | ||
|
|
b53e51de33 | ||
|
|
9478c71af1 | ||
|
|
a2c4eebec8 | ||
|
|
2e5a7d76df | ||
|
|
288249d0b8 | ||
|
|
cd47aae902 | ||
|
|
9bd18ee041 | ||
|
|
22c76df8e6 | ||
|
|
6c87436a96 | ||
|
|
734dac9456 | ||
|
|
85ca366893 | ||
|
|
46db736af8 | ||
|
|
7530048fbd | ||
|
|
c3c03a3a3b | ||
|
|
d1018b6da7 | ||
|
|
fe7928ae0e | ||
|
|
f6c39285c9 | ||
|
|
0e2a289f9f |
24
.gitattributes
vendored
Normal file
24
.gitattributes
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
/data/infra export-ignore
|
||||||
|
/docs export-ignore
|
||||||
|
/module/CLI/test export-ignore
|
||||||
|
/module/CLI/test-resources export-ignore
|
||||||
|
/module/Common/test export-ignore
|
||||||
|
/module/Common/test-func export-ignore
|
||||||
|
/module/Core/test export-ignore
|
||||||
|
/module/Core/test-func export-ignore
|
||||||
|
/module/Rest/test export-ignore
|
||||||
|
.env.dist export-ignore
|
||||||
|
.gitattributes export-ignore
|
||||||
|
.gitignore export-ignore
|
||||||
|
.phpstorm.meta.php export-ignore
|
||||||
|
.scrutinizer.yml export-ignore
|
||||||
|
.travis.yml export-ignore
|
||||||
|
build.sh export-ignore
|
||||||
|
CHANGELOG.md export-ignore
|
||||||
|
docker-compose.override.yml.dist export-ignore
|
||||||
|
docker-compose.yml export-ignore
|
||||||
|
func_tests_bootstrap.php export-ignore
|
||||||
|
indocker export-ignore
|
||||||
|
phpcs.xml export-ignore
|
||||||
|
phpunit.xml.dist export-ignore
|
||||||
|
phpunit-func.xml export-ignore
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ vendor/
|
|||||||
.env
|
.env
|
||||||
data/database.sqlite
|
data/database.sqlite
|
||||||
docs/swagger-ui
|
docs/swagger-ui
|
||||||
|
docker-compose.override.yml
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace PHPSTORM_META;
|
namespace PHPSTORM_META;
|
||||||
|
|
||||||
use Interop\Container\ContainerInterface;
|
use Psr\Container\ContainerInterface;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PhpStorm Container Interop code completion
|
* PhpStorm Container Interop code completion
|
||||||
@@ -16,4 +17,7 @@ $STATIC_METHOD_TYPES = [
|
|||||||
ContainerInterface::get('') => [
|
ContainerInterface::get('') => [
|
||||||
'' == '@',
|
'' == '@',
|
||||||
],
|
],
|
||||||
|
ServiceManager::build('') => [
|
||||||
|
'' == '@',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
extension="memcached.so"
|
|
||||||
@@ -6,11 +6,13 @@ branches:
|
|||||||
- develop
|
- develop
|
||||||
|
|
||||||
php:
|
php:
|
||||||
- 5.6
|
|
||||||
- 7
|
- 7
|
||||||
- 7.1
|
- 7.1
|
||||||
|
- 7.2
|
||||||
|
|
||||||
before_install: phpenv config-add .travis-php.ini
|
before_install:
|
||||||
|
- phpenv config-add data/infra/travis-php/memcached.ini
|
||||||
|
- phpenv config-add data/infra/travis-php/apcu.ini
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- composer self-update
|
- composer self-update
|
||||||
@@ -21,6 +23,7 @@ script:
|
|||||||
- composer check
|
- composer check
|
||||||
|
|
||||||
after_script:
|
after_script:
|
||||||
|
- vendor/bin/phpcov merge build --clover build/clover.xml
|
||||||
- wget https://scrutinizer-ci.com/ocular.phar
|
- wget https://scrutinizer-ci.com/ocular.phar
|
||||||
- php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
|
- php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
|
||||||
|
|
||||||
|
|||||||
54
CHANGELOG.md
54
CHANGELOG.md
@@ -1,5 +1,59 @@
|
|||||||
## CHANGELOG
|
## CHANGELOG
|
||||||
|
|
||||||
|
### 1.6.1
|
||||||
|
|
||||||
|
* Added gitattributes file to avoid files not needed in production to be included in distribution
|
||||||
|
|
||||||
|
### 1.6.0
|
||||||
|
|
||||||
|
**Features**
|
||||||
|
|
||||||
|
* [44: Consider allowing to set custom slugs instead of generating a short code](https://github.com/shlinkio/shlink/issues/44)
|
||||||
|
* [47: Allow to limit short codes availability by date range](https://github.com/shlinkio/shlink/issues/47)
|
||||||
|
* [48: Allow to limit the number of visits to a short code](https://github.com/shlinkio/shlink/issues/48)
|
||||||
|
* [105: Added option to enable/disable URL validation by response status code.](https://github.com/shlinkio/shlink/pull/105)
|
||||||
|
|
||||||
|
**Enhancements:**
|
||||||
|
|
||||||
|
* [27: Add repository functional tests with dbunit](https://github.com/shlinkio/shlink/issues/27)
|
||||||
|
* [86: Drop support for PHP 5](https://github.com/shlinkio/shlink/issues/86)
|
||||||
|
* [101: Make actions just capture very specific exceptions, and let the ErrorHandler catch any other exception](https://github.com/shlinkio/shlink/issues/101)
|
||||||
|
* [104: Use different templates for requested-short-code-does-not-exist and route-could-not-be-match](https://github.com/shlinkio/shlink/issues/104)
|
||||||
|
|
||||||
|
**Tasks**
|
||||||
|
|
||||||
|
* [99: Replace AnnotatedFactory by ConfigAbstractFactory](https://github.com/shlinkio/shlink/issues/99)
|
||||||
|
* [100: Replace twig by plates](https://github.com/shlinkio/shlink/issues/100)
|
||||||
|
* [102: Improve coding standards strictness](https://github.com/shlinkio/shlink/issues/102)
|
||||||
|
|
||||||
|
**Bugs**
|
||||||
|
|
||||||
|
* [103: Make NotFoundDelegate return proper content types based on accepted content](https://github.com/shlinkio/shlink/issues/103)
|
||||||
|
|
||||||
|
### 1.5.0
|
||||||
|
|
||||||
|
**Enhancements:**
|
||||||
|
|
||||||
|
* [95: Add tags CRUD to CLI](https://github.com/shlinkio/shlink/issues/95)
|
||||||
|
* [59: Add tags CRUD to REST](https://github.com/shlinkio/shlink/issues/59)
|
||||||
|
* [66: Allow to import certain information from older app directory when updating](https://github.com/shlinkio/shlink/issues/66)
|
||||||
|
|
||||||
|
**Tasks**
|
||||||
|
|
||||||
|
* [96: Add namespace to functions](https://github.com/shlinkio/shlink/issues/96)
|
||||||
|
* [76: Add response examples to swagger docs](https://github.com/shlinkio/shlink/issues/76)
|
||||||
|
* [93: Improve cross domain management by using the ImplicitOptionsMiddleware](https://github.com/shlinkio/shlink/issues/93)
|
||||||
|
|
||||||
|
**Bugs**
|
||||||
|
|
||||||
|
* [92: Fix formatted dates, using an ISO compliant format](https://github.com/shlinkio/shlink/issues/92)
|
||||||
|
|
||||||
|
### 1.4.0
|
||||||
|
|
||||||
|
**Enhancements:**
|
||||||
|
|
||||||
|
* [89: Update to expressive 2](https://github.com/shlinkio/shlink/issues/89)
|
||||||
|
|
||||||
### 1.3.1
|
### 1.3.1
|
||||||
|
|
||||||
**Tasks**
|
**Tasks**
|
||||||
|
|||||||
5
bin/cli
5
bin/cli
@@ -5,7 +5,4 @@ use Symfony\Component\Console\Application as CliApp;
|
|||||||
|
|
||||||
/** @var ContainerInterface $container */
|
/** @var ContainerInterface $container */
|
||||||
$container = include __DIR__ . '/../config/container.php';
|
$container = include __DIR__ . '/../config/container.php';
|
||||||
|
$container->get(CliApp::class)->run();
|
||||||
/** @var CliApp $app */
|
|
||||||
$app = $container->get(CliApp::class);
|
|
||||||
$app->run();
|
|
||||||
|
|||||||
28
bin/install
28
bin/install
@@ -1,14 +1,30 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
|
use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
use Zend\Config\Writer\PhpArray;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
|
||||||
|
use Zend\ServiceManager\Factory\InvokableFactory;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
chdir(dirname(__DIR__));
|
chdir(dirname(__DIR__));
|
||||||
|
|
||||||
require __DIR__ . '/../vendor/autoload.php';
|
require __DIR__ . '/../vendor/autoload.php';
|
||||||
|
|
||||||
$app = new Application();
|
$container = new ServiceManager([
|
||||||
$app->add(new InstallCommand(new PhpArray()));
|
'factories' => [
|
||||||
$app->setDefaultCommand('shlink:install');
|
Application::class => InstallApplicationFactory::class,
|
||||||
$app->run();
|
Filesystem::class => InvokableFactory::class,
|
||||||
|
QuestionHelper::class => InvokableFactory::class,
|
||||||
|
],
|
||||||
|
'services' => [
|
||||||
|
'config' => [
|
||||||
|
ConfigAbstractFactory::class => [
|
||||||
|
DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
$container->build(Application::class)->run();
|
||||||
|
|||||||
28
bin/update
28
bin/update
@@ -1,14 +1,30 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
use Shlinkio\Shlink\CLI\Command\Install\UpdateCommand;
|
use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
use Zend\Config\Writer\PhpArray;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
|
||||||
|
use Zend\ServiceManager\Factory\InvokableFactory;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
chdir(dirname(__DIR__));
|
chdir(dirname(__DIR__));
|
||||||
|
|
||||||
require __DIR__ . '/../vendor/autoload.php';
|
require __DIR__ . '/../vendor/autoload.php';
|
||||||
|
|
||||||
$app = new Application();
|
$container = new ServiceManager([
|
||||||
$app->add(new UpdateCommand(new PhpArray()));
|
'factories' => [
|
||||||
$app->setDefaultCommand('shlink:install');
|
Application::class => InstallApplicationFactory::class,
|
||||||
$app->run();
|
Filesystem::class => InvokableFactory::class,
|
||||||
|
QuestionHelper::class => InvokableFactory::class,
|
||||||
|
],
|
||||||
|
'services' => [
|
||||||
|
'config' => [
|
||||||
|
ConfigAbstractFactory::class => [
|
||||||
|
DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
$container->build(Application::class, ['isUpdate' => true])->run();
|
||||||
|
|||||||
14
build.sh
14
build.sh
@@ -8,7 +8,7 @@ if [ "$#" -ne 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
version=$1
|
version=$1
|
||||||
builtcontent=$(readlink -f '../shlink_build_tmp')
|
builtcontent=$(readlink -f "../shlink_${version}_dist")
|
||||||
projectdir=$(pwd)
|
projectdir=$(pwd)
|
||||||
|
|
||||||
# Copy project content to temp dir
|
# Copy project content to temp dir
|
||||||
@@ -20,8 +20,8 @@ cp -R "${projectdir}"/* "${builtcontent}"
|
|||||||
cd "${builtcontent}"
|
cd "${builtcontent}"
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
rm -r vendor
|
rm -rf vendor
|
||||||
rm composer.lock
|
rm -f composer.lock
|
||||||
composer self-update
|
composer self-update
|
||||||
composer install --no-dev --optimize-autoloader --no-progress --no-interaction
|
composer install --no-dev --optimize-autoloader --no-progress --no-interaction
|
||||||
|
|
||||||
@@ -31,10 +31,12 @@ rm build.sh
|
|||||||
rm CHANGELOG.md
|
rm CHANGELOG.md
|
||||||
rm composer.*
|
rm composer.*
|
||||||
rm LICENSE
|
rm LICENSE
|
||||||
|
rm indocker
|
||||||
|
rm docker-compose.yml
|
||||||
rm php*
|
rm php*
|
||||||
rm README.md
|
rm README.md
|
||||||
rm -r build
|
rm -rf build
|
||||||
rm -f data/database.sqlite
|
rm -ff data/database.sqlite
|
||||||
rm -rf data/infra
|
rm -rf data/infra
|
||||||
rm -rf data/{cache,log,proxies}/{*,.gitignore}
|
rm -rf data/{cache,log,proxies}/{*,.gitignore}
|
||||||
rm -rf config/params/{*,.gitignore}
|
rm -rf config/params/{*,.gitignore}
|
||||||
@@ -42,5 +44,5 @@ rm -rf config/autoload/{{,*.}local.php{,.dist},.gitignore}
|
|||||||
|
|
||||||
# Compressing file
|
# Compressing file
|
||||||
rm -f "${projectdir}"/build/shlink_${version}_dist.zip
|
rm -f "${projectdir}"/build/shlink_${version}_dist.zip
|
||||||
zip -ry "${projectdir}"/build/shlink_${version}_dist.zip .
|
zip -ry "${projectdir}"/build/shlink_${version}_dist.zip "../shlink_${version}_dist"
|
||||||
rm -rf "${builtcontent}"
|
rm -rf "${builtcontent}"
|
||||||
|
|||||||
@@ -1,49 +1,59 @@
|
|||||||
{
|
{
|
||||||
"name": "shlinkio/shlink",
|
"name": "shlinkio/shlink",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"homepage": "http://shlink.io",
|
"homepage": "https://shlink.io",
|
||||||
"description": "A self-hosted and PHP-based URL shortener application with CLI and REST interfaces",
|
"description": "A self-hosted and PHP-based URL shortener application with CLI and REST interfaces",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Alejandro Celaya Alastrué",
|
"name": "Alejandro Celaya Alastrué",
|
||||||
"homepage": "http://www.alejandrocelaya.com",
|
"homepage": "https://www.alejandrocelaya.com",
|
||||||
"email": "alejandro@alejandrocelaya.com"
|
"email": "alejandro@alejandrocelaya.com"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.6 || ^7.0",
|
"php": "^7.0",
|
||||||
"zendframework/zend-expressive": "^1.0",
|
"acelaya/ze-content-based-error-handler": "^2.0",
|
||||||
"zendframework/zend-expressive-fastroute": "^1.3",
|
"cocur/slugify": "^3.0",
|
||||||
"zendframework/zend-expressive-twigrenderer": "^1.0",
|
"doctrine/annotations": "^1.4 <1.5",
|
||||||
"zendframework/zend-stdlib": "^2.7",
|
"doctrine/cache": "^1.6 <1.7",
|
||||||
"zendframework/zend-servicemanager": "^3.0",
|
"doctrine/collections": "^1.4 <1.5",
|
||||||
"zendframework/zend-paginator": "^2.6",
|
"doctrine/common": "^2.7 <2.8",
|
||||||
"zendframework/zend-config": "^2.6",
|
"doctrine/dbal": "^2.5 <2.6",
|
||||||
"zendframework/zend-i18n": "^2.7",
|
"doctrine/migrations": "^1.4",
|
||||||
"mtymek/expressive-config-manager": "^0.4",
|
"doctrine/orm": "^2.5 <2.6",
|
||||||
"acelaya/zsm-annotated-services": "^0.2.0",
|
|
||||||
"acelaya/ze-content-based-error-handler": "^1.0",
|
|
||||||
"doctrine/orm": "^2.5",
|
|
||||||
"guzzlehttp/guzzle": "^6.2",
|
|
||||||
"symfony/console": "^3.0",
|
|
||||||
"symfony/process": "^3.0",
|
|
||||||
"symfony/filesystem": "^3.0",
|
|
||||||
"firebase/php-jwt": "^4.0",
|
|
||||||
"monolog/monolog": "^1.21",
|
|
||||||
"theorchard/monolog-cascade": "^0.4",
|
|
||||||
"endroid/qrcode": "^1.7",
|
"endroid/qrcode": "^1.7",
|
||||||
|
"firebase/php-jwt": "^4.0",
|
||||||
|
"guzzlehttp/guzzle": "^6.2",
|
||||||
|
"http-interop/http-middleware": "^0.4.1",
|
||||||
"mikehaertl/phpwkhtmltopdf": "^2.2",
|
"mikehaertl/phpwkhtmltopdf": "^2.2",
|
||||||
"doctrine/migrations": "^1.4"
|
"monolog/monolog": "^1.21",
|
||||||
|
"roave/security-advisories": "dev-master",
|
||||||
|
"symfony/console": "^3.0",
|
||||||
|
"symfony/filesystem": "^3.0",
|
||||||
|
"symfony/process": "^3.0",
|
||||||
|
"theorchard/monolog-cascade": "^0.4",
|
||||||
|
"zendframework/zend-config": "^3.0",
|
||||||
|
"zendframework/zend-config-aggregator": "^1.0",
|
||||||
|
"zendframework/zend-expressive": "^2.0",
|
||||||
|
"zendframework/zend-expressive-fastroute": "^2.0",
|
||||||
|
"zendframework/zend-expressive-helpers": "^4.2",
|
||||||
|
"zendframework/zend-expressive-platesrenderer": "^1.3",
|
||||||
|
"zendframework/zend-i18n": "^2.7",
|
||||||
|
"zendframework/zend-paginator": "^2.6",
|
||||||
|
"zendframework/zend-servicemanager": "^3.0",
|
||||||
|
"zendframework/zend-stdlib": "^3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5.0",
|
|
||||||
"squizlabs/php_codesniffer": "^2.3",
|
|
||||||
"roave/security-advisories": "dev-master",
|
|
||||||
"filp/whoops": "^2.0",
|
"filp/whoops": "^2.0",
|
||||||
|
"phpunit/dbunit": "^3.0",
|
||||||
|
"phpunit/phpcov": "^4.0",
|
||||||
|
"phpunit/phpunit": "^6.0",
|
||||||
|
"slevomat/coding-standard": "^4.0",
|
||||||
|
"squizlabs/php_codesniffer": "^3.1",
|
||||||
"symfony/var-dumper": "^3.0",
|
"symfony/var-dumper": "^3.0",
|
||||||
"vlucas/phpdotenv": "^2.2",
|
"vlucas/phpdotenv": "^2.2",
|
||||||
"phly/changelog-generator": "^2.1"
|
"zendframework/zend-expressive-tooling": "^0.4"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
@@ -60,22 +70,39 @@
|
|||||||
"psr-4": {
|
"psr-4": {
|
||||||
"ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
|
"ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
|
||||||
"ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
|
"ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
|
||||||
"ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
|
"ShlinkioTest\\Shlink\\Core\\": [
|
||||||
"ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
|
"module/Core/test",
|
||||||
|
"module/Core/test-func"
|
||||||
|
],
|
||||||
|
"ShlinkioTest\\Shlink\\Common\\": [
|
||||||
|
"module/Common/test",
|
||||||
|
"module/Common/test-func"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"check": [
|
"check": [
|
||||||
"@cs",
|
"@cs",
|
||||||
"@test"
|
"@test",
|
||||||
|
"@func-test"
|
||||||
],
|
],
|
||||||
"cs": "phpcs",
|
"cs": "phpcs",
|
||||||
"cs-fix": "phpcbf",
|
"cs-fix": "phpcbf",
|
||||||
"serve": "php -S 0.0.0.0:8000 -t public/",
|
"serve": "php -S 0.0.0.0:8000 -t public/",
|
||||||
"test": "phpunit --coverage-clover build/clover.xml",
|
"test": "phpunit --coverage-php build/coverage-unit.cov",
|
||||||
"pretty-test": "phpunit --coverage-html build/coverage"
|
"pretty-test": "phpunit --coverage-html build/coverage",
|
||||||
|
"func-test": "phpunit -c phpunit-func.xml --coverage-php build/coverage-func.cov",
|
||||||
|
"complete-pretty-test": [
|
||||||
|
"@test",
|
||||||
|
"@func-test",
|
||||||
|
"phpcov merge build --html build/html"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"process-timeout": 0
|
"process-timeout": 0,
|
||||||
|
"sort-packages": true,
|
||||||
|
"platform": {
|
||||||
|
"php": "7.0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Common;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'app_options' => [
|
'app_options' => [
|
||||||
'name' => 'Shlink',
|
'name' => 'Shlink',
|
||||||
'version' => '1.2.0',
|
'version' => '1.2.0',
|
||||||
'secret_key' => env('SECRET_KEY'),
|
'secret_key' => Common\env('SECRET_KEY'),
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,18 +1,29 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
|
||||||
use Zend\Expressive;
|
use Zend\Expressive;
|
||||||
use Zend\Expressive\Container;
|
use Zend\Expressive\Container;
|
||||||
|
use Zend\Expressive\Helper;
|
||||||
|
use Zend\Expressive\Middleware;
|
||||||
|
use Zend\Expressive\Plates;
|
||||||
use Zend\Expressive\Router;
|
use Zend\Expressive\Router;
|
||||||
use Zend\Expressive\Template;
|
use Zend\Expressive\Template;
|
||||||
use Zend\Expressive\Twig;
|
use Zend\ServiceManager\Factory\InvokableFactory;
|
||||||
|
use Zend\Stratigility\Middleware\ErrorHandler;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'dependencies' => [
|
'dependencies' => [
|
||||||
'factories' => [
|
'factories' => [
|
||||||
Expressive\Application::class => Container\ApplicationFactory::class,
|
Expressive\Application::class => Container\ApplicationFactory::class,
|
||||||
Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
|
Template\TemplateRendererInterface::class => Plates\PlatesRendererFactory::class,
|
||||||
\Twig_Environment::class => Twig\TwigEnvironmentFactory::class,
|
|
||||||
Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
|
Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
|
||||||
|
ErrorHandler::class => Container\ErrorHandlerFactory::class,
|
||||||
|
Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
|
||||||
|
|
||||||
|
Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
|
||||||
|
Helper\ServerUrlHelper::class => InvokableFactory::class,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Common;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'entity_manager' => [
|
'entity_manager' => [
|
||||||
@@ -6,9 +10,9 @@ return [
|
|||||||
'proxies_dir' => 'data/proxies',
|
'proxies_dir' => 'data/proxies',
|
||||||
],
|
],
|
||||||
'connection' => [
|
'connection' => [
|
||||||
'user' => env('DB_USER'),
|
'user' => Common\env('DB_USER'),
|
||||||
'password' => env('DB_PASSWORD'),
|
'password' => Common\env('DB_PASSWORD'),
|
||||||
'dbname' => env('DB_NAME', 'shlink'),
|
'dbname' => Common\env('DB_NAME', 'shlink'),
|
||||||
'charset' => 'utf8',
|
'charset' => 'utf8',
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
use Acelaya\ExpressiveErrorHandler\ErrorHandler\ContentBasedErrorHandler;
|
use Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory;
|
||||||
use Zend\Expressive\Container\WhoopsErrorHandlerFactory;
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'dependencies' => [
|
'dependencies' => [
|
||||||
@@ -21,7 +20,7 @@ return [
|
|||||||
'error_handler' => [
|
'error_handler' => [
|
||||||
'plugins' => [
|
'plugins' => [
|
||||||
'factories' => [
|
'factories' => [
|
||||||
ContentBasedErrorHandler::DEFAULT_CONTENT => WhoopsErrorHandlerFactory::class,
|
'text/html' => WhoopsErrorResponseGeneratorFactory::class,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Monolog\Handler\RotatingFileHandler;
|
use Monolog\Handler\RotatingFileHandler;
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,53 @@
|
|||||||
<?php
|
<?php
|
||||||
use Zend\Expressive\Container\ApplicationFactory;
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
|
||||||
|
use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
|
||||||
|
use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
|
||||||
|
use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
|
||||||
|
use Shlinkio\Shlink\Rest\Middleware\PathVersionMiddleware;
|
||||||
|
use Zend\Expressive;
|
||||||
|
use Zend\Stratigility\Middleware\ErrorHandler;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'middleware_pipeline' => [
|
'middleware_pipeline' => [
|
||||||
|
'pre-routing' => [
|
||||||
|
'middleware' => [
|
||||||
|
ErrorHandler::class,
|
||||||
|
LocaleMiddleware::class,
|
||||||
|
],
|
||||||
|
'priority' => 11,
|
||||||
|
],
|
||||||
|
'pre-routing-rest' => [
|
||||||
|
'path' => '/rest',
|
||||||
|
'middleware' => [
|
||||||
|
PathVersionMiddleware::class,
|
||||||
|
],
|
||||||
|
'priority' => 11,
|
||||||
|
],
|
||||||
|
|
||||||
'routing' => [
|
'routing' => [
|
||||||
'middleware' => [
|
'middleware' => [
|
||||||
ApplicationFactory::ROUTING_MIDDLEWARE,
|
Expressive\Application::ROUTING_MIDDLEWARE,
|
||||||
],
|
],
|
||||||
'priority' => 10,
|
'priority' => 10,
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'rest' => [
|
||||||
|
'path' => '/rest',
|
||||||
|
'middleware' => [
|
||||||
|
CrossDomainMiddleware::class,
|
||||||
|
Expressive\Middleware\ImplicitOptionsMiddleware::class,
|
||||||
|
BodyParserMiddleware::class,
|
||||||
|
CheckAuthenticationMiddleware::class,
|
||||||
|
],
|
||||||
|
'priority' => 5,
|
||||||
|
],
|
||||||
|
|
||||||
'post-routing' => [
|
'post-routing' => [
|
||||||
'middleware' => [
|
'middleware' => [
|
||||||
ApplicationFactory::DISPATCH_MIDDLEWARE,
|
Expressive\Application::DISPATCH_MIDDLEWARE,
|
||||||
],
|
],
|
||||||
'priority' => 1,
|
'priority' => 1,
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'phpwkhtmltopdf' => [
|
'phpwkhtmltopdf' => [
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'preview_generation' => [
|
'preview_generation' => [
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Zend\Expressive\Router\FastRouteRouter;
|
use Zend\Expressive\Router\FastRouteRouter;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'twig' => [
|
'templates' => [
|
||||||
'cache_dir' => 'data/cache/twig',
|
'extension' => 'phtml',
|
||||||
|
],
|
||||||
|
|
||||||
|
'plates' => [
|
||||||
'extensions' => [
|
'extensions' => [
|
||||||
// extension service names or instances
|
// extension service names or instances
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Common;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'translator' => [
|
'translator' => [
|
||||||
'locale' => env('DEFAULT_LOCALE', 'en'),
|
'locale' => Common\env('DEFAULT_LOCALE', 'en'),
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
||||||
|
use function Shlinkio\Shlink\Common\env;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
@@ -9,6 +12,7 @@ return [
|
|||||||
'hostname' => env('SHORTENED_URL_HOSTNAME'),
|
'hostname' => env('SHORTENED_URL_HOSTNAME'),
|
||||||
],
|
],
|
||||||
'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
|
'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
|
||||||
|
'validate_url' => true,
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,34 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManager;
|
use Doctrine\ORM\EntityManager;
|
||||||
use Doctrine\ORM\Tools\Console\ConsoleRunner;
|
use Doctrine\ORM\Tools\Console\ConsoleRunner;
|
||||||
use Interop\Container\ContainerInterface;
|
use Interop\Container\ContainerInterface;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
/** @var ContainerInterface $container */
|
$isTest = false;
|
||||||
|
foreach ($_SERVER['argv'] as $i => $arg) {
|
||||||
|
if ($arg === '--test') {
|
||||||
|
unset($_SERVER['argv'][$i]);
|
||||||
|
$isTest = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var ContainerInterface|ServiceManager $container */
|
||||||
$container = include __DIR__ . '/container.php';
|
$container = include __DIR__ . '/container.php';
|
||||||
|
|
||||||
|
// If in testing env, override DB connection to use an in-memory sqlite database
|
||||||
|
if ($isTest) {
|
||||||
|
$container->setAllowOverride(true);
|
||||||
|
$config = $container->get('config');
|
||||||
|
$config['entity_manager']['connection'] = [
|
||||||
|
'driver' => 'pdo_sqlite',
|
||||||
|
'path' => realpath(sys_get_temp_dir()) . '/shlink-tests.db',
|
||||||
|
];
|
||||||
|
$container->setService('config', $config);
|
||||||
|
}
|
||||||
|
|
||||||
/** @var EntityManager $em */
|
/** @var EntityManager $em */
|
||||||
$em = $container->get(EntityManager::class);
|
$em = $container->get(EntityManager::class);
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Acelaya\ExpressiveErrorHandler;
|
use Acelaya\ExpressiveErrorHandler;
|
||||||
use Shlinkio\Shlink\CLI;
|
use Shlinkio\Shlink\CLI;
|
||||||
use Shlinkio\Shlink\Common;
|
use Shlinkio\Shlink\Common;
|
||||||
use Shlinkio\Shlink\Core;
|
use Shlinkio\Shlink\Core;
|
||||||
use Shlinkio\Shlink\Rest;
|
use Shlinkio\Shlink\Rest;
|
||||||
use Zend\Expressive\ConfigManager;
|
use Zend\ConfigAggregator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
|
* Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
|
||||||
@@ -15,11 +17,11 @@ use Zend\Expressive\ConfigManager;
|
|||||||
* Obviously, if you use closures in your config you can't cache it.
|
* Obviously, if you use closures in your config you can't cache it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
return (new ConfigManager\ConfigManager([
|
return (new ConfigAggregator\ConfigAggregator([
|
||||||
ExpressiveErrorHandler\ConfigProvider::class,
|
ExpressiveErrorHandler\ConfigProvider::class,
|
||||||
Common\ConfigProvider::class,
|
Common\ConfigProvider::class,
|
||||||
Core\ConfigProvider::class,
|
Core\ConfigProvider::class,
|
||||||
CLI\ConfigProvider::class,
|
CLI\ConfigProvider::class,
|
||||||
Rest\ConfigProvider::class,
|
Rest\ConfigProvider::class,
|
||||||
new ConfigManager\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
|
new ConfigAggregator\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
|
||||||
], 'data/cache/app_config.php'))->getMergedConfig();
|
], 'data/cache/app_config.php'))->getMergedConfig();
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Dotenv\Dotenv;
|
use Dotenv\Dotenv;
|
||||||
use Zend\ServiceManager\ServiceManager;
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
@@ -9,7 +11,7 @@ require 'vendor/autoload.php';
|
|||||||
// If the Dotenv class exists, load env vars and enable errors
|
// If the Dotenv class exists, load env vars and enable errors
|
||||||
if (class_exists(Dotenv::class)) {
|
if (class_exists(Dotenv::class)) {
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
ini_set('display_errors', 1);
|
ini_set('display_errors', '1');
|
||||||
$dotenv = new Dotenv(__DIR__ . '/..');
|
$dotenv = new Dotenv(__DIR__ . '/..');
|
||||||
$dotenv->load();
|
$dotenv->load();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual libpng-dev
|
|||||||
RUN docker-php-ext-install gd
|
RUN docker-php-ext-install gd
|
||||||
|
|
||||||
# Install redis extension
|
# Install redis extension
|
||||||
ADD https://github.com/phpredis/phpredis/archive/php7.tar.gz /tmp/phpredis.tar.gz
|
ADD https://github.com/phpredis/phpredis/archive/3.1.4.tar.gz /tmp/phpredis.tar.gz
|
||||||
RUN mkdir -p /usr/src/php/ext/redis\
|
RUN mkdir -p /usr/src/php/ext/redis\
|
||||||
&& tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
|
&& tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
|
||||||
# configure and install
|
# configure and install
|
||||||
@@ -85,3 +85,6 @@ RUN rm /tmp/xdebug.tar.gz
|
|||||||
RUN php -r "readfile('https://getcomposer.org/installer');" | php
|
RUN php -r "readfile('https://getcomposer.org/installer');" | php
|
||||||
RUN chmod +x composer.phar
|
RUN chmod +x composer.phar
|
||||||
RUN mv composer.phar /usr/local/bin/composer
|
RUN mv composer.phar /usr/local/bin/composer
|
||||||
|
|
||||||
|
# Make home directory writable by anyone
|
||||||
|
RUN chmod 777 /home
|
||||||
|
|||||||
1
data/infra/travis-php/apcu.ini
Normal file
1
data/infra/travis-php/apcu.ini
Normal file
@@ -0,0 +1 @@
|
|||||||
|
extension="apcu.so"
|
||||||
1
data/infra/travis-php/memcached.ini
Normal file
1
data/infra/travis-php/memcached.ini
Normal file
@@ -0,0 +1 @@
|
|||||||
|
extension="memcached.so"
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkMigrations;
|
namespace ShlinkMigrations;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkMigrations;
|
namespace ShlinkMigrations;
|
||||||
|
|
||||||
|
|||||||
49
data/migrations/Version20171021093246.php
Normal file
49
data/migrations/Version20171021093246.php
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace ShlinkMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Migrations\AbstractMigration;
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\DBAL\Schema\SchemaException;
|
||||||
|
use Doctrine\DBAL\Types\Type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
class Version20171021093246 extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
* @throws SchemaException
|
||||||
|
*/
|
||||||
|
public function up(Schema $schema)
|
||||||
|
{
|
||||||
|
$shortUrls = $schema->getTable('short_urls');
|
||||||
|
if ($shortUrls->hasColumn('value_since')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$shortUrls->addColumn('valid_since', Type::DATETIME, [
|
||||||
|
'notnull' => false,
|
||||||
|
]);
|
||||||
|
$shortUrls->addColumn('valid_until', Type::DATETIME, [
|
||||||
|
'notnull' => false,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
* @throws SchemaException
|
||||||
|
*/
|
||||||
|
public function down(Schema $schema)
|
||||||
|
{
|
||||||
|
$shortUrls = $schema->getTable('short_urls');
|
||||||
|
if (! $shortUrls->hasColumn('value_since')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$shortUrls->dropColumn('valid_since');
|
||||||
|
$shortUrls->dropColumn('valid_until');
|
||||||
|
}
|
||||||
|
}
|
||||||
46
data/migrations/Version20171022064541.php
Normal file
46
data/migrations/Version20171022064541.php
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace ShlinkMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Migrations\AbstractMigration;
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\DBAL\Schema\SchemaException;
|
||||||
|
use Doctrine\DBAL\Types\Type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
class Version20171022064541 extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
* @throws SchemaException
|
||||||
|
*/
|
||||||
|
public function up(Schema $schema)
|
||||||
|
{
|
||||||
|
$shortUrls = $schema->getTable('short_urls');
|
||||||
|
if ($shortUrls->hasColumn('max_visits')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$shortUrls->addColumn('max_visits', Type::INTEGER, [
|
||||||
|
'unsigned' => true,
|
||||||
|
'notnull' => false,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
* @throws SchemaException
|
||||||
|
*/
|
||||||
|
public function down(Schema $schema)
|
||||||
|
{
|
||||||
|
$shortUrls = $schema->getTable('short_urls');
|
||||||
|
if (! $shortUrls->hasColumn('max_visits')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$shortUrls->dropColumn('max_visits');
|
||||||
|
}
|
||||||
|
}
|
||||||
0
data/proxies/.gitignore
vendored
Normal file → Executable file
0
data/proxies/.gitignore
vendored
Normal file → Executable file
8
docker-compose.override.yml.dist
Normal file
8
docker-compose.override.yml.dist
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
version: '2'
|
||||||
|
|
||||||
|
services:
|
||||||
|
shlink_php:
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- /etc/passwd:/etc/passwd:ro
|
||||||
|
- /etc/group:/etc/group:ro
|
||||||
@@ -25,6 +25,11 @@
|
|||||||
"description": "The authentication token that needs to be sent in the Authorization header"
|
"description": "The authentication token that needs to be sent in the Authorization header"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"400": {
|
"400": {
|
||||||
|
|||||||
@@ -68,6 +68,44 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"shortUrls": {
|
||||||
|
"data": [
|
||||||
|
{
|
||||||
|
"shortCode": "12C18",
|
||||||
|
"originalUrl": "https://store.steampowered.com",
|
||||||
|
"dateCreated": "2016-08-21T20:34:16+02:00",
|
||||||
|
"visitsCount": 328,
|
||||||
|
"tags": [
|
||||||
|
"games",
|
||||||
|
"tech"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"shortCode": "12Kb3",
|
||||||
|
"originalUrl": "https://shlink.io",
|
||||||
|
"dateCreated": "2016-05-01T20:34:16+02:00",
|
||||||
|
"visitsCount": 1029,
|
||||||
|
"tags": [
|
||||||
|
"shlink"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"shortCode": "123bA",
|
||||||
|
"originalUrl": "https://www.google.com",
|
||||||
|
"dateCreated": "2015-10-01T20:34:16+02:00",
|
||||||
|
"visitsCount": 25,
|
||||||
|
"tags": []
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"pagination": {
|
||||||
|
"currentPage": 5,
|
||||||
|
"pagesCount": 12
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"500": {
|
"500": {
|
||||||
|
|||||||
@@ -28,6 +28,11 @@
|
|||||||
"description": "The original long URL behind the short code."
|
"description": "The original long URL behind the short code."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"longUrl": "https://shlink.io"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"400": {
|
"400": {
|
||||||
|
|||||||
@@ -41,6 +41,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"tags": [
|
||||||
|
"games",
|
||||||
|
"tech"
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"400": {
|
"400": {
|
||||||
|
|||||||
@@ -36,6 +36,32 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"visits": {
|
||||||
|
"data": [
|
||||||
|
{
|
||||||
|
"referer": "https://twitter.com",
|
||||||
|
"date": "2015-08-20T05:05:03+04:00",
|
||||||
|
"remoteAddr": "10.20.30.40",
|
||||||
|
"userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"referer": "https://t.co",
|
||||||
|
"date": "2015-08-20T05:05:03+04:00",
|
||||||
|
"remoteAddr": "11.22.33.44",
|
||||||
|
"userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"referer": null,
|
||||||
|
"date": "2015-08-20T05:05:03+04:00",
|
||||||
|
"remoteAddr": "110.220.5.6",
|
||||||
|
"userAgent": "some_web_crawler/1.4"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"404": {
|
"404": {
|
||||||
|
|||||||
193
docs/swagger/paths/v1_tags.json
Normal file
193
docs/swagger/paths/v1_tags.json
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
{
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Tags"
|
||||||
|
],
|
||||||
|
"summary": "List existing tags",
|
||||||
|
"description": "Returns the list of all tags used in any short URL, ordered by name",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"$ref": "../parameters/Authorization.json"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "The list of tags",
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"tags": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"tags": {
|
||||||
|
"data": [
|
||||||
|
"games",
|
||||||
|
"php",
|
||||||
|
"shlink",
|
||||||
|
"tech"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Unexpected error.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Tags"
|
||||||
|
],
|
||||||
|
"summary": "Create tags",
|
||||||
|
"description": "Provided a list of tags, creates all that do not yet exist",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"$ref": "../parameters/Authorization.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tags[]",
|
||||||
|
"in": "formData",
|
||||||
|
"description": "The list of tag names to create",
|
||||||
|
"required": true,
|
||||||
|
"type": "array"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "The list of tags",
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"tags": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"examples": {
|
||||||
|
"application/json": {
|
||||||
|
"tags": {
|
||||||
|
"data": [
|
||||||
|
"games",
|
||||||
|
"php",
|
||||||
|
"shlink",
|
||||||
|
"tech"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Unexpected error.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"put": {
|
||||||
|
"tags": [
|
||||||
|
"Tags"
|
||||||
|
],
|
||||||
|
"summary": "Rename tag",
|
||||||
|
"description": "Renames one existing tag",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"$ref": "../parameters/Authorization.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "oldName",
|
||||||
|
"in": "formData",
|
||||||
|
"description": "Current name of the tag",
|
||||||
|
"required": true,
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "newName",
|
||||||
|
"in": "formData",
|
||||||
|
"description": "New name of the tag",
|
||||||
|
"required": true,
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"204": {
|
||||||
|
"description": "The tag has been properly renamed"
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "You have not provided either the oldName or the newName params.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"404": {
|
||||||
|
"description": "There's no tag found with the name provided in oldName param.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Unexpected error.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"delete": {
|
||||||
|
"tags": [
|
||||||
|
"Tags"
|
||||||
|
],
|
||||||
|
"summary": "Delete tags",
|
||||||
|
"description": "Deletes provided list of tags",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"$ref": "../parameters/Authorization.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tags[]",
|
||||||
|
"in": "query",
|
||||||
|
"description": "The names of the tags to delete",
|
||||||
|
"required": true,
|
||||||
|
"type": "array"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"204": {
|
||||||
|
"description": "Tags properly deleted"
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Unexpected error.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "../definitions/Error.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
"info": {
|
"info": {
|
||||||
"title": "Shlink",
|
"title": "Shlink",
|
||||||
"description": "Shlink, the self-hosted URL shortener",
|
"description": "Shlink, the self-hosted URL shortener",
|
||||||
"version": "1.2.0"
|
"version": "1.0"
|
||||||
},
|
},
|
||||||
"schemes": [
|
"schemes": [
|
||||||
"http",
|
"http",
|
||||||
@@ -22,17 +22,23 @@
|
|||||||
"/v1/authenticate": {
|
"/v1/authenticate": {
|
||||||
"$ref": "paths/v1_authenticate.json"
|
"$ref": "paths/v1_authenticate.json"
|
||||||
},
|
},
|
||||||
|
|
||||||
"/v1/short-codes": {
|
"/v1/short-codes": {
|
||||||
"$ref": "paths/v1_short-codes.json"
|
"$ref": "paths/v1_short-codes.json"
|
||||||
},
|
},
|
||||||
"/v1/short-codes/{shortCode}": {
|
"/v1/short-codes/{shortCode}": {
|
||||||
"$ref": "paths/v1_short-codes_{shortCode}.json"
|
"$ref": "paths/v1_short-codes_{shortCode}.json"
|
||||||
},
|
},
|
||||||
"/v1/short-codes/{shortCode}/visits": {
|
|
||||||
"$ref": "paths/v1_short-codes_{shortCode}_visits.json"
|
|
||||||
},
|
|
||||||
"/v1/short-codes/{shortCode}/tags": {
|
"/v1/short-codes/{shortCode}/tags": {
|
||||||
"$ref": "paths/v1_short-codes_{shortCode}_tags.json"
|
"$ref": "paths/v1_short-codes_{shortCode}_tags.json"
|
||||||
|
},
|
||||||
|
|
||||||
|
"/v1/tags": {
|
||||||
|
"$ref": "paths/v1_tags.json"
|
||||||
|
},
|
||||||
|
|
||||||
|
"/v1/short-codes/{shortCode}/visits": {
|
||||||
|
"$ref": "paths/v1_short-codes_{shortCode}_visits.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
33
func_tests_bootstrap.php
Normal file
33
func_tests_bootstrap.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use ShlinkioTest\Shlink\Common\DbUnit\DatabaseTestCase;
|
||||||
|
use Symfony\Component\Process\Process;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
|
// Create an empty .env file
|
||||||
|
if (! file_exists('.env')) {
|
||||||
|
touch('.env');
|
||||||
|
}
|
||||||
|
|
||||||
|
$shlinkDbPath = realpath(sys_get_temp_dir()) . '/shlink-tests.db';
|
||||||
|
if (file_exists($shlinkDbPath)) {
|
||||||
|
unlink($shlinkDbPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var ServiceManager $sm */
|
||||||
|
$sm = require __DIR__ . '/config/container.php';
|
||||||
|
$sm->setAllowOverride(true);
|
||||||
|
$config = $sm->get('config');
|
||||||
|
$config['entity_manager']['connection'] = [
|
||||||
|
'driver' => 'pdo_sqlite',
|
||||||
|
'path' => $shlinkDbPath,
|
||||||
|
];
|
||||||
|
$sm->setService('config', $config);
|
||||||
|
|
||||||
|
// Create database
|
||||||
|
$process = new Process('vendor/bin/doctrine orm:schema-tool:create --no-interaction -q --test', __DIR__);
|
||||||
|
$process->inheritEnvironmentVariables()
|
||||||
|
->mustRun();
|
||||||
|
|
||||||
|
DatabaseTestCase::$em = $sm->get('em');
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Shlinkio\Shlink\CLI\Command;
|
use Shlinkio\Shlink\CLI\Command;
|
||||||
|
use Shlinkio\Shlink\Common;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'cli' => [
|
'cli' => [
|
||||||
'locale' => env('CLI_LOCALE', 'en'),
|
'locale' => Common\env('CLI_LOCALE', 'en'),
|
||||||
'commands' => [
|
'commands' => [
|
||||||
Command\Shortcode\GenerateShortcodeCommand::class,
|
Command\Shortcode\GenerateShortcodeCommand::class,
|
||||||
Command\Shortcode\ResolveUrlCommand::class,
|
Command\Shortcode\ResolveUrlCommand::class,
|
||||||
@@ -17,7 +20,11 @@ return [
|
|||||||
Command\Api\GenerateKeyCommand::class,
|
Command\Api\GenerateKeyCommand::class,
|
||||||
Command\Api\DisableKeyCommand::class,
|
Command\Api\DisableKeyCommand::class,
|
||||||
Command\Api\ListKeysCommand::class,
|
Command\Api\ListKeysCommand::class,
|
||||||
]
|
Command\Tag\ListTagsCommand::class,
|
||||||
|
Command\Tag\CreateTagCommand::class,
|
||||||
|
Command\Tag\RenameTagCommand::class,
|
||||||
|
Command\Tag\DeleteTagsCommand::class,
|
||||||
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
<?php
|
<?php
|
||||||
use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Shlinkio\Shlink\CLI\Command;
|
use Shlinkio\Shlink\CLI\Command;
|
||||||
use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
|
use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
|
||||||
|
use Shlinkio\Shlink\Common\Service\IpLocationResolver;
|
||||||
|
use Shlinkio\Shlink\Common\Service\PreviewGenerator;
|
||||||
|
use Shlinkio\Shlink\Core\Service;
|
||||||
|
use Shlinkio\Shlink\Rest\Service\ApiKeyService;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
|
use Zend\I18n\Translator\Translator;
|
||||||
|
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
@@ -10,18 +17,52 @@ return [
|
|||||||
'factories' => [
|
'factories' => [
|
||||||
Application::class => ApplicationFactory::class,
|
Application::class => ApplicationFactory::class,
|
||||||
|
|
||||||
Command\Shortcode\GenerateShortcodeCommand::class => AnnotatedFactory::class,
|
Command\Shortcode\GenerateShortcodeCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Shortcode\ResolveUrlCommand::class => AnnotatedFactory::class,
|
Command\Shortcode\ResolveUrlCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Shortcode\ListShortcodesCommand::class => AnnotatedFactory::class,
|
Command\Shortcode\ListShortcodesCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Shortcode\GetVisitsCommand::class => AnnotatedFactory::class,
|
Command\Shortcode\GetVisitsCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Shortcode\GeneratePreviewCommand::class => AnnotatedFactory::class,
|
Command\Shortcode\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Visit\ProcessVisitsCommand::class => AnnotatedFactory::class,
|
Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class,
|
Command\Config\GenerateCharsetCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class,
|
Command\Config\GenerateSecretCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Api\GenerateKeyCommand::class => AnnotatedFactory::class,
|
Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Api\DisableKeyCommand::class => AnnotatedFactory::class,
|
Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
|
||||||
Command\Api\ListKeysCommand::class => AnnotatedFactory::class,
|
Command\Api\ListKeysCommand::class => ConfigAbstractFactory::class,
|
||||||
|
Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
|
||||||
|
Command\Tag\CreateTagCommand::class => ConfigAbstractFactory::class,
|
||||||
|
Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
|
||||||
|
Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
|
ConfigAbstractFactory::class => [
|
||||||
|
Command\Shortcode\GenerateShortcodeCommand::class => [
|
||||||
|
Service\UrlShortener::class,
|
||||||
|
'translator',
|
||||||
|
'config.url_shortener.domain',
|
||||||
|
],
|
||||||
|
Command\Shortcode\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
|
||||||
|
Command\Shortcode\ListShortcodesCommand::class => [Service\ShortUrlService::class, 'translator'],
|
||||||
|
Command\Shortcode\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
|
||||||
|
Command\Shortcode\GeneratePreviewCommand::class => [
|
||||||
|
Service\ShortUrlService::class,
|
||||||
|
PreviewGenerator::class,
|
||||||
|
'translator',
|
||||||
|
],
|
||||||
|
Command\Visit\ProcessVisitsCommand::class => [
|
||||||
|
Service\VisitService::class,
|
||||||
|
IpLocationResolver::class,
|
||||||
|
'translator',
|
||||||
|
],
|
||||||
|
Command\Config\GenerateCharsetCommand::class => ['translator'],
|
||||||
|
Command\Config\GenerateSecretCommand::class => ['translator'],
|
||||||
|
Command\Api\GenerateKeyCommand::class => [ApiKeyService::class, 'translator'],
|
||||||
|
Command\Api\DisableKeyCommand::class => [ApiKeyService::class, 'translator'],
|
||||||
|
Command\Api\ListKeysCommand::class => [ApiKeyService::class, 'translator'],
|
||||||
|
Command\Tag\ListTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
|
||||||
|
Command\Tag\CreateTagCommand::class => [Service\Tag\TagService::class, Translator::class],
|
||||||
|
Command\Tag\RenameTagCommand::class => [Service\Tag\TagService::class, Translator::class],
|
||||||
|
Command\Tag\DeleteTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
|
||||||
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'translator' => [
|
'translator' => [
|
||||||
|
|||||||
Binary file not shown.
@@ -1,15 +1,15 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Shlink 1.0\n"
|
"Project-Id-Version: Shlink 1.0\n"
|
||||||
"POT-Creation-Date: 2016-10-22 23:12+0200\n"
|
"POT-Creation-Date: 2017-10-21 20:17+0200\n"
|
||||||
"PO-Revision-Date: 2016-10-22 23:13+0200\n"
|
"PO-Revision-Date: 2017-10-21 20:19+0200\n"
|
||||||
"Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
|
"Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: es_ES\n"
|
"Language: es_ES\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Generator: Poedit 1.8.7.1\n"
|
"X-Generator: Poedit 2.0.1\n"
|
||||||
"X-Poedit-Basepath: ..\n"
|
"X-Poedit-Basepath: ..\n"
|
||||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
"X-Poedit-SourceCharset: UTF-8\n"
|
"X-Poedit-SourceCharset: UTF-8\n"
|
||||||
@@ -92,7 +92,7 @@ msgid "Processing URL %s..."
|
|||||||
msgstr "Procesando URL %s..."
|
msgstr "Procesando URL %s..."
|
||||||
|
|
||||||
msgid " <info>Success!</info>"
|
msgid " <info>Success!</info>"
|
||||||
msgstr "<info>¡Correcto!</info>"
|
msgstr " <info>¡Correcto!</info>"
|
||||||
|
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
@@ -107,6 +107,24 @@ msgstr "La URL larga a procesar"
|
|||||||
msgid "Tags to apply to the new short URL"
|
msgid "Tags to apply to the new short URL"
|
||||||
msgstr "Etiquetas a aplicar a la nueva URL acortada"
|
msgstr "Etiquetas a aplicar a la nueva URL acortada"
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"The date from which this short URL will be valid. If someone tries to access "
|
||||||
|
"it before this date, it will not be found."
|
||||||
|
msgstr ""
|
||||||
|
"La fecha desde la cual será válida esta URL acortada. Si alguien intenta "
|
||||||
|
"acceder a ella antes de esta fecha, no será encontrada."
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"The date until which this short URL will be valid. If someone tries to "
|
||||||
|
"access it after this date, it will not be found."
|
||||||
|
msgstr ""
|
||||||
|
"La fecha hasta la cual será válida está URL acortada. Si alguien intenta "
|
||||||
|
"acceder a ella después de esta fecha, no será encontrada."
|
||||||
|
|
||||||
|
msgid "If provided, this slug will be used instead of generating a short code"
|
||||||
|
msgstr ""
|
||||||
|
"Si se proporciona, este slug será usado en vez de generar un código corto"
|
||||||
|
|
||||||
msgid "A long URL was not provided. Which URL do you want to shorten?:"
|
msgid "A long URL was not provided. Which URL do you want to shorten?:"
|
||||||
msgstr "No se ha proporcionado una URL larga. ¿Qué URL deseas acortar?"
|
msgstr "No se ha proporcionado una URL larga. ¿Qué URL deseas acortar?"
|
||||||
|
|
||||||
@@ -123,6 +141,14 @@ msgstr "URL generada:"
|
|||||||
msgid "Provided URL \"%s\" is invalid. Try with a different one."
|
msgid "Provided URL \"%s\" is invalid. Try with a different one."
|
||||||
msgstr "La URL proporcionada \"%s\" e inválida. Prueba con una diferente."
|
msgstr "La URL proporcionada \"%s\" e inválida. Prueba con una diferente."
|
||||||
|
|
||||||
|
#, php-format
|
||||||
|
msgid ""
|
||||||
|
"Provided slug \"%s\" is already in use by another URL. Try with a different "
|
||||||
|
"one."
|
||||||
|
msgstr ""
|
||||||
|
"El slug proporcionado \"%s\" ya está siendo usado para otra URL. Prueba con "
|
||||||
|
"uno diferente."
|
||||||
|
|
||||||
msgid "Returns the detailed visits information for provided short code"
|
msgid "Returns the detailed visits information for provided short code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Devuelve la información detallada de visitas para el código corto "
|
"Devuelve la información detallada de visitas para el código corto "
|
||||||
@@ -141,7 +167,7 @@ msgstr ""
|
|||||||
"Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"
|
"Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"
|
||||||
|
|
||||||
msgid "A short code was not provided. Which short code do you want to use?:"
|
msgid "A short code was not provided. Which short code do you want to use?:"
|
||||||
msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?"
|
msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?:"
|
||||||
|
|
||||||
msgid "Referer"
|
msgid "Referer"
|
||||||
msgstr "Origen"
|
msgstr "Origen"
|
||||||
@@ -210,7 +236,7 @@ msgstr "El código corto a convertir"
|
|||||||
|
|
||||||
msgid "A short code was not provided. Which short code do you want to parse?:"
|
msgid "A short code was not provided. Which short code do you want to parse?:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"No se proporcionó un código corto. ¿Qué código corto quieres convertir?"
|
"No se proporcionó un código corto. ¿Qué código corto quieres convertir?:"
|
||||||
|
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "No URL found for short code \"%s\""
|
msgid "No URL found for short code \"%s\""
|
||||||
@@ -223,6 +249,57 @@ msgstr "URL larga:"
|
|||||||
msgid "Provided short code \"%s\" has an invalid format."
|
msgid "Provided short code \"%s\" has an invalid format."
|
||||||
msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."
|
msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."
|
||||||
|
|
||||||
|
#, php-format
|
||||||
|
msgid "Provided short code \"%s\" could not be found."
|
||||||
|
msgstr "El código corto proporcionado \"%s\" no ha podido ser encontrado."
|
||||||
|
|
||||||
|
msgid "Creates one or more tags."
|
||||||
|
msgstr "Crea una o más etiquetas."
|
||||||
|
|
||||||
|
msgid "The name of the tags to create"
|
||||||
|
msgstr "El nombre de las etiquetas a crear"
|
||||||
|
|
||||||
|
msgid "You have to provide at least one tag name"
|
||||||
|
msgstr "Debes proporcionar al menos un nombre de etiqueta"
|
||||||
|
|
||||||
|
msgid "Created tags"
|
||||||
|
msgstr "Etiquetas creadas"
|
||||||
|
|
||||||
|
msgid "Deletes one or more tags."
|
||||||
|
msgstr "Elimina una o más etiquetas."
|
||||||
|
|
||||||
|
msgid "The name of the tags to delete"
|
||||||
|
msgstr "El nombre de las etiquetas a eliminar"
|
||||||
|
|
||||||
|
msgid "Deleted tags"
|
||||||
|
msgstr "Etiquetas eliminadas"
|
||||||
|
|
||||||
|
msgid "Lists existing tags."
|
||||||
|
msgstr "Lista las etiquetas existentes."
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Name"
|
||||||
|
msgstr "Nombre"
|
||||||
|
|
||||||
|
msgid "No tags yet"
|
||||||
|
msgstr "Aún no hay etiquetas"
|
||||||
|
|
||||||
|
msgid "Renames one existing tag."
|
||||||
|
msgstr "Renombra una etiqueta existente."
|
||||||
|
|
||||||
|
msgid "Current name of the tag."
|
||||||
|
msgstr "Nombre actual de la etiqueta."
|
||||||
|
|
||||||
|
msgid "New name of the tag."
|
||||||
|
msgstr "Nuevo nombre de la etiqueta."
|
||||||
|
|
||||||
|
msgid "Tag properly renamed."
|
||||||
|
msgstr "Etiqueta correctamente renombrada."
|
||||||
|
|
||||||
|
#, php-format
|
||||||
|
msgid "A tag with name \"%s\" was not found"
|
||||||
|
msgstr "Una etiqueta con nombre \"%s\" no ha sido encontrada"
|
||||||
|
|
||||||
msgid "Processes visits where location is not set yet"
|
msgid "Processes visits where location is not set yet"
|
||||||
msgstr "Procesa las visitas donde la localización no ha sido establecida aún"
|
msgstr "Procesa las visitas donde la localización no ha sido establecida aún"
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Api;
|
namespace Shlinkio\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyService;
|
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputArgument;
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
@@ -21,18 +21,11 @@ class DisableKeyCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* DisableKeyCommand constructor.
|
|
||||||
* @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({ApiKeyService::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->apiKeyService = $apiKeyService;
|
$this->apiKeyService = $apiKeyService;
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
parent::__construct(null);
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Api;
|
namespace Shlinkio\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyService;
|
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -21,18 +21,11 @@ class GenerateKeyCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* GenerateKeyCommand constructor.
|
|
||||||
* @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({ApiKeyService::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->apiKeyService = $apiKeyService;
|
$this->apiKeyService = $apiKeyService;
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
parent::__construct(null);
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Api;
|
namespace Shlinkio\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Rest\Entity\ApiKey;
|
use Shlinkio\Shlink\Rest\Entity\ApiKey;
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyService;
|
|
||||||
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\Table;
|
use Symfony\Component\Console\Helper\Table;
|
||||||
@@ -23,18 +23,11 @@ class ListKeysCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* ListKeysCommand constructor.
|
|
||||||
* @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({ApiKeyService::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->apiKeyService = $apiKeyService;
|
$this->apiKeyService = $apiKeyService;
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
parent::__construct(null);
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
@@ -84,7 +77,7 @@ class ListKeysCommand extends Command
|
|||||||
$rowData[] = $this->{$formatMethod}($this->getEnabledSymbol($row));
|
$rowData[] = $this->{$formatMethod}($this->getEnabledSymbol($row));
|
||||||
}
|
}
|
||||||
|
|
||||||
$rowData[] = isset($expiration) ? $expiration->format(\DateTime::ISO8601) : '-';
|
$rowData[] = isset($expiration) ? $expiration->format(\DateTime::ATOM) : '-';
|
||||||
$table->addRow($rowData);
|
$table->addRow($rowData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Config;
|
namespace Shlinkio\Shlink\CLI\Command\Config;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -15,16 +16,10 @@ class GenerateCharsetCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* GenerateCharsetCommand constructor.
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({"translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(TranslatorInterface $translator)
|
public function __construct(TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
parent::__construct(null);
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Config;
|
namespace Shlinkio\Shlink\CLI\Command\Config;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
|
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -17,16 +18,10 @@ class GenerateSecretCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* GenerateCharsetCommand constructor.
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({"translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(TranslatorInterface $translator)
|
public function __construct(TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
parent::__construct(null);
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
|
|||||||
@@ -1,27 +1,27 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Install;
|
namespace Shlinkio\Shlink\CLI\Command\Install;
|
||||||
|
|
||||||
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
|
use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
use Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Exception\LogicException;
|
||||||
|
use Symfony\Component\Console\Exception\RuntimeException;
|
||||||
use Symfony\Component\Console\Helper\ProcessHelper;
|
use Symfony\Component\Console\Helper\ProcessHelper;
|
||||||
use Symfony\Component\Console\Helper\QuestionHelper;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
use Symfony\Component\Console\Question\ChoiceQuestion;
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
use Symfony\Component\Console\Question\Question;
|
use Symfony\Component\Console\Question\Question;
|
||||||
|
use Symfony\Component\Filesystem\Exception\IOException;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
use Zend\Config\Writer\WriterInterface;
|
use Zend\Config\Writer\WriterInterface;
|
||||||
|
|
||||||
class InstallCommand extends Command
|
class InstallCommand extends Command
|
||||||
{
|
{
|
||||||
use StringUtilsTrait;
|
const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
|
||||||
|
|
||||||
const DATABASE_DRIVERS = [
|
|
||||||
'MySQL' => 'pdo_mysql',
|
|
||||||
'PostgreSQL' => 'pdo_pgsql',
|
|
||||||
'SQLite' => 'pdo_sqlite',
|
|
||||||
];
|
|
||||||
const SUPPORTED_LANGUAGES = ['en', 'es'];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var InputInterface
|
* @var InputInterface
|
||||||
@@ -43,22 +43,44 @@ class InstallCommand extends Command
|
|||||||
* @var WriterInterface
|
* @var WriterInterface
|
||||||
*/
|
*/
|
||||||
private $configWriter;
|
private $configWriter;
|
||||||
|
/**
|
||||||
|
* @var Filesystem
|
||||||
|
*/
|
||||||
|
private $filesystem;
|
||||||
|
/**
|
||||||
|
* @var ConfigCustomizerPluginManagerInterface
|
||||||
|
*/
|
||||||
|
private $configCustomizers;
|
||||||
|
/**
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
private $isUpdate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* InstallCommand constructor.
|
* InstallCommand constructor.
|
||||||
* @param WriterInterface $configWriter
|
* @param WriterInterface $configWriter
|
||||||
* @param callable|null $databaseCreationLogic
|
* @param Filesystem $filesystem
|
||||||
|
* @param bool $isUpdate
|
||||||
|
* @throws LogicException
|
||||||
*/
|
*/
|
||||||
public function __construct(WriterInterface $configWriter)
|
public function __construct(
|
||||||
{
|
WriterInterface $configWriter,
|
||||||
parent::__construct(null);
|
Filesystem $filesystem,
|
||||||
|
ConfigCustomizerPluginManagerInterface $configCustomizers,
|
||||||
|
$isUpdate = false
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
$this->configWriter = $configWriter;
|
$this->configWriter = $configWriter;
|
||||||
|
$this->isUpdate = $isUpdate;
|
||||||
|
$this->filesystem = $filesystem;
|
||||||
|
$this->configCustomizers = $configCustomizers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure()
|
public function configure()
|
||||||
{
|
{
|
||||||
$this->setName('shlink:install')
|
$this
|
||||||
->setDescription('Installs Shlink');
|
->setName('shlink:install')
|
||||||
|
->setDescription('Installs or updates Shlink');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function execute(InputInterface $input, OutputInterface $output)
|
public function execute(InputInterface $input, OutputInterface $output)
|
||||||
@@ -67,40 +89,58 @@ class InstallCommand extends Command
|
|||||||
$this->output = $output;
|
$this->output = $output;
|
||||||
$this->questionHelper = $this->getHelper('question');
|
$this->questionHelper = $this->getHelper('question');
|
||||||
$this->processHelper = $this->getHelper('process');
|
$this->processHelper = $this->getHelper('process');
|
||||||
$params = [];
|
|
||||||
|
|
||||||
$output->writeln([
|
$output->writeln([
|
||||||
'<info>Welcome to Shlink!!</info>',
|
'<info>Welcome to Shlink!!</info>',
|
||||||
'This process will guide you through the installation.',
|
'This will guide you through the installation process.',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// Check if a cached config file exists and drop it if so
|
// Check if a cached config file exists and drop it if so
|
||||||
if (file_exists('data/cache/app_config.php')) {
|
if ($this->filesystem->exists('data/cache/app_config.php')) {
|
||||||
$output->write('Deleting old cached config...');
|
$output->write('Deleting old cached config...');
|
||||||
if (unlink('data/cache/app_config.php')) {
|
try {
|
||||||
|
$this->filesystem->remove('data/cache/app_config.php');
|
||||||
$output->writeln(' <info>Success</info>');
|
$output->writeln(' <info>Success</info>');
|
||||||
} else {
|
} catch (IOException $e) {
|
||||||
$output->writeln(
|
$output->writeln(
|
||||||
' <error>Failed!</error> You will have to manually delete the data/cache/app_config.php file to get'
|
' <error>Failed!</error> You will have to manually delete the data/cache/app_config.php file to get'
|
||||||
. ' new config applied.'
|
. ' new config applied.'
|
||||||
);
|
);
|
||||||
|
if ($output->isVerbose()) {
|
||||||
|
$this->getApplication()->renderException($e, $output);
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If running update command, ask the user to import previous config
|
||||||
|
$config = $this->isUpdate ? $this->importConfig() : new CustomizableAppConfig();
|
||||||
|
|
||||||
// Ask for custom config params
|
// Ask for custom config params
|
||||||
$params['DATABASE'] = $this->askDatabase();
|
foreach ([
|
||||||
$params['URL_SHORTENER'] = $this->askUrlShortener();
|
Plugin\DatabaseConfigCustomizerPlugin::class,
|
||||||
$params['LANGUAGE'] = $this->askLanguage();
|
Plugin\UrlShortenerConfigCustomizerPlugin::class,
|
||||||
$params['APP'] = $this->askApplication();
|
Plugin\LanguageConfigCustomizerPlugin::class,
|
||||||
|
Plugin\ApplicationConfigCustomizerPlugin::class,
|
||||||
|
] as $pluginName) {
|
||||||
|
/** @var Plugin\ConfigCustomizerPluginInterface $configCustomizer */
|
||||||
|
$configCustomizer = $this->configCustomizers->get($pluginName);
|
||||||
|
$configCustomizer->process($input, $output, $config);
|
||||||
|
}
|
||||||
|
|
||||||
// Generate config params files
|
// Generate config params files
|
||||||
$config = $this->buildAppConfig($params);
|
$this->configWriter->toFile(self::GENERATED_CONFIG_PATH, $config->getArrayCopy(), false);
|
||||||
$this->configWriter->toFile('config/params/generated_config.php', $config, false);
|
|
||||||
$output->writeln(['<info>Custom configuration properly generated!</info>', '']);
|
$output->writeln(['<info>Custom configuration properly generated!</info>', '']);
|
||||||
|
|
||||||
// Generate database
|
// If current command is not update, generate database
|
||||||
if (! $this->createDatabase()) {
|
if (! $this->isUpdate) {
|
||||||
return;
|
$this->output->writeln('Initializing database...');
|
||||||
|
if (! $this->runCommand(
|
||||||
|
'php vendor/bin/doctrine.php orm:schema-tool:create',
|
||||||
|
'Error generating database.'
|
||||||
|
)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run database migrations
|
// Run database migrations
|
||||||
@@ -116,105 +156,47 @@ class InstallCommand extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function askDatabase()
|
/**
|
||||||
|
* @return CustomizableAppConfig
|
||||||
|
* @throws RuntimeException
|
||||||
|
*/
|
||||||
|
private function importConfig()
|
||||||
{
|
{
|
||||||
$params = [];
|
$config = new CustomizableAppConfig();
|
||||||
$this->printTitle('DATABASE');
|
|
||||||
|
|
||||||
// Select database type
|
// Ask the user if he/she wants to import an older configuration
|
||||||
$databases = array_keys(self::DATABASE_DRIVERS);
|
$importConfig = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
|
||||||
$dbType = $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
|
'<question>Do you want to import previous configuration? (Y/n):</question> '
|
||||||
'<question>Select database type (defaults to ' . $databases[0] . '):</question>',
|
|
||||||
$databases,
|
|
||||||
0
|
|
||||||
));
|
));
|
||||||
$params['DRIVER'] = self::DATABASE_DRIVERS[$dbType];
|
if (! $importConfig) {
|
||||||
|
return $config;
|
||||||
// Ask for connection params if database is not SQLite
|
|
||||||
if ($params['DRIVER'] !== self::DATABASE_DRIVERS['SQLite']) {
|
|
||||||
$params['NAME'] = $this->ask('Database name', 'shlink');
|
|
||||||
$params['USER'] = $this->ask('Database username');
|
|
||||||
$params['PASSWORD'] = $this->ask('Database password');
|
|
||||||
$params['HOST'] = $this->ask('Database host', 'localhost');
|
|
||||||
$params['PORT'] = $this->ask('Database port', $this->getDefaultDbPort($params['DRIVER']));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $params;
|
// Ask the user for the older shlink path
|
||||||
}
|
$keepAsking = true;
|
||||||
|
do {
|
||||||
|
$config->setImportedInstallationPath($this->ask(
|
||||||
|
'Previous shlink installation path from which to import config'
|
||||||
|
));
|
||||||
|
$configFile = $config->getImportedInstallationPath() . '/' . self::GENERATED_CONFIG_PATH;
|
||||||
|
$configExists = $this->filesystem->exists($configFile);
|
||||||
|
|
||||||
protected function getDefaultDbPort($driver)
|
if (! $configExists) {
|
||||||
{
|
$keepAsking = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
|
||||||
return $driver === 'pdo_mysql' ? '3306' : '5432';
|
'Provided path does not seem to be a valid shlink root path. '
|
||||||
}
|
. '<question>Do you want to try another path? (Y/n):</question> '
|
||||||
|
));
|
||||||
|
}
|
||||||
|
} while (! $configExists && $keepAsking);
|
||||||
|
|
||||||
protected function askUrlShortener()
|
// If after some retries the user has chosen not to test another path, return
|
||||||
{
|
if (! $configExists) {
|
||||||
$this->printTitle('URL SHORTENER');
|
return $config;
|
||||||
|
}
|
||||||
|
|
||||||
// Ask for URL shortener params
|
// Read the config file
|
||||||
return [
|
$config->exchangeArray(include $configFile);
|
||||||
'SCHEMA' => $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
|
return $config;
|
||||||
'<question>Select schema for generated short URLs (defaults to http):</question>',
|
|
||||||
['http', 'https'],
|
|
||||||
0
|
|
||||||
)),
|
|
||||||
'HOSTNAME' => $this->ask('Hostname for generated URLs'),
|
|
||||||
'CHARS' => $this->ask(
|
|
||||||
'Character set for generated short codes (leave empty to autogenerate one)',
|
|
||||||
null,
|
|
||||||
true
|
|
||||||
) ?: str_shuffle(UrlShortener::DEFAULT_CHARS)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function askLanguage()
|
|
||||||
{
|
|
||||||
$this->printTitle('LANGUAGE');
|
|
||||||
|
|
||||||
return [
|
|
||||||
'DEFAULT' => $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
|
|
||||||
'<question>Select default language for the application in general (defaults to '
|
|
||||||
. self::SUPPORTED_LANGUAGES[0] . '):</question>',
|
|
||||||
self::SUPPORTED_LANGUAGES,
|
|
||||||
0
|
|
||||||
)),
|
|
||||||
'CLI' => $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
|
|
||||||
'<question>Select default language for CLI executions (defaults to '
|
|
||||||
. self::SUPPORTED_LANGUAGES[0] . '):</question>',
|
|
||||||
self::SUPPORTED_LANGUAGES,
|
|
||||||
0
|
|
||||||
)),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function askApplication()
|
|
||||||
{
|
|
||||||
$this->printTitle('APPLICATION');
|
|
||||||
|
|
||||||
return [
|
|
||||||
'SECRET' => $this->ask(
|
|
||||||
'Define a secret string that will be used to sign API tokens (leave empty to autogenerate one)',
|
|
||||||
null,
|
|
||||||
true
|
|
||||||
) ?: $this->generateRandomString(32),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param string $text
|
|
||||||
*/
|
|
||||||
protected function printTitle($text)
|
|
||||||
{
|
|
||||||
$text = trim($text);
|
|
||||||
$length = strlen($text) + 4;
|
|
||||||
$header = str_repeat('*', $length);
|
|
||||||
|
|
||||||
$this->output->writeln([
|
|
||||||
'',
|
|
||||||
'<info>' . $header . '</info>',
|
|
||||||
'<info>* ' . strtoupper($text) . ' *</info>',
|
|
||||||
'<info>' . $header . '</info>',
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -222,10 +204,11 @@ class InstallCommand extends Command
|
|||||||
* @param string|null $default
|
* @param string|null $default
|
||||||
* @param bool $allowEmpty
|
* @param bool $allowEmpty
|
||||||
* @return string
|
* @return string
|
||||||
|
* @throws RuntimeException
|
||||||
*/
|
*/
|
||||||
protected function ask($text, $default = null, $allowEmpty = false)
|
private function ask($text, $default = null, $allowEmpty = false)
|
||||||
{
|
{
|
||||||
if (isset($default)) {
|
if ($default !== null) {
|
||||||
$text .= ' (defaults to ' . $default . ')';
|
$text .= ' (defaults to ' . $default . ')';
|
||||||
}
|
}
|
||||||
do {
|
do {
|
||||||
@@ -236,87 +219,31 @@ class InstallCommand extends Command
|
|||||||
if (empty($value) && ! $allowEmpty) {
|
if (empty($value) && ! $allowEmpty) {
|
||||||
$this->output->writeln('<error>Value can\'t be empty</error>');
|
$this->output->writeln('<error>Value can\'t be empty</error>');
|
||||||
}
|
}
|
||||||
} while (empty($value) && empty($default) && ! $allowEmpty);
|
} while (empty($value) && $default === null && ! $allowEmpty);
|
||||||
|
|
||||||
return $value;
|
return $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param array $params
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
protected function buildAppConfig(array $params)
|
|
||||||
{
|
|
||||||
// Build simple config
|
|
||||||
$config = [
|
|
||||||
'app_options' => [
|
|
||||||
'secret_key' => $params['APP']['SECRET'],
|
|
||||||
],
|
|
||||||
'entity_manager' => [
|
|
||||||
'connection' => [
|
|
||||||
'driver' => $params['DATABASE']['DRIVER'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'translator' => [
|
|
||||||
'locale' => $params['LANGUAGE']['DEFAULT'],
|
|
||||||
],
|
|
||||||
'cli' => [
|
|
||||||
'locale' => $params['LANGUAGE']['CLI'],
|
|
||||||
],
|
|
||||||
'url_shortener' => [
|
|
||||||
'domain' => [
|
|
||||||
'schema' => $params['URL_SHORTENER']['SCHEMA'],
|
|
||||||
'hostname' => $params['URL_SHORTENER']['HOSTNAME'],
|
|
||||||
],
|
|
||||||
'shortcode_chars' => $params['URL_SHORTENER']['CHARS'],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
// Build dynamic database config
|
|
||||||
if ($params['DATABASE']['DRIVER'] === 'pdo_sqlite') {
|
|
||||||
$config['entity_manager']['connection']['path'] = 'data/database.sqlite';
|
|
||||||
} else {
|
|
||||||
$config['entity_manager']['connection']['user'] = $params['DATABASE']['USER'];
|
|
||||||
$config['entity_manager']['connection']['password'] = $params['DATABASE']['PASSWORD'];
|
|
||||||
$config['entity_manager']['connection']['dbname'] = $params['DATABASE']['NAME'];
|
|
||||||
$config['entity_manager']['connection']['host'] = $params['DATABASE']['HOST'];
|
|
||||||
$config['entity_manager']['connection']['port'] = $params['DATABASE']['PORT'];
|
|
||||||
|
|
||||||
if ($params['DATABASE']['DRIVER'] === 'pdo_mysql') {
|
|
||||||
$config['entity_manager']['connection']['driverOptions'] = [
|
|
||||||
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $config;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function createDatabase()
|
|
||||||
{
|
|
||||||
$this->output->writeln('Initializing database...');
|
|
||||||
return $this->runCommand('php vendor/bin/doctrine.php orm:schema-tool:create', 'Error generating database.');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $command
|
* @param string $command
|
||||||
* @param string $errorMessage
|
* @param string $errorMessage
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
protected function runCommand($command, $errorMessage)
|
private function runCommand($command, $errorMessage)
|
||||||
{
|
{
|
||||||
$process = $this->processHelper->run($this->output, $command);
|
$process = $this->processHelper->run($this->output, $command);
|
||||||
if ($process->isSuccessful()) {
|
if ($process->isSuccessful()) {
|
||||||
$this->output->writeln(' <info>Success!</info>');
|
$this->output->writeln(' <info>Success!</info>');
|
||||||
return true;
|
return true;
|
||||||
} else {
|
}
|
||||||
if ($this->output->isVerbose()) {
|
|
||||||
return false;
|
if ($this->output->isVerbose()) {
|
||||||
}
|
|
||||||
$this->output->writeln(
|
|
||||||
' <error>' . $errorMessage . '</error> Run this command with -vvv to see specific error info.'
|
|
||||||
);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->output->writeln(
|
||||||
|
' <error>' . $errorMessage . '</error> Run this command with -vvv to see specific error info.'
|
||||||
|
);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
<?php
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Install;
|
|
||||||
|
|
||||||
use Zend\Config\Writer\WriterInterface;
|
|
||||||
|
|
||||||
class UpdateCommand extends InstallCommand
|
|
||||||
{
|
|
||||||
public function createDatabase()
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
|
use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
|
||||||
use Shlinkio\Shlink\Common\Service\PreviewGenerator;
|
|
||||||
use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
|
use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
|
||||||
use Shlinkio\Shlink\Core\Service\ShortUrlService;
|
|
||||||
use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
|
use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -27,14 +26,6 @@ class GeneratePreviewCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $shortUrlService;
|
private $shortUrlService;
|
||||||
|
|
||||||
/**
|
|
||||||
* GeneratePreviewCommand constructor.
|
|
||||||
* @param ShortUrlServiceInterface $shortUrlService
|
|
||||||
* @param PreviewGeneratorInterface $previewGenerator
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({ShortUrlService::class, PreviewGenerator::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
ShortUrlServiceInterface $shortUrlService,
|
ShortUrlServiceInterface $shortUrlService,
|
||||||
PreviewGeneratorInterface $previewGenerator,
|
PreviewGeneratorInterface $previewGenerator,
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
|
use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
|
use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\QuestionHelper;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
@@ -30,14 +31,6 @@ class GenerateShortcodeCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* GenerateShortcodeCommand constructor.
|
|
||||||
* @param UrlShortenerInterface $urlShortener
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
* @param array $domainConfig
|
|
||||||
*
|
|
||||||
* @Inject({UrlShortener::class, "translator", "config.url_shortener.domain"})
|
|
||||||
*/
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
UrlShortenerInterface $urlShortener,
|
UrlShortenerInterface $urlShortener,
|
||||||
TranslatorInterface $translator,
|
TranslatorInterface $translator,
|
||||||
@@ -59,9 +52,23 @@ class GenerateShortcodeCommand extends Command
|
|||||||
->addOption(
|
->addOption(
|
||||||
'tags',
|
'tags',
|
||||||
't',
|
't',
|
||||||
InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
|
InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
|
||||||
$this->translator->translate('Tags to apply to the new short URL')
|
$this->translator->translate('Tags to apply to the new short URL')
|
||||||
);
|
)
|
||||||
|
->addOption('validSince', 's', InputOption::VALUE_REQUIRED, $this->translator->translate(
|
||||||
|
'The date from which this short URL will be valid. '
|
||||||
|
. 'If someone tries to access it before this date, it will not be found.'
|
||||||
|
))
|
||||||
|
->addOption('validUntil', 'u', InputOption::VALUE_REQUIRED, $this->translator->translate(
|
||||||
|
'The date until which this short URL will be valid. '
|
||||||
|
. 'If someone tries to access it after this date, it will not be found.'
|
||||||
|
))
|
||||||
|
->addOption('customSlug', 'c', InputOption::VALUE_REQUIRED, $this->translator->translate(
|
||||||
|
'If provided, this slug will be used instead of generating a short code'
|
||||||
|
))
|
||||||
|
->addOption('maxVisits', 'm', InputOption::VALUE_REQUIRED, $this->translator->translate(
|
||||||
|
'This will limit the number of visits for this short URL.'
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function interact(InputInterface $input, OutputInterface $output)
|
public function interact(InputInterface $input, OutputInterface $output)
|
||||||
@@ -94,6 +101,8 @@ class GenerateShortcodeCommand extends Command
|
|||||||
$processedTags = array_merge($processedTags, $explodedTags);
|
$processedTags = array_merge($processedTags, $explodedTags);
|
||||||
}
|
}
|
||||||
$tags = $processedTags;
|
$tags = $processedTags;
|
||||||
|
$customSlug = $input->getOption('customSlug');
|
||||||
|
$maxVisits = $input->getOption('maxVisits');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (! isset($longUrl)) {
|
if (! isset($longUrl)) {
|
||||||
@@ -101,7 +110,14 @@ class GenerateShortcodeCommand extends Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$shortCode = $this->urlShortener->urlToShortCode(new Uri($longUrl), $tags);
|
$shortCode = $this->urlShortener->urlToShortCode(
|
||||||
|
new Uri($longUrl),
|
||||||
|
$tags,
|
||||||
|
$this->getOptionalDate($input, 'validSince'),
|
||||||
|
$this->getOptionalDate($input, 'validUntil'),
|
||||||
|
$customSlug,
|
||||||
|
$maxVisits !== null ? (int) $maxVisits : null
|
||||||
|
);
|
||||||
$shortUrl = (new Uri())->withPath($shortCode)
|
$shortUrl = (new Uri())->withPath($shortCode)
|
||||||
->withScheme($this->domainConfig['schema'])
|
->withScheme($this->domainConfig['schema'])
|
||||||
->withHost($this->domainConfig['hostname']);
|
->withHost($this->domainConfig['hostname']);
|
||||||
@@ -117,6 +133,19 @@ class GenerateShortcodeCommand extends Command
|
|||||||
) . '</error>',
|
) . '</error>',
|
||||||
$longUrl
|
$longUrl
|
||||||
));
|
));
|
||||||
|
} catch (NonUniqueSlugException $e) {
|
||||||
|
$output->writeln(sprintf(
|
||||||
|
'<error>' . $this->translator->translate(
|
||||||
|
'Provided slug "%s" is already in use by another URL. Try with a different one.'
|
||||||
|
) . '</error>',
|
||||||
|
$customSlug
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function getOptionalDate(InputInterface $input, string $fieldName)
|
||||||
|
{
|
||||||
|
$since = $input->getOption($fieldName);
|
||||||
|
return $since !== null ? new \DateTime($since) : null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Common\Util\DateRange;
|
use Shlinkio\Shlink\Common\Util\DateRange;
|
||||||
use Shlinkio\Shlink\Core\Service\VisitsTracker;
|
|
||||||
use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
|
use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\QuestionHelper;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
@@ -26,13 +26,6 @@ class GetVisitsCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* GetVisitsCommand constructor.
|
|
||||||
* @param VisitsTrackerInterface $visitsTracker
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({VisitsTracker::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(VisitsTrackerInterface $visitsTracker, TranslatorInterface $translator)
|
public function __construct(VisitsTrackerInterface $visitsTracker, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->visitsTracker = $visitsTracker;
|
$this->visitsTracker = $visitsTracker;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
|
use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
|
||||||
use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
|
use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
|
||||||
use Shlinkio\Shlink\Core\Service\ShortUrlService;
|
|
||||||
use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
|
use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\QuestionHelper;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
@@ -28,13 +28,6 @@ class ListShortcodesCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* ListShortcodesCommand constructor.
|
|
||||||
* @param ShortUrlServiceInterface $shortUrlService
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({ShortUrlService::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
|
public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->shortUrlService = $shortUrlService;
|
$this->shortUrlService = $shortUrlService;
|
||||||
@@ -88,12 +81,11 @@ class ListShortcodesCommand extends Command
|
|||||||
|
|
||||||
public function execute(InputInterface $input, OutputInterface $output)
|
public function execute(InputInterface $input, OutputInterface $output)
|
||||||
{
|
{
|
||||||
$page = intval($input->getOption('page'));
|
$page = (int) $input->getOption('page');
|
||||||
$searchTerm = $input->getOption('searchTerm');
|
$searchTerm = $input->getOption('searchTerm');
|
||||||
$tags = $input->getOption('tags');
|
$tags = $input->getOption('tags');
|
||||||
$tags = ! empty($tags) ? explode(',', $tags) : [];
|
$tags = ! empty($tags) ? explode(',', $tags) : [];
|
||||||
$showTags = $input->getOption('showTags');
|
$showTags = $input->getOption('showTags');
|
||||||
$orderBy = $input->getOption('orderBy');
|
|
||||||
|
|
||||||
/** @var QuestionHelper $helper */
|
/** @var QuestionHelper $helper */
|
||||||
$helper = $this->getHelper('question');
|
$helper = $this->getHelper('question');
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
namespace Shlinkio\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
|
||||||
use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
|
use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
|
use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Helper\QuestionHelper;
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
@@ -24,13 +25,6 @@ class ResolveUrlCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* ResolveUrlCommand constructor.
|
|
||||||
* @param UrlShortenerInterface $urlShortener
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({UrlShortener::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
|
public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
|
||||||
{
|
{
|
||||||
$this->urlShortener = $urlShortener;
|
$this->urlShortener = $urlShortener;
|
||||||
@@ -88,6 +82,10 @@ class ResolveUrlCommand extends Command
|
|||||||
$output->writeln(sprintf('<error>' . $this->translator->translate(
|
$output->writeln(sprintf('<error>' . $this->translator->translate(
|
||||||
'Provided short code "%s" has an invalid format.'
|
'Provided short code "%s" has an invalid format.'
|
||||||
) . '</error>', $shortCode));
|
) . '</error>', $shortCode));
|
||||||
|
} catch (EntityDoesNotExistException $e) {
|
||||||
|
$output->writeln(sprintf('<error>' . $this->translator->translate(
|
||||||
|
'Provided short code "%s" could not be found.'
|
||||||
|
) . '</error>', $shortCode));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
61
module/CLI/src/Command/Tag/CreateTagCommand.php
Normal file
61
module/CLI/src/Command/Tag/CreateTagCommand.php
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Command\Tag;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Input\InputOption;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Zend\I18n\Translator\TranslatorInterface;
|
||||||
|
|
||||||
|
class CreateTagCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var TagServiceInterface
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
/**
|
||||||
|
* @var TranslatorInterface
|
||||||
|
*/
|
||||||
|
private $translator;
|
||||||
|
|
||||||
|
public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
|
||||||
|
{
|
||||||
|
$this->tagService = $tagService;
|
||||||
|
$this->translator = $translator;
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function configure()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setName('tag:create')
|
||||||
|
->setDescription($this->translator->translate('Creates one or more tags.'))
|
||||||
|
->addOption(
|
||||||
|
'name',
|
||||||
|
't',
|
||||||
|
InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
||||||
|
$this->translator->translate('The name of the tags to create')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
|
{
|
||||||
|
$tagNames = $input->getOption('name');
|
||||||
|
if (empty($tagNames)) {
|
||||||
|
$output->writeln(sprintf(
|
||||||
|
'<comment>%s</comment>',
|
||||||
|
$this->translator->translate('You have to provide at least one tag name')
|
||||||
|
));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->tagService->createTags($tagNames);
|
||||||
|
$output->writeln($this->translator->translate('Created tags') . sprintf(': ["<info>%s</info>"]', implode(
|
||||||
|
'</info>", "<info>',
|
||||||
|
$tagNames
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
61
module/CLI/src/Command/Tag/DeleteTagsCommand.php
Normal file
61
module/CLI/src/Command/Tag/DeleteTagsCommand.php
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Command\Tag;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Input\InputOption;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Zend\I18n\Translator\TranslatorInterface;
|
||||||
|
|
||||||
|
class DeleteTagsCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var TagServiceInterface
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
/**
|
||||||
|
* @var TranslatorInterface
|
||||||
|
*/
|
||||||
|
private $translator;
|
||||||
|
|
||||||
|
public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
|
||||||
|
{
|
||||||
|
$this->tagService = $tagService;
|
||||||
|
$this->translator = $translator;
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function configure()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setName('tag:delete')
|
||||||
|
->setDescription($this->translator->translate('Deletes one or more tags.'))
|
||||||
|
->addOption(
|
||||||
|
'name',
|
||||||
|
't',
|
||||||
|
InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
||||||
|
$this->translator->translate('The name of the tags to delete')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
|
{
|
||||||
|
$tagNames = $input->getOption('name');
|
||||||
|
if (empty($tagNames)) {
|
||||||
|
$output->writeln(sprintf(
|
||||||
|
'<comment>%s</comment>',
|
||||||
|
$this->translator->translate('You have to provide at least one tag name')
|
||||||
|
));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->tagService->deleteTags($tagNames);
|
||||||
|
$output->writeln($this->translator->translate('Deleted tags') . sprintf(': ["<info>%s</info>"]', implode(
|
||||||
|
'</info>", "<info>',
|
||||||
|
$tagNames
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
59
module/CLI/src/Command/Tag/ListTagsCommand.php
Normal file
59
module/CLI/src/Command/Tag/ListTagsCommand.php
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Command\Tag;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Core\Entity\Tag;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Helper\Table;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Zend\I18n\Translator\TranslatorInterface;
|
||||||
|
|
||||||
|
class ListTagsCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var TagServiceInterface
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
/**
|
||||||
|
* @var TranslatorInterface
|
||||||
|
*/
|
||||||
|
private $translator;
|
||||||
|
|
||||||
|
public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
|
||||||
|
{
|
||||||
|
$this->tagService = $tagService;
|
||||||
|
$this->translator = $translator;
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function configure()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setName('tag:list')
|
||||||
|
->setDescription($this->translator->translate('Lists existing tags.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
|
{
|
||||||
|
$table = new Table($output);
|
||||||
|
$table->setHeaders([$this->translator->translate('Name')])
|
||||||
|
->setRows($this->getTagsRows());
|
||||||
|
|
||||||
|
$table->render();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getTagsRows()
|
||||||
|
{
|
||||||
|
$tags = $this->tagService->listTags();
|
||||||
|
if (empty($tags)) {
|
||||||
|
return [[$this->translator->translate('No tags yet')]];
|
||||||
|
}
|
||||||
|
|
||||||
|
return array_map(function (Tag $tag) {
|
||||||
|
return [$tag->getName()];
|
||||||
|
}, $tags);
|
||||||
|
}
|
||||||
|
}
|
||||||
55
module/CLI/src/Command/Tag/RenameTagCommand.php
Normal file
55
module/CLI/src/Command/Tag/RenameTagCommand.php
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Command\Tag;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Zend\I18n\Translator\TranslatorInterface;
|
||||||
|
|
||||||
|
class RenameTagCommand extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var TagServiceInterface
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
/**
|
||||||
|
* @var TranslatorInterface
|
||||||
|
*/
|
||||||
|
private $translator;
|
||||||
|
|
||||||
|
public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
|
||||||
|
{
|
||||||
|
$this->tagService = $tagService;
|
||||||
|
$this->translator = $translator;
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function configure()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setName('tag:rename')
|
||||||
|
->setDescription($this->translator->translate('Renames one existing tag.'))
|
||||||
|
->addArgument('oldName', InputArgument::REQUIRED, $this->translator->translate('Current name of the tag.'))
|
||||||
|
->addArgument('newName', InputArgument::REQUIRED, $this->translator->translate('New name of the tag.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
|
{
|
||||||
|
$oldName = $input->getArgument('oldName');
|
||||||
|
$newName = $input->getArgument('newName');
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->tagService->renameTag($oldName, $newName);
|
||||||
|
$output->writeln(sprintf('<info>%s</info>', $this->translator->translate('Tag properly renamed.')));
|
||||||
|
} catch (EntityDoesNotExistException $e) {
|
||||||
|
$output->writeln('<error>' . sprintf($this->translator->translate(
|
||||||
|
'A tag with name "%s" was not found'
|
||||||
|
), $oldName) . '</error>');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Command\Visit;
|
namespace Shlinkio\Shlink\CLI\Command\Visit;
|
||||||
|
|
||||||
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
|
|
||||||
use Shlinkio\Shlink\Common\Exception\WrongIpException;
|
use Shlinkio\Shlink\Common\Exception\WrongIpException;
|
||||||
use Shlinkio\Shlink\Common\Service\IpLocationResolver;
|
|
||||||
use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
|
use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
|
||||||
use Shlinkio\Shlink\Core\Entity\VisitLocation;
|
use Shlinkio\Shlink\Core\Entity\VisitLocation;
|
||||||
use Shlinkio\Shlink\Core\Service\VisitService;
|
|
||||||
use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
|
use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -30,14 +29,6 @@ class ProcessVisitsCommand extends Command
|
|||||||
*/
|
*/
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
/**
|
|
||||||
* ProcessVisitsCommand constructor.
|
|
||||||
* @param VisitServiceInterface $visitService
|
|
||||||
* @param IpLocationResolverInterface $ipLocationResolver
|
|
||||||
* @param TranslatorInterface $translator
|
|
||||||
*
|
|
||||||
* @Inject({VisitService::class, IpLocationResolver::class, "translator"})
|
|
||||||
*/
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
VisitServiceInterface $visitService,
|
VisitServiceInterface $visitService,
|
||||||
IpLocationResolverInterface $ipLocationResolver,
|
IpLocationResolverInterface $ipLocationResolver,
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI;
|
namespace Shlinkio\Shlink\CLI;
|
||||||
|
|
||||||
use Zend\Config\Factory;
|
use Zend\Config\Factory;
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace Shlinkio\Shlink\CLI\Factory;
|
namespace Shlinkio\Shlink\CLI\Factory;
|
||||||
|
|
||||||
use Interop\Container\ContainerInterface;
|
use Interop\Container\ContainerInterface;
|
||||||
|
|||||||
57
module/CLI/src/Factory/InstallApplicationFactory.php
Normal file
57
module/CLI/src/Factory/InstallApplicationFactory.php
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Factory;
|
||||||
|
|
||||||
|
use Interop\Container\ContainerInterface;
|
||||||
|
use Interop\Container\Exception\ContainerException;
|
||||||
|
use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManager;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\Factory\DefaultConfigCustomizerPluginFactory;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Console\Exception\LogicException;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
use Zend\Config\Writer\PhpArray;
|
||||||
|
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
|
||||||
|
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
|
||||||
|
use Zend\ServiceManager\Exception\ServiceNotFoundException;
|
||||||
|
use Zend\ServiceManager\Factory\FactoryInterface;
|
||||||
|
|
||||||
|
class InstallApplicationFactory implements FactoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Create an object
|
||||||
|
*
|
||||||
|
* @param ContainerInterface $container
|
||||||
|
* @param string $requestedName
|
||||||
|
* @param null|array $options
|
||||||
|
* @return object
|
||||||
|
* @throws LogicException
|
||||||
|
* @throws ServiceNotFoundException if unable to resolve the service.
|
||||||
|
* @throws ServiceNotCreatedException if an exception is raised when
|
||||||
|
* creating a service.
|
||||||
|
* @throws ContainerException if any other error occurs
|
||||||
|
*/
|
||||||
|
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
|
||||||
|
{
|
||||||
|
$isUpdate = $options !== null && isset($options['isUpdate']) ? (bool) $options['isUpdate'] : false;
|
||||||
|
|
||||||
|
$app = new Application();
|
||||||
|
$command = new InstallCommand(
|
||||||
|
new PhpArray(),
|
||||||
|
$container->get(Filesystem::class),
|
||||||
|
new ConfigCustomizerPluginManager($container, ['factories' => [
|
||||||
|
Plugin\DatabaseConfigCustomizerPlugin::class => ConfigAbstractFactory::class,
|
||||||
|
Plugin\UrlShortenerConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
|
||||||
|
Plugin\LanguageConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
|
||||||
|
Plugin\ApplicationConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
|
||||||
|
]]),
|
||||||
|
$isUpdate
|
||||||
|
);
|
||||||
|
$app->add($command);
|
||||||
|
$app->setDefaultCommand($command->getName());
|
||||||
|
|
||||||
|
return $app;
|
||||||
|
}
|
||||||
|
}
|
||||||
12
module/CLI/src/Install/ConfigCustomizerPluginManager.php
Normal file
12
module/CLI/src/Install/ConfigCustomizerPluginManager.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;
|
||||||
|
use Zend\ServiceManager\AbstractPluginManager;
|
||||||
|
|
||||||
|
class ConfigCustomizerPluginManager extends AbstractPluginManager implements ConfigCustomizerPluginManagerInterface
|
||||||
|
{
|
||||||
|
protected $instanceOf = ConfigCustomizerPluginInterface::class;
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install;
|
||||||
|
|
||||||
|
use Psr\Container\ContainerInterface;
|
||||||
|
|
||||||
|
interface ConfigCustomizerPluginManagerInterface extends ContainerInterface
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Exception\RuntimeException;
|
||||||
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Question\Question;
|
||||||
|
|
||||||
|
abstract class AbstractConfigCustomizerPlugin implements ConfigCustomizerPluginInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var QuestionHelper
|
||||||
|
*/
|
||||||
|
protected $questionHelper;
|
||||||
|
|
||||||
|
public function __construct(QuestionHelper $questionHelper)
|
||||||
|
{
|
||||||
|
$this->questionHelper = $questionHelper;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param string $text
|
||||||
|
* @param string|null $default
|
||||||
|
* @param bool $allowEmpty
|
||||||
|
* @return string
|
||||||
|
* @throws RuntimeException
|
||||||
|
*/
|
||||||
|
protected function ask(InputInterface $input, OutputInterface $output, $text, $default = null, $allowEmpty = false)
|
||||||
|
{
|
||||||
|
if ($default !== null) {
|
||||||
|
$text .= ' (defaults to ' . $default . ')';
|
||||||
|
}
|
||||||
|
do {
|
||||||
|
$value = $this->questionHelper->ask($input, $output, new Question(
|
||||||
|
'<question>' . $text . ':</question> ',
|
||||||
|
$default
|
||||||
|
));
|
||||||
|
if (empty($value) && ! $allowEmpty) {
|
||||||
|
$output->writeln('<error>Value can\'t be empty</error>');
|
||||||
|
}
|
||||||
|
} while (empty($value) && $default === null && ! $allowEmpty);
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param string $text
|
||||||
|
*/
|
||||||
|
protected function printTitle(OutputInterface $output, $text)
|
||||||
|
{
|
||||||
|
$text = trim($text);
|
||||||
|
$length = strlen($text) + 4;
|
||||||
|
$header = str_repeat('*', $length);
|
||||||
|
|
||||||
|
$output->writeln([
|
||||||
|
'',
|
||||||
|
'<info>' . $header . '</info>',
|
||||||
|
'<info>* ' . strtoupper($text) . ' *</info>',
|
||||||
|
'<info>' . $header . '</info>',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
|
||||||
|
class ApplicationConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
|
||||||
|
{
|
||||||
|
use StringUtilsTrait;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param CustomizableAppConfig $appConfig
|
||||||
|
* @return void
|
||||||
|
* @throws \Symfony\Component\Console\Exception\RuntimeException
|
||||||
|
*/
|
||||||
|
public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
|
||||||
|
{
|
||||||
|
$this->printTitle($output, 'APPLICATION');
|
||||||
|
|
||||||
|
if ($appConfig->hasApp() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
|
||||||
|
'<question>Do you want to keep imported application config? (Y/n):</question> '
|
||||||
|
))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$appConfig->setApp([
|
||||||
|
'SECRET' => $this->ask(
|
||||||
|
$input,
|
||||||
|
$output,
|
||||||
|
'Define a secret string that will be used to sign API tokens (leave empty to autogenerate one)',
|
||||||
|
null,
|
||||||
|
true
|
||||||
|
) ?: $this->generateRandomString(32),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
|
||||||
|
interface ConfigCustomizerPluginInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param CustomizableAppConfig $appConfig
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig);
|
||||||
|
}
|
||||||
100
module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
Normal file
100
module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Acelaya\ZsmAnnotatedServices\Annotation as DI;
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Symfony\Component\Console\Exception\RuntimeException;
|
||||||
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Question\ChoiceQuestion;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
use Symfony\Component\Filesystem\Exception\IOException;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
|
||||||
|
class DatabaseConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
|
||||||
|
{
|
||||||
|
const DATABASE_DRIVERS = [
|
||||||
|
'MySQL' => 'pdo_mysql',
|
||||||
|
'PostgreSQL' => 'pdo_pgsql',
|
||||||
|
'SQLite' => 'pdo_sqlite',
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Filesystem
|
||||||
|
*/
|
||||||
|
private $filesystem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DatabaseConfigCustomizerPlugin constructor.
|
||||||
|
* @param QuestionHelper $questionHelper
|
||||||
|
* @param Filesystem $filesystem
|
||||||
|
*
|
||||||
|
* @DI\Inject({QuestionHelper::class, Filesystem::class})
|
||||||
|
*/
|
||||||
|
public function __construct(QuestionHelper $questionHelper, Filesystem $filesystem)
|
||||||
|
{
|
||||||
|
parent::__construct($questionHelper);
|
||||||
|
$this->filesystem = $filesystem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param CustomizableAppConfig $appConfig
|
||||||
|
* @return void
|
||||||
|
* @throws IOException
|
||||||
|
* @throws RuntimeException
|
||||||
|
*/
|
||||||
|
public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
|
||||||
|
{
|
||||||
|
$this->printTitle($output, 'DATABASE');
|
||||||
|
|
||||||
|
if ($appConfig->hasDatabase() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
|
||||||
|
'<question>Do you want to keep imported database config? (Y/n):</question> '
|
||||||
|
))) {
|
||||||
|
// If the user selected to keep DB config and is configured to use sqlite, copy DB file
|
||||||
|
if ($appConfig->getDatabase()['DRIVER'] === self::DATABASE_DRIVERS['SQLite']) {
|
||||||
|
try {
|
||||||
|
$this->filesystem->copy(
|
||||||
|
$appConfig->getImportedInstallationPath() . '/' . CustomizableAppConfig::SQLITE_DB_PATH,
|
||||||
|
CustomizableAppConfig::SQLITE_DB_PATH
|
||||||
|
);
|
||||||
|
} catch (IOException $e) {
|
||||||
|
$output->writeln('<error>It wasn\'t possible to import the SQLite database</error>');
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Select database type
|
||||||
|
$params = [];
|
||||||
|
$databases = array_keys(self::DATABASE_DRIVERS);
|
||||||
|
$dbType = $this->questionHelper->ask($input, $output, new ChoiceQuestion(
|
||||||
|
'<question>Select database type (defaults to ' . $databases[0] . '):</question>',
|
||||||
|
$databases,
|
||||||
|
0
|
||||||
|
));
|
||||||
|
$params['DRIVER'] = self::DATABASE_DRIVERS[$dbType];
|
||||||
|
|
||||||
|
// Ask for connection params if database is not SQLite
|
||||||
|
if ($params['DRIVER'] !== self::DATABASE_DRIVERS['SQLite']) {
|
||||||
|
$params['NAME'] = $this->ask($input, $output, 'Database name', 'shlink');
|
||||||
|
$params['USER'] = $this->ask($input, $output, 'Database username');
|
||||||
|
$params['PASSWORD'] = $this->ask($input, $output, 'Database password');
|
||||||
|
$params['HOST'] = $this->ask($input, $output, 'Database host', 'localhost');
|
||||||
|
$params['PORT'] = $this->ask($input, $output, 'Database port', $this->getDefaultDbPort($params['DRIVER']));
|
||||||
|
}
|
||||||
|
|
||||||
|
$appConfig->setDatabase($params);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getDefaultDbPort($driver)
|
||||||
|
{
|
||||||
|
return $driver === 'pdo_mysql' ? '3306' : '5432';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin\Factory;
|
||||||
|
|
||||||
|
use Interop\Container\ContainerInterface;
|
||||||
|
use Interop\Container\Exception\ContainerException;
|
||||||
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
|
||||||
|
use Zend\ServiceManager\Exception\ServiceNotFoundException;
|
||||||
|
use Zend\ServiceManager\Factory\FactoryInterface;
|
||||||
|
|
||||||
|
class DefaultConfigCustomizerPluginFactory implements FactoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Create an object
|
||||||
|
*
|
||||||
|
* @param ContainerInterface $container
|
||||||
|
* @param string $requestedName
|
||||||
|
* @param null|array $options
|
||||||
|
* @return object
|
||||||
|
* @throws ServiceNotFoundException if unable to resolve the service.
|
||||||
|
* @throws ServiceNotCreatedException if an exception is raised when
|
||||||
|
* creating a service.
|
||||||
|
* @throws ContainerException if any other error occurs
|
||||||
|
*/
|
||||||
|
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
|
||||||
|
{
|
||||||
|
return new $requestedName($container->get(QuestionHelper::class));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Symfony\Component\Console\Exception\RuntimeException;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Question\ChoiceQuestion;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
|
||||||
|
class LanguageConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
|
||||||
|
{
|
||||||
|
const SUPPORTED_LANGUAGES = ['en', 'es'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param CustomizableAppConfig $appConfig
|
||||||
|
* @return void
|
||||||
|
* @throws RuntimeException
|
||||||
|
*/
|
||||||
|
public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
|
||||||
|
{
|
||||||
|
$this->printTitle($output, 'LANGUAGE');
|
||||||
|
|
||||||
|
if ($appConfig->hasLanguage() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
|
||||||
|
'<question>Do you want to keep imported language? (Y/n):</question> '
|
||||||
|
))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$appConfig->setLanguage([
|
||||||
|
'DEFAULT' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
|
||||||
|
'<question>Select default language for the application in general (defaults to '
|
||||||
|
. self::SUPPORTED_LANGUAGES[0] . '):</question>',
|
||||||
|
self::SUPPORTED_LANGUAGES,
|
||||||
|
0
|
||||||
|
)),
|
||||||
|
'CLI' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
|
||||||
|
'<question>Select default language for CLI executions (defaults to '
|
||||||
|
. self::SUPPORTED_LANGUAGES[0] . '):</question>',
|
||||||
|
self::SUPPORTED_LANGUAGES,
|
||||||
|
0
|
||||||
|
)),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
||||||
|
use Symfony\Component\Console\Exception\RuntimeException;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Question\ChoiceQuestion;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
|
||||||
|
class UrlShortenerConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param InputInterface $input
|
||||||
|
* @param OutputInterface $output
|
||||||
|
* @param CustomizableAppConfig $appConfig
|
||||||
|
* @return void
|
||||||
|
* @throws RuntimeException
|
||||||
|
*/
|
||||||
|
public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
|
||||||
|
{
|
||||||
|
$this->printTitle($output, 'URL SHORTENER');
|
||||||
|
|
||||||
|
if ($appConfig->hasUrlShortener() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
|
||||||
|
'<question>Do you want to keep imported URL shortener config? (Y/n):</question> '
|
||||||
|
))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ask for URL shortener params
|
||||||
|
$appConfig->setUrlShortener([
|
||||||
|
'SCHEMA' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
|
||||||
|
'<question>Select schema for generated short URLs (defaults to http):</question>',
|
||||||
|
['http', 'https'],
|
||||||
|
0
|
||||||
|
)),
|
||||||
|
'HOSTNAME' => $this->ask($input, $output, 'Hostname for generated URLs'),
|
||||||
|
'CHARS' => $this->ask(
|
||||||
|
$input,
|
||||||
|
$output,
|
||||||
|
'Character set for generated short codes (leave empty to autogenerate one)',
|
||||||
|
null,
|
||||||
|
true
|
||||||
|
) ?: str_shuffle(UrlShortener::DEFAULT_CHARS),
|
||||||
|
'VALIDATE_URL' => $this->questionHelper->ask(
|
||||||
|
$input,
|
||||||
|
$output,
|
||||||
|
new ConfirmationQuestion(
|
||||||
|
'<question>Do you want to validate long urls by 200 HTTP status code on response (Y/n):</question>'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
269
module/CLI/src/Model/CustomizableAppConfig.php
Normal file
269
module/CLI/src/Model/CustomizableAppConfig.php
Normal file
@@ -0,0 +1,269 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Shlinkio\Shlink\CLI\Model;
|
||||||
|
|
||||||
|
use Zend\Stdlib\ArraySerializableInterface;
|
||||||
|
|
||||||
|
final class CustomizableAppConfig implements ArraySerializableInterface
|
||||||
|
{
|
||||||
|
const SQLITE_DB_PATH = 'data/database.sqlite';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private $database;
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private $urlShortener;
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private $language;
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private $app;
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
private $importedInstallationPath;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getDatabase()
|
||||||
|
{
|
||||||
|
return $this->database;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $database
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setDatabase(array $database)
|
||||||
|
{
|
||||||
|
$this->database = $database;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasDatabase()
|
||||||
|
{
|
||||||
|
return ! empty($this->database);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getUrlShortener()
|
||||||
|
{
|
||||||
|
return $this->urlShortener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $urlShortener
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setUrlShortener(array $urlShortener)
|
||||||
|
{
|
||||||
|
$this->urlShortener = $urlShortener;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasUrlShortener()
|
||||||
|
{
|
||||||
|
return ! empty($this->urlShortener);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getLanguage()
|
||||||
|
{
|
||||||
|
return $this->language;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $language
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setLanguage(array $language)
|
||||||
|
{
|
||||||
|
$this->language = $language;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasLanguage()
|
||||||
|
{
|
||||||
|
return ! empty($this->language);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getApp()
|
||||||
|
{
|
||||||
|
return $this->app;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $app
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function setApp(array $app)
|
||||||
|
{
|
||||||
|
$this->app = $app;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasApp()
|
||||||
|
{
|
||||||
|
return ! empty($this->app);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getImportedInstallationPath()
|
||||||
|
{
|
||||||
|
return $this->importedInstallationPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $importedInstallationPath
|
||||||
|
* @return $this|self
|
||||||
|
*/
|
||||||
|
public function setImportedInstallationPath($importedInstallationPath)
|
||||||
|
{
|
||||||
|
$this->importedInstallationPath = $importedInstallationPath;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function hasImportedInstallationPath()
|
||||||
|
{
|
||||||
|
return $this->importedInstallationPath !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exchange internal values from provided array
|
||||||
|
*
|
||||||
|
* @param array $array
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function exchangeArray(array $array)
|
||||||
|
{
|
||||||
|
if (isset($array['app_options'], $array['app_options']['secret_key'])) {
|
||||||
|
$this->setApp([
|
||||||
|
'SECRET' => $array['app_options']['secret_key'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($array['entity_manager'], $array['entity_manager']['connection'])) {
|
||||||
|
$this->deserializeDatabase($array['entity_manager']['connection']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($array['translator'], $array['translator']['locale'], $array['cli'], $array['cli']['locale'])) {
|
||||||
|
$this->setLanguage([
|
||||||
|
'DEFAULT' => $array['translator']['locale'],
|
||||||
|
'CLI' => $array['cli']['locale'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($array['url_shortener'])) {
|
||||||
|
$urlShortener = $array['url_shortener'];
|
||||||
|
$this->setUrlShortener([
|
||||||
|
'SCHEMA' => $urlShortener['domain']['schema'],
|
||||||
|
'HOSTNAME' => $urlShortener['domain']['hostname'],
|
||||||
|
'CHARS' => $urlShortener['shortcode_chars'],
|
||||||
|
'VALIDATE_URL' => $urlShortener['validate_url'] ?? true,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function deserializeDatabase(array $conn)
|
||||||
|
{
|
||||||
|
if (! isset($conn['driver'])) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$driver = $conn['driver'];
|
||||||
|
|
||||||
|
$params = ['DRIVER' => $driver];
|
||||||
|
if ($driver !== 'pdo_sqlite') {
|
||||||
|
$params['USER'] = $conn['user'];
|
||||||
|
$params['PASSWORD'] = $conn['password'];
|
||||||
|
$params['NAME'] = $conn['dbname'];
|
||||||
|
$params['HOST'] = $conn['host'];
|
||||||
|
$params['PORT'] = $conn['port'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->setDatabase($params);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an array representation of the object
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getArrayCopy()
|
||||||
|
{
|
||||||
|
$config = [
|
||||||
|
'app_options' => [
|
||||||
|
'secret_key' => $this->app['SECRET'],
|
||||||
|
],
|
||||||
|
'entity_manager' => [
|
||||||
|
'connection' => [
|
||||||
|
'driver' => $this->database['DRIVER'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
'translator' => [
|
||||||
|
'locale' => $this->language['DEFAULT'],
|
||||||
|
],
|
||||||
|
'cli' => [
|
||||||
|
'locale' => $this->language['CLI'],
|
||||||
|
],
|
||||||
|
'url_shortener' => [
|
||||||
|
'domain' => [
|
||||||
|
'schema' => $this->urlShortener['SCHEMA'],
|
||||||
|
'hostname' => $this->urlShortener['HOSTNAME'],
|
||||||
|
],
|
||||||
|
'shortcode_chars' => $this->urlShortener['CHARS'],
|
||||||
|
'validate_url' => $this->urlShortener['VALIDATE_URL'],
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
// Build dynamic database config based on selected driver
|
||||||
|
if ($this->database['DRIVER'] === 'pdo_sqlite') {
|
||||||
|
$config['entity_manager']['connection']['path'] = self::SQLITE_DB_PATH;
|
||||||
|
} else {
|
||||||
|
$config['entity_manager']['connection']['user'] = $this->database['USER'];
|
||||||
|
$config['entity_manager']['connection']['password'] = $this->database['PASSWORD'];
|
||||||
|
$config['entity_manager']['connection']['dbname'] = $this->database['NAME'];
|
||||||
|
$config['entity_manager']['connection']['host'] = $this->database['HOST'];
|
||||||
|
$config['entity_manager']['connection']['port'] = $this->database['PORT'];
|
||||||
|
|
||||||
|
if ($this->database['DRIVER'] === 'pdo_mysql') {
|
||||||
|
$config['entity_manager']['connection']['driverOptions'] = [
|
||||||
|
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $config;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?php
|
||||||
|
return [];
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
|
use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
|
||||||
use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
|
use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
|
use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
namespace ShlinkioTest\Shlink\CLI\Command\Api;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
|
use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
|
||||||
use Shlinkio\Shlink\Rest\Entity\ApiKey;
|
use Shlinkio\Shlink\Rest\Entity\ApiKey;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Config;
|
namespace ShlinkioTest\Shlink\CLI\Command\Config;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Shlinkio\Shlink\CLI\Command\Config\GenerateCharsetCommand;
|
use Shlinkio\Shlink\CLI\Command\Config\GenerateCharsetCommand;
|
||||||
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
use Shlinkio\Shlink\Core\Service\UrlShortener;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
|
|||||||
@@ -1,18 +1,29 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Install;
|
namespace ShlinkioTest\Shlink\CLI\Command\Install;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
|
use Prophecy\Prophecy\MethodProphecy;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
|
use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
use Symfony\Component\Console\Helper\ProcessHelper;
|
use Symfony\Component\Console\Helper\ProcessHelper;
|
||||||
use Symfony\Component\Console\Tester\CommandTester;
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Symfony\Component\Filesystem\Exception\IOException;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
use Symfony\Component\Process\Process;
|
use Symfony\Component\Process\Process;
|
||||||
use Zend\Config\Writer\WriterInterface;
|
use Zend\Config\Writer\WriterInterface;
|
||||||
|
|
||||||
class InstallCommandTest extends TestCase
|
class InstallCommandTest extends TestCase
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var InstallCommand
|
||||||
|
*/
|
||||||
|
protected $command;
|
||||||
/**
|
/**
|
||||||
* @var CommandTester
|
* @var CommandTester
|
||||||
*/
|
*/
|
||||||
@@ -21,6 +32,10 @@ class InstallCommandTest extends TestCase
|
|||||||
* @var ObjectProphecy
|
* @var ObjectProphecy
|
||||||
*/
|
*/
|
||||||
protected $configWriter;
|
protected $configWriter;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
protected $filesystem;
|
||||||
|
|
||||||
public function setUp()
|
public function setUp()
|
||||||
{
|
{
|
||||||
@@ -31,81 +46,96 @@ class InstallCommandTest extends TestCase
|
|||||||
$processHelper->setHelperSet(Argument::any())->willReturn(null);
|
$processHelper->setHelperSet(Argument::any())->willReturn(null);
|
||||||
$processHelper->run(Argument::cetera())->willReturn($processMock->reveal());
|
$processHelper->run(Argument::cetera())->willReturn($processMock->reveal());
|
||||||
|
|
||||||
|
$this->filesystem = $this->prophesize(Filesystem::class);
|
||||||
|
$this->filesystem->exists(Argument::cetera())->willReturn(false);
|
||||||
|
|
||||||
|
$this->configWriter = $this->prophesize(WriterInterface::class);
|
||||||
|
|
||||||
|
$configCustomizer = $this->prophesize(ConfigCustomizerPluginInterface::class);
|
||||||
|
$configCustomizers = $this->prophesize(ConfigCustomizerPluginManagerInterface::class);
|
||||||
|
$configCustomizers->get(Argument::cetera())->willReturn($configCustomizer->reveal());
|
||||||
|
|
||||||
$app = new Application();
|
$app = new Application();
|
||||||
$helperSet = $app->getHelperSet();
|
$helperSet = $app->getHelperSet();
|
||||||
$helperSet->set($processHelper->reveal());
|
$helperSet->set($processHelper->reveal());
|
||||||
$app->setHelperSet($helperSet);
|
$app->setHelperSet($helperSet);
|
||||||
|
$this->command = new InstallCommand(
|
||||||
$this->configWriter = $this->prophesize(WriterInterface::class);
|
$this->configWriter->reveal(),
|
||||||
$command = new InstallCommand($this->configWriter->reveal());
|
$this->filesystem->reveal(),
|
||||||
$app->add($command);
|
$configCustomizers->reveal()
|
||||||
|
|
||||||
$questionHelper = $command->getHelper('question');
|
|
||||||
$questionHelper->setInputStream($this->createInputStream());
|
|
||||||
$this->commandTester = new CommandTester($command);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function createInputStream()
|
|
||||||
{
|
|
||||||
$stream = fopen('php://memory', 'rb+', false);
|
|
||||||
fwrite($stream, <<<CLI_INPUT
|
|
||||||
|
|
||||||
shlink_db
|
|
||||||
alejandro
|
|
||||||
1234
|
|
||||||
|
|
||||||
|
|
||||||
0
|
|
||||||
doma.in
|
|
||||||
abc123BCA
|
|
||||||
|
|
||||||
1
|
|
||||||
my_secret
|
|
||||||
CLI_INPUT
|
|
||||||
);
|
);
|
||||||
rewind($stream);
|
$app->add($this->command);
|
||||||
|
|
||||||
return $stream;
|
$this->commandTester = new CommandTester($this->command);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
public function inputIsProperlyParsed()
|
public function generatedConfigIsProperlyPersisted()
|
||||||
{
|
{
|
||||||
$this->configWriter->toFile(Argument::any(), [
|
$this->configWriter->toFile(Argument::any(), Argument::type('array'), false)->shouldBeCalledTimes(1);
|
||||||
'app_options' => [
|
$this->commandTester->execute([]);
|
||||||
'secret_key' => 'my_secret',
|
}
|
||||||
],
|
|
||||||
'entity_manager' => [
|
/**
|
||||||
'connection' => [
|
* @test
|
||||||
'driver' => 'pdo_mysql',
|
*/
|
||||||
'dbname' => 'shlink_db',
|
public function cachedConfigIsDeletedIfExists()
|
||||||
'user' => 'alejandro',
|
{
|
||||||
'password' => '1234',
|
/** @var MethodProphecy $appConfigExists */
|
||||||
'host' => 'localhost',
|
$appConfigExists = $this->filesystem->exists('data/cache/app_config.php')->willReturn(true);
|
||||||
'port' => '3306',
|
/** @var MethodProphecy $appConfigRemove */
|
||||||
'driverOptions' => [
|
$appConfigRemove = $this->filesystem->remove('data/cache/app_config.php')->willReturn(null);
|
||||||
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
|
|
||||||
]
|
$this->commandTester->execute([]);
|
||||||
],
|
|
||||||
],
|
$appConfigExists->shouldHaveBeenCalledTimes(1);
|
||||||
'translator' => [
|
$appConfigRemove->shouldHaveBeenCalledTimes(1);
|
||||||
'locale' => 'en',
|
}
|
||||||
],
|
|
||||||
'cli' => [
|
/**
|
||||||
'locale' => 'es',
|
* @test
|
||||||
],
|
*/
|
||||||
'url_shortener' => [
|
public function exceptionWhileDeletingCachedConfigCancelsProcess()
|
||||||
'domain' => [
|
{
|
||||||
'schema' => 'http',
|
/** @var MethodProphecy $appConfigExists */
|
||||||
'hostname' => 'doma.in',
|
$appConfigExists = $this->filesystem->exists('data/cache/app_config.php')->willReturn(true);
|
||||||
],
|
/** @var MethodProphecy $appConfigRemove */
|
||||||
'shortcode_chars' => 'abc123BCA',
|
$appConfigRemove = $this->filesystem->remove('data/cache/app_config.php')->willThrow(IOException::class);
|
||||||
],
|
/** @var MethodProphecy $configToFile */
|
||||||
], false)->shouldBeCalledTimes(1);
|
$configToFile = $this->configWriter->toFile(Argument::cetera())->willReturn(true);
|
||||||
$this->commandTester->execute([
|
|
||||||
'command' => 'shlink:install',
|
$this->commandTester->execute([]);
|
||||||
|
|
||||||
|
$appConfigExists->shouldHaveBeenCalledTimes(1);
|
||||||
|
$appConfigRemove->shouldHaveBeenCalledTimes(1);
|
||||||
|
$configToFile->shouldNotHaveBeenCalled();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function whenCommandIsUpdatePreviousConfigCanBeImported()
|
||||||
|
{
|
||||||
|
$ref = new \ReflectionObject($this->command);
|
||||||
|
$prop = $ref->getProperty('isUpdate');
|
||||||
|
$prop->setAccessible(true);
|
||||||
|
$prop->setValue($this->command, true);
|
||||||
|
|
||||||
|
/** @var MethodProphecy $importedConfigExists */
|
||||||
|
$importedConfigExists = $this->filesystem->exists(
|
||||||
|
__DIR__ . '/../../../test-resources/' . InstallCommand::GENERATED_CONFIG_PATH
|
||||||
|
)->willReturn(true);
|
||||||
|
|
||||||
|
$this->commandTester->setInputs([
|
||||||
|
'',
|
||||||
|
'/foo/bar/wrong_previous_shlink',
|
||||||
|
'',
|
||||||
|
__DIR__ . '/../../../test-resources',
|
||||||
]);
|
]);
|
||||||
|
$this->commandTester->execute([]);
|
||||||
|
|
||||||
|
$importedConfigExists->shouldHaveBeenCalled();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Shortcode\GeneratePreviewCommand;
|
use Shlinkio\Shlink\CLI\Command\Shortcode\GeneratePreviewCommand;
|
||||||
@@ -63,7 +65,7 @@ class GeneratePreviewCommandTest extends TestCase
|
|||||||
$this->previewGenerator->generatePreview('http://baz.com/something')->shouldBeCalledTimes(1);
|
$this->previewGenerator->generatePreview('http://baz.com/something')->shouldBeCalledTimes(1);
|
||||||
|
|
||||||
$this->commandTester->execute([
|
$this->commandTester->execute([
|
||||||
'command' => 'shortcode:process-previews'
|
'command' => 'shortcode:process-previews',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +85,7 @@ class GeneratePreviewCommandTest extends TestCase
|
|||||||
->shouldBeCalledTimes(count($items));
|
->shouldBeCalledTimes(count($items));
|
||||||
|
|
||||||
$this->commandTester->execute([
|
$this->commandTester->execute([
|
||||||
'command' => 'shortcode:process-previews'
|
'command' => 'shortcode:process-previews',
|
||||||
]);
|
]);
|
||||||
$output = $this->commandTester->getDisplay();
|
$output = $this->commandTester->getDisplay();
|
||||||
$this->assertEquals(count($items), substr_count($output, 'Error'));
|
$this->assertEquals(count($items), substr_count($output, 'Error'));
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
|
use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
|
||||||
@@ -27,7 +29,7 @@ class GenerateShortcodeCommandTest extends TestCase
|
|||||||
$this->urlShortener = $this->prophesize(UrlShortener::class);
|
$this->urlShortener = $this->prophesize(UrlShortener::class);
|
||||||
$command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
|
$command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
|
||||||
'schema' => 'http',
|
'schema' => 'http',
|
||||||
'hostname' => 'foo.com'
|
'hostname' => 'foo.com',
|
||||||
]);
|
]);
|
||||||
$app = new Application();
|
$app = new Application();
|
||||||
$app->add($command);
|
$app->add($command);
|
||||||
@@ -44,7 +46,7 @@ class GenerateShortcodeCommandTest extends TestCase
|
|||||||
|
|
||||||
$this->commandTester->execute([
|
$this->commandTester->execute([
|
||||||
'command' => 'shortcode:generate',
|
'command' => 'shortcode:generate',
|
||||||
'longUrl' => 'http://domain.com/foo/bar'
|
'longUrl' => 'http://domain.com/foo/bar',
|
||||||
]);
|
]);
|
||||||
$output = $this->commandTester->getDisplay();
|
$output = $this->commandTester->getDisplay();
|
||||||
$this->assertTrue(strpos($output, 'http://foo.com/abc123') > 0);
|
$this->assertTrue(strpos($output, 'http://foo.com/abc123') > 0);
|
||||||
@@ -60,7 +62,7 @@ class GenerateShortcodeCommandTest extends TestCase
|
|||||||
|
|
||||||
$this->commandTester->execute([
|
$this->commandTester->execute([
|
||||||
'command' => 'shortcode:generate',
|
'command' => 'shortcode:generate',
|
||||||
'longUrl' => 'http://domain.com/invalid'
|
'longUrl' => 'http://domain.com/invalid',
|
||||||
]);
|
]);
|
||||||
$output = $this->commandTester->getDisplay();
|
$output = $this->commandTester->getDisplay();
|
||||||
$this->assertTrue(
|
$this->assertTrue(
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
|
use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
|
use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
|
use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
|
||||||
|
use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
|
||||||
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;
|
||||||
@@ -55,7 +58,7 @@ class ResolveUrlCommandTest extends TestCase
|
|||||||
public function incorrectShortCodeOutputsErrorMessage()
|
public function incorrectShortCodeOutputsErrorMessage()
|
||||||
{
|
{
|
||||||
$shortCode = 'abc123';
|
$shortCode = 'abc123';
|
||||||
$this->urlShortener->shortCodeToUrl($shortCode)->willReturn(null)
|
$this->urlShortener->shortCodeToUrl($shortCode)->willThrow(EntityDoesNotExistException::class)
|
||||||
->shouldBeCalledTimes(1);
|
->shouldBeCalledTimes(1);
|
||||||
|
|
||||||
$this->commandTester->execute([
|
$this->commandTester->execute([
|
||||||
@@ -63,7 +66,7 @@ class ResolveUrlCommandTest extends TestCase
|
|||||||
'shortCode' => $shortCode,
|
'shortCode' => $shortCode,
|
||||||
]);
|
]);
|
||||||
$output = $this->commandTester->getDisplay();
|
$output = $this->commandTester->getDisplay();
|
||||||
$this->assertEquals('No URL found for short code "' . $shortCode . '"' . PHP_EOL, $output);
|
$this->assertEquals('Provided short code "' . $shortCode . '" could not be found.' . PHP_EOL, $output);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
69
module/CLI/test/Command/Tag/CreateTagCommandTest.php
Normal file
69
module/CLI/test/Command/Tag/CreateTagCommandTest.php
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
<?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\CreateTagCommand;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Zend\I18n\Translator\Translator;
|
||||||
|
|
||||||
|
class CreateTagCommandTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var CreateTagCommand
|
||||||
|
*/
|
||||||
|
private $command;
|
||||||
|
/**
|
||||||
|
* @var CommandTester
|
||||||
|
*/
|
||||||
|
private $commandTester;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->tagService = $this->prophesize(TagServiceInterface::class);
|
||||||
|
|
||||||
|
$command = new CreateTagCommand($this->tagService->reveal(), Translator::factory([]));
|
||||||
|
$app = new Application();
|
||||||
|
$app->add($command);
|
||||||
|
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function errorIsReturnedWhenNoTagsAreProvided()
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([]);
|
||||||
|
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
$this->assertContains('You have to provide at least one tag name', $output);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function serviceIsInvokedOnSuccess()
|
||||||
|
{
|
||||||
|
$tagNames = ['foo', 'bar'];
|
||||||
|
/** @var MethodProphecy $createTags */
|
||||||
|
$createTags = $this->tagService->createTags($tagNames)->willReturn([]);
|
||||||
|
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'--name' => $tagNames,
|
||||||
|
]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains(sprintf('Created tags: ["%s"]', implode('", "', $tagNames)), $output);
|
||||||
|
$createTags->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
}
|
||||||
70
module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
Normal file
70
module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
<?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\DeleteTagsCommand;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Zend\I18n\Translator\Translator;
|
||||||
|
|
||||||
|
class DeleteTagsCommandTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var DeleteTagsCommand
|
||||||
|
*/
|
||||||
|
private $command;
|
||||||
|
/**
|
||||||
|
* @var CommandTester
|
||||||
|
*/
|
||||||
|
private $commandTester;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->tagService = $this->prophesize(TagServiceInterface::class);
|
||||||
|
|
||||||
|
$command = new DeleteTagsCommand($this->tagService->reveal(), Translator::factory([]));
|
||||||
|
$app = new Application();
|
||||||
|
$app->add($command);
|
||||||
|
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function errorIsReturnedWhenNoTagsAreProvided()
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([]);
|
||||||
|
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
$this->assertContains('You have to provide at least one tag name', $output);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function serviceIsInvokedOnSuccess()
|
||||||
|
{
|
||||||
|
$tagNames = ['foo', 'bar'];
|
||||||
|
/** @var MethodProphecy $deleteTags */
|
||||||
|
$deleteTags = $this->tagService->deleteTags($tagNames)->will(function () {
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'--name' => $tagNames,
|
||||||
|
]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains(sprintf('Deleted tags: ["%s"]', implode('", "', $tagNames)), $output);
|
||||||
|
$deleteTags->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
}
|
||||||
75
module/CLI/test/Command/Tag/ListTagsCommandTest.php
Normal file
75
module/CLI/test/Command/Tag/ListTagsCommandTest.php
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
<?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 Shlinkio\Shlink\Core\Entity\Tag;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Zend\I18n\Translator\Translator;
|
||||||
|
|
||||||
|
class ListTagsCommandTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var ListTagsCommand
|
||||||
|
*/
|
||||||
|
private $command;
|
||||||
|
/**
|
||||||
|
* @var CommandTester
|
||||||
|
*/
|
||||||
|
private $commandTester;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->tagService = $this->prophesize(TagServiceInterface::class);
|
||||||
|
|
||||||
|
$command = new ListTagsCommand($this->tagService->reveal(), Translator::factory([]));
|
||||||
|
$app = new Application();
|
||||||
|
$app->add($command);
|
||||||
|
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function noTagsPrintsEmptyMessage()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $listTags */
|
||||||
|
$listTags = $this->tagService->listTags()->willReturn([]);
|
||||||
|
|
||||||
|
$this->commandTester->execute([]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains('No tags yet', $output);
|
||||||
|
$listTags->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function listOfTagsIsPrinted()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $listTags */
|
||||||
|
$listTags = $this->tagService->listTags()->willReturn([
|
||||||
|
(new Tag())->setName('foo'),
|
||||||
|
(new Tag())->setName('bar'),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->commandTester->execute([]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains('foo', $output);
|
||||||
|
$this->assertContains('bar', $output);
|
||||||
|
$listTags->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
}
|
||||||
82
module/CLI/test/Command/Tag/RenameTagCommandTest.php
Normal file
82
module/CLI/test/Command/Tag/RenameTagCommandTest.php
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
<?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\RenameTagCommand;
|
||||||
|
use Shlinkio\Shlink\Core\Entity\Tag;
|
||||||
|
use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
|
||||||
|
use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Zend\I18n\Translator\Translator;
|
||||||
|
|
||||||
|
class RenameTagCommandTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var RenameTagCommand
|
||||||
|
*/
|
||||||
|
private $command;
|
||||||
|
/**
|
||||||
|
* @var CommandTester
|
||||||
|
*/
|
||||||
|
private $commandTester;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $tagService;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->tagService = $this->prophesize(TagServiceInterface::class);
|
||||||
|
|
||||||
|
$command = new RenameTagCommand($this->tagService->reveal(), Translator::factory([]));
|
||||||
|
$app = new Application();
|
||||||
|
$app->add($command);
|
||||||
|
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function errorIsPrintedIfExceptionIsThrown()
|
||||||
|
{
|
||||||
|
$oldName = 'foo';
|
||||||
|
$newName = 'bar';
|
||||||
|
/** @var MethodProphecy $renameTag */
|
||||||
|
$renameTag = $this->tagService->renameTag($oldName, $newName)->willThrow(EntityDoesNotExistException::class);
|
||||||
|
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'oldName' => $oldName,
|
||||||
|
'newName' => $newName,
|
||||||
|
]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains('A tag with name "foo" was not found', $output);
|
||||||
|
$renameTag->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function successIsPrintedIfNoErrorOccurs()
|
||||||
|
{
|
||||||
|
$oldName = 'foo';
|
||||||
|
$newName = 'bar';
|
||||||
|
/** @var MethodProphecy $renameTag */
|
||||||
|
$renameTag = $this->tagService->renameTag($oldName, $newName)->willReturn(new Tag());
|
||||||
|
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'oldName' => $oldName,
|
||||||
|
'newName' => $newName,
|
||||||
|
]);
|
||||||
|
$output = $this->commandTester->getDisplay();
|
||||||
|
|
||||||
|
$this->assertContains('Tag properly renamed', $output);
|
||||||
|
$renameTag->shouldHaveBeenCalled();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Command\Visit;
|
namespace ShlinkioTest\Shlink\CLI\Command\Visit;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;
|
use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI;
|
namespace ShlinkioTest\Shlink\CLI;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Shlinkio\Shlink\CLI\ConfigProvider;
|
use Shlinkio\Shlink\CLI\ConfigProvider;
|
||||||
|
|
||||||
class ConfigProviderTest extends TestCase
|
class ConfigProviderTest extends TestCase
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace ShlinkioTest\Shlink\CLI\Factory;
|
namespace ShlinkioTest\Shlink\CLI\Factory;
|
||||||
|
|
||||||
use PHPUnit_Framework_TestCase as TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
|
use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
|
||||||
use Shlinkio\Shlink\Core\Options\AppOptions;
|
use Shlinkio\Shlink\Core\Options\AppOptions;
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
|
|||||||
35
module/CLI/test/Factory/InstallApplicationFactoryTest.php
Normal file
35
module/CLI/test/Factory/InstallApplicationFactoryTest.php
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace ShlinkioTest\Shlink\CLI\Factory;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
|
||||||
|
use Symfony\Component\Console\Application;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
use Zend\ServiceManager\ServiceManager;
|
||||||
|
|
||||||
|
class InstallApplicationFactoryTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var InstallApplicationFactory
|
||||||
|
*/
|
||||||
|
private $factory;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->factory = new InstallApplicationFactory();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function serviceIsCreated()
|
||||||
|
{
|
||||||
|
$instance = $this->factory->__invoke(new ServiceManager(['services' => [
|
||||||
|
Filesystem::class => $this->prophesize(Filesystem::class)->reveal(),
|
||||||
|
]]), '');
|
||||||
|
|
||||||
|
$this->assertInstanceOf(Application::class, $instance);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Prophecy\Argument;
|
||||||
|
use Prophecy\Prophecy\MethodProphecy;
|
||||||
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\ApplicationConfigCustomizerPlugin;
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Console\Input\ArrayInput;
|
||||||
|
use Symfony\Component\Console\Output\NullOutput;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
|
||||||
|
class ApplicationConfigCustomizerPluginTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var ApplicationConfigCustomizerPlugin
|
||||||
|
*/
|
||||||
|
private $plugin;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $questionHelper;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->questionHelper = $this->prophesize(QuestionHelper::class);
|
||||||
|
$this->plugin = new ApplicationConfigCustomizerPlugin($this->questionHelper->reveal());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function configIsRequestedToTheUser()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $askSecret */
|
||||||
|
$askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('the_secret');
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertTrue($config->hasApp());
|
||||||
|
$this->assertEquals([
|
||||||
|
'SECRET' => 'the_secret',
|
||||||
|
], $config->getApp());
|
||||||
|
$askSecret->shouldHaveBeenCalledTimes(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function overwriteIsRequestedIfValueIsAlreadySet()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $ask */
|
||||||
|
$ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
|
||||||
|
$last = array_pop($args);
|
||||||
|
return $last instanceof ConfirmationQuestion ? false : 'the_new_secret';
|
||||||
|
});
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
$config->setApp([
|
||||||
|
'SECRET' => 'foo',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'SECRET' => 'the_new_secret',
|
||||||
|
], $config->getApp());
|
||||||
|
$ask->shouldHaveBeenCalledTimes(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function existingValueIsKeptIfRequested()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $ask */
|
||||||
|
$ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
|
||||||
|
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
$config->setApp([
|
||||||
|
'SECRET' => 'foo',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'SECRET' => 'foo',
|
||||||
|
], $config->getApp());
|
||||||
|
$ask->shouldHaveBeenCalledTimes(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Prophecy\Argument;
|
||||||
|
use Prophecy\Prophecy\MethodProphecy;
|
||||||
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
|
use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
|
||||||
|
use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
|
||||||
|
use Symfony\Component\Console\Helper\QuestionHelper;
|
||||||
|
use Symfony\Component\Console\Input\ArrayInput;
|
||||||
|
use Symfony\Component\Console\Output\NullOutput;
|
||||||
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
|
|
||||||
|
class DatabaseConfigCustomizerPluginTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var DatabaseConfigCustomizerPlugin
|
||||||
|
*/
|
||||||
|
private $plugin;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $questionHelper;
|
||||||
|
/**
|
||||||
|
* @var ObjectProphecy
|
||||||
|
*/
|
||||||
|
private $filesystem;
|
||||||
|
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
$this->questionHelper = $this->prophesize(QuestionHelper::class);
|
||||||
|
$this->filesystem = $this->prophesize(Filesystem::class);
|
||||||
|
|
||||||
|
$this->plugin = new DatabaseConfigCustomizerPlugin(
|
||||||
|
$this->questionHelper->reveal(),
|
||||||
|
$this->filesystem->reveal()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function configIsRequestedToTheUser()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $askSecret */
|
||||||
|
$askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('MySQL');
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertTrue($config->hasDatabase());
|
||||||
|
$this->assertEquals([
|
||||||
|
'DRIVER' => 'pdo_mysql',
|
||||||
|
'NAME' => 'MySQL',
|
||||||
|
'USER' => 'MySQL',
|
||||||
|
'PASSWORD' => 'MySQL',
|
||||||
|
'HOST' => 'MySQL',
|
||||||
|
'PORT' => 'MySQL',
|
||||||
|
], $config->getDatabase());
|
||||||
|
$askSecret->shouldHaveBeenCalledTimes(6);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function overwriteIsRequestedIfValueIsAlreadySet()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $ask */
|
||||||
|
$ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
|
||||||
|
$last = array_pop($args);
|
||||||
|
return $last instanceof ConfirmationQuestion ? false : 'MySQL';
|
||||||
|
});
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
$config->setDatabase([
|
||||||
|
'DRIVER' => 'pdo_pgsql',
|
||||||
|
'NAME' => 'MySQL',
|
||||||
|
'USER' => 'MySQL',
|
||||||
|
'PASSWORD' => 'MySQL',
|
||||||
|
'HOST' => 'MySQL',
|
||||||
|
'PORT' => 'MySQL',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'DRIVER' => 'pdo_mysql',
|
||||||
|
'NAME' => 'MySQL',
|
||||||
|
'USER' => 'MySQL',
|
||||||
|
'PASSWORD' => 'MySQL',
|
||||||
|
'HOST' => 'MySQL',
|
||||||
|
'PORT' => 'MySQL',
|
||||||
|
], $config->getDatabase());
|
||||||
|
$ask->shouldHaveBeenCalledTimes(7);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function existingValueIsKeptIfRequested()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $ask */
|
||||||
|
$ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
|
||||||
|
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
$config->setDatabase([
|
||||||
|
'DRIVER' => 'pdo_pgsql',
|
||||||
|
'NAME' => 'MySQL',
|
||||||
|
'USER' => 'MySQL',
|
||||||
|
'PASSWORD' => 'MySQL',
|
||||||
|
'HOST' => 'MySQL',
|
||||||
|
'PORT' => 'MySQL',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'DRIVER' => 'pdo_pgsql',
|
||||||
|
'NAME' => 'MySQL',
|
||||||
|
'USER' => 'MySQL',
|
||||||
|
'PASSWORD' => 'MySQL',
|
||||||
|
'HOST' => 'MySQL',
|
||||||
|
'PORT' => 'MySQL',
|
||||||
|
], $config->getDatabase());
|
||||||
|
$ask->shouldHaveBeenCalledTimes(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public function sqliteDatabaseIsImportedWhenRequested()
|
||||||
|
{
|
||||||
|
/** @var MethodProphecy $ask */
|
||||||
|
$ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
|
||||||
|
/** @var MethodProphecy $copy */
|
||||||
|
$copy = $this->filesystem->copy(Argument::cetera())->willReturn(null);
|
||||||
|
|
||||||
|
$config = new CustomizableAppConfig();
|
||||||
|
$config->setDatabase([
|
||||||
|
'DRIVER' => 'pdo_sqlite',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'DRIVER' => 'pdo_sqlite',
|
||||||
|
], $config->getDatabase());
|
||||||
|
$ask->shouldHaveBeenCalledTimes(1);
|
||||||
|
$copy->shouldHaveBeenCalledTimes(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user