fix: resolve PDO WeakMap warning (open-telemetry#334)

ycchuang99 · web-flow · commit dcc982105907 · 2025-03-18T14:38:39.000+11:00
Replace comparison operators with null coalescing operator to fix undefined array error. Fixes open-telemetry/opentelemetry-php#1529
diff --git a/src/Instrumentation/PDO/src/PDOTracker.php b/src/Instrumentation/PDO/src/PDOTracker.php
@@ -57,7 +57,8 @@ public function trackedAttributesForStatement(PDOStatement $statement): array
             return [];
         }
 
-        return $this->pdoToAttributesMap[$pdo] ?: [];
+        /** @psalm-var array<non-empty-string, bool|int|float|string|array|null> */
+        return $this->pdoToAttributesMap[$pdo] ?? [];
     }
 
     /**
@@ -91,7 +92,8 @@ public function trackPdoAttributes(PDO $pdo, string $dsn): array
      */
     public function trackedAttributesForPdo(PDO $pdo): array
     {
-        return $this->pdoToAttributesMap[$pdo] ?: [];
+        /** @psalm-var array<non-empty-string, bool|int|float|string|array|null> */
+        return $this->pdoToAttributesMap[$pdo] ?? [];
     }
 
     public function getSpanForPreparedStatement(PDOStatement $statement): ?SpanContextInterface

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ public function trackedAttributesForStatement(PDOStatement $statement): array`
`57`	`57`	`return [];`
`58`	`58`	`}`
`59`	`59`
`60`		`- return $this->pdoToAttributesMap[$pdo] ?: [];`
	`60`	`+ /** @psalm-var array<non-empty-string, bool\|int\|float\|string\|array\|null> */`
	`61`	`+ return $this->pdoToAttributesMap[$pdo] ?? [];`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`/**`
`@@ -91,7 +92,8 @@ public function trackPdoAttributes(PDO $pdo, string $dsn): array`
`91`	`92`	`*/`
`92`	`93`	`public function trackedAttributesForPdo(PDO $pdo): array`
`93`	`94`	`{`
`94`		`- return $this->pdoToAttributesMap[$pdo] ?: [];`
	`95`	`+ /** @psalm-var array<non-empty-string, bool\|int\|float\|string\|array\|null> */`
	`96`	`+ return $this->pdoToAttributesMap[$pdo] ?? [];`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`public function getSpanForPreparedStatement(PDOStatement $statement): ?SpanContextInterface`