8000 bug #42174 Indicate compatibility with psr/log 2 and 3 (derrabus) · symfony/symfony@39c02d6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 39c02d6

Browse files
derrabusderrabus
committed
bug #42174 Indicate compatibility with psr/log 2 and 3 (derrabus)
This PR was merged into the 4.4 branch. Discussion ---------- Indicate compatibility with psr/log 2 and 3 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Versions 2 and 3 of the PSR-3 interfaces have been published and most of our components are already compatible. Commits ------- d2209ec Indicate compatibility with psr/log 2 and 3
2 parents fa74feb + d2209ec commit 39c02d6

File tree

21 files changed

+25
-24
lines changed

21 files changed

+25
-24
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"psr/event-dispatcher-implementation": "1.0",
2424
"psr/http-client-implementation": "1.0",
2525
"psr/link-implementation": "1.0",
26-
"psr/log-implementation": "1.0",
26+
"psr/log-implementation": "1.0|2.0",
2727
"psr/simple-cache-implementation": "1.0",
2828
"symfony/cache-implementation": "1.0|2.0",
2929
"symfony/event-dispatcher-implementation": "1.1",
@@ -41,7 +41,7 @@
4141
"psr/cache": "^1.0|^2.0",
4242
"psr/container": "^1.0",
4343
"psr/link": "^1.0",
44-
"psr/log": "~1.0",
44+
"psr/log": "^1|^2",
4545
"symfony/contracts": "^1.1.8",
4646
"symfony/polyfill-ctype": "~1.8",
4747
"symfony/polyfill-intl-icu": "~1.0",

‎src/Symfony/Component/Cache/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"require": {
2424
"php": ">=7.1.3",
2525
"psr/cache": "^1.0|^2.0",
26-
"psr/log": "~1.0",
26+
"psr/log": "^1|^2|^3",
2727
"symfony/cache-contracts": "^1.1.7|^2",
2828
"symfony/service-contracts": "^1.1|^2",
2929
"symfony/var-exporter": "^4.2|^5.0"

‎src/Symfony/Component/Console/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"symfony/lock": "^4.4|^5.0",
3030
"symfony/process": "^3.4|^4.0|^5.0",
3131
"symfony/var-dumper": "^4.3|^5.0",
32-
"psr/log": "~1.0"
32+
"psr/log": "^1|^2"
3333
},
3434
"provide": {
35-
"psr/log-implementation": "1.0"
35+
"psr/log-implementation": "1.0|2.0"
3636
},
3737
"suggest": {
3838
"symfony/event-dispatcher": "",
@@ -41,6 +41,7 @@
4141
"psr/log": "For using the console logger"
4242
},
4343
"conflict": {
44+
"psr/log": ">=3",
4445
"symfony/dependency-injection": "<3.4",
4546
"symfony/event-dispatcher": "<4.3|>=5",
4647
"symfony/lock": "<4.4",

‎src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
1414
if (true) {
1515
class TestLogger extends \Psr\Log\AbstractLogger
1616
{
17-
public function log($level, $message, array $context = [])
17+
public function log($level, $message, array $context = []): void
1818
{
1919
echo $message, "\n";
2020
}

‎src/Symfony/Component/Debug/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"psr/log": "~1.0",
20+
"psr/log": "^1|^2|^3",
2121
"symfony/polyfill-php80": "^1.15"
2222
},
2323
"conflict": {

‎src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
1414
if (true) {
1515
class TestLogger extends \Psr\Log\AbstractLogger
1616
{
17-
public function log($level, $message, array $context = [])
17+
public function log($level, $message, array $context = []): void
1818
{
1919
echo 'LOG: ', $message, "\n";
2020
}

‎src/Symfony/Component/ErrorHandler/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"psr/log": "~1.0",
20+
"psr/log": "^1|^2|^3",
2121
"symfony/debug": "^4.4.5",
2222
"symfony/polyfill-php80": "^1.15",
2323
"symfony/var-dumper": "^4.4|^5.0"

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"symfony/http-foundation": "^3.4|^4.0|^5.0",
2828
"symfony/service-contracts": "^1.1|^2",
2929
"symfony/stopwatch": "^3.4|^4.0|^5.0",
30-
"psr/log": "~1.0"
30+
"psr/log": "^1|^2|^3"
3131
},
3232
"conflict": {
3333
"symfony/dependency-injection": "<3.4"

‎src/Symfony/Component/HttpClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"require": {
2424
"php": ">=7.1.3",
25-
"psr/log": "^1.0",
25+
"psr/log": "^1|^2|^3",
2626
"symfony/http-client-contracts": "^1.1.10|^2",
2727
"symfony/polyfill-php73": "^1.11",
2828
"symfony/service-contracts": "^1.0|^2"

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/polyfill-ctype": "^1.8",
2525
"symfony/polyfill-php73": "^1.9",
2626
"symfony/polyfill-php80": "^1.15",
27-
"psr/log": "~1.0"
27+
"psr/log": "^1|^2"
2828
},
2929
"require-dev": {
3030
"symfony/browser-kit": "^4.3|^5.0",
@@ -45,7 +45,7 @@
4545
"twig/twig": "^1.43|^2.13|^3.0.4"
4646
},
4747
"provide": {
48-
"psr/log-implementation": "1.0"
48+
"psr/log-implementation": "1.0|2.0"
4949
},
5050
"conflict": {
5151
"symfony/browser-kit": "<4.3",

‎src/Symfony/Component/Lock/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"psr/log": "~1.0"
20+
"psr/log": "^1|^2|^3"
2121
},
2222
"require-dev": {
2323
"doctrine/dbal": "^2.6|^3.0",

‎src/Symfony/Component/Mailer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=7.1.3",
2020
"egulias/email-validator": "^2.1.10|^3",
21-
"psr/log": "~1.0",
21+
"psr/log": "^1|^2|^3",
2222
"symfony/event-dispatcher": "^4.3",
2323
"symfony/mime": "^4.4.21|^5.2.6",
2424
"symfony/service-contracts": "^1.1|^2"

‎src/Symfony/Component/Messenger/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"psr/log": "~1.0",
20+
"psr/log": "^1|^2|^3",
2121
"symfony/polyfill-php80": "^1.15"
2222
},
2323
"require-dev": {

‎src/Symfony/Component/Routing/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/expression-language": "^3.4|^4.0|^5.0",
2626
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
2727
"doctrine/annotations": "^1.10.4",
28-
"psr/log": "~1.0"
28+
"psr/log": "^1|^2|^3"
2929
},
3030
"conflict": {
3131
"symfony/config": "<4.2",

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"symfony/ldap": "^4.4|^5.0",
2929
"symfony/translation": "^4.4|^5.0",
3030
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
31-
"psr/log": "~1.0"
31+
"psr/log": "^1|^2|^3"
3232
},
3333
"conflict": {
3434
"symfony/event-dispatcher": "<4.3|>=5",

‎src/Symfony/Component/Security/Guard/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/security-http": "^4.4.1"
2222
},
2323
"require-dev": {
24-
"psr/log": "~1.0"
24+
"psr/log": "^1|^2|^3"
2525
},
2626
"autoload": {
2727
"psr-4": { "Symfony\\Component\\Security\\Guard\\": "" },

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"require-dev": {
2626
"symfony/routing": "^3.4|^4.0|^5.0",
2727
"symfony/security-csrf": "^3.4.11|^4.0.11|^5.0",
28-
"psr/log": "~1.0"
28+
"psr/log": "^1|^2|^3"
2929
},
3030
"conflict": {
3131
"symfony/event-dispatcher": ">=5",

‎src/Symfony/Component/Security/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"symfony/expression-language": "^3.4|^4.0|^5.0",
4040
"symfony/ldap": "^4.4|^5.0",
4141
"symfony/translation": "^4.4|^5.0",
42-
"psr/log": "~1.0"
42+
"psr/log": "^1|^2|^3"
4343
},
4444
"conflict": {
4545
"symfony/event-dispatcher": ">=5",

‎src/Symfony/Component/Templating/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"symfony/polyfill-ctype": "~1.8"
2121
},
2222
"require-dev": {
23-
"psr/log": "~1.0"
23+
"psr/log": "^1|^2|^3"
2424
},
2525
"suggest": {
2626
"psr/log-implementation": "For using debug logging in loaders"

‎src/Symfony/Component/Translation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"symfony/service-contracts": "^1.1.2|^2",
3030
"symfony/yaml": "^3.4|^4.0|^5.0",
3131
"symfony/finder": "~2.8|~3.0|~4.0|^5.0",
32-
"psr/log": "~1.0"
32+
"psr/log": "^1|^2|^3"
3333
},
3434
"conflict": {
3535
"symfony/config": "<3.4",

‎src/Symfony/Component/Workflow/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/property-access": "^3.4|^4.3|^5.0"
2525
},
2626
"require-dev": {
27-
"psr/log": "~1.0",
27+
"psr/log": "^1|^2|^3",
2828
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
2929
"symfony/event-dispatcher": "^4.3",
3030
"symfony/expression-language": "^3.4|^4.0|^5.0",

0 commit comments

Comments
 (0)
0