8000 Merge branch '2.0' · symfony/symfony@99a96d3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 99a96d3

Browse files
committed
Merge branch '2.0'
* 2.0: fixed CS
2 parents 8550f37 + 68b7662 commit 99a96d3

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function onKernelResponse(FilterResponseEvent $event)
4545
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))) {
4646
$this->sendHeaders = false;
4747
$this->headers = array();
48+
4849
return;
4950
}
5051

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

< 8000 div class="d-flex flex-row flex-justify-end flex-1 flex-order-1 flex-sm-order-2 flex-items-center">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function refreshUser(UserInterface $user)
6464
// try next one
6565
}
6666
}
67-
67+
6868
if ($supportedUserFound) {
6969
throw new UsernameNotFoundException(sprintf('There is no user with name "%s".', $user->getUsername()));
7070
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ class AssociationEntity
3131
* @var \Symfony\Tests\Bridge\Doctrine\Form\Fixtures\CompositeIdentEntity
3232
*/
3333
public $composite;
34-
}
34+
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,29 @@ public function testStart()
170170
$this->assertSame(array(), $this->session->getFlashes());
171171
$this->assertSame(array(), $this->session->all());
172172
}
173-
173+
174174
public function testSavedOnDestruct()
175175
{
176176
$this->session->set('foo', 'bar');
177-
177+
178178
$this->session->__destruct();
179-
179+
180180
$expected = array(
181181
'attributes'=>array('foo'=>'bar'),
182182
'flashes'=>array(),
183183
);
184184
$saved = $this->storage->read('_symfony2');
185185
$this->assertSame($expected, $saved);
186186
}
187-
187+
188188
public function testSavedOnDestructAfterManualSave()
189189
{
190190
$this->session->set('foo', 'nothing');
191191
$this->session->save();
192192
$this->session->set('foo', 'bar');
193-
193+
194194
$this->session->__destruct();
195-
195+
196196
$expected = array(
197197
'attributes'=>array('foo'=>'bar'),
198198
'flashes'=>array(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function testMatchNonAlpha()
160160
$this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.urlencode($chars).'/bar'));
161161
$this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.strtr($chars, array('%' => '%25', '+' => '%2B')).'/bar'));
162162
}
163-
163+
164164
public function testMatchWithDotMetacharacterInRequirements()
165165
{
166166
$collection = new RouteCollection();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ public function provideCompileData()
9898
)),
9999
);
100100
}
101-
}
101+
}

0 commit comments

Comments
 (0)
0