minor #35487 [Messenger] Fix messenger argument (jderusse)

Robin Chalas · Robin Chalas · commit 5f87c7b43474 · 2020-01-27T23:28:36.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] Fix messenger argument | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - `Connection::DEFAULT_OPTIONS` is an key/value array. The exception `Unknown option found : [%s]. Allowed options are [%s]` should use allowed option's key instead of the value. Commits ------- ae0c634 Fix exception message in Doctrine Messenger
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -86,13 +86,13 @@ public static function buildConfiguration($dsn, array $options = [])
         // check for extra keys in options
         $optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS));
         if (0 < \count($optionsExtraKeys)) {
-            throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
+            throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));
         }
 
         // check for extra keys in options
         $queryExtraKeys = array_diff(array_keys($query), array_keys(self::DEFAULT_OPTIONS));
         if (0 < \count($queryExtraKeys)) {
-            throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
+            throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));
         }
 
         return $configuration;

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ public static function buildConfiguration($dsn, array $options = [])`
`86`	`86`	`// check for extra keys in options`
`87`	`87`	`$optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS));`
`88`	`88`	`if (0 < \count($optionsExtraKeys)) {`
`89`		`- throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));`
	`89`	`+ throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// check for extra keys in options`
`93`	`93`	`$queryExtraKeys = array_diff(array_keys($query), array_keys(self::DEFAULT_OPTIONS));`
`94`	`94`	`if (0 < \count($queryExtraKeys)) {`
`95`		`- throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));`
	`95`	`+ throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return $configuration;`