Merge branch '4.4' into 5.0

fabpot · fabpot · commit 5eac7720160c · 2019-12-01T09:48:26.000+01:00
* 4.4:
  Fix CS
  Fix CS
  Fix CS
  [DependencyInjection][Xml] Fix the attribute 'tag' is not allowed in 'bind' tag
diff --git a/Ldap.php b/Ldap.php
@@ -75,11 +75,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0): st
     public static function create(string $adapter, array $config = []): self
     {
         if (!isset(self::$adapterMap[$adapter])) {
-            throw new DriverNotFoundException(sprintf(
-                'Adapter "%s" not found. You should use one of: %s',
-                $adapter,
-                implode(', ', self::$adapterMap)
-            ));
+            throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s', $adapter, implode(', ', self::$adapterMap)));
         }
 
         $class = self::$adapterMap[$adapter];

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,7 @@ public function escape(string $subject, string $ignore = '', int $flags = 0): st`
`75`	`75`	`public static function create(string $adapter, array $config = []): self`
`76`	`76`	`{`
`77`	`77`	`if (!isset(self::$adapterMap[$adapter])) {`
`78`		`- throw new DriverNotFoundException(sprintf(`
`79`		`- 'Adapter "%s" not found. You should use one of: %s',`
`80`		`- $adapter,`
`81`		`- implode(', ', self::$adapterMap)`
`82`		`- ));`
	`78`	`+ throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s', $adapter, implode(', ', self::$adapterMap)));`
`83`	`79`	`}`
`84`	`80`
`85`	`81`	`$class = self::$adapterMap[$adapter];`