Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8a792de

Browse filesBrowse files
committed
Merge branch '6.4' into 7.1
* 6.4: add missing namespace declaration Fix named arguments in data providers [FrameworkBundle] Do not access the container when the kernel is shut down
2 parents 69e306c + 6a9665b commit 8a792de
Copy full SHA for 8a792de

File tree

Expand file treeCollapse file tree

1 file changed

+3
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-2
lines changed

‎Test/KernelTestCase.php

Copy file name to clipboardExpand all lines: Test/KernelTestCase.php
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ protected static function ensureKernelShutdown()
118118
if (null !== static::$kernel) {
119119
static::$kernel->boot();
120120
$container = static::$kernel->getContainer();
121-
static::$kernel->shutdown();
122-
static::$booted = false;
123121

124122
if ($container->has('services_resetter')) {
125123
// Instantiate the service because Container::reset() only resets services that have been used
126124
$container->get('services_resetter');
127125
}
128126

127+
static::$kernel->shutdown();
128+
static::$booted = false;
129+
129130
if ($container instanceof ResetInterface) {
130131
$container->reset();
131132
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.