Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add debug command #372

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Enh #353: Add shortcut for tag reference #333 (@xepozz)
- Enh #356: Improve usage `NotFoundException` for cases with definitions (@vjik)
- Enh #364: Minor refactoring to improve performance of container (@samdark)
- New #372: Add `debug:container` console command (@samdark, @xepozz)

## 1.2.1 December 23, 2022

Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,11 @@ $config = ContainerConfig::create()
$container = new Container($config);
```

## Configuration debugging

If you use the package with Yii3, `./yii debug:container` command is available.
It shows information about container.

## Documentation

- [Internals](docs/internals.md)
Expand Down
20 changes: 16 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-mbstring": "*",
"psr/container": "^1.1|^2.0",
"yiisoft/definitions": "^3.0"
"yiisoft/definitions": "^3.0",
"yiisoft/var-dumper": "^1.7",
samdark marked this conversation as resolved.
Show resolved Hide resolved
"symfony/console": "^5.4|^6.0"
samdark marked this conversation as resolved.
Show resolved Hide resolved
samdark marked this conversation as resolved.
Show resolved Hide resolved
},
"require-dev": {
"league/container": "^4.2",
Expand All @@ -47,7 +49,8 @@
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^4.30|^5.7",
"yiisoft/injector": "^1.0",
"yiisoft/test-support": "^3.0"
"yiisoft/test-support": "^3.0",
"yiisoft/config": "^1.3"
},
"suggest": {
"yiisoft/injector": "^1.0",
samdark marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -66,6 +69,14 @@
"Yiisoft\\Di\\Tests\\": "tests"
}
},
"extra": {
"config-plugin-options": {
"source-directory": "config"
},
"config-plugin": {
"params": "params.php"
}
},
"scripts": {
"test": "phpunit --testdox --no-interaction",
"test-watch": "phpunit-watcher watch"
Expand All @@ -77,7 +88,8 @@
"sort-packages": true,
"allow-plugins": {
"infection/extension-installer": true,
"composer/package-versions-deprecated": true
"composer/package-versions-deprecated": true,
"yiisoft/config": false
}
}
}
18 changes: 18 additions & 0 deletions config/params.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

use Yiisoft\Di\Command\DebugContainerCommand;

return [
'yiisoft/yii-debug' => [
'ignoredCommands' => [
'debug:container',
],
],
'yiisoft/yii-console' => [
'commands' => [
'debug:container' => DebugContainerCommand::class,
],
],
];
190 changes: 190 additions & 0 deletions src/Command/DebugContainerCommand.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
<?php

declare(strict_types=1);

namespace Yiisoft\Di\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;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Yiisoft\Config\ConfigInterface;
use Yiisoft\Definitions\ArrayDefinition;
use Yiisoft\Definitions\CallableDefinition;
use Yiisoft\Definitions\ValueDefinition;
use Yiisoft\Di\Helpers\DefinitionNormalizer;
use Yiisoft\VarDumper\VarDumper;

#[AsCommand(
name: 'debug:container',
description: 'Show information about container',
)]
final class DebugContainerCommand extends Command

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great to debug tags. Or can I pass tag@tag-name as an id?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you please elaborate?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to see all services with given tag. Is it possible now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yiisoft/config must provide API to explore the config files

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BoShurik no, it is not possible yet.

{
public function __construct(
private readonly ContainerInterface $container,
) {
parent::__construct();
}

protected function configure(): void
{
$this
->addArgument('id', InputArgument::IS_ARRAY, 'Service ID')
->addOption('groups', null, InputOption::VALUE_NONE, 'Show groups')
->addOption('group', 'g', InputOption::VALUE_REQUIRED, 'Show group');
}

protected function execute(InputInterface $input, OutputInterface $output): int
{
$config = $this->container->get(ConfigInterface::class);

$io = new SymfonyStyle($input, $output);

if ($input->hasArgument('id') && !empty($ids = $input->getArgument('id'))) {

Check failure on line 50 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedAssignment

src/Command/DebugContainerCommand.php:50:49: MixedAssignment: Unable to determine the type that $ids is being assigned to (see https://psalm.dev/032)
$build = $this->getConfigBuild($config);
foreach ($ids as $id) {

Check failure on line 52 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedAssignment

src/Command/DebugContainerCommand.php:52:30: MixedAssignment: Unable to determine the type that $id is being assigned to (see https://psalm.dev/032)
$definition = null;
foreach ($build as $definitions) {

Check failure on line 54 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedAssignment

src/Command/DebugContainerCommand.php:54:36: MixedAssignment: Unable to determine the type that $definitions is being assigned to (see https://psalm.dev/032)
if (array_key_exists($id, $definitions)) {

Check failure on line 55 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedArgument

src/Command/DebugContainerCommand.php:55:42: MixedArgument: Argument 1 of array_key_exists cannot be mixed, expecting array-key (see https://psalm.dev/030)

Check failure on line 55 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedArgument

src/Command/DebugContainerCommand.php:55:47: MixedArgument: Argument 2 of array_key_exists cannot be mixed, expecting array<array-key, mixed> (see https://psalm.dev/030)
$definition = $definitions[$id];

Check failure on line 56 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedAssignment

src/Command/DebugContainerCommand.php:56:25: MixedAssignment: Unable to determine the type that $definition is being assigned to (see https://psalm.dev/032)
}
}
if ($definition === null) {
$io->error(
sprintf(
'Service "%s" not found.',
$id,

Check failure on line 63 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedArgument

src/Command/DebugContainerCommand.php:63:29: MixedArgument: Argument 2 of sprintf cannot be mixed, expecting float|int|object{__tostring()}|string (see https://psalm.dev/030)
)
);
continue;
}
$io->title($id);

Check failure on line 68 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedArgument

src/Command/DebugContainerCommand.php:68:28: MixedArgument: Argument 1 of Symfony\Component\Console\Style\SymfonyStyle::title cannot be mixed, expecting string (see https://psalm.dev/030)

$normalizedDefinition = DefinitionNormalizer::normalize($definition, $id);
if ($normalizedDefinition instanceof ArrayDefinition) {
$definitionList = ['ID' => $id];
if (class_exists($normalizedDefinition->getClass())) {
$definitionList[] = ['Class' => $normalizedDefinition->getClass()];
}
if (!empty($normalizedDefinition->getConstructorArguments())) {
$definitionList[] = [
'Constructor' => $this->export(
$normalizedDefinition->getConstructorArguments()
),
];
}
if (!empty($normalizedDefinition->getMethodsAndProperties())) {
$definitionList[] = [
'Methods' => $this->export(
$normalizedDefinition->getMethodsAndProperties()
),
];
}
if (isset($definition['tags'])) {
$definitionList[] = ['Tags' => $this->export($definition['tags'])];

Check failure on line 91 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedArrayAccess

src/Command/DebugContainerCommand.php:91:70: MixedArrayAccess: Cannot access array value on mixed variable $definition (see https://psalm.dev/051)
}

$io->definitionList(...$definitionList);

continue;
}
if ($normalizedDefinition instanceof CallableDefinition || $normalizedDefinition instanceof ValueDefinition) {
$io->text(
$this->export($definition)
);
continue;
}

$output->writeln([
$id,
VarDumper::create($normalizedDefinition)->asString(),
]);
}

return self::SUCCESS;
}

if ($input->hasOption('groups') && $input->getOption('groups')) {
$build = $this->getConfigBuild($config);
$groups = array_keys($build);
sort($groups);

$io->table(['Groups'], array_map(static fn ($group) => [$group], $groups));

return self::SUCCESS;
}
if ($input->hasOption('group') && !empty($group = $input->getOption('group'))) {

Check failure on line 123 in src/Command/DebugContainerCommand.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

MixedAssignment

src/Command/DebugContainerCommand.php:123:50: MixedAssignment: Unable to determine the type that $group is being assigned to (see https://psalm.dev/032)
$data = $config->get($group);
ksort($data);

$rows = $this->getGroupServices($data);

$table = new Table($output);
$table
->setHeaderTitle($group)
->setHeaders(['Service', 'Definition'])
->setRows($rows);
$table->render();

return self::SUCCESS;
}

$build = $this->getConfigBuild($config);

foreach ($build as $group => $data) {
$rows = $this->getGroupServices($data);

$table = new Table($output);
$table
->setHeaderTitle($group)
->setHeaders(['Group', 'Services'])
->setRows($rows);
$table->render();
}

return self::SUCCESS;
}

private function getConfigBuild(mixed $config): array
{
$reflection = new ReflectionClass($config);
$buildReflection = $reflection->getProperty('build');
$buildReflection->setAccessible(true);
return $buildReflection->getValue($config);
}

protected function getGroupServices(array $data): array
{
$rows = [];
foreach ($data as $id => $definition) {
$class = '';
if (is_string($definition)) {
$class = $definition;
}
if (is_array($definition)) {
$class = $definition['class'] ?? $id;
}
if (is_object($definition)) {
$class = $definition::class;
}

$rows[] = [
$id,
$class,
];
}
return $rows;
}

protected function export(mixed $value): string
{
return VarDumper::create($value)->asString();
}
}
50 changes: 50 additions & 0 deletions tests/Unit/Command/DebugContainerCommandTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

declare(strict_types=1);

namespace Yiisoft\Di\Tests\Unit\Command;

use PHPUnit\Framework\TestCase;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Symfony\Component\Console\Tester\CommandTester;
use Yiisoft\Config\Config;
use Yiisoft\Config\ConfigInterface;
use Yiisoft\Config\ConfigPaths;
use Yiisoft\Di\Command\DebugContainerCommand;
use Yiisoft\Di\Container;
use Yiisoft\Di\ContainerConfig;

final class DebugContainerCommandTest extends TestCase
{
public function testCommand(): void
{
$container = $this->createContainer();
$config = $container->get(ConfigInterface::class);
// trigger config build
$config->get('params');

$command = new DebugContainerCommand($container);
$commandTester = new CommandTester($command);

$commandTester->execute([]);

$this->assertEquals(0, $commandTester->getStatusCode());
}

private function createContainer(): ContainerInterface
{
$config = ContainerConfig::create()
->withDefinitions([
LoggerInterface::class => NullLogger::class,
ConfigInterface::class => [
'class' => Config::class,
'__construct()' => [
new ConfigPaths(__DIR__ . '/config'),
],
],
]);
return new Container($config);
}
}
11 changes: 11 additions & 0 deletions tests/Unit/Command/config/.merge-plan.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

return [
'/'=>[
'params' => [

]
],
];
13 changes: 13 additions & 0 deletions tests/Unit/Command/config/param1.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

return [
'/' => [
'params' => [
'yiitest/yii-debug' => [
'param1.php',
],
],
],
];
Loading