8000 simplifying: creating Inflector when it's needed · symfony/maker-bundle@9b38f1b · GitHub
[go: up one dir, main page]
Skip to content

Commit 9b38f1b

Browse files
weaverryanweaverryan
committed
simplifying: creating Inflector when it's needed
1 parent 2cec448 commit 9b38f1b

File tree

6 files changed

+3
-28
lines changed

6 files changed

+3
-28
lines changed

‎src/DependencyInjection/MakerExtension.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\MakerBundle\DependencyInjection;
1313

14-
use Doctrine\Inflector\InflectorFactory;
1514
use Symfony\Bundle\MakerBundle\DependencyInjection\CompilerPass\MakeCommandRegistrationPass;
1615
use Symfony\Bundle\MakerBundle\MakerInterface;
1716
use Symfony\Component\Config\FileLocator;
@@ -49,10 +48,6 @@ public function load(array $configs, ContainerBuilder $container)
4948
$doctrineHelperDefinition = $container->getDefinition('maker.doctrine_helper');
5049
$doctrineHelperDefinition->replaceArgument(0, $rootNamespace.'\\Entity');
5150

52-
if (!class_exists(InflectorFactory::class)) {
53-
$container->removeDefinition('maker.doctrine_inflector');
54-
}
55-
5651
$container->registerForAutoconfiguration(MakerInterface::class)
5752
->addTag(MakeCommandRegistrationPass::MAKER_TAG);
5853
}

‎src/Maker/MakeCrud.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,13 @@ final class MakeCrud extends AbstractMaker
4343

4444
private $formTypeRenderer;
4545

46-
/** @var Inflector|null */
47-
private $inflector;
48-
49-
public function __construct(DoctrineHelper $doctrineHelper, FormTypeRenderer $formTypeRenderer, Inflector $inflector = null)
46+
public function __construct(DoctrineHelper $doctrineHelper, FormTypeRenderer $formTypeRenderer)
5047
{
5148
$this->doctrineHelper = $doctrineHelper;
5249
$this->formTypeRenderer = $formTypeRenderer;
53-
$this->inflector = $inflector;
54-
55-
if (null === $inflector) {
56-
@trigger_error(sprintf('"%s" will require a value for the $inflector argument in 2.0.', __METHOD__), E_USER_DEPRECATED);
5750

58-
if (class_exists(InflectorFactory::class)) {
59-
$this->inflector = InflectorFactory::create()->build();
60-
}
51+
if (class_exists(InflectorFactory::class)) {
52+
$this->inflector = InflectorFactory::create()->build();
6153
}
6254
}
6355

‎src/Resources/config/makers.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<service id="maker.maker.make_crud" class="Symfony\Bundle\MakerBundle\Maker\MakeCrud">
2828
<argument type="service" id="maker.doctrine_helper" />
2929
<argument type="service" id="maker.renderer.form_type_renderer" />
30-
<argument type="service" id="maker.doctrine_inflector" on-invalid="null" />
3130
<tag name="maker.command" />
3231
</service>
3332

‎src/Resources/config/services.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
<argument type="service" id="doctrine" on-invalid="ignore" />
4141
</service>
4242

43-
<service id="maker.doctrine_inflector_factory" class="Doctrine\Inflector\InflectorFactory">
44-
<factory class="Doctrine\Inflector\InflectorFactory" method="create" />
45-
</service>
46-
47-
<service id="maker.doctrine_inflector" class="Doctrine\Inflector\Inflector">
48-
<factory service="maker.doctrine_inflector_factory" method="build" />
49-
</service>
50-
5143
<service id="maker.auto_command.abstract" class="Symfony\Bundle\MakerBundle\Command\MakerCommand" abstract="true">
5244
<argument /> <!-- maker -->
5345
<argument type="service" id="maker.file_manager" />

‎src/Test/MakerTestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ abstract class MakerTestCase extends TestCase
2121

2222
/**
2323
* @dataProvider getTestDetails
24-
* @group legacy
2524
*/
2625
public function testExecute(MakerTestDetails $makerTestDetails)
2726
{

‎tests/Maker/FunctionalTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class FunctionalTest extends TestCase
2424
/**
2525
* Smoke test to make sure the DI autowiring works and all makers
2626
* are registered and have the correct arguments.
27-
*
28-
* @group legacy
2927
*/
3028
public function testWiring()
3129
{

0 commit comments

Comments
 (0)
0