Merge pull request #617 from yiisoft/split-debug

Split debug

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ## 1.1.0 July 24, 2023
 
+- Enh #617: Add debug collector for yiisoft/yii-debug (@xepozz)
 - Chg #722: Remove legacy array syntax for typecast. Use `Param` instead (@terabytesoftw)
 - Chg #724: Typecast refactoring (@Tigrov)
 - Chg #728: Refactor `AbstractSchema::getColumnPhpType()` (@Tigrov)

composer-require-checker.json

@@ -0,0 +1,6 @@
+{
+    "symbol-whitelist" : [
+        "Yiisoft\\Yii\\Debug\\Collector\\CollectorTrait",
+        "Yiisoft\\Yii\\Debug\\Collector\\SummaryCollectorInterface"
+    ]
+}

composer.json

@@ -34,14 +34,15 @@
         "rector/rector": "^0.17",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
-        "yiisoft/aliases": "^1.1|^2.0",
+        "vimeo/psalm": "^4.30|^5.12.0",
+        "yiisoft/aliases": "^3.0",
         "yiisoft/cache-file": "^2.0",
         "yiisoft/di": "^1.0",
         "yiisoft/event-dispatcher": "^1.0",
         "yiisoft/json": "^1.0",
         "yiisoft/log": "^2.0",
-        "yiisoft/var-dumper": "^1.5"
+        "yiisoft/var-dumper": "^1.5",
+        "yiisoft/yii-debug": "dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -59,11 +60,20 @@
             "Yiisoft\\Db\\Sqlite\\Tests\\": "vendor/yiisoft/db-sqlite/tests"
         }
     },
+    "extra": {
+        "config-plugin-options": {
+            "source-directory": "config"
+        },
+        "config-plugin": {
+            "params": "params.php"
+        }
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "yiisoft/config": false
         }
     },
     "scripts": {

config/params.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Db\Connection\ConnectionInterface;
+use Yiisoft\Db\Debug\ConnectionInterfaceProxy;
+use Yiisoft\Db\Debug\DatabaseCollector;
+
+return [
+    'yiisoft/yii-debug' => [
+        'collectors' => [
+            DatabaseCollector::class,
+        ],
+        'trackedServices' => [
+            ConnectionInterface::class => [ConnectionInterfaceProxy::class, DatabaseCollector::class],
+        ],
+    ],
+];

src/Connection/ConnectionInterface.php

@@ -212,7 +212,7 @@ public function setTablePrefix(string $value): void;
     /**
      * Executes callback provided in a transaction.
      *
-     * @param Closure $closure A valid PHP callback that performs the job. Accepts connection instance as parameter.
+     * @psalm-param Closure(ConnectionInterface): mixed $closure A valid PHP callback that performs the job. Accepts connection instance as parameter.
      * @param string|null $isolationLevel The isolation level to use for this transaction.
      * {@see TransactionInterface::begin()} for details.
      *