From 82083c872b879aea8af05d7d4937d1997dcc4347 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 17 Oct 2022 22:20:02 +0200 Subject: [PATCH] Allow `psr/log` 2.0 & 3.0 --- .github/workflows/coding-standards.yml | 6 +++--- .github/workflows/continuous-integration.yml | 12 ++++++------ composer.json | 7 +------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index f26e7d4..005e568 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -16,11 +16,11 @@ jobs: strategy: matrix: php: - - "7.4" + - "7.2" steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -33,7 +33,7 @@ jobs: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: composer-options: "--optimize-autoloader --prefer-dist" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5f9bee1..3e34f07 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -27,7 +27,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" with: fetch-depth: 2 @@ -46,7 +46,7 @@ jobs: run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: composer-options: "--optimize-autoloader --prefer-dist" @@ -67,7 +67,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" with: fetch-depth: 2 @@ -86,7 +86,7 @@ jobs: run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: composer-options: "--optimize-autoloader --prefer-dist" @@ -118,7 +118,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" with: fetch-depth: 2 @@ -137,7 +137,7 @@ jobs: run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: composer-options: "--optimize-autoloader --prefer-dist" dependency-versions: "lowest" diff --git a/composer.json b/composer.json index 94378c3..c96ead8 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "require": { "php": ">=7.2.0", "ext-mbstring": "*", - "psr/log": "^1.0", + "psr/log": "^1.0.1 || ^2.0 || ^3.0", "masterminds/html5": "^2.7" }, "require-dev": { @@ -45,10 +45,5 @@ }, "autoload-dev": { "psr-4": { "Tests\\Readability\\": "tests/" } - }, - "config":{ - "platform": { - "php": "7.2.34" - } } }