Skip to content

Commit f7de540

Browse files
committed
wip cs fix
1 parent 2fbdd0f commit f7de540

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+249
-273
lines changed

Admin/Extension/FrontendLinkExtension.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class FrontendLinkExtension extends AdminExtension
4141
private $translator;
4242

4343
/**
44-
* @param RouterInterface $router
44+
* @param RouterInterface $router
4545
* @param TranslatorInterface $translator
4646
*/
4747
public function __construct(RouterInterface $router, TranslatorInterface $translator)
@@ -99,16 +99,15 @@ public function configureTabMenu(
9999
'uri' => $uri,
100100
'attributes' => array(
101101
'class' => 'sonata-admin-menu-item',
102-
'role' => 'menuitem'
102+
'role' => 'menuitem',
103103
),
104104
'linkAttributes' => array(
105105
'class' => 'sonata-admin-frontend-link',
106106
'role' => 'button',
107107
'target' => '_blank',
108-
'title' => $this->translator->trans('admin.menu_frontend_link_title', array(), 'CmfRoutingBundle')
109-
)
108+
'title' => $this->translator->trans('admin.menu_frontend_link_title', array(), 'CmfRoutingBundle'),
109+
),
110110
)
111111
);
112112
}
113-
114113
}

Admin/RedirectRouteAdmin.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ class RedirectRouteAdmin extends Admin
2222
{
2323
protected $translationDomain = 'CmfRoutingBundle';
2424

25-
/**
26-
* Root path for the route parent selection
25+
/**
26+
* Root path for the route parent selection.
27+
*
2728
* @var string
2829
*/
2930
protected $routeRoot;

Admin/RouteAdmin.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,22 @@ class RouteAdmin extends Admin
2525
protected $translationDomain = 'CmfRoutingBundle';
2626

2727
/**
28-
* Root path for the route parent selection
28+
* Root path for the route parent selection.
29+
*
2930
* @var string
3031
*/
3132
protected $routeRoot;
3233

3334
/**
34-
* Root path for the route content selection
35+
* Root path for the route content selection.
36+
*
3537
* @var string
3638
*/
3739
protected $contentRoot;
3840

3941
/**
40-
* Full class name for content that can be referenced by a route
42+
* Full class name for content that can be referenced by a route.
43+
*
4144
* @var string
4245
*/
4346
protected $contentClass;
@@ -156,7 +159,7 @@ protected function configureFieldsForDefaults($dynamicDefaults)
156159

157160
//parse variable pattern and add defaults for tokens - taken from routecompiler
158161
/** @var $route Route */
159-
$route = $this->subject;
162+
$route = $this->subject;
160163
if ($route && $route->getVariablePattern()) {
161164
preg_match_all('#\{\w+\}#', $route->getVariablePattern(), $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
162165
foreach ($matches as $match) {

CmfRoutingBundle.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
2222

2323
/**
24-
* Bundle class
24+
* Bundle class.
2525
*/
2626
class CmfRoutingBundle extends Bundle
2727
{
@@ -92,8 +92,8 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
9292
$container->addCompilerPass(
9393
$doctrineOrmCompiler::createXmlMappingDriver(
9494
array(
95-
realpath(__DIR__ . '/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
96-
realpath(__DIR__ . '/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
95+
realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
96+
realpath(__DIR__.'/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
9797
),
9898
array('cmf_routing.dynamic.persistence.orm.manager_name'),
9999
'cmf_routing.backend_type_orm',
@@ -107,8 +107,8 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
107107
* DoctrineBundle (available only since DoctrineBundle 2.4 and Symfony 2.3)
108108
* Otherwise use the standalone one from CmfCoreBundle.
109109
*
110-
* @return boolean|string the compiler pass to use or false if no suitable
111-
* one was found
110+
* @return bool|string the compiler pass to use or false if no suitable
111+
* one was found
112112
*/
113113
private function findDoctrineOrmCompiler()
114114
{
@@ -138,7 +138,7 @@ private function findDoctrineOrmCompiler()
138138
*/
139139
private function buildBaseCompilerPass($compilerClass, $driverClass, $type)
140140
{
141-
$arguments = array(array(realpath(__DIR__ . '/Resources/config/doctrine-base')), sprintf('.%s.xml', $type));
141+
$arguments = array(array(realpath(__DIR__.'/Resources/config/doctrine-base')), sprintf('.%s.xml', $type));
142142
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\DefaultFileLocator', $arguments);
143143
$driver = new Definition($driverClass, array($locator));
144144

Controller/RedirectController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Routing\RouterInterface;
1515
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
1616
use Symfony\Component\HttpFoundation\RedirectResponse;
17-
1817
use Symfony\Cmf\Component\Routing\RedirectRouteInterface;
1918

2019
/**
@@ -41,7 +40,7 @@ public function __construct(RouterInterface $router)
4140
}
4241

4342
/**
44-
* Action to redirect based on a RedirectRouteInterface route
43+
* Action to redirect based on a RedirectRouteInterface route.
4544
*
4645
* @param RedirectRouteInterface $contentDocument
4746
*

0 commit comments

Comments
 (0)