Cleanup

composer.json

@@ -26,8 +26,6 @@
             "url": "https://github.com/sponsors/yiisoft"
         }
     ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": "^8.1",
         "ext-mbstring": "*",
@@ -80,9 +78,6 @@
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        },
         "config-plugin-options": {
             "source-directory": "config"
         },

config/params.php

@@ -91,9 +91,9 @@
     ],
     'yiisoft/yii-console' => [
         'commands' => [
-            DebugResetCommand::COMMAND_NAME => DebugResetCommand::class,
-            DebugContainerCommand::COMMAND_NAME => DebugContainerCommand::class,
-            DebugEventsCommand::COMMAND_NAME => DebugEventsCommand::class,
+            'debug:reset' => DebugResetCommand::class,
+            'debug:container' => DebugContainerCommand::class,
+            'debug:events' => DebugEventsCommand::class,
         ],
     ],
 ];

src/Collector/Console/CommandCollector.php

@@ -25,8 +25,9 @@ final class CommandCollector implements SummaryCollectorInterface
     private const UNDEFINED_EXIT_CODE = -1;
     private array $commands = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/Console/ConsoleAppInfoCollector.php

@@ -22,8 +22,9 @@
     private float $requestProcessingTimeStarted = 0;
     private float $requestProcessingTimeStopped = 0;
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array
@@ -32,12 +33,12 @@
             return [];
         }
         return [
             'applicationProcessingTime' => $this->applicationProcessingTimeStopped - $this->applicationProcessingTimeStarted,
             'preloadTime' => $this->applicationProcessingTimeStarted - $this->requestProcessingTimeStarted,
             'applicationEmit' => $this->applicationProcessingTimeStopped - $this->requestProcessingTimeStopped,
             'requestProcessingTime' => $this->requestProcessingTimeStopped - $this->requestProcessingTimeStarted,
             'memoryPeakUsage' => memory_get_peak_usage(),
             'memoryUsage' => memory_get_usage(),
         ];
     }
 
@@ -64,7 +65,7 @@
             $this->applicationProcessingTimeStopped = microtime(true);
         }
 
         $this->timelineCollector->collect($this, spl_object_id($event));
     }
 
     public function getSummary(): array
@@ -79,7 +80,7 @@
                 ],
                 'request' => [
                     'startTime' => $this->requestProcessingTimeStarted,
                     'processingTime' => $this->requestProcessingTimeStopped - $this->requestProcessingTimeStarted,
                 ],
                 'memory' => [
                     'peakUsage' => memory_get_peak_usage(),

src/Collector/EventCollector.php

@@ -14,8 +14,9 @@ final class EventCollector implements SummaryCollectorInterface
 
     private array $events = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/EventDispatcherInterfaceProxy.php

@@ -9,8 +9,8 @@
 final class EventDispatcherInterfaceProxy implements EventDispatcherInterface
 {
     public function __construct(
-        private EventDispatcherInterface $dispatcher,
-        private EventCollector $collector
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly EventCollector $collector
     ) {
     }
 

src/Collector/ExceptionCollector.php

@@ -13,8 +13,9 @@ final class ExceptionCollector implements SummaryCollectorInterface
 
     private ?Throwable $exception = null;
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/HttpClientCollector.php

@@ -32,8 +32,9 @@ final class HttpClientCollector implements SummaryCollectorInterface
      */
     private array $requests = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function collect(RequestInterface $request, float $startTime, string $line, string $uniqueId): void

src/Collector/HttpClientInterfaceProxy.php

@@ -10,8 +10,10 @@
 
 final class HttpClientInterfaceProxy implements ClientInterface
 {
-    public function __construct(private ClientInterface $decorated, private HttpClientCollector $collector)
-    {
+    public function __construct(
+        private readonly ClientInterface $decorated,
+        private readonly HttpClientCollector $collector
+    ) {
     }
 
     public function sendRequest(RequestInterface $request): ResponseInterface

src/Collector/LogCollector.php

@@ -10,8 +10,9 @@ class LogCollector implements SummaryCollectorInterface
 
     private array $messages = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/LoggerInterfaceProxy.php

@@ -10,8 +10,10 @@
 
 final class LoggerInterfaceProxy implements LoggerInterface
 {
-    public function __construct(private LoggerInterface $logger, private LogCollector $collector)
-    {
+    public function __construct(
+        private readonly LoggerInterface $logger,
+        private readonly LogCollector $collector
+    ) {
     }
 
     public function emergency(string|Stringable $message, array $context = []): void

src/Collector/ServiceCollector.php

@@ -10,8 +10,9 @@ final class ServiceCollector implements SummaryCollectorInterface
 
     private array $items = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/ServiceMethodProxy.php

@@ -11,7 +11,7 @@ class ServiceMethodProxy extends ServiceProxy
     public function __construct(
         string $service,
         object $instance,
-        private array $methods,
+        private readonly array $methods,
         ContainerProxyConfig $config
     ) {
         parent::__construct($service, $instance, $config);

src/Collector/ServiceProxy.php

@@ -11,7 +11,7 @@ class ServiceProxy extends ObjectProxy
     use ProxyLogTrait;
 
     public function __construct(
-        private string $service,
+        private readonly string $service,
         object $instance,
         ContainerProxyConfig $config,
     ) {

src/Collector/Stream/FilesystemStreamCollector.php

@@ -18,8 +18,8 @@ public function __construct(
          * - '/' . preg_quote('yii-debug/src/Dumper', '/') . '/'
          * - '/ClosureExporter/'
          */
-        private array $ignoredPathPatterns = [],
-        private array $ignoredClasses = [],
+        private readonly array $ignoredPathPatterns = [],
+        private readonly array $ignoredClasses = [],
     ) {
     }
 

src/Collector/Stream/HttpStreamCollector.php

@@ -12,9 +12,9 @@ final class HttpStreamCollector implements SummaryCollectorInterface
     use CollectorTrait;
 
     public function __construct(
-        private array $ignoredPathPatterns = [],
-        private array $ignoredClasses = [],
-        private array $ignoredUrls = []
+        private readonly array $ignoredPathPatterns = [],
+        private readonly array $ignoredClasses = [],
+        private readonly array $ignoredUrls = []
     ) {
     }
 

src/Collector/VarDumperCollector.php

@@ -10,8 +10,9 @@ final class VarDumperCollector implements SummaryCollectorInterface
 
     private array $vars = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function collect(mixed $variable, string $line): void

src/Collector/VarDumperHandlerInterfaceProxy.php

@@ -9,8 +9,8 @@
 final class VarDumperHandlerInterfaceProxy implements HandlerInterface
 {
     public function __construct(
-        private HandlerInterface $decorated,
-        private VarDumperCollector $collector,
+        private readonly HandlerInterface $decorated,
+        private readonly VarDumperCollector $collector,
     ) {
     }
 

src/Collector/Web/MiddlewareCollector.php

@@ -18,8 +18,9 @@ final class MiddlewareCollector implements SummaryCollectorInterface
     private array $beforeStack = [];
     private array $afterStack = [];
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/Web/RequestCollector.php

@@ -27,8 +27,9 @@ final class RequestCollector implements SummaryCollectorInterface
     private ?ServerRequestInterface $request = null;
     private ?ResponseInterface $response = null;
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Collector/Web/WebAppInfoCollector.php

@@ -21,8 +21,9 @@ final class WebAppInfoCollector implements SummaryCollectorInterface
     private float $requestProcessingTimeStarted = 0;
     private float $requestProcessingTimeStopped = 0;
 
-    public function __construct(private TimelineCollector $timelineCollector)
-    {
+    public function __construct(
+        private readonly TimelineCollector $timelineCollector
+    ) {
     }
 
     public function getCollected(): array

src/Command/DebugContainerCommand.php

@@ -5,6 +5,8 @@
 namespace Yiisoft\Yii\Debug\Command;
 
 use Psr\Container\ContainerInterface;
+use ReflectionClass;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
@@ -21,22 +23,22 @@
 use Yiisoft\Yii\Console\ExitCode;
 use Yiisoft\Yii\Debug\Debugger;
 
+#[AsCommand(
+    name: 'debug:container',
+    description: 'Show information about container',
+)]
 final class DebugContainerCommand extends Command
 {
-    public const COMMAND_NAME = 'debug:container';
-    protected static $defaultName = self::COMMAND_NAME;
-
     public function __construct(
-        private ContainerInterface $container,
-        private Debugger $debugger,
+        private readonly ContainerInterface $container,
+        private readonly Debugger $debugger,
     ) {
         parent::__construct();
     }
 
     protected function configure(): void
     {
         $this
-            ->setDescription('Show information about container')
             ->addArgument('id', InputArgument::IS_ARRAY, 'Service ID')
             ->addOption('groups', null, InputOption::VALUE_NONE, 'Show groups')
             ->addOption('group', 'g', InputOption::VALUE_REQUIRED, 'Show group');
@@ -118,7 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $groups = array_keys($build);
             sort($groups);
 
-            $io->table(['Groups'], array_map(fn ($group) => [$group], $groups));
+            $io->table(['Groups'], array_map(static fn ($group) => [$group], $groups));
 
             return ExitCode::OK;
         }
@@ -156,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     private function getConfigBuild(mixed $config): array
     {
-        $reflection = new \ReflectionClass($config);
+        $reflection = new ReflectionClass($config);
         $buildReflection = $reflection->getProperty('build');
         $buildReflection->setAccessible(true);
         return $buildReflection->getValue($config);

src/Command/DebugEventsCommand.php

@@ -6,6 +6,7 @@
 
 use Psr\Container\ContainerInterface;
 use ReflectionClass;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
@@ -19,22 +20,22 @@
 use Yiisoft\Yii\Console\ExitCode;
 use Yiisoft\Yii\Debug\Debugger;
 
+#[AsCommand(
+    name: 'debug:events',
+    description: 'Show information about events and listeners',
+)]
 final class DebugEventsCommand extends Command
 {
-    public const COMMAND_NAME = 'debug:events';
-    protected static $defaultName = self::COMMAND_NAME;
-
     public function __construct(
-        private ContainerInterface $container,
-        private Debugger $debugger,
+        private readonly ContainerInterface $container,
+        private readonly Debugger $debugger,
     ) {
         parent::__construct();
     }
 
     protected function configure(): void
     {
         $this
-            ->setDescription('Show information about events and listeners')
             ->addArgument('id', InputArgument::IS_ARRAY, 'Service ID')
             ->addOption('groups', null, InputOption::VALUE_NONE, 'Show groups')
             ->addOption('group', 'g', InputOption::VALUE_REQUIRED, 'Show group');
@@ -52,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $groups = array_keys($build);
             sort($groups);
 
-            $io->table(['Groups'], array_map(fn ($group) => [$group], $groups));
+            $io->table(['Groups'], array_map(static fn ($group) => [$group], $groups));
 
             return ExitCode::OK;
         }

src/Command/DebugResetCommand.php

@@ -4,29 +4,30 @@
 
 namespace Yiisoft\Yii\Debug\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Yiisoft\Yii\Console\ExitCode;
 use Yiisoft\Yii\Debug\Debugger;
 use Yiisoft\Yii\Debug\Storage\StorageInterface;
 
+#[AsCommand(
+    name: 'debug:reset',
+    description: 'Clear debug data',
+)]
 final class DebugResetCommand extends Command
 {
-    public const COMMAND_NAME = 'debug:reset';
-    protected static $defaultName = self::COMMAND_NAME;
-
     public function __construct(
-        private StorageInterface $storage,
-        private Debugger $debugger,
+        private readonly StorageInterface $storage,
+        private readonly Debugger $debugger,
     ) {
         parent::__construct();
     }
 
     protected function configure(): void
     {
         $this
-            ->setDescription('Clear debug data')
             ->setHelp('This command clears debug storage data');
     }