diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d333107..778f80c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,21 +192,12 @@ jobs: - name: Start database server run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms - name: Use PHP - if: ${{ matrix.php-version == '8.1' }} uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} tools: composer extensions: swoole-4.7.1, pdo_sqlsrv-5.10.0beta2 coverage: none - - name: Use PHP - if: ${{ matrix.php-version != '8.1' }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - tools: composer - extensions: swoole-4.7.1, pdo_sqlsrv-5.9.0 - coverage: none - if: ${{ matrix.php-version == '8.1' }} run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - if: ${{ matrix.php-version != '8.1' }} diff --git a/Dockerfile b/Dockerfile index aea95a86..91d0361f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM php:8.0.9-alpine3.14 as base ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SWOOLE_VERSION 4.7.1 -ENV PDO_SQLSRV_VERSION 5.9.0 +ENV PDO_SQLSRV_VERSION 5.10.0beta2 ENV MS_ODBC_SQL_VERSION 17.5.2.2 ENV LC_ALL "C" diff --git a/composer.json b/composer.json index 1d1eaa07..94d2536f 100644 --- a/composer.json +++ b/composer.json @@ -15,30 +15,29 @@ "php": "^8.0", "ext-json": "*", "ext-pdo": "*", - "akrabat/ip-address-middleware": "^2.0", - "cakephp/chronos": "^2.2", + "akrabat/ip-address-middleware": "^2.1", + "cakephp/chronos": "^2.3", "cocur/slugify": "^4.0", - "doctrine/dbal": "^3.1.4", - "doctrine/migrations": "^3.3 <3.3.2", - "doctrine/orm": "^2.9", - "endroid/qr-code": "^4.2", - "geoip2/geoip2": "^2.11", - "guzzlehttp/guzzle": "^7.3", + "doctrine/migrations": "^3.3", + "doctrine/orm": "^2.10", + "endroid/qr-code": "^4.4", + "geoip2/geoip2": "^2.12", + "guzzlehttp/guzzle": "^7.4", "happyr/doctrine-specification": "^2.0", "jaybizzle/crawler-detect": "^1.2", - "laminas/laminas-config": "^3.5", - "laminas/laminas-config-aggregator": "^1.5", - "laminas/laminas-diactoros": "^2.6", - "laminas/laminas-inputfilter": "^2.12", - "laminas/laminas-servicemanager": "^3.7", - "laminas/laminas-stdlib": "^3.5", + "laminas/laminas-config": "^3.7", + "laminas/laminas-config-aggregator": "^1.7", + "laminas/laminas-diactoros": "^2.8", + "laminas/laminas-inputfilter": "^2.13", + "laminas/laminas-servicemanager": "^3.10", + "laminas/laminas-stdlib": "^3.6", "lcobucci/jwt": "^4.1", "league/uri": "^6.4", "lstrojny/functional-php": "^1.17", - "mezzio/mezzio": "^3.5", - "mezzio/mezzio-fastroute": "^3.2", - "mezzio/mezzio-problem-details": "^1.4", - "mezzio/mezzio-swoole": "^3.3", + "mezzio/mezzio": "^3.7", + "mezzio/mezzio-fastroute": "^3.3", + "mezzio/mezzio-problem-details": "^1.5", + "mezzio/mezzio-swoole": "^3.5", "monolog/monolog": "^2.3", "nikolaposa/monolog-factory": "^3.1", "ocramius/proxy-manager": "^2.11", @@ -48,35 +47,35 @@ "pugx/shortid-php": "^0.7", "ramsey/uuid": "^3.9", "rlanvin/php-ip": "3.0.0-rc2", - "shlinkio/shlink-common": "dev-main#0f935d4 as 4.1", + "shlinkio/shlink-common": "^4.1", "shlinkio/shlink-config": "^1.3.1", "shlinkio/shlink-event-dispatcher": "^2.2", - "shlinkio/shlink-importer": "^2.3.1", + "shlinkio/shlink-importer": "^2.4", "shlinkio/shlink-installer": "^6.2.1", - "shlinkio/shlink-ip-geolocation": "^2.1", - "symfony/console": "^5.3", - "symfony/filesystem": "^5.3", - "symfony/lock": "^5.3", + "shlinkio/shlink-ip-geolocation": "^2.2", + "symfony/console": "^5.4", + "symfony/filesystem": "^5.4", + "symfony/lock": "^5.4", "symfony/mercure": "^0.6", - "symfony/process": "^5.3", - "symfony/string": "^5.3" + "symfony/process": "^5.4", + "symfony/string": "^5.4" }, "require-dev": { "devster/ubench": "^2.1", "dms/phpunit-arraysubset-asserts": "^0.3.0", "eaglewu/swoole-ide-helper": "dev-master", - "infection/infection": "^0.25.0", + "infection/infection": "^0.25.3", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan": "^1.2", "phpstan/phpstan-doctrine": "^1.0", "phpstan/phpstan-symfony": "^1.0", "phpunit/php-code-coverage": "^9.2", "phpunit/phpunit": "^9.5", "roave/security-advisories": "dev-master", "shlinkio/php-coding-standard": "~2.2.0", - "shlinkio/shlink-test-utils": "^2.3", - "symfony/var-dumper": "^5.3", - "veewee/composer-run-parallel": "^1.0" + "shlinkio/shlink-test-utils": "^2.4", + "symfony/var-dumper": "^6.0", + "veewee/composer-run-parallel": "^1.1" }, "autoload": { "psr-4": { diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 1503ddf2..fe6c2722 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -2,7 +2,7 @@ FROM php:8.0.9-fpm-alpine3.14 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.20 -ENV PDO_SQLSRV_VERSION 5.9.0 +ENV PDO_SQLSRV_VERSION 5.10.0beta2 ENV MS_ODBC_SQL_VERSION 17.5.2.2 RUN apk update diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 5b4fac1c..0ceb2030 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.20 ENV INOTIFY_VERSION 3.0.0 ENV SWOOLE_VERSION 4.7.1 -ENV PDO_SQLSRV_VERSION 5.9.0 +ENV PDO_SQLSRV_VERSION 5.10.0beta2 ENV MS_ODBC_SQL_VERSION 17.5.2.2 RUN apk update