Skip to content

Commit

Permalink
Merge pull request #79 from j0k3r/fix/psr-log-2-3
Browse files Browse the repository at this point in the history
Allow `psr/log` 2.0 & 3.0
  • Loading branch information
j0k3r committed Oct 17, 2022
2 parents 6689f19 + 82083c8 commit 7cd8476
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/coding-standards.yml
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/continuous-integration.yml
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
with:
fetch-depth: 2

Expand All @@ -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"

Expand All @@ -67,7 +67,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
with:
fetch-depth: 2

Expand All @@ -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"

Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
with:
fetch-depth: 2

Expand All @@ -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"
Expand Down
7 changes: 1 addition & 6 deletions composer.json
Expand Up @@ -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": {
Expand All @@ -45,10 +45,5 @@
},
"autoload-dev": {
"psr-4": { "Tests\\Readability\\": "tests/" }
},
"config":{
"platform": {
"php": "7.2.34"
}
}
}

0 comments on commit 7cd8476

Please sign in to comment.