From 3dc46bc5a312548752e1520f997a3747368827e5 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 4 Jan 2022 17:50:41 +0100 Subject: [PATCH] Updated to latest shlink-common and shlink-config --- composer.json | 12 +++++++++--- config/autoload/delete_short_urls.global.php | 2 +- config/autoload/entity-manager.global.php | 2 +- config/autoload/geolite2.global.php | 2 +- config/autoload/locks.global.php | 2 +- config/autoload/mercure.global.php | 2 +- config/autoload/qr-codes.global.php | 2 +- config/autoload/rabbit.global.php | 2 +- config/autoload/redirects.global.php | 2 +- config/autoload/redis.global.php | 2 +- config/autoload/router.global.php | 2 +- config/autoload/swoole.global.php | 2 +- config/autoload/tracking.global.php | 2 +- config/autoload/url-shortener.global.php | 2 +- config/autoload/webhooks.global.php | 2 +- config/config.php | 2 +- config/test/test_config.global.php | 2 +- 17 files changed, 25 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 80ad59be..4bc4890e 100644 --- a/composer.json +++ b/composer.json @@ -48,8 +48,8 @@ "predis/predis": "^1.1", "pugx/shortid-php": "^1.0", "ramsey/uuid": "^4.2", - "shlinkio/shlink-common": "^4.2.1", - "shlinkio/shlink-config": "^1.4", + "shlinkio/shlink-common": "dev-main#5cb4092 as 4.3", + "shlinkio/shlink-config": "^1.5", "shlinkio/shlink-event-dispatcher": "^2.3", "shlinkio/shlink-importer": "^2.5", "shlinkio/shlink-installer": "dev-develop#a008036 as 7.0", @@ -192,6 +192,12 @@ }, "config": { "sort-packages": true, - "platform-check": false + "platform-check": false, + "allow-plugins": { + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "infection/extension-installer": true, + "veewee/composer-run-parallel": true + } } } diff --git a/config/autoload/delete_short_urls.global.php b/config/autoload/delete_short_urls.global.php index 49a3e944..a3964e71 100644 --- a/config/autoload/delete_short_urls.global.php +++ b/config/autoload/delete_short_urls.global.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Shlinkio\Shlink; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return (static function (): array { $threshold = env('DELETE_SHORT_URL_THRESHOLD'); diff --git a/config/autoload/entity-manager.global.php b/config/autoload/entity-manager.global.php index c67809d2..fbeb5ab6 100644 --- a/config/autoload/entity-manager.global.php +++ b/config/autoload/entity-manager.global.php @@ -5,7 +5,7 @@ declare(strict_types=1); use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository; use function Functional\contains; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return (static function (): array { $driver = env('DB_DRIVER'); diff --git a/config/autoload/geolite2.global.php b/config/autoload/geolite2.global.php index 64127173..fd11e52a 100644 --- a/config/autoload/geolite2.global.php +++ b/config/autoload/geolite2.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return [ diff --git a/config/autoload/locks.global.php b/config/autoload/locks.global.php index 60054147..16fdbbca 100644 --- a/config/autoload/locks.global.php +++ b/config/autoload/locks.global.php @@ -7,7 +7,7 @@ use Predis\ClientInterface as PredisClient; use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory; use Symfony\Component\Lock; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY; diff --git a/config/autoload/mercure.global.php b/config/autoload/mercure.global.php index aff8c6ee..7eb356ab 100644 --- a/config/autoload/mercure.global.php +++ b/config/autoload/mercure.global.php @@ -7,7 +7,7 @@ use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider; use Symfony\Component\Mercure\Hub; use Symfony\Component\Mercure\HubInterface; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return (static function (): array { $publicUrl = env('MERCURE_PUBLIC_HUB_URL'); diff --git a/config/autoload/qr-codes.global.php b/config/autoload/qr-codes.global.php index 5f528620..7940ad18 100644 --- a/config/autoload/qr-codes.global.php +++ b/config/autoload/qr-codes.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const Shlinkio\Shlink\DEFAULT_QR_CODE_ERROR_CORRECTION; use const Shlinkio\Shlink\DEFAULT_QR_CODE_FORMAT; diff --git a/config/autoload/rabbit.global.php b/config/autoload/rabbit.global.php index b08dccf2..adf304c8 100644 --- a/config/autoload/rabbit.global.php +++ b/config/autoload/rabbit.global.php @@ -6,7 +6,7 @@ use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory; use Laminas\ServiceManager\Proxy\LazyServiceFactory; use PhpAmqpLib\Connection\AMQPStreamConnection; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return [ diff --git a/config/autoload/redirects.global.php b/config/autoload/redirects.global.php index 18f2719e..e38b9c25 100644 --- a/config/autoload/redirects.global.php +++ b/config/autoload/redirects.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME; use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE; diff --git a/config/autoload/redis.global.php b/config/autoload/redis.global.php index fbcb5846..871ac531 100644 --- a/config/autoload/redis.global.php +++ b/config/autoload/redis.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return (static function (): array { $redisServers = env('REDIS_SERVERS'); diff --git a/config/autoload/router.global.php b/config/autoload/router.global.php index a6c6d5f0..55397e27 100644 --- a/config/autoload/router.global.php +++ b/config/autoload/router.global.php @@ -4,7 +4,7 @@ declare(strict_types=1); use Mezzio\Router\FastRouteRouter; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return [ diff --git a/config/autoload/swoole.global.php b/config/autoload/swoole.global.php index f7159ed7..d5a6fd55 100644 --- a/config/autoload/swoole.global.php +++ b/config/autoload/swoole.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const Shlinkio\Shlink\MIN_TASK_WORKERS; diff --git a/config/autoload/tracking.global.php b/config/autoload/tracking.global.php index 26fe4639..2dc23890 100644 --- a/config/autoload/tracking.global.php +++ b/config/autoload/tracking.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return [ diff --git a/config/autoload/url-shortener.global.php b/config/autoload/url-shortener.global.php index 1e5df0a3..d5b4bfe5 100644 --- a/config/autoload/url-shortener.global.php +++ b/config/autoload/url-shortener.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH; use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH; diff --git a/config/autoload/webhooks.global.php b/config/autoload/webhooks.global.php index 585d3eb2..fb946028 100644 --- a/config/autoload/webhooks.global.php +++ b/config/autoload/webhooks.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; return (static function (): array { $webhooks = env('VISITS_WEBHOOKS'); diff --git a/config/config.php b/config/config.php index c62828f3..330cd836 100644 --- a/config/config.php +++ b/config/config.php @@ -11,7 +11,7 @@ use Mezzio\ProblemDetails; use Mezzio\Swoole; use function class_exists; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use const PHP_SAPI; diff --git a/config/test/test_config.global.php b/config/test/test_config.global.php index 0898c732..bfefab2c 100644 --- a/config/test/test_config.global.php +++ b/config/test/test_config.global.php @@ -22,7 +22,7 @@ use SebastianBergmann\CodeCoverage\Report\PHP; use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml; use function Laminas\Stratigility\middleware; -use function Shlinkio\Shlink\Common\env; +use function Shlinkio\Shlink\Config\env; use function sprintf; use function sys_get_temp_dir;