Skip to content

Commit 43eff7c

Browse files
committed
Merge pull request #134 from symfony-cmf/bs
Bundle Standards
2 parents a9800c6 + acaa237 commit 43eff7c

18 files changed

+444
-184
lines changed

DependencyInjection/CmfRoutingExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function load(array $configs, ContainerBuilder $container)
3434
}
3535

3636
/* set up the chain router */
37-
$loader->load('chain_routing.xml');
37+
$loader->load('routing-chain.xml');
3838
$container->setParameter($this->getAlias() . '.replace_symfony_router', $config['chain']['replace_symfony_router']);
3939

4040
// add the routers defined in the configuration mapping
@@ -48,7 +48,7 @@ public function load(array $configs, ContainerBuilder $container)
4848

4949
public function setupFormTypes(array $config, ContainerBuilder $container, LoaderInterface $loader)
5050
{
51-
$loader->load('form_type.xml');
51+
$loader->load('form-type.xml');
5252

5353
if (isset($config['dynamic'])) {
5454
$routeTypeTypeDefinition = $container->getDefinition('cmf_routing.route_type_form_type');
@@ -84,7 +84,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
8484
$container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
8585
$container->setParameter($this->getAlias() . '.uri_filter_regexp', $config['uri_filter_regexp']);
8686

87-
$loader->load('dynamic_routing.xml');
87+
$loader->load('routing-dynamic.xml');
8888

8989
$hasProvider = false;
9090
$hasContentRepository = false;
@@ -138,7 +138,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
138138

139139
public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuilder $container)
140140
{
141-
$loader->load('provider_phpcr.xml');
141+
$loader->load('provider-phpcr.xml');
142142

143143
$container->setParameter($this->getAlias() . '.backend_type_phpcr', true);
144144

@@ -168,7 +168,7 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
168168
return;
169169
}
170170

171-
$loader->load('admin_phpcr.xml');
171+
$loader->load('admin-phpcr.xml');
172172
}
173173

174174
/**

LICENSE

Lines changed: 0 additions & 23 deletions
This file was deleted.
File renamed without changes.

Resources/config/doctrine/RedirectRoute.phpcr.xml

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

Resources/config/doctrine/Route.phpcr.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.
File renamed without changes.

Resources/meta/LICENSE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
RoutingBundle
2+
3+
The MIT License
4+
5+
Copyright (c) 2011-2012 Symfony2 CMF
6+
7+
Permission is hereby granted, free of charge, to any person obtaining a copy
8+
of this software and associated documentation files (the "Software"), to deal
9+
in the Software without restriction, including without limitation the rights
10+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the Software is
12+
furnished to do so, subject to the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included in
15+
all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
THE SOFTWARE.

0 commit comments

Comments
 (0)