Remove $skipCollect from Debugger (#302)

yiisoft · Jan 15, 2025 · ace7cea · ace7cea
1 parent 666d2f1
commit ace7cea
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/Debugger.php b/src/Debugger.php
@@ -18,8 +18,6 @@
  */
 final class Debugger
 {
-    private bool $skipCollect = false;
-
     /**
      * @psalm-var array<string, CollectorInterface>
      */
@@ -66,19 +64,16 @@ public function getId(): string
 
     public function startup(object $event): void
     {
-        $this->id = str_replace('.', '', uniqid('', true));
-        $this->skipCollect = false;
-
         if ($event instanceof BeforeRequest && $this->isRequestIgnored($event->getRequest())) {
-            $this->skipCollect = true;
             return;
         }
 
         if ($event instanceof ApplicationStartup && $this->isCommandIgnored($event->commandName)) {
-            $this->skipCollect = true;
             return;
         }
 
+        $this->id = str_replace('.', '', uniqid('', true));
+
         foreach ($this->collectors as $collector) {
             $collector->startup();
         }
@@ -91,20 +86,18 @@ public function shutdown(): void
         }
 
         try {
-            if (!$this->skipCollect) {
-                $collectedData = array_map(
-                    static fn (CollectorInterface $collector) => $collector->getCollected(),
-                    $this->collectors
-                );
+            $collectedData = array_map(
+                static fn (CollectorInterface $collector) => $collector->getCollected(),
+                $this->collectors
+            );
 
-                /** @var array[] $data */
-                [$data, $objectsMap] = $this->dataNormalizer->prepareDataAndObjectsMap($collectedData, 30);
+            /** @var array[] $data */
+            [$data, $objectsMap] = $this->dataNormalizer->prepareDataAndObjectsMap($collectedData, 30);
 
-                /** @var array $summary */
-                $summary = $this->dataNormalizer->prepareData($this->collectSummaryData(), 30);
+            /** @var array $summary */
+            $summary = $this->dataNormalizer->prepareData($this->collectSummaryData(), 30);
 
-                $this->storage->write($this->getId(), $data, $objectsMap, $summary);
-            }
+            $this->storage->write($this->getId(), $data, $objectsMap, $summary);
         } finally {
             foreach ($this->collectors as $collector) {
                 $collector->shutdown();

diff --git a/tests/Unit/DebuggerTest.php b/tests/Unit/DebuggerTest.php
@@ -40,7 +40,9 @@ public function testStartupWithSkipCollect(): void
     public function testIgnoreByHeader(): void
     {
         $collector = $this->getMockBuilder(CollectorInterface::class)->getMock();
-        $collector->expects($this->once())->method('shutdown');
+        $collector->expects($this->never())->method('startup');
+        $collector->expects($this->never())->method('shutdown');
+
         $storage = $this->getMockBuilder(StorageInterface::class)->getMock();
         $storage->expects($this->never())->method('write');
 
@@ -52,7 +54,9 @@ public function testIgnoreByHeader(): void
     public function testIgnoreByEnv(): void
     {
         $collector = $this->getMockBuilder(CollectorInterface::class)->getMock();
-        $collector->expects($this->once())->method('shutdown');
+        $collector->expects($this->never())->method('startup');
+        $collector->expects($this->never())->method('shutdown');
+
         $storage = $this->getMockBuilder(StorageInterface::class)->getMock();
         $storage->expects($this->never())->method('write');
 
@@ -80,7 +84,9 @@ public function testShutdown(): void
     public function testShutdownWithSkipRequestCollect(): void
     {
         $collector = $this->getMockBuilder(CollectorInterface::class)->getMock();
-        $collector->expects($this->once())->method('shutdown');
+        $collector->expects($this->never())->method('startup');
+        $collector->expects($this->never())->method('shutdown');
+
         $storage = $this->getMockBuilder(StorageInterface::class)->getMock();
         $storage->expects($this->never())->method('write');
 
@@ -94,7 +100,8 @@ public function testShutdownWithSkipCommandCollect(array $ignoredCommands, ?stri
     {
         $collector = $this->getMockBuilder(CollectorInterface::class)->getMock();
         $collector->expects($this->never())->method('startup');
-        $collector->expects($this->once())->method('shutdown');
+        $collector->expects($this->never())->method('shutdown');
+
         $storage = $this->getMockBuilder(StorageInterface::class)->getMock();
         $storage->expects($this->never())->method('write');