fix tests
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -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.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user