minor #36105 [FrameworkBundle] Fix deprecation message for booting a kernel twice (jschaedl)

fabpot · fabpot · commit efb4a7f0bca0 · 2020-03-18T09:09:03.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] Fix deprecation message for booting a kernel twice | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | -  | License | MIT | Doc PR | -   Commits ------- a0a6243 Fix deprecation messages
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -42,7 +42,7 @@ private function doTearDown()
     protected static function createClient(array $options = [], array $server = [])
     {
         if (static::$booted) {
-            @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw an exception in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         $kernel = static::bootKernel($options);
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -40,7 +40,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
 
         if (!empty($config['query_string'])) {
             if ('' === $config['search_dn'] || '' === $config['search_password']) {
-                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);
             }
             $definition->addMethodCall('setQueryString', [$config['query_string']]);
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -44,7 +44,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
 
         if (!empty($config['query_string'])) {
             if ('' === $config['search_dn'] || '' === $config['search_password']) {
-                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);
             }
             $definition->addMethodCall('setQueryString', [$config['query_string']]);
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
@@ -42,7 +42,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
 
         if (!empty($config['query_string'])) {
             if ('' === $config['search_dn'] || '' === $config['search_password']) {
-                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);
             }
             $definition->addMethodCall('setQueryString', [$config['query_string']]);
         }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
@@ -89,7 +89,7 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke
                 if ('' !== $this->searchDn && '' !== $this->searchPassword) {
                     $this->ldap->bind($this->searchDn, $this->searchPassword);
                 } else {
-                    @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);
+                    @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);
                 }
                 $query = str_replace('{username}', $username, $this->queryString);
                 $result = $this->ldap->query($this->dnString, $query)->execute();

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private function doTearDown()`
`42`	`42`	`protected static function createClient(array $options = [], array $server = [])`
`43`	`43`	`{`
`44`	`44`	`if (static::$booted) {`
`45`		`- @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED);`
	`45`	`+ @trigger_error(sprintf('Calling "%s()" while a kernel has been booted is deprecated since Symfony 4.4 and will throw an exception in 5.0, ensure the kernel is shut down before calling the method.', __METHOD__), E_USER_DEPRECATED);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$kernel = static::bootKernel($options);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,`
`40`	`40`
`41`	`41`	`if (!empty($config['query_string'])) {`
`42`	`42`	`if ('' === $config['search_dn'] \|\| '' === $config['search_password']) {`
`43`		`- @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);`
	`43`	`+ @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);`
`44`	`44`	`}`
`45`	`45`	`$definition->addMethodCall('setQueryString', [$config['query_string']]);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,`
`44`	`44`
`45`	`45`	`if (!empty($config['query_string'])) {`
`46`	`46`	`if ('' === $config['search_dn'] \|\| '' === $config['search_password']) {`
`47`		`- @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);`
	`47`	`+ @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);`
`48`	`48`	`}`
`49`	`49`	`$definition->addMethodCall('setQueryString', [$config['query_string']]);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,`
`42`	`42`
`43`	`43`	`if (!empty($config['query_string'])) {`
`44`	`44`	`if ('' === $config['search_dn'] \|\| '' === $config['search_password']) {`
`45`		`- @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);`
	`45`	`+ @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);`
`46`	`46`	`}`
`47`	`47`	`$definition->addMethodCall('setQueryString', [$config['query_string']]);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke`
`89`	`89`	`if ('' !== $this->searchDn && '' !== $this->searchPassword) {`
`90`	`90`	`$this->ldap->bind($this->searchDn, $this->searchPassword);`
`91`	`91`	`} else {`
`92`		`- @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw in Symfony 5.0.', E_USER_DEPRECATED);`
	`92`	`+ @trigger_error('Using the "query_string" config without using a "search_dn" and a "search_password" is deprecated since Symfony 4.4 and will throw an exception in Symfony 5.0.', E_USER_DEPRECATED);`
`93`	`93`	`}`
`94`	`94`	`$query = str_replace('{username}', $username, $this->queryString);`
`95`	`95`	`$result = $this->ldap->query($this->dnString, $query)->execute();`