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

Updated shlink packages and installed shlink-config

Browse Source
This commit is contained in:
Alejandro Celaya 2020-03-14 19:24:21 +01:00
parent da858f0353
commit d32112fe7e
8 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@
[![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink) [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink)
[![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/) [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/master/LICENSE) [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/master/LICENSE)
[![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://acel.me/donate) [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain. A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain.

9
composer.json
View File

@ -49,10 +49,11 @@
"predis/predis": "^1.1", "predis/predis": "^1.1",
"pugx/shortid-php": "^0.5", "pugx/shortid-php": "^0.5",
"ramsey/uuid": "^3.9", "ramsey/uuid": "^3.9",
"shlinkio/shlink-common": "^2.8.0", "shlinkio/shlink-common": "^3.0",
"shlinkio/shlink-event-dispatcher": "^1.3", "shlinkio/shlink-config": "^1.0",
"shlinkio/shlink-installer": "^4.2.0", "shlinkio/shlink-event-dispatcher": "^1.4",
"shlinkio/shlink-ip-geolocation": "^1.3.1", "shlinkio/shlink-installer": "^4.3",
"shlinkio/shlink-ip-geolocation": "^1.4",
"symfony/console": "^5.0", "symfony/console": "^5.0",
"symfony/filesystem": "^5.0", "symfony/filesystem": "^5.0",
"symfony/lock": "^5.0", "symfony/lock": "^5.0",

3
config/config.php
View File

@ -19,11 +19,12 @@ return (new ConfigAggregator\ConfigAggregator([
Mezzio\Swoole\ConfigProvider::class, Mezzio\Swoole\ConfigProvider::class,
ProblemDetails\ConfigProvider::class, ProblemDetails\ConfigProvider::class,
Common\ConfigProvider::class, Common\ConfigProvider::class,
Config\ConfigProvider::class,
IpGeolocation\ConfigProvider::class, IpGeolocation\ConfigProvider::class,
EventDispatcher\ConfigProvider::class,
Core\ConfigProvider::class, Core\ConfigProvider::class,
CLI\ConfigProvider::class, CLI\ConfigProvider::class,
Rest\ConfigProvider::class, Rest\ConfigProvider::class,
EventDispatcher\ConfigProvider::class,
new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'), new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
env('APP_ENV') === 'test' env('APP_ENV') === 'test'
? new ConfigAggregator\PhpFileProvider('config/test/*.global.php') ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')

2
module/CLI/src/ConfigProvider.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\CLI; namespace Shlinkio\Shlink\CLI;
use function Shlinkio\Shlink\Common\loadConfigFromGlob; use function Shlinkio\Shlink\Config\loadConfigFromGlob;
class ConfigProvider class ConfigProvider
{ {

2
module/Core/src/Config/SimplifiedConfigParser.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Config; namespace Shlinkio\Shlink\Core\Config;
use Laminas\Stdlib\ArrayUtils; use Laminas\Stdlib\ArrayUtils;
use Shlinkio\Shlink\Installer\Util\PathCollection; use Shlinkio\Shlink\Config\Collection\PathCollection;
use function array_flip; use function array_flip;
use function array_intersect_key; use function array_intersect_key;

2
module/Core/src/ConfigProvider.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core; namespace Shlinkio\Shlink\Core;
use function Shlinkio\Shlink\Common\loadConfigFromGlob; use function Shlinkio\Shlink\Config\loadConfigFromGlob;
class ConfigProvider class ConfigProvider
{ {

16
module/Core/test/Model/VisitorTest.php
View File

@ -5,16 +5,15 @@ declare(strict_types=1);
namespace ShlinkioTest\Shlink\Core\Model; namespace ShlinkioTest\Shlink\Core\Model;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
use Shlinkio\Shlink\Core\Model\Visitor; use Shlinkio\Shlink\Core\Model\Visitor;
use function random_int;
use function str_repeat; use function str_repeat;
use function strlen;
use function substr; use function substr;
class VisitorTest extends TestCase class VisitorTest extends TestCase
{ {
use StringUtilsTrait;
/** /**
* @test * @test
* @dataProvider provideParams * @dataProvider provideParams
@ -60,4 +59,15 @@ class VisitorTest extends TestCase
], ],
]; ];
} }
private function generateRandomString(int $length): string
{
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters);
$randomString = '';
for ($i = 0; $i < $length; $i++) {
$randomString .= $characters[random_int(0, $charactersLength - 1)];
}
return $randomString;
}
} }

2
module/Rest/src/ConfigProvider.php
View File

@ -8,7 +8,7 @@ use Closure;
use function Functional\first; use function Functional\first;
use function Functional\map; use function Functional\map;
use function Shlinkio\Shlink\Common\loadConfigFromGlob; use function Shlinkio\Shlink\Config\loadConfigFromGlob;
use function sprintf; use function sprintf;
class ConfigProvider class ConfigProvider