fix failing psr3 tests (#281)

- yii built-in fields have moved around
- whether to use autoload in class_exists was always false, so remove param

Author: brettmc

src/Instrumentation/Psr3/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/Instrumentation/Psr3/src/Psr3Instrumentation.php

@@ -107,25 +107,25 @@ private static function getMode(): string
     /**
      * @see https://www.php.net/manual/en/function.class-uses.php#112671
      */
-    private static function class_uses_deep(object $class, bool $autoload = false): array
+    private static function class_uses_deep(object $class): array
     {
         $traits = [];
 
         // Get traits of all parent classes
         do {
-            $traits = array_merge(class_uses($class, $autoload), $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), $autoload);
+            $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, $autoload), $traits);
+            $traits = array_merge(class_uses($trait, false), $traits);
         }
 
         return array_unique($traits);

src/Instrumentation/Psr3/tests/Integration/Psr3InstrumentationTest.php

@@ -19,20 +19,19 @@ class Psr3InstrumentationTest extends TestCase
 {
     private ScopeInterface $scope;
     private SpanInterface $span;
-    private TracerProvider $tracerProvider;
     /** @var LoggerInterface&MockObject */
     private LoggerInterface $logger;
 
     public function setUp(): void
     {
         $this->logger = $this->createMock(LoggerInterface::class);
-        $this->tracerProvider = new TracerProvider(
+        $tracerProvider = new TracerProvider(
             new SimpleSpanProcessor(
                 new InMemoryExporter(new ArrayObject())
             )
         );
 
-        $this->span = $this->tracerProvider
+        $this->span = $tracerProvider
             ->getTracer('phpunit')
             ->spanBuilder('root')
             ->startSpan();

src/Instrumentation/Psr3/tests/phpt/export_multi.phpt

@@ -41,9 +41,7 @@ $span->end();
 
 Message context:
 
-time: %d.%d
-memory: %d
-category: '%s'
+%A
 
 {
     "resource": {

src/Instrumentation/Psr3/tests/phpt/export_yii.phpt

@@ -36,7 +36,7 @@ $span->end();
 %s [info][%s] hello world
 
 Message context:
-
+%A
 foo: 'bar'
 exception: RuntimeException: kablam in %s
 Stack trace:
@@ -47,10 +47,7 @@ Next Exception: kaboom in %s
 Stack trace:
 #0 %s
 #1 {main}
-time: %d.%d
-memory: %d
-category: '%s'
-
+%A
 {
     "resource": {
         "attributes": [],

src/Instrumentation/Psr3/tests/phpt/inject_yii.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test inject context to symfony logger
+Test inject context to yii logger
 --FILE--
 
 <?php
@@ -31,19 +31,7 @@ $span->end();
 %s [warning][%s] hello world traceId=%s spanId=%s
 
 Message context:
-
-foo: 'bar'
-exception: RuntimeException: kablam in %s
-Stack trace:
-#0 %s
-#1 %s
-
-Next Exception: kaboom in %s
-Stack trace:
-#0 %s
-#1 %s
+%A
+foo: 'bar'%A
 traceId: '%s'
-spanId: '%s'
-time: %d.%d
-memory: %d
-category: '%s'
+spanId: '%s'%A