Merge branch '4.4' into 5.2
* 4.4: Indicate compatibility with psr/log 2 and 3 Signed-off-by: Alexander M. Turek <me@derrabus.de>
This commit is contained in:
commit
5ec14aa468
|
@ -23,7 +23,7 @@
|
|||
"psr/event-dispatcher-implementation": "1.0",
|
||||
"psr/http-client-implementation": "1.0",
|
||||
"psr/link-implementation": "1.0",
|
||||
"psr/log-implementation": "1.0",
|
||||
"psr/log-implementation": "1.0|2.0",
|
||||
"psr/simple-cache-implementation": "1.0",
|
||||
"symfony/cache-implementation": "1.0|2.0",
|
||||
"symfony/event-dispatcher-implementation": "2.0",
|
||||
|
@ -42,7 +42,7 @@
|
|||
"psr/container": "^1.0",
|
||||
"psr/event-dispatcher": "^1.0",
|
||||
"psr/link": "^1.0",
|
||||
"psr/log": "~1.0",
|
||||
"psr/log": "^1|^2",
|
||||
"symfony/contracts": "^2.1",
|
||||
"symfony/polyfill-ctype": "~1.8",
|
||||
"symfony/polyfill-intl-grapheme": "~1.0",
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/cache": "^1.0|^2.0",
|
||||
"psr/log": "^1.1",
|
||||
"psr/log": "^1.1|^2|^3",
|
||||
"symfony/cache-contracts": "^1.1.7|^2",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
"symfony/service-contracts": "^1.1|^2",
|
||||
|
|
|
@ -30,10 +30,10 @@
|
|||
"symfony/lock": "^4.4|^5.0",
|
||||
"symfony/process": "^4.4|^5.0",
|
||||
"symfony/var-dumper": "^4.4|^5.0",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "1.0"
|
||||
"psr/log-implementation": "1.0|2.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/event-dispatcher": "",
|
||||
|
@ -42,6 +42,7 @@
|
|||
"psr/log": "For using the console logger"
|
||||
},
|
||||
"conflict": {
|
||||
"psr/log": ">=3",
|
||||
"symfony/dependency-injection": "<4.4",
|
||||
"symfony/dotenv": "<5.1",
|
||||
"symfony/event-dispatcher": "<4.4",
|
||||
|
|
|
@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
|
|||
if (true) {
|
||||
class TestLogger extends \Psr\Log\AbstractLogger
|
||||
{
|
||||
public function log($level, $message, array $context = [])
|
||||
public function log($level, $message, array $context = []): void
|
||||
{
|
||||
echo 'LOG: ', $message, "\n";
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/log": "^1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
"symfony/var-dumper": "^4.4|^5.0"
|
||||
},
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
"symfony/http-foundation": "^4.4|^5.0",
|
||||
"symfony/service-contracts": "^1.1|^2",
|
||||
"symfony/stopwatch": "^4.4|^5.0",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<4.4"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
},
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/log": "^1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/http-client-contracts": "^2.2",
|
||||
"symfony/polyfill-php73": "^1.11",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
"symfony/polyfill-ctype": "^1.8",
|
||||
"symfony/polyfill-php73": "^1.9",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/browser-kit": "^4.4|^5.0",
|
||||
|
@ -45,7 +45,7 @@
|
|||
"twig/twig": "^2.13|^3.0.4"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "1.0"
|
||||
"psr/log-implementation": "1.0|2.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/browser-kit": "<4.4",
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/log": "~1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/deprecation-contracts": "^2.1",
|
||||
"symfony/polyfill-php80": "^1.15"
|
||||
},
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"egulias/email-validator": "^2.1.10|^3",
|
||||
"psr/log": "~1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/event-dispatcher": "^4.4|^5.0",
|
||||
"symfony/mime": "^5.2.6",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/log": "~1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/amqp-messenger": "^5.1",
|
||||
"symfony/deprecation-contracts": "^2.1",
|
||||
"symfony/doctrine-messenger": "^5.1",
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/event-dispatcher-contracts": "^2",
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
"symfony/expression-language": "^4.4|^5.0",
|
||||
"symfony/dependency-injection": "^4.4|^5.0",
|
||||
"doctrine/annotations": "^1.10.4",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/config": "<5.0",
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
"symfony/ldap": "^4.4|^5.0",
|
||||
"symfony/translation": "^4.4|^5.0",
|
||||
"symfony/validator": "^5.2",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/event-dispatcher": "<4.4",
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
"symfony/polyfill-php80": "^1.15"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": { "Symfony\\Component\\Security\\Guard\\": "" },
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
"symfony/routing": "^4.4|^5.0",
|
||||
"symfony/security-csrf": "^4.4|^5.0",
|
||||
"symfony/translation": "^4.4|^5.0",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/event-dispatcher": "<4.3",
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"require-dev": {
|
||||
"predis/predis": "~1.0"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
"symfony/polyfill-ctype": "~1.8"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log-implementation": "For using debug logging in loaders"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
"symfony/service-contracts": "^1.1.2|^2",
|
||||
"symfony/yaml": "^4.4|^5.0",
|
||||
"symfony/finder": "^4.4|^5.0",
|
||||
"psr/log": "~1.0"
|
||||
"psr/log": "^1|^2|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/config": "<4.4",
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
"symfony/polyfill-php80": "^1.15"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/dependency-injection": "^4.4|^5.0",
|
||||
"symfony/event-dispatcher": "^4.4|^5.0",
|
||||
"symfony/expression-language": "^4.4|^5.0",
|
||||
|
|
Reference in New Issue