Merge branch '4.4' into 5.2

derrabus · derrabus · commit 5ba6a1a4d0eb · 2021-07-18T17:21:43.000+02:00
* 4.4:
  Indicate compatibility with psr/log 2 and 3

Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Tests/phpt/exception_rethrown.phpt b/Tests/phpt/exception_rethrown.phpt
@@ -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";
         }
diff --git a/composer.json b/composer.json
@@ -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"
     },

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';`
`14`	`14`	`if (true) {`
`15`	`15`	`class TestLogger extends \Psr\Log\AbstractLogger`
`16`	`16`	`{`
`17`		`- public function log($level, $message, array $context = [])`
	`17`	`+ public function log($level, $message, array $context = []): void`
`18`	`18`	`{`
`19`	`19`	`echo 'LOG: ', $message, "\n";`
`20`	`20`	`}`