Commit29a08ee

committed

[DI] throw an exception when the kernel has been booted twices

1 parent9f6cbaa commit29a08eeCopy full SHA for 29a08ee

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ CHANGELOG`
`8`	`8`	* Deprecated the`$parser` argument of`ControllerResolver::__construct()` and`DelegatingLoader::__construct()`
`9`	`9`	* Deprecated the`controller_name_converter` and`resolve_controller_name_subscriber` services
`10`	`10`	* The`ControllerResolver` and`DelegatingLoader` classes have been marked as`final`
	`11`	+* Deprecated booting the kernel before running`WebTestCase::createClient()`
`11`	`12`
`12`	`13`	`4.3.0`
`13`	`14`	`-----`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ abstract class KernelTestCase extends TestCase`
`37`	`37`	`*/`
`38`	`38`	`protectedstatic$container;`
`39`	`39`
	`40`	`+protectedstatic$booted;`
	`41`	`+`
`40`	`42`	`protectedfunctiondoTearDown():void`
`41`	`43`	`{`
`42`	`44`	`static::ensureKernelShutdown();`
`@@ -72,6 +74,7 @@ protected static function bootKernel(array $options = [])`
`72`	`74`
`73`	`75`	`static::$kernel =static::createKernel($options);`
`74`	`76`	`static::$kernel->boot();`
	`77`	`+static::$booted =true;`
`75`	`78`
`76`	`79`	`$container =static::$kernel->getContainer();`
`77`	`80`	`static::$container =$container->has('test.service_container') ?$container->get('test.service_container') :$container;`
`@@ -126,6 +129,7 @@ protected static function ensureKernelShutdown()`
`126`	`129`	`if (null !==static::$kernel) {`
`127`	`130`	`$container =static::$kernel->getContainer();`
`128`	`131`	`static::$kernel->shutdown();`
	`132`	`+static::$booted =false;`
`129`	`133`	`if ($containerinstanceof ResetInterface) {`
`130`	`134`	`$container->reset();`
`131`	`135`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ protected function doTearDown(): void`
`39`	`39`	`*/`
`40`	`40`	`protectedstaticfunctioncreateClient(array$options = [],array$server = [])`
`41`	`41`	`{`
	`42`	`+if (true ===static::$booted) {`
	`43`	`+ @trigger_error(sprintf('Booting the kernel before calling %s::%s is deprecated and will throw in Symfony 5.0, the kernel should only be booted once.',__CLASS__,__METHOD__),E_USER_DEPRECATED);`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`$kernel =static::bootKernel($options);`
`43`	`47`
`44`	`48`	`try {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public function testFlash($config, $insulate)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
	`73`	`+ *`
`73`	`74`	`* See if two separate insulated clients can run without`
`74`	`75`	`* polluting eachother's session data.`
`75`	`76`	`*`
`@@ -82,7 +83,7 @@ public function testTwoClients($config, $insulate)`
`82`	`83`	`if ($insulate) {`
`83`	`84`	`$client1->insulate();`
`84`	`85`	`}`
`85`		`-`
	`86`	`+$this->ensureKernelShutdown();`
`86`	`87`	`// start second client`
`87`	`88`	`$client2 =$this->createClient(['test_case' =>'Session','root_config' =>$config]);`
`88`	`89`	`if ($insulate) {`

Comments

(0)