Merge branch '2.4'
* 2.4: [HttpKernel] fixed unit tests when using phpunit.phar add expression request matcher tests
This commit is contained in:
commit
69d2c8e715
@ -0,0 +1,68 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\HttpFoundation\Tests;
|
||||||
|
|
||||||
|
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
|
||||||
|
use Symfony\Component\HttpFoundation\ExpressionRequestMatcher;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
|
class ExpressionRequestMatcherTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @expectedException \LogicException
|
||||||
|
*/
|
||||||
|
public function testWhenNoExpressionIsSet()
|
||||||
|
{
|
||||||
|
$expressionRequestMatcher = new ExpressionRequestMatcher();
|
||||||
|
$expressionRequestMatcher->matches(new Request());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideExpressions
|
||||||
|
*/
|
||||||
|
public function testMatchesWhenParentMatchesIsTrue($expression, $expected)
|
||||||
|
{
|
||||||
|
$request = Request::create('/foo');
|
||||||
|
$expressionRequestMatcher = new ExpressionRequestMatcher();
|
||||||
|
|
||||||
|
$expressionRequestMatcher->setExpression(new ExpressionLanguage(), $expression);
|
||||||
|
$this->assertSame($expected, $expressionRequestMatcher->matches($request));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideExpressions
|
||||||
|
*/
|
||||||
|
public function testMatchesWhenParentMatchesIsFalse($expression)
|
||||||
|
{
|
||||||
|
$request = Request::create('/foo');
|
||||||
|
$request->attributes->set('foo', 'foo');
|
||||||
|
$expressionRequestMatcher = new ExpressionRequestMatcher();
|
||||||
|
$expressionRequestMatcher->matchAttribute('foo', 'bar');
|
||||||
|
|
||||||
|
$expressionRequestMatcher->setExpression(new ExpressionLanguage(), $expression);
|
||||||
|
$this->assertFalse($expressionRequestMatcher->matches($request));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideExpressions()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('request.getMethod() == method', true),
|
||||||
|
array('request.getPathInfo() == path', true),
|
||||||
|
array('request.getHost() == host', true),
|
||||||
|
array('request.getClientIp() == ip', true),
|
||||||
|
array('request.attributes.all() == attributes', true),
|
||||||
|
array('request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', true),
|
||||||
|
array('request.getMethod() != method', false),
|
||||||
|
array('request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', false),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -77,11 +77,7 @@ class KernelTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testBootSetsTheBootedFlagToTrue()
|
public function testBootSetsTheBootedFlagToTrue()
|
||||||
{
|
{
|
||||||
// use test kernel to access isBooted()
|
// use test kernel to access isBooted()
|
||||||
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
|
$kernel = $this->getKernelForTest(array('initializeBundles', 'initializeContainer'));
|
||||||
->setConstructorArgs(array('test', false))
|
|
||||||
->setMethods(array('initializeBundles', 'initializeContainer'))
|
|
||||||
->getMock();
|
|
||||||
|
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
$this->assertTrue($kernel->isBooted());
|
$this->assertTrue($kernel->isBooted());
|
||||||
@ -575,12 +571,7 @@ EOF;
|
|||||||
$child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
|
$child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
|
||||||
|
|
||||||
// use test kernel so we can access getBundleMap()
|
// use test kernel so we can access getBundleMap()
|
||||||
$kernel = $this
|
$kernel = $this->getKernelForTest(array('registerBundles'));
|
||||||
->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
|
|
||||||
->setMethods(array('registerBundles'))
|
|
||||||
->setConstructorArgs(array('test', false))
|
|
||||||
->getMock()
|
|
||||||
;
|
|
||||||
$kernel
|
$kernel
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('registerBundles')
|
->method('registerBundles')
|
||||||
@ -599,18 +590,12 @@ EOF;
|
|||||||
$child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
|
$child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
|
||||||
|
|
||||||
// use test kernel so we can access getBundleMap()
|
// use test kernel so we can access getBundleMap()
|
||||||
$kernel = $this
|
$kernel = $this->getKernelForTest(array('registerBundles'));
|
||||||
->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
|
|
||||||
->setMethods(array('registerBundles'))
|
|
||||||
->setConstructorArgs(array('test', false))
|
|
||||||
->getMock()
|
|
||||||
;
|
|
||||||
$kernel
|
$kernel
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('registerBundles')
|
->method('registerBundles')
|
||||||
->will($this->returnValue(array($grandparent, $parent, $child)))
|
->will($this->returnValue(array($grandparent, $parent, $child)))
|
||||||
;
|
;
|
||||||
|
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
$map = $kernel->getBundleMap();
|
$map = $kernel->getBundleMap();
|
||||||
@ -637,18 +622,12 @@ EOF;
|
|||||||
$child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
|
$child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
|
||||||
|
|
||||||
// use test kernel so we can access getBundleMap()
|
// use test kernel so we can access getBundleMap()
|
||||||
$kernel = $this
|
$kernel = $this->getKernelForTest(array('registerBundles'));
|
||||||
->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
|
|
||||||
->setMethods(array('registerBundles'))
|
|
||||||
->setConstructorArgs(array('test', false))
|
|
||||||
->getMock()
|
|
||||||
;
|
|
||||||
$kernel
|
$kernel
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('registerBundles')
|
->method('registerBundles')
|
||||||
->will($this->returnValue(array($parent, $grandparent, $child)))
|
->will($this->returnValue(array($parent, $grandparent, $child)))
|
||||||
;
|
;
|
||||||
|
|
||||||
$kernel->boot();
|
$kernel->boot();
|
||||||
|
|
||||||
$map = $kernel->getBundleMap();
|
$map = $kernel->getBundleMap();
|
||||||
@ -793,17 +772,34 @@ EOF;
|
|||||||
*/
|
*/
|
||||||
protected function getKernel(array $methods = array(), array $bundles = array())
|
protected function getKernel(array $methods = array(), array $bundles = array())
|
||||||
{
|
{
|
||||||
|
$methods[] = 'registerBundles';
|
||||||
|
|
||||||
$kernel = $this
|
$kernel = $this
|
||||||
->getMockBuilder('Symfony\Component\HttpKernel\Kernel')
|
->getMockBuilder('Symfony\Component\HttpKernel\Kernel')
|
||||||
->setMethods($methods)
|
->setMethods($methods)
|
||||||
->setConstructorArgs(array('test', false))
|
->setConstructorArgs(array('test', false))
|
||||||
->getMockForAbstractClass()
|
->getMockForAbstractClass()
|
||||||
;
|
;
|
||||||
|
|
||||||
$kernel->expects($this->any())
|
$kernel->expects($this->any())
|
||||||
->method('registerBundles')
|
->method('registerBundles')
|
||||||
->will($this->returnValue($bundles))
|
->will($this->returnValue($bundles))
|
||||||
;
|
;
|
||||||
|
$p = new \ReflectionProperty($kernel, 'rootDir');
|
||||||
|
$p->setAccessible(true);
|
||||||
|
$p->setValue($kernel, __DIR__.'/Fixtures');
|
||||||
|
|
||||||
|
return $kernel;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getKernelForTest(array $methods = array())
|
||||||
|
{
|
||||||
|
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
|
||||||
|
->setConstructorArgs(array('test', false))
|
||||||
|
->setMethods($methods)
|
||||||
|
->getMock();
|
||||||
|
$p = new \ReflectionProperty($kernel, 'rootDir');
|
||||||
|
$p->setAccessible(true);
|
||||||
|
$p->setValue($kernel, __DIR__.'/Fixtures');
|
||||||
|
|
||||||
return $kernel;
|
return $kernel;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user