Ci fixes

.github/workflows/php.yml

@@ -114,6 +114,10 @@ jobs:
             php-version: 7.4
           - project: 'Instrumentation/OpenAIPHP'
             php-version: 8.0
+          - project: 'Logs/Monolog'
+            php-version: 7.4
+          - project: 'Logs/Monolog'
+            php-version: 8.0
           - project: 'Instrumentation/CakePHP'
             php-version: 7.4
           - project: 'Propagation/ServerTiming'

src/Aws/composer.json

@@ -46,7 +46,8 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "symfony/runtime": true,
-            "php-http/discovery": false
+            "php-http/discovery": false,
+            "tbachert/spi": false
         }
     }
 }

src/Aws/src/Xray/IdGenerator.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *

src/Aws/src/Xray/Propagator.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright The OpenTelemetry Authors
  *

src/Context/Swoole/composer.json

@@ -32,5 +32,11 @@
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
     "vimeo/psalm": "^5.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false,
+      "tbachert/spi": true
+    }
   }
 }

src/Context/Swoole/phpstan.neon.dist

@@ -7,3 +7,9 @@ parameters:
     paths:
         - src
         - tests
+    reportUnmatchedIgnoredErrors: false
+    ignoreErrors:
+        -
+            message: "#.*with no type specified.#"
+            paths:
+                - src/SwooleContextStorage.php

src/Context/Swoole/psalm.xml.dist

@@ -2,6 +2,8 @@
 <psalm
     errorLevel="3"
     cacheDirectory="var/cache/psalm"
+    findUnusedBaselineEntry="false"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">

src/Context/Swoole/src/SwooleContextStorage.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\Context\ContextStorageScopeInterface;
 use OpenTelemetry\Context\ExecutionContextAwareInterface;
 
+/**
+ * @todo add type-hints (string|int) when 7.4+8.0 support dropped
+ */
 final class SwooleContextStorage implements ContextStorageInterface, ExecutionContextAwareInterface
 {
     /** @var ContextStorageInterface&ExecutionContextAwareInterface */

src/Instrumentation/Laravel/composer.json

@@ -48,7 +48,8 @@
     "lock": false,
     "sort-packages": true,
     "allow-plugins": {
-      "php-http/discovery": false
+      "php-http/discovery": false,
+      "tbachert/spi": true
     }
   }
 }

src/Instrumentation/Laravel/src/Watchers/RedisCommand/Serializer.php

@@ -70,7 +70,7 @@ public static function serializeCommand(string $command, array $params): string
         }
 
         // In some cases (for example when using LUA scripts) arrays are valid parameters
-        $paramsToSerialize = array_map(function($param) { return is_array($param) ? json_encode($param) : $param; }, $paramsToSerialize);
+        $paramsToSerialize = array_map(function ($param) { return is_array($param) ? json_encode($param) : $param; }, $paramsToSerialize);
 
         return $command . ' ' . implode(' ', $paramsToSerialize);
     }