More psalm issues resolved

Author: intuibase

src/Instrumentation/PDO/src/PDOTracker.php

@@ -54,7 +54,7 @@ public function trackedAttributesForStatement(PDOStatement $statement): iterable
             return [];
         }
 
-        return $this->pdoToAttributesMap[$pdo] ?? [];
+        return $this->pdoToAttributesMap[$pdo] ?: [];
     }
 
     /**
@@ -88,11 +88,15 @@ public function trackPdoAttributes(PDO $pdo, string $dsn): iterable
      */
     public function trackedAttributesForPdo(PDO $pdo): iterable
     {
-        return $this->pdoToAttributesMap[$pdo] ?? [];
+        return $this->pdoToAttributesMap[$pdo] ?: [];
     }
 
     public function getSpanForPreparedStatement(PDOStatement $statement): ?SpanContextInterface
     {
+        if (!$this->preparedStatementToSpanMap->offsetExists($statement)) {
+            return null;
+        }
+
         return ($this->preparedStatementToSpanMap[$statement] ?? null)?->get();
     }
 

src/Instrumentation/Psr15/src/Psr15Instrumentation.php

@@ -33,6 +33,7 @@ public static function register(): void
         /**
          * Create a span for each psr-15 middleware that is executed.
          */
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             MiddlewareInterface::class,
             'process',
@@ -65,6 +66,7 @@ public static function register(): void
          * Create a span to wrap RequestHandlerInterface::handle. The first execution is assumed to be the root span, which
          * is stored as a request attribute which may be accessed by later hooks.
          */
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             RequestHandlerInterface::class,
             'handle',

src/Instrumentation/Psr3/src/Formatter.php

@@ -15,7 +15,7 @@ public static function format(array $context): array
             if ($key === 'exception' && $value instanceof Throwable) {
                 $formatted[$key] = self::formatThrowable($value);
             } else {
-                $formatted[$key] = json_decode(json_encode($value));
+                $formatted[$key] = json_decode(json_encode($value) ?: '');
             }
         }
 

src/Instrumentation/Psr3/src/Psr3Instrumentation.php

@@ -116,19 +116,19 @@ private static function class_uses_deep(object $class): array
 
         // Get traits of all parent classes
         do {
-            $traits = array_merge(class_uses($class, false), $traits);
+            $traits = array_merge(class_uses($class, false) ?: [], $traits);
         } while ($class = get_parent_class($class));
 
         // Get traits of all parent traits
         $traitsToSearch = $traits;
         while (!empty($traitsToSearch)) {
-            $newTraits = class_uses(array_pop($traitsToSearch), false);
+            $newTraits = class_uses(array_pop($traitsToSearch), false) ?: [];
             $traits = array_merge($newTraits, $traits);
             $traitsToSearch = array_merge($newTraits, $traitsToSearch);
         };
 
         foreach ($traits as $trait => $same) {
-            $traits = array_merge(class_uses($trait, false), $traits);
+            $traits = array_merge(class_uses($trait, false) ?: [], $traits);
         }
 
         return array_unique($traits);

src/Instrumentation/Psr6/src/Psr6Instrumentation.php

@@ -58,6 +58,7 @@ public static function register(): void
         };
 
         foreach (['getItem', 'getItems', 'hasItem', 'clear', 'deleteItem', 'deleteItems', 'save', 'saveDeferred', 'commit'] as $f) {
+            /** @psalm-suppress UnusedFunctionCall */
             hook(class: CacheItemPoolInterface::class, function: $f, pre: $pre, post: $post);
         }
     }