From da76eb5cf41fd188e72abf19a63f3c97fc944b8c Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 4 Nov 2021 21:17:31 +0100 Subject: [PATCH 1/2] Updated to phpstan 1.0 --- CHANGELOG.md | 1 + composer.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a7e0a98..fc24d045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Changed * [#1218](https://github.com/shlinkio/shlink/issues/1218) Updated to symfony/mercure 0.6. +* [#1223](https://github.com/shlinkio/shlink/issues/1223) Updated to phpstan 1.0. ### Deprecated * *Nothing* diff --git a/composer.json b/composer.json index 7abcf315..880f9a6b 100644 --- a/composer.json +++ b/composer.json @@ -66,9 +66,9 @@ "eaglewu/swoole-ide-helper": "dev-master", "infection/infection": "^0.25.0", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/phpstan": "^0.12.94", - "phpstan/phpstan-doctrine": "^0.12.42", - "phpstan/phpstan-symfony": "^0.12.41", + "phpstan/phpstan": "^1.0", + "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", From f532b5edeee0b07a4b414c5ab4895f07120fd728 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 4 Nov 2021 21:31:51 +0100 Subject: [PATCH 2/2] Added LC_ALL: C env var during ms db tests --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d2067da..cf252eb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,8 @@ jobs: matrix: php-version: ['8.0', '8.1'] continue-on-error: ${{ matrix.php-version == '8.1' }} + env: + LC_ALL: C steps: - name: Checkout code uses: actions/checkout@v2