Merge branch '2.0'

* 2.0:
  fixed CS

src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

@@ -45,6 +45,7 @@ class FirePHPHandler extends BaseFirePHPHandler
         if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))) {
             $this->sendHeaders = false;
             $this->headers = array();
+
             return;
         }
 

src/Symfony/Component/Security/Core/User/ChainUserProvider.php

@@ -64,7 +64,7 @@ class ChainUserProvider implements UserProviderInterface
                 // try next one
             }
         }
-        
+
         if ($supportedUserFound) {
             throw new UsernameNotFoundException(sprintf('There is no user with name "%s".', $user->getUsername()));
         } else {

tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php

@@ -31,4 +31,4 @@ class AssociationEntity
      * @var \Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity
      */
     public $composite;
-}
+}

tests/Symfony/Tests/Component/HttpFoundation/SessionTest.php

@@ -170,13 +170,13 @@ class SessionTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(array(), $this->session->getFlashes());
         $this->assertSame(array(), $this->session->all());
     }
-    
+
     public function testSavedOnDestruct()
     {
         $this->session->set('foo', 'bar');
-        
+
         $this->session->__destruct();
-        
+
         $expected = array(
             'attributes'=>array('foo'=>'bar'),
             'flashes'=>array(),
@@ -184,15 +184,15 @@ class SessionTest extends \PHPUnit_Framework_TestCase
         $saved = $this->storage->read('_symfony2');
         $this->assertSame($expected, $saved);
     }
-    
+
     public function testSavedOnDestructAfterManualSave()
     {
         $this->session->set('foo', 'nothing');
         $this->session->save();
         $this->session->set('foo', 'bar');
-        
+
         $this->session->__destruct();
-        
+
         $expected = array(
             'attributes'=>array('foo'=>'bar'),
             'flashes'=>array(),

tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php

@@ -160,7 +160,7 @@ class UrlMatcherTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.urlencode($chars).'/bar'));
         $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.strtr($chars, array('%' => '%25', '+' => '%2B')).'/bar'));
     }
-    
+
     public function testMatchWithDotMetacharacterInRequirements()
     {
         $collection = new RouteCollection();

tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php

@@ -98,4 +98,4 @@ class RouteCompilerTest extends \PHPUnit_Framework_TestCase
                 )),
         );
     }
-}
+}