fixed various inconsistencies
This commit is contained in:
parent
e2ac5dfc78
commit
a6b1247689
@ -594,6 +594,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
$request = new Request();
|
||||
|
||||
$server = array();
|
||||
$server['SERVER_NAME'] = 'servername';
|
||||
$server['SERVER_PORT'] = '90';
|
||||
$request->initialize(array(), array(), array(), array(), array(), $server);
|
||||
|
@ -90,9 +90,4 @@ class Foo
|
||||
{
|
||||
return $this->foo;
|
||||
}
|
||||
|
||||
public function doGenerateFragmentUri(ControllerReference $reference, Request $request, $absolute = false, $strict = true)
|
||||
{
|
||||
return parent::generateFragmentUri($reference, $request, $absolute, $strict);
|
||||
}
|
||||
}
|
||||
|
@ -125,7 +125,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
|
||||
throw new InvalidPropertyPathException(sprintf(
|
||||
'Could not parse property path "%s". Unexpected token "%s" at position %d',
|
||||
$propertyPath,
|
||||
$remaining{0},
|
||||
$remaining[0],
|
||||
$position
|
||||
));
|
||||
}
|
||||
|
@ -111,7 +111,7 @@ class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
|
||||
|
||||
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php', array('foo' => 'bar')));
|
||||
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -18,7 +18,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
public function testGetSetLogger()
|
||||
{
|
||||
$loader = new ProjectTemplateLoader4(new TemplateNameParser());
|
||||
$loader = new ProjectTemplateLoader4();
|
||||
$logger = $this->getMock('Psr\Log\LoggerInterface');
|
||||
$loader->setLogger($logger);
|
||||
$this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');
|
||||
|
Reference in New Issue
Block a user