Fabien Potencier 14 anos atrás
pai
commit
8700cd6154

+ 1 - 1
src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class WebProcessor extends BaseWebProcessor
 {
-    public function __construct(RequestInterface $request) 
+    public function __construct(RequestInterface $request)
     {
         parent::__construct($request->server->all());
     }

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php

@@ -12,4 +12,4 @@ class AuthenticationCommencingTest extends WebTestCase
         $client->request('GET', '/secure-but-not-covered-by-access-control');
         $this->assertRedirect($client->getResponse(), '/login');
     }
-}
+}

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php

@@ -48,4 +48,4 @@ class LocalizedController extends ContainerAware
     {
         return new Response('Homepage');
     }
-}
+}

+ 3 - 4
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/localized_routing.yml

@@ -7,7 +7,7 @@ localized_check_path:
     pattern: /{_locale}/login_check
     defaults: { _controller: FormLoginBundle:Localized:loginCheck }
     requirements: { _locale: "^[a-z]{2}$" }
-    
+
 localized_default_target_path:
     pattern: /{_locale}/profile
     defaults: { _controller: FormLoginBundle:Localized:profile }
@@ -17,14 +17,13 @@ localized_logout_path:
     pattern: /{_locale}/logout
     defaults: { _controller: FormLoginBundle:Localized:logout }
     requirements: { _locale: "^[a-z]{2}$" }
-    
+
 localized_logout_target_path:
     pattern: /{_locale}/
     defaults: { _controller: FormLoginBundle:Localized:homepage }
     requirements: { _locale: "^[a-z]{2}$" }
-    
+
 localized_secure_path:
     pattern: /{_locale}/secure/
     defaults: { _controller: FormLoginBundle:Localized:secure }
     requirements: { _locale: "^[a-z]{2}$" }
-    

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/routing.yml

@@ -27,4 +27,4 @@ form_logout:
 
 form_secure_action:
     pattern: /secure-but-not-covered-by-access-control
-    defaults: { _controller: FormLoginBundle:Login:secure }
+    defaults: { _controller: FormLoginBundle:Login:secure }

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php

@@ -68,4 +68,4 @@ class LocalizedRoutesAsPathTest extends WebTestCase
 
         $this->deleteTmpDir('StandardFormLogin');
     }
-}
+}

+ 4 - 5
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_routes.yml

@@ -1,6 +1,6 @@
 imports:
     - { resource: ./../config/default.yml }
-    
+
 security:
     encoders:
         Symfony\Component\Security\Core\User\User: plaintext
@@ -9,7 +9,7 @@ security:
         in_memory:
             users:
                 johannes: { password: test, roles: [ROLE_USER] }
-                
+
     firewalls:
         default:
             form_login:
@@ -20,7 +20,6 @@ security:
                 path: localized_logout_path
                 target: localized_logout_target_path
             anonymous: ~
-            
+
     access_control:
-        - { path: '^/(?:[a-z]{2})/secure/.*', roles: ROLE_USER }       
-    
+        - { path: '^/(?:[a-z]{2})/secure/.*', roles: ROLE_USER }

+ 2 - 2
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_routes_with_forward.yml

@@ -1,8 +1,8 @@
 imports:
     - { resource: ./localized_routes.yml }
-    
+
 security:
-    firewalls: 
+    firewalls:
         default:
             form_login:
                 use_forward: true

+ 3 - 3
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/routes_as_path.yml

@@ -1,8 +1,8 @@
 imports:
     - { resource: ./config.yml }
-    
+
 security:
-    firewalls: 
+    firewalls:
         default:
             form_login:
                 login_path: form_login
@@ -10,4 +10,4 @@ security:
                 default_target_path: form_login_default_target_path
             logout:
                 path: form_logout
-                target: form_login_homepage
+                target: form_login_homepage

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/routing.yml

@@ -2,4 +2,4 @@ _form_login_bundle:
     resource: @FormLoginBundle/Resources/config/routing.yml
 
 _form_login_localized:
-    resource: @FormLoginBundle/Resources/config/localized_routing.yml
+    resource: @FormLoginBundle/Resources/config/localized_routing.yml

+ 1 - 1
src/Symfony/Component/HttpFoundation/Request.php

@@ -212,7 +212,7 @@ class Request
             $defaults['SERVER_PORT'] = $components['port'];
             $defaults['HTTP_HOST'] = $defaults['HTTP_HOST'].':'.$components['port'];
         }
-        
+
         if (!isset($components['path'])) {
             $components['path'] = '';
         }

+ 2 - 2
tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

@@ -132,7 +132,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
         $this->assertEquals($dateTime->format('d.m.Y H:i'), $transformer->transform($input));
     }
-    
+
     public function testTransform_differentPatterns()
     {
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
@@ -238,7 +238,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
         $this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010 04:05', null));
     }
-    
+
     public function testReverseTransform_differentPatterns()
     {
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');

+ 2 - 2
tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php

@@ -604,13 +604,13 @@ class DateTypeTest extends LocalizedTestCase
 
         $this->assertSame('{{ day }}.{{ month }}.{{ year }}', $view->get('date_pattern'));
     }
-    
+
     public function testPassDatePatternToViewDifferentPattern()
     {
         $form = $this->factory->create('date', null, array(
             'format' => 'MM*yyyy*dd'
         ));
-        
+
         $view = $form->createView();
 
         $this->assertSame('{{ month }}*{{ year }}*{{ day }}', $view->get('date_pattern'));

+ 3 - 3
tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php

@@ -111,7 +111,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
         $request = Request::create('http://example.com/jsonrpc', 'POST', array(), array(), array(), array(), $json);
         $this->assertEquals($json, $request->getContent());
         $this->assertFalse($request->isSecure());
-        
+
         $request = Request::create('http://test.com');
         $this->assertEquals('http://test.com/', $request->getUri());
         $this->assertEquals('/', $request->getPathInfo());
@@ -119,7 +119,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(80, $request->getPort());
         $this->assertEquals('test.com', $request->getHttpHost());
         $this->assertFalse($request->isSecure());
-        
+
         $request = Request::create('http://test.com:90/?test=1');
         $this->assertEquals('http://test.com:90/?test=1', $request->getUri());
         $this->assertEquals('/', $request->getPathInfo());
@@ -127,7 +127,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(90, $request->getPort());
         $this->assertEquals('test.com:90', $request->getHttpHost());
         $this->assertFalse($request->isSecure());
-        
+
     }
 
     /**