Skip to content

Commit 4b500d7

Browse files
committed
Merge branch '4.0'
* 4.0: [Form][WCAG] Add hidden labels on date and time fields Pass on previous exception in FatalThrowableError [Routing] remove dead code [Routing] fix typo [Form][WCAG] Fixed HTML errors fix merge [FrameworkBundle] [Console] add a warning when command is not found [WebProfilerBundle] limit ajax request to 100 and remove the last one
2 parents 5965917 + 9c6268c commit 4b500d7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Tests/Matcher/DumpedRedirectableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
2525

2626
$class = 'DumpedRedirectableUrlMatcher'.++$i;
2727
$dumper = new PhpMatcherDumper($routes);
28-
$dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
28+
eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
2929

3030
return $this->getMockBuilder($class)
3131
->setConstructorArgs(array($context ?: new RequestContext()))

Tests/Matcher/DumpedUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
2323

2424
$class = 'DumpedUrlMatcher'.++$i;
2525
$dumper = new PhpMatcherDumper($routes);
26-
$dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class)));
26+
eval('?>'.$dumper->dump(array('class' => $class)));
2727

2828
return new $class($context ?: new RequestContext());
2929
}

Tests/Matcher/RedirectableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function testSchemeRedirectRedirectsToFirstScheme()
6666
$matcher->match('/foo');
6767
}
6868

69-
public function testNoSchemaRedirectIfOnOfMultipleSchemesMatches()
69+
public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
7070
{
7171
$coll = new RouteCollection();
7272
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http')));

0 commit comments

Comments
 (0)