Skip to content

Commit 0793fe7

Browse files
Merge branch '2.8' into 3.2
* 2.8: use Precise on Travis to keep PHP LDAP support fix(security): ensure the 'route' index is set before attempting to use it [WebProfilerBundle] Fix full sized dump hovering in toolbar
2 parents 68582c0 + 6158ab3 commit 0793fe7

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: php
22

3+
dist: precise
34
sudo: false
45

56
git:

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,12 @@
369369
100% { background: #222; }
370370
}
371371

372-
.sf-toolbar-block.sf-toolbar-block-dump {
373-
position: static;
374-
}
375-
376372
.sf-toolbar-block.sf-toolbar-block-dump .sf-toolbar-info {
377373
max-width: none;
378-
right: 0;
374+
width: 100%;
375+
position: fixed;
376+
box-sizing: border-box;
377+
left: 0;
379378
}
380379

381380
.sf-toolbar-block-dump pre.sf-dump {

src/Symfony/Component/Security/Http/HttpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function checkRequestPath(Request $request, $path)
108108
$parameters = $this->urlMatcher->match($request->getPathInfo());
109109
}
110110

111-
return $path === $parameters['_route'];
111+
return isset($parameters['_route']) && $path === $parameters['_route'];
112112
} catch (MethodNotAllowedException $e) {
113113
return false;
114114
} catch (ResourceNotFoundException $e) {

src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,19 @@ public function testCheckRequestPathWithUrlMatcherLoadingException()
221221
$utils->checkRequestPath($this->getRequest(), 'foobar');
222222
}
223223

224+
public function testCheckPathWithoutRouteParam()
225+
{
226+
$urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
227+
$urlMatcher
228+
->expects($this->any())
229+
->method('match')
230+
->willReturn(array('_controller' => 'PathController'))
231+
;
232+
233+
$utils = new HttpUtils(null, $urlMatcher);
234+
$this->assertFalse($utils->checkRequestPath($this->getRequest(), 'path/index.html'));
235+
}
236+
224237
/**
225238
* @expectedException \InvalidArgumentException
226239
* @expectedExceptionMessage Matcher must either implement UrlMatcherInterface or RequestMatcherInterface

0 commit comments

Comments
 (0)