Merge branch '3.2' into 3.3

* 3.2: Fix indent of methods
symfony · Jul 5, 2017 · 5768424 · 5768424
2 parents 56f72d7 + f3cba17
commit 5768424
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
@@ -78,27 +78,27 @@ public function testSecurityConfigurationForMultipleIPAddresses($config)
         $this->assertRestricted($barredClient, '/secured-by-two-ips');
     }
 
-   /**
-    * @dataProvider getConfigs
-    */
-   public function testSecurityConfigurationForExpression($config)
-   {
-       $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('HTTP_USER_AGENT' => 'Firefox 1.0'));
-       $this->assertAllowed($allowedClient, '/protected-via-expression');
-
-       $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
-       $this->assertRestricted($barredClient, '/protected-via-expression');
-
-       $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
-
-       $allowedClient->request('GET', '/protected-via-expression');
-       $form = $allowedClient->followRedirect()->selectButton('login')->form();
-       $form['_username'] = 'johannes';
-       $form['_password'] = 'test';
-       $allowedClient->submit($form);
-       $this->assertRedirect($allowedClient->getResponse(), '/protected-via-expression');
-       $this->assertAllowed($allowedClient, '/protected-via-expression');
-   }
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testSecurityConfigurationForExpression($config)
+    {
+        $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('HTTP_USER_AGENT' => 'Firefox 1.0'));
+        $this->assertAllowed($allowedClient, '/protected-via-expression');
+
+        $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
+        $this->assertRestricted($barredClient, '/protected-via-expression');
+
+        $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
+
+        $allowedClient->request('GET', '/protected-via-expression');
+        $form = $allowedClient->followRedirect()->selectButton('login')->form();
+        $form['_username'] = 'johannes';
+        $form['_password'] = 'test';
+        $allowedClient->submit($form);
+        $this->assertRedirect($allowedClient->getResponse(), '/protected-via-expression');
+        $this->assertAllowed($allowedClient, '/protected-via-expression');
+    }
 
     private function assertAllowed($client, $path)
     {