Skip to content

Commit c450eae

Browse files
committed
Removed configuration
1 parent dfb2e11 commit c450eae

File tree

4 files changed

+11
-97
lines changed

4 files changed

+11
-97
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/DependencyInjection/EnumExtension.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1313
use Symfony\Component\Validator\Validator\ValidatorInterface;
1414
use Yokai\EnumBundle\EnumInterface;
15-
use Yokai\EnumBundle\EnumRegistry;
1615

1716
/**
1817
* @author Yann Eugoné <[email protected]>
@@ -24,9 +23,6 @@ class EnumExtension extends Extension
2423
*/
2524
public function load(array $configs, ContainerBuilder $container): void
2625
{
27-
$configuration = new Configuration();
28-
$config = $this->processConfiguration($configuration, $configs);
29-
3026
$xmlLoader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
3127
$xmlLoader->load('enum.xml');
3228

@@ -47,13 +43,7 @@ public function load(array $configs, ContainerBuilder $container): void
4743
$xmlLoader->load('twig.xml');
4844
}
4945

50-
if ($config['enum_autoconfiguration']) {
51-
$container->registerForAutoconfiguration(EnumInterface::class)
52-
->addTag('enum');
53-
}
54-
55-
if ($config['enum_registry_autoconfigurable']) {
56-
$container->setAlias(EnumRegistry::class, 'enum.registry');
57-
}
46+
$container->registerForAutoconfiguration(EnumInterface::class)
47+
->addTag('enum');
5848
}
5949
}

src/Resources/config/enum.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8+
<service id="Yokai\EnumBundle\EnumRegistry" alias="yokai_enum.enum_registry"/>
9+
810
<service id="yokai_enum.constant_extractor" class="Yokai\EnumBundle\ConstantExtractor" public="false"/>
911
<service id="yokai_enum.enum_registry" class="Yokai\EnumBundle\EnumRegistry"/>
1012
<service id="yokai_enum.abstract_translated_enum" class="Yokai\EnumBundle\AbstractTranslatedEnum" abstract="true">

tests/DependencyInjection/EnumExtensionTest.php

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,68 +18,28 @@ public function extension(): EnumExtension
1818
return new EnumExtension();
1919
}
2020

21-
/**
22-
* @test
23-
*/
24-
public function it_register_enum_for_autoconfiguration_by_default(): void
25-
{
26-
$container = new ContainerBuilder();
27-
$this->extension()->load([[]], $container);
28-
29-
$autoconfigure = $container->getAutoconfiguredInstanceof();
30-
$this->assertArrayHasKey(EnumInterface::class, $autoconfigure);
31-
$this->assertEquals(['enum' => [[]]], $autoconfigure[EnumInterface::class]->getTags());
32-
}
33-
34-
/**
35-
* @test
36-
*/
37-
public function it_do_not_register_enum_for_autoconfiguration_if_asked_to(): void
38-
{
39-
$container = new ContainerBuilder();
40-
$this->extension()->load([['enum_autoconfiguration' => false]], $container);
41-
42-
$autoconfigure = $container->getAutoconfiguredInstanceof();
43-
$this->assertArrayNotHasKey(EnumInterface::class, $autoconfigure);
44-
}
45-
46-
/**
47-
* @test
48-
*/
49-
public function it_register_enum_registry_alias_for_autowire_by_default(): void
50-
{
51-
$container = new ContainerBuilder();
52-
$this->extension()->load([[]], $container);
53-
$this->assertTrue($container->hasAlias(EnumRegistry::class));
54-
}
55-
56-
/**
57-
* @test
58-
*/
59-
public function it_do_not_register_enum_registry_alias_for_autowire_if_asked_to(): void
60-
{
61-
$container = new ContainerBuilder();
62-
$this->extension()->load([['enum_registry_autoconfigurable' => false]], $container);
63-
$this->assertFalse($container->hasAlias(EnumRegistry::class));
64-
}
65-
66-
6721
/**
6822
* @test
6923
*/
7024
public function it_register_services(): void
7125
{
7226
$container = new ContainerBuilder();
7327
$this->extension()->load([[]], $container);
28+
7429
$services = [
7530
'yokai_enum.form_type.enum_type',
7631
'yokai_enum.form_extension.enum_type_guesser',
7732
'yokai_enum.validator_constraints.enum_validator',
7833
'yokai_enum.twig_extension.enum_extension',
7934
];
80-
8135
foreach ($services as $service) {
8236
self::assertTrue($container->has($service), sprintf('Service "%s" is registered', $service));
8337
}
38+
39+
$autoconfigure = $container->getAutoconfiguredInstanceof();
40+
$this->assertArrayHasKey(EnumInterface::class, $autoconfigure);
41+
$this->assertEquals(['enum' => [[]]], $autoconfigure[EnumInterface::class]->getTags());
42+
43+
$this->assertTrue($container->hasAlias(EnumRegistry::class));
8444
}
8545
}

0 commit comments

Comments
 (0)