Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit bbc75d8

Browse files
dantleechdantleech
committed
Renamed undescored names
1 parent 336e71d commit bbc75d8

File tree

11 files changed

+50
-51
lines changed

11 files changed

+50
-51
lines changed

‎DependencyInjection/Compiler/AutoRoutePass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class AutoRoutePass implements CompilerPassInterface
1515
public function process(ContainerBuilder $container)
1616
{
1717
if (!$container->hasDefinition(
18-
'symfony_cmf_routing_auto_route.builder_unit_chain_factory'
18+
'symfony_cmf_routing_auto.builder_unit_chain_factory'
1919
)) {
2020
return;
2121
}
2222

2323
$builderUnitChainFactory = $container->getDefinition(
24-
'symfony_cmf_routing_auto_route.builder_unit_chain_factory'
24+
'symfony_cmf_routing_auto.builder_unit_chain_factory'
2525
);
2626

2727

@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
3030
);
3131

3232
foreach ($types as $type) {
33-
$ids = $container->findTaggedServiceIds('symfony_cmf_routing_auto_route.'.$type);
33+
$ids = $container->findTaggedServiceIds('symfony_cmf_routing_auto.'.$type);
3434
foreach ($ids as $id => $attributes) {
3535
if (!isset($attributes[0]['alias'])) {
3636
throw new \InvalidArgumentException(sprintf(

‎DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Configuration implements ConfigurationInterface
1515
public function getConfigTreeBuilder()
1616
{
1717
$treeBuilder = new TreeBuilder();
18-
$treeBuilder->root('symfony_cmf_routing_auto_route')
18+
$treeBuilder->root('symfony_cmf_routing_auto')
1919
->children()
2020
->arrayNode('auto_route_definitions')
2121
->useAttributeAsKey('class')

‎DependencyInjection/SymfonyCmfRoutingAutoExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Config\Loader\LoaderInterface;
1111
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1212

13-
class SymfonyCmfRoutingAutoRouteExtension extends Extension
13+
class SymfonyCmfRoutingAutoExtension extends Extension
1414
{
1515
/**
1616
* {@inheritDoc}
@@ -26,7 +26,7 @@ public function load(array $configs, ContainerBuilder $container)
2626
$loader->load('not_exists_action.xml');
2727

2828
$config = $processor->processConfiguration($configuration, $configs);
29-
$chainFactoryDef = $container->getDefinition('symfony_cmf_routing_auto_route.builder_unit_chain_factory');
29+
$chainFactoryDef = $container->getDefinition('symfony_cmf_routing_auto.builder_unit_chain_factory');
3030

3131
// normalize configuration
3232
foreach ($config['auto_route_definitions'] as $classFqn => $config) {

‎EventListener/AutoRouteListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected function getArm()
2121
{
2222
// lazy load the auto_route_manager service to prevent a cirular-reference
2323
// to the document manager.
24-
return $this->container->get('symfony_cmf_routing_auto_route.auto_route_manager');
24+
return $this->container->get('symfony_cmf_routing_auto.auto_route_manager');
2525
}
2626

2727
public function onFlush(OnFlushEventArgs $args)

‎Resources/config/auto_route.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,44 @@
55

66
<parameters>
77

8-
<parameter key="symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber_class">Symfony\Cmf\Bundle\RoutingAutoBundle\Subscriber\AutoRouteSubscriber</parameter>
9-
<parameter key="symfony_cmf_routing_auto_route.auto_route_manager_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteManager</parameter>
10-
<parameter key="symfony_cmf_routing_auto_route.builder_unit_chain_factory_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderUnitChainFactory</parameter>
11-
<parameter key="symfony_cmf_routing_auto_route.builder_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Builder</parameter>
12-
<parameter key="symfony_cmf_routing_auto_route.route_maker_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\GenericMaker</parameter>
8+
<parameter key="symfony_cmf_routing_auto.phpcrodm_auto_route_listener_class">Symfony\Cmf\Bundle\RoutingAutoBundle\Subscriber\AutoRouteListener</parameter>
9+
<parameter key="symfony_cmf_routing_auto.auto_route_manager_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteManager</parameter>
10+
<parameter key="symfony_cmf_routing_auto.builder_unit_chain_factory_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderUnitChainFactory</parameter>
11+
<parameter key="symfony_cmf_routing_auto.builder_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Builder</parameter>
12+
<parameter key="symfony_cmf_routing_auto.route_maker_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\GenericMaker</parameter>
1313

1414
</parameters>
1515

1616
<services>
1717
<service
18-
id="symfony_cmf_routing_auto_route.slugifier"
18+
id="symfony_cmf_routing_auto.slugifier"
1919
class="Symfony\Cmf\Bundle\CoreBundle\Slugifier\CallbackSlugifier"
2020
>
2121
<argument>Ferrandini\Urlizer::urlize</argument>
2222
</service>
2323

2424
<service
25-
id="symfony_cmf_routing_auto_route.auto_route_manager"
25+
id="symfony_cmf_routing_auto.auto_route_manager"
2626
class="Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteManager"
2727
>
28-
<argument type="service" id="symfony_cmf_routing_auto_route.builder_unit_chain_factory"/>
28+
<argument type="service" id="symfony_cmf_routing_auto.builder_unit_chain_factory"/>
2929
</service>
3030

31-
<service id="symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber" class="%symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber_class%">
31+
<service id="symfony_cmf_routing_auto.phpcrodm_auto_route_listener" class="%symfony_cmf_routing_auto.phpcrodm_auto_route_listener_class%">
3232
<argument type="service" id="service_container"/>
33-
<tag name="doctrine_phpcr.event_subscriber"/>
33+
<tag name="doctrine_phpcr.event_listener" event="onFlush"/>
3434
</service>
3535

36-
<service id="symfony_cmf_routing_auto_route.builder_unit_chain_factory" class="%symfony_cmf_routing_auto_route.builder_unit_chain_factory_class%">
36+
<service id="symfony_cmf_routing_auto.builder_unit_chain_factory" class="%symfony_cmf_routing_auto.builder_unit_chain_factory_class%">
3737
<argument type="service" id="service_container"/>
38-
<argument type="service" id="symfony_cmf_routing_auto_route.builder"/>
38+
<argument type="service" id="symfony_cmf_routing_auto.builder"/>
3939
</service>
4040

41-
<service id="symfony_cmf_routing_auto_route.builder" class="%symfony_cmf_routing_auto_route.builder_class%">
41+
<service id="symfony_cmf_routing_auto.builder" class="%symfony_cmf_routing_auto.builder_class%">
4242
<argument type="service" id="doctrine_phpcr.default_session"/>
4343
</service>
4444

45-
<service id="symfony_cmf_routing_auto_route.route_maker" class="%symfony_cmf_routing_auto_route.route_maker_class%">
45+
<service id="symfony_cmf_routing_auto.route_maker" class="%symfony_cmf_routing_auto.route_maker_class%">
4646
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
4747
</service>
4848

‎Resources/config/exists_action.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55

66
<parameters>
77

8-
<parameter key="symfony_cmf_routing_auto_route.exists_action.use_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\UsePath</parameter>
9-
<parameter key="symfony_cmf_routing_auto_route.exists_action.auto_increment_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\AutoIncrementPath</parameter>
8+
<parameter key="symfony_cmf_routing_auto.exists_action.use_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\UsePath</parameter>
9+
<parameter key="symfony_cmf_routing_auto.exists_action.auto_increment_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\AutoIncrementPath</parameter>
1010

1111
</parameters>
1212

1313
<services>
1414

1515
<service
16-
id="symfony_cmf_routing_auto_route.exists_action.use"
17-
class="%symfony_cmf_routing_auto_route.exists_action.use_class%"
16+
id="symfony_cmf_routing_auto.exists_action.use"
17+
class="%symfony_cmf_routing_auto.exists_action.use_class%"
1818
scope="prototype"
1919
>
2020
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
21-
<tag name="symfony_cmf_routing_auto_route.exists_action" alias="use"/>
21+
<tag name="symfony_cmf_routing_auto.exists_action" alias="use"/>
2222
</service>
2323

2424
<service
25-
id="symfony_cmf_routing_auto_route.exists_action.auto_increment"
26-
class="%symfony_cmf_routing_auto_route.exists_action.auto_increment_class%"
25+
id="symfony_cmf_routing_auto.exists_action.auto_increment"
26+
class="%symfony_cmf_routing_auto.exists_action.auto_increment_class%"
2727
scope="prototype"
2828
>
2929
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
30-
<argument type="service" id="symfony_cmf_routing_auto_route.route_maker"/>
31-
<tag name="symfony_cmf_routing_auto_route.exists_action" alias="auto_increment"/>
30+
<argument type="service" id="symfony_cmf_routing_auto.route_maker"/>
31+
<tag name="symfony_cmf_routing_auto.exists_action" alias="auto_increment"/>
3232
</service>
3333

3434
</services>

‎Resources/config/not_exists_action.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55

66
<parameters>
77

8-
<parameter key="symfony_cmf_routing_auto_route.not_exists_action.throw_exception_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\ThrowException</parameter>
9-
<parameter key="symfony_cmf_routing_auto_route.not_exists_action.create_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\CreatePath</parameter>
8+
<parameter key="symfony_cmf_routing_auto.not_exists_action.throw_exception_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\ThrowException</parameter>
9+
<parameter key="symfony_cmf_routing_auto.not_exists_action.create_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\CreatePath</parameter>
1010
</parameters>
1111

1212
<services>
1313

1414
<service
15-
id="symfony_cmf_routing_auto_route.not_exists_action.throw_exception"
16-
class="%symfony_cmf_routing_auto_route.not_exists_action.throw_exception_class%"
15+
id="symfony_cmf_routing_auto.not_exists_action.throw_exception"
16+
class="%symfony_cmf_routing_auto.not_exists_action.throw_exception_class%"
1717
scope="prototype"
1818
>
19-
<tag name="symfony_cmf_routing_auto_route.not_exists_action" alias="throw_exception"/>
19+
<tag name="symfony_cmf_routing_auto.not_exists_action" alias="throw_exception"/>
2020
</service>
2121

2222
<service
23-
id="symfony_cmf_routing_auto_route.not_exists_action.create"
24-
class="%symfony_cmf_routing_auto_route.not_exists_action.create_class%"
23+
id="symfony_cmf_routing_auto.not_exists_action.create"
24+
class="%symfony_cmf_routing_auto.not_exists_action.create_class%"
2525
scope="prototype"
2626
>
27-
<argument type="service" id="symfony_cmf_routing_auto_route.route_maker"/>
28-
<tag name="symfony_cmf_routing_auto_route.not_exists_action" alias="create"/>
27+
<argument type="service" id="symfony_cmf_routing_auto.route_maker"/>
28+
<tag name="symfony_cmf_routing_auto.not_exists_action" alias="create"/>
2929
</service>
3030

3131
</services>

‎Resources/config/path_provider.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55

66
<parameters>
77

8-
<parameter key="symfony_cmf_routing_auto_route.provider.specified_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\SpecifiedProvider</parameter>
9-
<parameter key="symfony_cmf_routing_auto_route.provider.from_object_method_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\FromObjectMethodProvider</parameter>
8+
<parameter key="symfony_cmf_routing_auto.provider.specified_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\SpecifiedProvider</parameter>
9+
<parameter key="symfony_cmf_routing_auto.provider.from_object_method_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\FromObjectMethodProvider</parameter>
1010

1111
</parameters>
1212

1313
<services>
1414

1515
<service
16-
id="symfony_cmf_routing_auto_route.path_provider.specified"
17-
class="%symfony_cmf_routing_auto_route.provider.specified_class%"
16+
id="symfony_cmf_routing_auto.path_provider.specified"
17+
class="%symfony_cmf_routing_auto.provider.specified_class%"
1818
scope="prototype"
1919
>
20-
<tag name="symfony_cmf_routing_auto_route.path_provider" alias="specified"/>
20+
<tag name="symfony_cmf_routing_auto.path_provider" alias="specified"/>
2121
</service>
2222

2323
<service
24-
id="symfony_cmf_routing_auto_route.path_provider.from_object_method"
25-
class="%symfony_cmf_routing_auto_route.provider.from_object_method_class%"
24+
id="symfony_cmf_routing_auto.path_provider.from_object_method"
25+
class="%symfony_cmf_routing_auto.provider.from_object_method_class%"
2626
scope="prototype"
2727
>
28-
<tag name="symfony_cmf_routing_auto_route.path_provider" alias="from_object_method"/>
28+
<tag name="symfony_cmf_routing_auto.path_provider" alias="from_object_method"/>
2929
</service>
3030
</services>
3131
</container>

‎Tests/Functional/AutoRoute/AutoRouteManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function setUp()
1515
{
1616
parent::setUp();
1717
$this->arm = $this->getContainer()->get(
18-
'symfony_cmf_routing_auto_route.auto_route_manager'
18+
'symfony_cmf_routing_auto.auto_route_manager'
1919
);
2020
}
2121

‎Tests/Functional/app/AppKernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ public function getCacheDir()
4949
return __DIR__.'/cache';
5050
}
5151
}
52-

0 commit comments

Comments
 (0)