Skip to content

Tests: Replace ContainerLoader with ContainerBuilder #83

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.

Sign up for GitHub

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

Merged
f3l1x merged 1 commit into from
Jan 6, 2026
Merged

Tests: Replace ContainerLoader with ContainerBuilder #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 11 additions & 16 deletions tests/Cases/Command/Command.HelperSet.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,28 @@
<?php declare(strict_types = 1);

use Contributte\Console\DI\ConsoleExtension;
use Contributte\Tester\Environment;
use Contributte\Tester\Toolkit;
use Contributte\Tester\Utils\ContainerBuilder;
use Contributte\Tester\Utils\Neonkit;
use Nette\DI\Compiler;
use Nette\DI\Container;
use Nette\DI\ContainerLoader;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Helper\HelperSet;
use Tester\Assert;
use Tester\FileMock;
use Tests\Fixtures\HelperSetCommand;

require_once __DIR__ . '/../../bootstrap.php';

// Test auto filling helperSet in command
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
services:
- Tests\Fixtures\HelperSetCommand
', 'neon'));
}, [getmypid(), 1]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
services:
- Tests\Fixtures\HelperSetCommand
NEON));
})->build();

/** @var Application $application */
$application = $container->getByType(Application::class);
Expand Down
27 changes: 11 additions & 16 deletions tests/Cases/DI/ConsoleExtension.EventDispatcher.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,30 @@

use Contributte\Console\Application;
use Contributte\Console\DI\ConsoleExtension;
use Contributte\Tester\Environment;
use Contributte\Tester\Toolkit;
use Contributte\Tester\Utils\ContainerBuilder;
use Contributte\Tester\Utils\Neonkit;
use Nette\DI\Compiler;
use Nette\DI\Container;
use Nette\DI\ContainerLoader;
use Symfony\Component\Console\ConsoleEvents;
use Symfony\Component\Console\Event\ConsoleErrorEvent;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Tester\Assert;
use Tester\FileMock;
use Tests\Fixtures\ThrowingCommand;

require_once __DIR__ . '/../../bootstrap.php';

Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
services:
- Tests\Fixtures\ThrowingCommand
- Symfony\Component\EventDispatcher\EventDispatcher
', 'neon'));
}, [getmypid(), 1]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
services:
- Tests\Fixtures\ThrowingCommand
- Symfony\Component\EventDispatcher\EventDispatcher
NEON));
})->build();

/** @var Application $application */
$application = $container->getByType(Application::class);
Expand Down
98 changes: 42 additions & 56 deletions tests/Cases/DI/ConsoleExtension.HelperSet.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,72 @@
<?php declare(strict_types = 1);

use Contributte\Console\DI\ConsoleExtension;
use Contributte\Tester\Environment;
use Contributte\Tester\Toolkit;
use Contributte\Tester\Utils\ContainerBuilder;
use Contributte\Tester\Utils\Neonkit;
use Nette\DI\Compiler;
use Nette\DI\Container;
use Nette\DI\ContainerLoader;
use Nette\DI\InvalidConfigurationException;
use Symfony\Component\Console\Application;
use Tester\Assert;
use Tester\FileMock;
use Tests\Fixtures\FooHelperSet;

require_once __DIR__ . '/../../bootstrap.php';

// Default helperSet
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
}, [getmypid(), 1]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
})->build();

// 4 default helpers
Assert::count(4, $container->getByType(Application::class)->getHelperSet()->getIterator());
});

// Own helperSet
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
helperSet: Tests\Fixtures\FooHelperSet
', 'neon'));
}, [getmypid(), 2]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
helperSet: Tests\Fixtures\FooHelperSet
NEON));
})->build();

// Our helper set
Assert::type(FooHelperSet::class, $container->getByType(Application::class)->getHelperSet());
});

// Own helperSet as service
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
helperSet: @Tests\Fixtures\FooHelperSet

services:
- Tests\Fixtures\FooHelperSet
', 'neon'));
}, [getmypid(), 3]);
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
helperSet: @Tests\Fixtures\FooHelperSet

/** @var Container $container */
$container = new $class();
services:
- Tests\Fixtures\FooHelperSet
NEON));
})->build();

// Our helper set
Assert::type(FooHelperSet::class, $container->getByType(Application::class)->getHelperSet());
});

// Own helper
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
helpers:
- Tests\Fixtures\FooHelper
', 'neon'));
}, [getmypid(), 4]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
helpers:
- Tests\Fixtures\FooHelper
NEON));
})->build();

// 4 default helpers
// 1 foo helper
Expand All @@ -90,13 +76,13 @@ Toolkit::test(function (): void {
// Null helperSet
Toolkit::test(function (): void {
Assert::exception(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
helperSet: null
', 'neon'));
}, [getmypid(), 5]);
}, InvalidConfigurationException::class, "The item 'console › helperSet' expects to be string|Nette\DI\Definitions\Statement, null given.");
ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
helperSet: null
NEON));
})->build();
}, InvalidConfigurationException::class, "~The item 'console.+helperSet' expects to be string\|Nette\\\\DI\\\\Definitions\\\\Statement, null given\.~");
});
27 changes: 11 additions & 16 deletions tests/Cases/DI/ConsoleExtension.lazy.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,28 @@
use Contributte\Console\Application;
use Contributte\Console\CommandLoader\ContainerCommandLoader;
use Contributte\Console\DI\ConsoleExtension;
use Contributte\Tester\Environment;
use Contributte\Tester\Toolkit;
use Contributte\Tester\Utils\ContainerBuilder;
use Contributte\Tester\Utils\Neonkit;
use Nette\DI\Compiler;
use Nette\DI\Container;
use Nette\DI\ContainerLoader;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
use Tester\Assert;
use Tester\FileMock;
use Tests\Fixtures\FooCommand;

require_once __DIR__ . '/../../bootstrap.php';

// 1 command of type FooCommand lazy-loading
Toolkit::test(function (): void {
$loader = new ContainerLoader(Environment::getTestDir(), true);
$class = $loader->load(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->loadConfig(FileMock::create('
console:
services:
foo: Tests\Fixtures\FooCommand
', 'neon'));
}, [getmypid(), 1]);

/** @var Container $container */
$container = new $class();
$container = ContainerBuilder::of()
->withCompiler(function (Compiler $compiler): void {
$compiler->addExtension('console', new ConsoleExtension(true));
$compiler->addConfig(Neonkit::load(<<<'NEON'
console:
services:
foo: Tests\Fixtures\FooCommand
NEON));
})->build();

Assert::type(Application::class, $container->getByType(Application::class));

Expand Down
Loading