Adapt to yiisoft/yii-debug summary (#100)

rustamwin · web-flow · commit 6eafec31ed57 · 2025-06-28T15:22:01.000+05:00
* Adapt to yiisoft/yii-debug summary

* Add changelog

* Fix tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - New #97: Add HTTP cookie authentication method (@IbragimovDiyorbek)
 - Chg #95, #99: Change PHP constraint in `composer.json` to `8.0 - 8.4` (@vjik)
 - Bug #99: Explicitly mark nullable parameters (@vjik)
+- Eng #100: Adapt summary data in debug collector (@rustamwin)
 
 ## 3.1.1 May 06, 2024
 
diff --git a/src/Debug/IdentityCollector.php b/src/Debug/IdentityCollector.php
@@ -50,10 +50,8 @@ public function getSummary(): array
         }
         $lastIdentity = end($this->identities);
         return [
-            'identity' => [
-                'lastId' => is_array($lastIdentity) ? $lastIdentity['id'] : null,
-                'total' => count($this->identities),
-            ],
+            'lastId' => is_array($lastIdentity) ? $lastIdentity['id'] : null,
+            'total' => count($this->identities),
         ];
     }
 }
diff --git a/tests/Debug/UserCollectorTest.php b/tests/Debug/UserCollectorTest.php
@@ -44,9 +44,8 @@ protected function checkSummaryData(array $data): void
     {
         parent::checkSummaryData($data);
 
-        $this->assertArrayHasKey('identity', $data);
-        $this->assertArrayHasKey('lastId', $data['identity']);
-        $this->assertEquals('stub2', $data['identity']['lastId']);
-        $this->assertEquals(2, $data['identity']['total']);
+        $this->assertArrayHasKey('lastId', $data);
+        $this->assertEquals('stub2', $data['lastId']);
+        $this->assertEquals(2, $data['total']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,8 @@ public function getSummary(): array`
`50`	`50`	`}`
`51`	`51`	`$lastIdentity = end($this->identities);`
`52`	`52`	`return [`
`53`		`- 'identity' => [`
`54`		`- 'lastId' => is_array($lastIdentity) ? $lastIdentity['id'] : null,`
`55`		`- 'total' => count($this->identities),`
`56`		`- ],`
	`53`	`+ 'lastId' => is_array($lastIdentity) ? $lastIdentity['id'] : null,`
	`54`	`+ 'total' => count($this->identities),`
`57`	`55`	`];`
`58`	`56`	`}`
`59`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,8 @@ protected function checkSummaryData(array $data): void`
`44`	`44`	`{`
`45`	`45`	`parent::checkSummaryData($data);`
`46`	`46`
`47`		`- $this->assertArrayHasKey('identity', $data);`
`48`		`- $this->assertArrayHasKey('lastId', $data['identity']);`
`49`		`- $this->assertEquals('stub2', $data['identity']['lastId']);`
`50`		`- $this->assertEquals(2, $data['identity']['total']);`
	`47`	`+ $this->assertArrayHasKey('lastId', $data);`
	`48`	`+ $this->assertEquals('stub2', $data['lastId']);`
	`49`	`+ $this->assertEquals(2, $data['total']);`
`51`	`50`	`}`
`52`	`51`	`}`