Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2940956 by alexpott: Properly disable resource tracking in the ContainerBuilder

merge-requests/1654/head
Lee Rowlands 2018-02-05 07:42:49 +10:00
parent 3dad711909
commit 33e0ba310d
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
View File

@ -27,8 +27,8 @@ class ContainerBuilder extends SymfonyContainerBuilder {
* {@inheritdoc}
*/
public function __construct(ParameterBagInterface $parameterBag = NULL) {
$this->setResourceTracking(FALSE);
parent::__construct($parameterBag);
$this->setResourceTracking(FALSE);
}
/**

23
core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
View File

@ -118,4 +118,27 @@ class ContainerBuilderTest extends UnitTestCase {
serialize($container);
}
/**
* Tests constructor and resource tracking disabling.
*
* This test runs in a separate process to ensure the aliased class does not
* affect any other tests.
*
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function testConstructor() {
class_alias(testInterface::class, 'Symfony\Component\Config\Resource\ResourceInterface');
$container = new ContainerBuilder();
$this->assertFalse($container->isTrackingResources());
}
}
/**
* A test interface for testing ContainerBuilder::__construct().
*
* @see \Drupal\Tests\Core\DependencyInjection\ContainerBuilderTest::testConstructor()
*/
interface testInterface {
}