diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php index 08d98d96cc..ae0a1c55aa 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php +++ b/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; } diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php index b0556f7b0a..14a0decea7 100644 --- a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php +++ b/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 { diff --git a/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php index 042d4a9702..2e5ac3fef2 100644 --- a/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php +++ b/tests/Symfony/Tests/Bridge/Doctrine/Fixtures/AssociationEntity.php @@ -31,4 +31,4 @@ class AssociationEntity * @var \Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity */ public $composite; -} \ No newline at end of file +} diff --git a/tests/Symfony/Tests/Component/HttpFoundation/SessionTest.php b/tests/Symfony/Tests/Component/HttpFoundation/SessionTest.php index d5f615a6b1..8318101e66 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/SessionTest.php +++ b/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(), diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php index 4e5f74c213..3eb13e07fe 100644 --- a/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php +++ b/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(); diff --git a/tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php b/tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php index 342bab0b31..2ed569afe5 100644 --- a/tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php +++ b/tests/Symfony/Tests/Component/Routing/RouteCompilerTest.php @@ -98,4 +98,4 @@ class RouteCompilerTest extends \PHPUnit_Framework_TestCase )), ); } -} \ No newline at end of file +}