Fix deprecation messages

jschaedl · jschaedl · commit 3f6e6903960e · 2020-03-17T20:48:51.000+01:00
diff --git a/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/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/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/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/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/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']]);
         }

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`	`}`