Skip to content

Commit 9ec030c

Browse files
ElectricMaxxxElectricMaxxx
authored
Merge pull request #377 from symfony-cmf/cleanups
cleanup code
2 parents 6c447bf + 436edc6 commit 9ec030c

39 files changed

+289
-304
lines changed

‎.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
65
- 7.0
76
- hhvm
@@ -18,13 +17,15 @@ env:
1817
- SYMFONY_VERSION=3.1.*
1918
global:
2019
- SYMFONY_DEPRECATIONS_HELPER=231
21-
- SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_DIR="./.phpunit"
20+
- SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
21+
- SYMFONY_PHPUNIT_DIR="./.phpunit"
22+
- SYMFONY_PHPUNIT_VERSION=5.7
2223

2324
matrix:
2425
include:
2526
- php: 7.0
2627
env: DEPS=dev SYMFONY_VERSION=3.3.*
27-
- php: 5.5
28+
- php: 5.6
2829
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
2930
- php: 7.0
3031
env: SYMFONY_VERSION=3.0.*

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"sonata-project/block-bundle": "^2.2.8|^3.0",
2929
"sonata-project/core-bundle": "^2.2.5|^3.0",
3030
"symfony/monolog-bundle": "^2.3|^3.0",
31-
"doctrine/orm": "^2.3",
31+
"doctrine/orm": "^2.5",
3232
"doctrine/data-fixtures": "^1.0.0"
3333
},
3434
"minimum-stability": "dev",

‎src/CmfRoutingBundle.php

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@
1111

1212
namespace Symfony\Cmf\Bundle\RoutingBundle;
1313

14+
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
1415
use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
16+
use Doctrine\Common\Persistence\Mapping\Driver\DefaultFileLocator;
17+
use Doctrine\ODM\PHPCR\Mapping\Driver\XmlDriver as PHPCRXmlDriver;
18+
use Doctrine\ODM\PHPCR\Version as PHPCRVersion;
19+
use Doctrine\ORM\Mapping\Driver\XmlDriver as ORMXmlDriver;
20+
use Doctrine\ORM\Version as ORMVersion;
21+
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass;
1522
use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\ValidationPass;
1623
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1724
use Symfony\Component\DependencyInjection\Definition;
@@ -20,6 +27,7 @@
2027
use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
2128
use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
2229
use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
30+
use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass as CmfDoctrineOrmMappingsPass;
2331

2432
/**
2533
* Bundle class.
@@ -49,24 +57,24 @@ public function build(ContainerBuilder $container)
4957
*/
5058
private function buildPhpcrCompilerPass(ContainerBuilder $container)
5159
{
52-
if (!class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')
53-
|| !class_exists('Doctrine\ODM\PHPCR\Version')
60+
if (!class_exists(DoctrinePhpcrMappingsPass::class)
61+
|| !class_exists(PHPCRVersion::class)
5462
) {
5563
return;
5664
}
5765

5866
$container->addCompilerPass(
59-
$this->buildBaseCompilerPass('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass', 'Doctrine\ODM\PHPCR\Mapping\Driver\XmlDriver', 'phpcr')
67+
$this->buildBaseCompilerPass(DoctrinePhpcrMappingsPass::class, PHPCRXmlDriver::class, 'phpcr')
6068
);
6169
$container->addCompilerPass(
6270
DoctrinePhpcrMappingsPass::createXmlMappingDriver(
63-
array(
71+
[
6472
realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
6573
realpath(__DIR__.'/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr',
66-
),
67-
array('cmf_routing.dynamic.persistence.phpcr.manager_name'),
74+
],
75+
['cmf_routing.dynamic.persistence.phpcr.manager_name'],
6876
'cmf_routing.backend_type_phpcr',
69-
array('CmfRoutingBundle' => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr')
77+
['CmfRoutingBundle' => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr']
7078
)
7179
);
7280
}
@@ -79,7 +87,7 @@ private function buildPhpcrCompilerPass(ContainerBuilder $container)
7987
*/
8088
private function buildOrmCompilerPass(ContainerBuilder $container)
8189
{
82-
if (!class_exists('Doctrine\ORM\Version')) {
90+
if (!class_exists(ORMVersion::class)) {
8391
return;
8492
}
8593

@@ -89,28 +97,28 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
8997
}
9098

9199
$container->addCompilerPass(
92-
$this->buildBaseCompilerPass($doctrineOrmCompiler, 'Doctrine\ORM\Mapping\Driver\XmlDriver', 'orm')
100+
$this->buildBaseCompilerPass($doctrineOrmCompiler, ORMXmlDriver::class, 'orm')
93101
);
94102
$container->addCompilerPass(
95103
$doctrineOrmCompiler::createXmlMappingDriver(
96-
array(
104+
[
97105
realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
98106
realpath(__DIR__.'/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
99-
),
100-
array('cmf_routing.dynamic.persistence.orm.manager_name'),
107+
],
108+
['cmf_routing.dynamic.persistence.orm.manager_name'],
101109
'cmf_routing.backend_type_orm_default',
102-
array('CmfRoutingBundle' => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm')
110+
['CmfRoutingBundle' => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm']
103111
)
104112
);
105113

106114
$container->addCompilerPass(
107115
$doctrineOrmCompiler::createXmlMappingDriver(
108-
array(
116+
[
109117
realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
110-
),
111-
array('cmf_routing.dynamic.persistence.orm.manager_name'),
118+
],
119+
['cmf_routing.dynamic.persistence.orm.manager_name'],
112120
'cmf_routing.backend_type_orm_custom',
113-
array()
121+
[]
114122
)
115123
);
116124
}
@@ -125,14 +133,14 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
125133
*/
126134
private function findDoctrineOrmCompiler()
127135
{
128-
if (class_exists('Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass')
129-
&& class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')
136+
if (class_exists(RegisterMappingsPass::class)
137+
&& class_exists(DoctrineOrmMappingsPass::class)
130138
) {
131-
return 'Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass';
139+
return DoctrineOrmMappingsPass::class;
132140
}
133141

134-
if (class_exists('Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
135-
return 'Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass';
142+
if (class_exists(CmfDoctrineOrmMappingsPass::class)) {
143+
return CmfDoctrineOrmMappingsPass::class;
136144
}
137145

138146
return false;
@@ -151,14 +159,14 @@ private function findDoctrineOrmCompiler()
151159
*/
152160
private function buildBaseCompilerPass($compilerClass, $driverClass, $type)
153161
{
154-
$arguments = array(array(realpath(__DIR__.'/Resources/config/doctrine-base')), sprintf('.%s.xml', $type));
155-
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\DefaultFileLocator', $arguments);
156-
$driver = new Definition($driverClass, array($locator));
162+
$arguments = [[realpath(__DIR__.'/Resources/config/doctrine-base')], sprintf('.%s.xml', $type)];
163+
$locator = new Definition(DefaultFileLocator::class, $arguments);
164+
$driver = new Definition($driverClass, [$locator]);
157165

158166
return new $compilerClass(
159167
$driver,
160-
array('Symfony\Component\Routing'),
161-
array(sprintf('cmf_routing.dynamic.persistence.%s.manager_name', $type)),
168+
['Symfony\Component\Routing'],
169+
[sprintf('cmf_routing.dynamic.persistence.%s.manager_name', $type)],
162170
sprintf('cmf_routing.backend_type_%s', $type)
163171
);
164172
}

‎src/DependencyInjection/CmfRoutingExtension.php

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ private function setupChainRouter(array $config, ContainerBuilder $container, Lo
5454
// add the routers defined in the configuration mapping
5555
$router = $container->getDefinition('cmf_routing.router');
5656
foreach ($config['chain']['routers_by_id'] as $id => $priority) {
57-
$router->addMethodCall('add', array(new Reference($id), trim($priority)));
57+
$router->addMethodCall('add', [new Reference($id), trim($priority)]);
5858
}
5959
}
6060

6161
private function setupFormTypes(array $config, ContainerBuilder $container, LoaderInterface $loader)
6262
{
6363
$loader->load('form-type.xml');
6464

65-
if (isset($config['dynamic'])) {
65+
if (array_key_exists('dynamic', $config)) {
6666
$routeTypeTypeDefinition = $container->getDefinition('cmf_routing.route_type_form_type');
6767

6868
foreach (array_keys($config['dynamic']['controllers_by_type']) as $routeType) {
69-
$routeTypeTypeDefinition->addMethodCall('addRouteType', array($routeType));
69+
$routeTypeTypeDefinition->addMethodCall('addRouteType', [$routeType]);
7070
}
7171
}
7272
}
@@ -83,7 +83,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
8383
$loader->load('routing-dynamic.xml');
8484

8585
// strip whitespace (XML support)
86-
foreach (array('controllers_by_type', 'controllers_by_class', 'templates_by_class', 'route_filters_by_id') as $option) {
86+
foreach (['controllers_by_type', 'controllers_by_class', 'templates_by_class', 'route_filters_by_id'] as $option) {
8787
$config[$option] = array_map('trim', $config[$option]);
8888
}
8989

@@ -98,7 +98,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
9898
throw new InvalidConfigurationException('It makes no sense to activate auto_locale_pattern when no locales are configured.');
9999
}
100100

101-
$this->configureParameters($container, $config, array(
101+
$this->configureParameters($container, $config, [
102102
'generic_controller' => 'generic_controller',
103103
'controllers_by_type' => 'controllers_by_type',
104104
'controllers_by_class' => 'controllers_by_class',
@@ -108,7 +108,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
108108
'limit_candidates' => 'dynamic.limit_candidates',
109109
'locales' => 'dynamic.locales',
110110
'auto_locale_pattern' => 'dynamic.auto_locale_pattern',
111-
));
111+
]);
112112

113113
$hasProvider = false;
114114
$hasContentRepository = false;
@@ -118,7 +118,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
118118
}
119119

120120
if ($config['persistence']['orm']['enabled']) {
121-
$this->loadOrmProvider($config['persistence']['orm'], $loader, $container, $locales, $config['match_implicit_locale']);
121+
$this->loadOrmProvider($config['persistence']['orm'], $loader, $container, $config['match_implicit_locale']);
122122
$hasProvider = $hasContentRepository = true;
123123
}
124124

@@ -139,27 +139,27 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
139139
// content repository is optional
140140
if ($hasContentRepository) {
141141
$generator = $container->getDefinition('cmf_routing.generator');
142-
$generator->addMethodCall('setContentRepository', array(new Reference('cmf_routing.content_repository')));
142+
$generator->addMethodCall('setContentRepository', [new Reference('cmf_routing.content_repository')]);
143143
$container->getDefinition('cmf_routing.enhancer.content_repository')
144-
->addTag('dynamic_router_route_enhancer', array('priority' => 100));
144+
->addTag('dynamic_router_route_enhancer', ['priority' => 100]);
145145
}
146146

147147
$dynamic = $container->getDefinition('cmf_routing.dynamic_router');
148148

149149
// if any mappings are defined, set the respective route enhancer
150150
if (count($config['controllers_by_type']) > 0) {
151151
$container->getDefinition('cmf_routing.enhancer.controllers_by_type')
152-
->addTag('dynamic_router_route_enhancer', array('priority' => 60));
152+
->addTag('dynamic_router_route_enhancer', ['priority' => 60]);
153153
}
154154

155155
if (count($config['controllers_by_class']) > 0) {
156156
$container->getDefinition('cmf_routing.enhancer.controllers_by_class')
157-
->addTag('dynamic_router_route_enhancer', array('priority' => 50));
157+
->addTag('dynamic_router_route_enhancer', ['priority' => 50]);
158158
}
159159

160160
if (count($config['templates_by_class']) > 0) {
161161
$container->getDefinition('cmf_routing.enhancer.templates_by_class')
162-
->addTag('dynamic_router_route_enhancer', array('priority' => 40));
162+
->addTag('dynamic_router_route_enhancer', ['priority' => 40]);
163163

164164
/*
165165
* The CoreBundle prepends the controller from ContentBundle if the
@@ -174,7 +174,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
174174
}
175175

176176
// if the content class defines the template, we also need to make sure we use the generic controller for those routes
177-
$controllerForTemplates = array();
177+
$controllerForTemplates = [];
178178
foreach ($config['templates_by_class'] as $key => $value) {
179179
$controllerForTemplates[$key] = $config['generic_controller'];
180180
}
@@ -183,31 +183,31 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
183183
$definition->replaceArgument(2, $controllerForTemplates);
184184

185185
$container->getDefinition('cmf_routing.enhancer.controller_for_templates_by_class')
186-
->addTag('dynamic_router_route_enhancer', array('priority' => 30));
186+
->addTag('dynamic_router_route_enhancer', ['priority' => 30]);
187187
}
188188

189189
if (null !== $config['generic_controller'] && $defaultController !== $config['generic_controller']) {
190190
$container->getDefinition('cmf_routing.enhancer.explicit_template')
191-
->addTag('dynamic_router_route_enhancer', array('priority' => 10));
191+
->addTag('dynamic_router_route_enhancer', ['priority' => 10]);
192192
}
193193

194194
if (null !== $defaultController) {
195195
$container->getDefinition('cmf_routing.enhancer.default_controller')
196-
->addTag('dynamic_router_route_enhancer', array('priority' => -100));
196+
->addTag('dynamic_router_route_enhancer', ['priority' => -100]);
197197
}
198198

199199
if (count($config['route_filters_by_id']) > 0) {
200200
$matcher = $container->getDefinition('cmf_routing.nested_matcher');
201201

202202
foreach ($config['route_filters_by_id'] as $id => $priority) {
203-
$matcher->addMethodCall('addRouteFilter', array(new Reference($id), $priority));
203+
$matcher->addMethodCall('addRouteFilter', [new Reference($id), $priority]);
204204
}
205205
}
206206

207207
$dynamic->replaceArgument(2, new Reference($config['url_generator']));
208208
}
209209

210-
private function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuilder $container, array $locales, $matchImplicitLocale)
210+
private function loadPhpcrProvider(array $config, LoaderInterface $loader, ContainerBuilder $container, array $locales, $matchImplicitLocale)
211211
{
212212
$loader->load('provider-phpcr.xml');
213213

@@ -222,29 +222,17 @@ private function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuil
222222
} elseif (!$matchImplicitLocale) {
223223
// remove all but the prefixes configuration from the service definition.
224224
$definition = $container->getDefinition('cmf_routing.phpcr_candidates_prefix');
225-
$definition->setArguments(array($definition->getArgument(0)));
225+
$definition->setArguments([$definition->getArgument(0)]);
226226
}
227227

228-
if ($config['enable_initializer']) {
229-
$this->loadInitializer($config, $loader, $container);
228+
if (true === $config['enable_initializer']) {
229+
$this->loadInitializer($loader, $container);
230230
}
231231
}
232232

233-
/**
234-
* @param array $config
235-
* @param XmlFileLoader $loader
236-
* @param ContainerBuilder $container
237-
*/
238-
private function loadInitializer($config, XmlFileLoader $loader, ContainerBuilder $container)
233+
private function loadInitializer(LoaderInterface $loader, ContainerBuilder $container)
239234
{
240-
$initializedBasepaths = array();
241-
if ('auto' === $config['enable_initializer'] && empty($initializedBasepaths)) {
242-
return;
243-
}
244-
245-
if (true === $config['enable_initializer'] && empty($initializedBasepaths)) {
246-
$initializedBasepaths = $container->getParameter($this->getAlias().'.dynamic.persistence.phpcr.route_basepaths');
247-
}
235+
$initializedBasepaths = $container->getParameter($this->getAlias().'.dynamic.persistence.phpcr.route_basepaths');
248236

249237
$container->setParameter(
250238
$this->getAlias().'.dynamic.persistence.phpcr.initialized_basepaths',
@@ -254,7 +242,7 @@ private function loadInitializer($config, XmlFileLoader $loader, ContainerBuilde
254242
$loader->load('initializer-phpcr.xml');
255243
}
256244

257-
private function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container, $matchImplicitLocale)
245+
private function loadOrmProvider(array $config, LoaderInterface $loader, ContainerBuilder $container, $matchImplicitLocale)
258246
{
259247
$loader->load('provider-orm.xml');
260248

@@ -269,7 +257,7 @@ private function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilde
269257

270258
if (!$matchImplicitLocale) {
271259
// remove the locales argument from the candidates
272-
$container->getDefinition('cmf_routing.orm_candidates')->setArguments(array());
260+
$container->getDefinition('cmf_routing.orm_candidates')->setArguments([]);
273261
}
274262
}
275263

0 commit comments

Comments
 (0)