Merge branch '2.1'
* 2.1: [Locale] fixed tests [Config] Fixed tests on Windows [TwigBundle] Fixed tests [Security] Move DigestDataTest.php inside the Security component Fixed DefaultValue for session.auto_start in NodeDefinition Fix namespace of Validator and BrowserKit Tests Conflicts: src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
This commit is contained in:
Fabien Potencier
commit
869be1df6d
@ -179,7 +179,7 @@ class Configuration implements ConfigurationInterface
|
||||
->children()
|
||||
->booleanNode('auto_start')
|
||||
->info('DEPRECATED! Session starts on demand')
|
||||
->defaultNull()
|
||||
->defaultFalse()
|
||||
->beforeNormalization()
|
||||
->ifTrue(function($v) { return null !== $v; })
|
||||
->then(function($v) {
|
||||
|
||||
@ -60,10 +60,9 @@ class TwigExtensionTest extends TestCase
|
||||
// Globals
|
||||
$calls = $container->getDefinition('twig')->getMethodCalls();
|
||||
$this->assertEquals('app', $calls[0][1][0], '->load() registers services as Twig globals');
|
||||
|
||||
$this->assertEquals(new Reference('templating.globals'), $calls[0][1][1]);
|
||||
$this->assertEquals('foo', $calls[1][1][0], '->load() registers services as Twig globals');
|
||||
$this->assertEquals(new Reference('bar'), $calls[1][1][1], '->load() registers services as Twig globals');
|
||||
|
||||
$this->assertEquals('pi', $calls[2][1][0], '->load() registers variables as Twig globals');
|
||||
$this->assertEquals(3.14, $calls[2][1][1], '->load() registers variables as Twig globals');
|
||||
|
||||
@ -103,8 +102,7 @@ class TwigExtensionTest extends TestCase
|
||||
$this->compileContainer($container);
|
||||
|
||||
$calls = $container->getDefinition('twig')->getMethodCalls();
|
||||
array_shift($calls);
|
||||
foreach ($calls as $call) {
|
||||
foreach (array_slice($calls, 1) as $call) {
|
||||
list($name, $value) = each($globals);
|
||||
$this->assertEquals($name, $call[1][0]);
|
||||
$this->assertSame($value, $call[1][1]);
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
<?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\Bundle\TwigBundle\Tests;
|
||||
|
||||
use Symfony\Bundle\TwigBundle\TwigEngine;
|
||||
use Symfony\Component\DependencyInjection\Container;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Session\Session;
|
||||
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
|
||||
use Symfony\Component\Templating\TemplateNameParser;
|
||||
|
||||
class TwigEngineTest extends TestCase
|
||||
{
|
||||
public function testEvaluateAddsAppGlobal()
|
||||
{
|
||||
$environment = $this->getTwigEnvironment();
|
||||
$container = $this->getContainer();
|
||||
$locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
|
||||
$engine = new TwigEngine($environment, new TemplateNameParser(), $locator);
|
||||
|
||||
$template = $this->getMock('\Twig_TemplateInterface');
|
||||
|
||||
$environment->expects($this->once())
|
||||
->method('loadTemplate')
|
||||
->will($this->returnValue($template));
|
||||
|
||||
$engine->render('name');
|
||||
}
|
||||
|
||||
public function testEvaluateWithoutAvailableRequest()
|
||||
{
|
||||
$environment = $this->getTwigEnvironment();
|
||||
$container = new Container();
|
||||
$locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
|
||||
$engine = new TwigEngine($environment, new TemplateNameParser(), $locator);
|
||||
|
||||
$template = $this->getMock('\Twig_TemplateInterface');
|
||||
|
||||
$environment->expects($this->once())
|
||||
->method('loadTemplate')
|
||||
->will($this->returnValue($template));
|
||||
|
||||
$container->set('request', null);
|
||||
|
||||
$engine->render('name');
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Container with a Session-containing Request service.
|
||||
*
|
||||
* @return Container
|
||||
*/
|
||||
protected function getContainer()
|
||||
{
|
||||
$container = new Container();
|
||||
$request = new Request();
|
||||
$session = new Session(new MockArraySessionStorage());
|
||||
|
||||
$request->setSession($session);
|
||||
$container->set('request', $request);
|
||||
|
||||
return $container;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a mock Twig_Environment object.
|
||||
*
|
||||
* @return \Twig_Environment
|
||||
*/
|
||||
protected function getTwigEnvironment()
|
||||
{
|
||||
return $this
|
||||
->getMockBuilder('\Twig_Environment')
|
||||
->setMethods(array('loadTemplate'))
|
||||
->getMock();
|
||||
}
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\Client;
|
||||
use Symfony\Component\BrowserKit\History;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\CookieJar;
|
||||
use Symfony\Component\BrowserKit\Cookie;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\Cookie;
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\History;
|
||||
use Symfony\Component\BrowserKit\Request;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\Request;
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Tests\BrowserKit;
|
||||
namespace Symfony\Component\BrowserKit\Tests;
|
||||
|
||||
use Symfony\Component\BrowserKit\Response;
|
||||
|
||||
|
||||
@ -875,6 +875,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
|
||||
array('y-LLLLL-d', '1970-J-1'),
|
||||
array('y-LLLLL-d', '1970-S-1'),
|
||||
);
|
||||
|
||||
if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
|
||||
$data[] = array('y-M-d', '1970/1/1');
|
||||
$data[] = array('yy-M-d', '70/1/1');
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Allator\Tests\Constraints;
|
||||
namespace Symfony\Component\Validator\Tests\Constraints;
|
||||
|
||||
use Symfony\Component\Validator\Constraints\All;
|
||||
use Symfony\Component\Validator\Constraints\Valid;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Collectionator\Tests\Constraints;
|
||||
namespace Symfony\Component\Validator\Tests\Constraints;
|
||||
|
||||
use Symfony\Component\Validator\Constraints\Collection;
|
||||
use Symfony\Component\Validator\Constraints\Collection\Required;
|
||||
|
||||
Reference in New Issue
Block a user