Skip to content

Commit a6b1247

Browse files
committed
fixed various inconsistencies
1 parent e2ac5df commit a6b1247

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ public function testGetSchemeAndHttpHost()
594594
{
595595
$request = new Request();
596596

597+
$server = array();
597598
$server['SERVER_NAME'] = 'servername';
598599
$server['SERVER_PORT'] = '90';
599600
$request->initialize(array(), array(), array(), array(), array(), $server);

src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,4 @@ public function getFoo()
9090
{
9191
return $this->foo;
9292
}
93-
94-
public function doGenerateFragmentUri(ControllerReference $reference, Request $request, $absolute = false, $strict = true)
95-
{
96-
return parent::generateFragmentUri($reference, $request, $absolute, $strict);
97-
}
9893
}

src/Symfony/Component/PropertyAccess/PropertyPath.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function __construct($propertyPath)
125125
throw new InvalidPropertyPathException(sprintf(
126126
'Could not parse property path "%s". Unexpected token "%s" at position %d',
127127
$propertyPath,
128-
$remaining{0},
128+
$remaining[0],
129129
$position
130130
));
131131
}

src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testGetExistingEngine()
111111

112112
$delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
113113

114-
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php', array('foo' => 'bar')));
114+
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
115115
}
116116

117117
/**

src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testGetSetLogger()
2020
{
21-
$loader = new ProjectTemplateLoader4(new TemplateNameParser());
21+
$loader = new ProjectTemplateLoader4();
2222
$logger = $this->getMock('Psr\Log\LoggerInterface');
2323
$loader->setLogger($logger);
2424
$this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');

0 commit comments

Comments
 (0)