Merge branch '3.4' into 4.3
* 3.4: Relax transient test
This commit is contained in:
commit
cc2246e916
@ -329,7 +329,7 @@ class ProfilerControllerTest extends WebTestCase
|
||||
$token = $client->getResponse()->headers->get('x-debug-token');
|
||||
$client->request('GET', '/_profiler/search?ip=&method=GET&status_code=&url=&token=&start=&end=&limit=10');
|
||||
|
||||
$this->assertStringContainsString('1 results found', $client->getResponse()->getContent());
|
||||
$this->assertStringContainsString('results found', $client->getResponse()->getContent());
|
||||
$this->assertStringContainsString(sprintf('<a href="/_profiler/%s">%s</a>', $token, $token), $client->getResponse()->getContent());
|
||||
}
|
||||
|
||||
|
@ -21,18 +21,6 @@ class WebProfilerBundleKernel extends Kernel
|
||||
parent::__construct('test', false);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getName()
|
||||
{
|
||||
if (null === $this->name) {
|
||||
$this->name = parent::getName().substr(md5(__CLASS__), -16);
|
||||
}
|
||||
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
public function registerBundles()
|
||||
{
|
||||
return [
|
||||
@ -61,6 +49,10 @@ class WebProfilerBundleKernel extends Kernel
|
||||
'toolbar' => true,
|
||||
'intercept_redirects' => false,
|
||||
]);
|
||||
|
||||
$containerBuilder->loadFromExtension('twig', [
|
||||
'strict_variables' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
public function getCacheDir()
|
||||
|
@ -105,10 +105,6 @@ class TemplateManagerTest extends TestCase
|
||||
{
|
||||
$this->twigEnvironment = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
|
||||
|
||||
$this->twigEnvironment->expects($this->any())
|
||||
->method('loadTemplate')
|
||||
->willReturn('loadedTemplate');
|
||||
|
||||
if (Environment::MAJOR_VERSION > 1) {
|
||||
$loader = $this->createMock(LoaderInterface::class);
|
||||
$loader
|
||||
|
Reference in New Issue
Block a user