fix tests

This commit is contained in:
Etienne Roudeix
2013-12-09 15:02:09 +01:00
parent 79e4193791
commit 28d2add37d
2 changed files with 25 additions and 7 deletions

View File

@@ -15,7 +15,30 @@ trait RewrittenUrlTestTrait
public function setUp() public function setUp()
{ {
new URL(null); $stubRouterAdmin = $this->getMockBuilder('\Symfony\Component\Routing\Router')
->disableOriginalConstructor()
->setMethods(array('getContext'))
->getMock();
$stubRequestContext = $this->getMockBuilder('\Symfony\Component\Routing\RequestContext')
->disableOriginalConstructor()
->setMethods(array('getHost'))
->getMock();
$stubRequestContext->expects($this->any())
->method('getHost')
->will($this->returnValue('localhost'));
$stubRouterAdmin->expects($this->any())
->method('getContext')
->will($this->returnValue(
$stubRequestContext
));
$container = $this->getContainer();
$container->set('router.admin', $stubRouterAdmin);
new URL($container);
} }
/** /**

View File

@@ -51,17 +51,12 @@ class URL
self::$instance = $this; self::$instance = $this;
if ($container !== null) if ($container !== null)
$this->requestContext = $this->getContext($container); $this->requestContext = $container->get('router.admin')->getContext();
$this->retriever = new RewritingRetriever(); $this->retriever = new RewritingRetriever();
$this->resolver = new RewritingResolver(); $this->resolver = new RewritingResolver();
} }
public function getContext($container)
{
return $container->get('router.admin')->getContext();
}
/** /**
* Return this class instance, only once instanciated. * Return this class instance, only once instanciated.
* *