Merge pull request #58 from ingenerator/support-all-psr-log-versions

craig410 · web-flow · commit 42773732aa96 · 2023-10-27T11:13:37.000+01:00
Support all versions of PSR Log
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Unreleased
 
+### v2.0.0 (2023-10-27)
+
+* Support psr/log ^1.1 || ^2.0 || ^3.0
+
 ### v1.20.0 (2023-10-17)
 
 * Add DateIntervalUtils to stringify a DateInterval, and DateIntervalFactory for shorthand creation
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "ext-pdo": "~8.1.0 || ~8.2.0",
     "ext-sodium": "~8.1.0 || ~8.2.0",
     "php": "~8.1.0 || ~8.2.0",
-    "psr/log": "^1.1"
+    "psr/log": "^1.1 || ^2.0 || ^3.0"
   },
   "require-dev": {
     "johnkary/phpunit-speedtrap": "^3.3",
diff --git a/src/Logging/StackdriverApplicationLogger.php b/src/Logging/StackdriverApplicationLogger.php
@@ -195,7 +195,7 @@ public function __construct(
      * @param string $message
      * @param array  $context
      */
-    public function log($level, $message, array $context = [])
+    public function log($level, $message, array $context = []): void
     {
         // These are the only `context` keys that will be used as top-level properties. Anything else is moved to a
         // `custom_context` key to prevent it overwriting internal metadata and low-level log entry properties e.g.

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function __construct(`
`195`	`195`	`* @param string $message`
`196`	`196`	`* @param array $context`
`197`	`197`	`*/`
`198`		`- public function log($level, $message, array $context = [])`
	`198`	`+ public function log($level, $message, array $context = []): void`
`199`	`199`	`{`
`200`	`200`	// These are the only `context` keys that will be used as top-level properties. Anything else is moved to a
`201`	`201`	// `custom_context` key to prevent it overwriting internal metadata and low-level log entry properties e.g.