Fix tests & psalm errors

yiisoft · Sep 4, 2023 · 6d4db1b · 6d4db1b
1 parent f8bf302
commit 6d4db1b
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 56 deletions.
diff --git a/src/Collector/ExceptionCollector.php b/src/Collector/ExceptionCollector.php
@@ -40,7 +40,7 @@ public function collect(ApplicationError $error): void
         }
 
         $this->exception = $error->getThrowable();
-        $this->timelineCollector->collect($error::class, $this);
+        $this->timelineCollector->collect($this, $error::class);
     }
 
     public function getSummary(): array

diff --git a/src/Collector/HttpClientCollector.php b/src/Collector/HttpClientCollector.php
@@ -70,7 +70,7 @@ public function collect(RequestInterface $request, float|string $startTime, stri
             'headers' => $request->getHeaders(),
             'line' => $line,
         ];
-        $this->timelineCollector->collect($uniqueId, $this);
+        $this->timelineCollector->collect($this, $uniqueId);
     }
 
     public function collectTotalTime(?ResponseInterface $response, float|string $startTime, ?string $uniqueId): void

diff --git a/src/Collector/TimelineCollector.php b/src/Collector/TimelineCollector.php
@@ -24,7 +24,7 @@ public function collect(CollectorInterface $collector, string|int $reference, ..
             return;
         }
 
-        $this->events[] = [microtime(true), $reference, $collector::class, ...$data];
+        $this->events[] = [microtime(true), $reference, $collector::class, array_values($data)];
     }
 
     private function reset(): void

diff --git a/tests/Unit/Collector/CommandCollectorTest.php b/tests/Unit/Collector/CommandCollectorTest.php
@@ -13,6 +13,7 @@
 use Yiisoft\Yii\Console\Output\ConsoleBufferedOutput;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\Console\CommandCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 
 final class CommandCollectorTest extends AbstractCollectorTestCase
@@ -57,7 +58,7 @@ public function testCollectWithInactiveCollector(): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new CommandCollector();
+        return new CommandCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void

diff --git a/tests/Unit/Collector/ConsoleAppInfoCollectorTest.php b/tests/Unit/Collector/ConsoleAppInfoCollectorTest.php
@@ -8,8 +8,8 @@
 use Yiisoft\Yii\Console\Event\ApplicationStartup;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\Console\ConsoleAppInfoCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Collector\Web\WebAppInfoCollector;
-
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 
 use function sleep;
@@ -31,7 +31,7 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new ConsoleAppInfoCollector();
+        return new ConsoleAppInfoCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void

diff --git a/tests/Unit/Collector/ContainerInterfaceProxyTest.php b/tests/Unit/Collector/ContainerInterfaceProxyTest.php
@@ -18,13 +18,14 @@
 use Yiisoft\EventDispatcher\Provider\Provider;
 use Yiisoft\Files\FileHelper;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
-use Yiisoft\Yii\Debug\Collector\EventCollector;
-use Yiisoft\Yii\Debug\Collector\LogCollector;
-use Yiisoft\Yii\Debug\Collector\ServiceCollector;
 use Yiisoft\Yii\Debug\Collector\ContainerInterfaceProxy;
 use Yiisoft\Yii\Debug\Collector\ContainerProxyConfig;
+use Yiisoft\Yii\Debug\Collector\EventCollector;
 use Yiisoft\Yii\Debug\Collector\EventDispatcherInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\LogCollector;
 use Yiisoft\Yii\Debug\Collector\LoggerInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\ServiceCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 
 class ContainerInterfaceProxyTest extends TestCase
 {
@@ -72,7 +73,7 @@ public function testGetAndHasWithCallableServices(): void
                 ],
             ],
             $dispatcherMock,
-            new ServiceCollector(),
+            $this->createServiceCollector(),
             $this->path,
             1
         );
@@ -89,7 +90,7 @@ public function testGetAndHasWithCallableServices(): void
     public function testGetWithArrayConfigWithStringKeys(): void
     {
         $dispatcherMock = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
-        $serviceCollector = new ServiceCollector();
+        $serviceCollector = $this->createServiceCollector();
         $serviceCollector->startup(); // activate collector
 
         $config = new ContainerProxyConfig(
@@ -127,7 +128,7 @@ public function testGetWithoutConfig(): void
                 EventDispatcherInterface::class,
             ],
             $dispatcherMock,
-            new ServiceCollector(),
+            $this->createServiceCollector(),
             $this->path,
             1
         );
@@ -183,7 +184,7 @@ private function getConfig(): ContainerProxyConfig
                 ],
             ],
             $dispatcherMock,
-            new ServiceCollector(),
+            $this->createServiceCollector(),
             $this->path,
             1
         );
@@ -201,4 +202,9 @@ private function getContainer(): Container
             ]);
         return new Container($config);
     }
+
+    protected function createServiceCollector(): ServiceCollector
+    {
+        return new ServiceCollector(new TimelineCollector());
+    }
 }
diff --git a/tests/Unit/Collector/ContainerProxyConfigTest.php b/tests/Unit/Collector/ContainerProxyConfigTest.php
@@ -7,12 +7,13 @@
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
-use Yiisoft\Yii\Debug\Collector\EventCollector;
-use Yiisoft\Yii\Debug\Collector\LogCollector;
-use Yiisoft\Yii\Debug\Collector\ServiceCollector;
 use Yiisoft\Yii\Debug\Collector\ContainerProxyConfig;
+use Yiisoft\Yii\Debug\Collector\EventCollector;
 use Yiisoft\Yii\Debug\Collector\EventDispatcherInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\LogCollector;
 use Yiisoft\Yii\Debug\Collector\LoggerInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\ServiceCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 
 final class ContainerProxyConfigTest extends TestCase
 {
@@ -23,13 +24,13 @@ public function testImmutability(): void
         $dispatcherMock = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
 
         $this->assertNotSame($config, $config->activate());
-        $this->assertNotSame($config, $config->withCollector(new ServiceCollector()));
+        $this->assertNotSame($config, $config->withCollector($this->createServiceCollector()));
         $this->assertNotSame($config, $config->withLogLevel(1));
         $this->assertNotSame($config, $config->withProxyCachePath('@tests/runtime'));
         $this->assertNotSame(
             $config,
             $config->withDispatcher(
-                new EventDispatcherInterfaceProxy($dispatcherMock, new EventCollector())
+                new EventDispatcherInterfaceProxy($dispatcherMock, new EventCollector(new TimelineCollector()))
             )
         );
         $this->assertNotSame(
@@ -51,7 +52,7 @@ public function testGetters(): void
                 LoggerInterface::class => [LoggerInterfaceProxy::class, LogCollector::class],
             ],
             $dispatcherMock,
-            new ServiceCollector(),
+            $this->createServiceCollector(),
             '@tests/runtime',
             1
         );
@@ -79,4 +80,9 @@ public function testGetters(): void
         $this->assertFalse($config->hasDecoratedServiceArrayConfigWithStringKeys(LoggerInterface::class));
         $this->assertFalse($config->hasDecoratedServiceCallableConfig(LoggerInterface::class));
     }
+
+    protected function createServiceCollector(): ServiceCollector
+    {
+        return new ServiceCollector(new TimelineCollector());
+    }
 }
diff --git a/tests/Unit/Collector/EventCollectorTest.php b/tests/Unit/Collector/EventCollectorTest.php
@@ -6,6 +6,7 @@
 
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\EventCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 use Yiisoft\Yii\Debug\Tests\Unit\Support\DummyEvent;
 
@@ -21,7 +22,7 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new EventCollector();
+        return new EventCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void

diff --git a/tests/Unit/Collector/EventDispatcherProxyTest.php b/tests/Unit/Collector/EventDispatcherProxyTest.php
diff --git a/tests/Unit/Collector/LogCollectorTest.php b/tests/Unit/Collector/LogCollectorTest.php
@@ -7,6 +7,7 @@
 use Psr\Log\LogLevel;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\LogCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 
 final class LogCollectorTest extends AbstractCollectorTestCase
@@ -21,6 +22,6 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new LogCollector();
+        return new LogCollector(new TimelineCollector());
     }
 }
diff --git a/tests/Unit/Collector/MiddlewareCollectorTest.php b/tests/Unit/Collector/MiddlewareCollectorTest.php
@@ -13,6 +13,7 @@
 use Yiisoft\Middleware\Dispatcher\Event\BeforeMiddleware;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Collector\Web\MiddlewareCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 use Yiisoft\Yii\Debug\Tests\Unit\Support\DummyMiddleware;
@@ -34,7 +35,7 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new MiddlewareCollector();
+        return new MiddlewareCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void

diff --git a/tests/Unit/Collector/RequestCollectorTest.php b/tests/Unit/Collector/RequestCollectorTest.php
@@ -9,6 +9,7 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Collector\Web\RequestCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 use Yiisoft\Yii\Http\Event\AfterRequest;
@@ -59,7 +60,7 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new RequestCollector();
+        return new RequestCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void

diff --git a/tests/Unit/Collector/ServiceCollectorTest.php b/tests/Unit/Collector/ServiceCollectorTest.php
@@ -7,6 +7,7 @@
 use stdClass;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\ServiceCollector;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 
 final class ServiceCollectorTest extends AbstractCollectorTestCase
@@ -22,6 +23,6 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new ServiceCollector();
+        return new ServiceCollector(new TimelineCollector());
     }
 }
diff --git a/tests/Unit/Collector/WebAppInfoCollectorTest.php b/tests/Unit/Collector/WebAppInfoCollectorTest.php
@@ -7,6 +7,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
+use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Collector\Web\WebAppInfoCollector;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 use Yiisoft\Yii\Http\Event\AfterRequest;
@@ -33,7 +34,7 @@ protected function collectTestData(CollectorInterface $collector): void
 
     protected function getCollector(): CollectorInterface
     {
-        return new WebAppInfoCollector();
+        return new WebAppInfoCollector(new TimelineCollector());
     }
 
     protected function checkCollectedData(array $data): void