Remove aligned '=>' and '='

polc · fabpot · commit 53c144e5fdd0 · 2014-10-26T08:30:58.000+01:00
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -37,27 +37,27 @@ public function collect(Request $request, Response $response, \Exception $except
     {
         if (null === $this->context) {
             $this->data = array(
-                'enabled'       => false,
+                'enabled' => false,
                 'authenticated' => false,
-                'token_class'   => null,
-                'user'          => '',
-                'roles'         => array(),
+                'token_class' => null,
+                'user' => '',
+                'roles' => array(),
             );
         } elseif (null === $token = $this->context->getToken()) {
             $this->data = array(
-                'enabled'       => true,
+                'enabled' => true,
                 'authenticated' => false,
-                'token_class'   => null,
-                'user'          => '',
-                'roles'         => array(),
+                'token_class' => null,
+                'user' => '',
+                'roles' => array(),
             );
         } else {
             $this->data = array(
-                'enabled'       => true,
+                'enabled' => true,
                 'authenticated' => $token->isAuthenticated(),
-                'token_class'   => get_class($token),
-                'user'          => $token->getUsername(),
-                'roles'         => array_map(function ($role) { return $role->getRole();}, $token->getRoles()),
+                'token_class' => get_class($token),
+                'user' => $token->getUsername(),
+                'roles' => array_map(function ($role) { return $role->getRole();}, $token->getRoles()),
             );
         }
     }
diff --git a/DependencyInjection/Security/Factory/AbstractFactory.php b/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -27,24 +27,24 @@
 abstract class AbstractFactory implements SecurityFactoryInterface
 {
     protected $options = array(
-        'check_path'                     => '/login_check',
-        'use_forward'                    => false,
-        'require_previous_session'       => true,
+        'check_path' => '/login_check',
+        'use_forward' => false,
+        'require_previous_session' => true,
     );
 
     protected $defaultSuccessHandlerOptions = array(
         'always_use_default_target_path' => false,
-        'default_target_path'            => '/',
-        'login_path'                     => '/login',
-        'target_path_parameter'          => '_target_path',
-        'use_referer'                    => false,
+        'default_target_path' => '/',
+        'login_path' => '/login',
+        'target_path_parameter' => '_target_path',
+        'use_referer' => false,
     );
 
     protected $defaultFailureHandlerOptions = array(
-        'failure_path'                   => null,
-        'failure_forward'                => false,
-        'login_path'                     => '/login',
-        'failure_path_parameter'         => '_failure_path',
+        'failure_path' => null,
+        'failure_forward' => false,
+        'login_path' => '/login',
+        'failure_path_parameter' => '_failure_path',
     );
 
     public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -135,8 +135,8 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
             ->getDefinition('security.acl.dbal.schema_listener')
             ->addTag('doctrine.event_listener', array(
                 'connection' => $config['connection'],
-                'event'      => 'postGenerateSchema',
-                'lazy'       => true,
+                'event' => 'postGenerateSchema',
+                'lazy' => true,
             ))
         ;
 
@@ -281,8 +281,8 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             $listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.logout_listener'));
             $listener->replaceArgument(3, array(
                 'csrf_parameter' => $firewall['logout']['csrf_parameter'],
-                'intention'      => $firewall['logout']['intention'],
-                'logout_path'    => $firewall['logout']['path'],
+                'intention' => $firewall['logout']['intention'],
+                'logout_path' => $firewall['logout']['path'],
             ));
             $listeners[] = new Reference($listenerId);
 
@@ -452,7 +452,7 @@ private function createEncoder($config, ContainerBuilder $container)
         // pbkdf2 encoder
         if ('pbkdf2' === $config['algorithm']) {
             return array(
-                'class'     => new Parameter('security.encoder.pbkdf2.class'),
+                'class' => new Parameter('security.encoder.pbkdf2.class'),
                 'arguments' => array(
                     $config['hash_algorithm'],
                     $config['encode_as_base64'],
@@ -465,14 +465,14 @@ private function createEncoder($config, ContainerBuilder $container)
         // bcrypt encoder
         if ('bcrypt' === $config['algorithm']) {
             return array(
-                'class'     => new Parameter('security.encoder.bcrypt.class'),
+                'class' => new Parameter('security.encoder.bcrypt.class'),
                 'arguments' => array($config['cost']),
             );
         }
 
         // message digest encoder
         return array(
-            'class'     => new Parameter('security.encoder.digest.class'),
+            'class' => new Parameter('security.encoder.digest.class'),
             'arguments' => array(
                 $config['algorithm'],
                 $config['encode_as_base64'],
diff --git a/Tests/DependencyInjection/CompleteConfigurationTest.php b/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -26,9 +26,9 @@ public function testRolesHierarchy()
     {
         $container = $this->getContainer('container1');
         $this->assertEquals(array(
-            'ROLE_ADMIN'       => array('ROLE_USER'),
+            'ROLE_ADMIN' => array('ROLE_USER'),
             'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),
-            'ROLE_REMOTE'      => array('ROLE_USER', 'ROLE_ADMIN'),
+            'ROLE_REMOTE' => array('ROLE_USER', 'ROLE_ADMIN'),
         ), $container->getParameter('security.role_hierarchy.roles'));
     }
 
diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -36,7 +36,7 @@ public function testCreate()
             'index_5' => new Reference('qux'),
             'index_6' => new Reference('bar'),
             'index_7' => array(
-                'use_forward'                    => true,
+                'use_forward' => true,
             ),
         ), $definition->getArguments());
 
diff --git a/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php b/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
@@ -22,7 +22,7 @@ public function loginAction()
         $form = $this->container->get('form.factory')->create('user_login');
 
         return $this->container->get('templating')->renderResponse('CsrfFormLoginBundle:Login:login.html.twig', array(
-            'form'  => $form->createView(),
+            'form' => $form->createView(),
         ));
     }
 
diff --git a/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php b/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
@@ -29,7 +29,7 @@ public function loginAction()
         return $this->container->get('templating')->renderResponse('FormLoginBundle:Localized:login.html.twig', array(
             // last username entered by the user
             'last_username' => $this->container->get('request')->getSession()->get(SecurityContext::LAST_USERNAME),
-            'error'         => $error,
+            'error' => $error,
         ));
     }
 
diff --git a/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php b/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
@@ -30,7 +30,7 @@ public function loginAction()
         return $this->container->get('templating')->renderResponse('FormLoginBundle:Login:login.html.twig', array(
             // last username entered by the user
             'last_username' => $this->container->get('request')->getSession()->get(SecurityContext::LAST_USERNAME),
-            'error'         => $error,
+            'error' => $error,
         ));
     }
 
diff --git a/Tests/Functional/SwitchUserTest.php b/Tests/Functional/SwitchUserTest.php
@@ -54,10 +54,10 @@ public function testSwitchedUserExit()
     public function getTestParameters()
     {
         return array(
-            'unauthorized_user_cannot_switch'               => array('user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403),
-            'authorized_user_can_switch'                    => array('user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200),
+            'unauthorized_user_cannot_switch' => array('user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403),
+            'authorized_user_can_switch' => array('user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200),
             'authorized_user_cannot_switch_to_non_existent' => array('user_can_switch', 'user_does_not_exist', 'user_can_switch', 500),
-            'authorized_user_can_switch_to_himself'         => array('user_can_switch', 'user_can_switch', 'user_can_switch', 200),
+            'authorized_user_can_switch_to_himself' => array('user_can_switch', 'user_can_switch', 'user_can_switch', 200),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public function testRolesHierarchy()`
`26`	`26`	`{`
`27`	`27`	`$container = $this->getContainer('container1');`
`28`	`28`	`$this->assertEquals(array(`
`29`		`- 'ROLE_ADMIN' => array('ROLE_USER'),`
	`29`	`+ 'ROLE_ADMIN' => array('ROLE_USER'),`
`30`	`30`	`'ROLE_SUPER_ADMIN' => array('ROLE_USER', 'ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'),`
`31`		`- 'ROLE_REMOTE' => array('ROLE_USER', 'ROLE_ADMIN'),`
	`31`	`+ 'ROLE_REMOTE' => array('ROLE_USER', 'ROLE_ADMIN'),`
`32`	`32`	`), $container->getParameter('security.role_hierarchy.roles'));`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function loginAction()`
`22`	`22`	`$form = $this->container->get('form.factory')->create('user_login');`
`23`	`23`
`24`	`24`	`return $this->container->get('templating')->renderResponse('CsrfFormLoginBundle:Login:login.html.twig', array(`
`25`		`- 'form' => $form->createView(),`
	`25`	`+ 'form' => $form->createView(),`
`26`	`26`	`));`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function loginAction()`
`29`	`29`	`return $this->container->get('templating')->renderResponse('FormLoginBundle:Localized:login.html.twig', array(`
`30`	`30`	`// last username entered by the user`
`31`	`31`	`'last_username' => $this->container->get('request')->getSession()->get(SecurityContext::LAST_USERNAME),`
`32`		`- 'error' => $error,`
	`32`	`+ 'error' => $error,`
`33`	`33`	`));`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function loginAction()`
`30`	`30`	`return $this->container->get('templating')->renderResponse('FormLoginBundle:Login:login.html.twig', array(`
`31`	`31`	`// last username entered by the user`
`32`	`32`	`'last_username' => $this->container->get('request')->getSession()->get(SecurityContext::LAST_USERNAME),`
`33`		`- 'error' => $error,`
	`33`	`+ 'error' => $error,`
`34`	`34`	`));`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ public function testSwitchedUserExit()`
`54`	`54`	`public function getTestParameters()`
`55`	`55`	`{`
`56`	`56`	`return array(`
`57`		`- 'unauthorized_user_cannot_switch' => array('user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403),`
`58`		`- 'authorized_user_can_switch' => array('user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200),`
	`57`	`+ 'unauthorized_user_cannot_switch' => array('user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403),`
	`58`	`+ 'authorized_user_can_switch' => array('user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200),`
`59`	`59`	`'authorized_user_cannot_switch_to_non_existent' => array('user_can_switch', 'user_does_not_exist', 'user_can_switch', 500),`
`60`		`- 'authorized_user_can_switch_to_himself' => array('user_can_switch', 'user_can_switch', 'user_can_switch', 200),`
	`60`	`+ 'authorized_user_can_switch_to_himself' => array('user_can_switch', 'user_can_switch', 'user_can_switch', 200),`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`