Skip to content

Commit 7cd8476

Browse files
authored
Merge pull request #79 from j0k3r/fix/psr-log-2-3
Allow `psr/log` 2.0 & 3.0
2 parents 6689f19 + 82083c8 commit 7cd8476

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

.github/workflows/coding-standards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
strategy:
1717
matrix:
1818
php:
19-
- "7.4"
19+
- "7.2"
2020

2121
steps:
2222
- name: "Checkout"
23-
uses: "actions/checkout@v2"
23+
uses: "actions/checkout@v3"
2424

2525
- name: "Install PHP"
2626
uses: "shivammathur/setup-php@v2"
@@ -33,7 +33,7 @@ jobs:
3333
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434

3535
- name: "Install dependencies with Composer"
36-
uses: "ramsey/composer-install@v1"
36+
uses: "ramsey/composer-install@v2"
3737
with:
3838
composer-options: "--optimize-autoloader --prefer-dist"
3939

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout"
30-
uses: "actions/checkout@v2"
30+
uses: "actions/checkout@v3"
3131
with:
3232
fetch-depth: 2
3333

@@ -46,7 +46,7 @@ jobs:
4646
run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
4747

4848
- name: "Install dependencies with Composer"
49-
uses: "ramsey/composer-install@v1"
49+
uses: "ramsey/composer-install@v2"
5050
with:
5151
composer-options: "--optimize-autoloader --prefer-dist"
5252

@@ -67,7 +67,7 @@ jobs:
6767

6868
steps:
6969
- name: "Checkout"
70-
uses: "actions/checkout@v2"
70+
uses: "actions/checkout@v3"
7171
with:
7272
fetch-depth: 2
7373

@@ -86,7 +86,7 @@ jobs:
8686
run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
8787

8888
- name: "Install dependencies with Composer"
89-
uses: "ramsey/composer-install@v1"
89+
uses: "ramsey/composer-install@v2"
9090
with:
9191
composer-options: "--optimize-autoloader --prefer-dist"
9292

@@ -118,7 +118,7 @@ jobs:
118118

119119
steps:
120120
- name: "Checkout"
121-
uses: "actions/checkout@v2"
121+
uses: "actions/checkout@v3"
122122
with:
123123
fetch-depth: 2
124124

@@ -137,7 +137,7 @@ jobs:
137137
run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
138138

139139
- name: "Install dependencies with Composer"
140-
uses: "ramsey/composer-install@v1"
140+
uses: "ramsey/composer-install@v2"
141141
with:
142142
composer-options: "--optimize-autoloader --prefer-dist"
143143
dependency-versions: "lowest"

composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"require": {
2727
"php": ">=7.2.0",
2828
"ext-mbstring": "*",
29-
"psr/log": "^1.0",
29+
"psr/log": "^1.0.1 || ^2.0 || ^3.0",
3030
"masterminds/html5": "^2.7"
3131
},
3232
"require-dev": {
@@ -45,10 +45,5 @@
4545
},
4646
"autoload-dev": {
4747
"psr-4": { "Tests\\Readability\\": "tests/" }
48-
},
49-
"config":{
50-
"platform": {
51-
"php": "7.2.34"
52-
}
5348
}
5449
}

0 commit comments

Comments
 (0)