Merge branch '3.4' into 4.4

fabpot · fabpot · commit b137b15a4182 · 2020-04-12T16:39:55.000+02:00
* 3.4:
  Tweak the code to avoid fabbot false positives
diff --git a/Encoder/EncoderFactory.php b/Encoder/EncoderFactory.php
@@ -72,10 +72,10 @@ private function createEncoder(array $config, bool $isExtra = false): PasswordEn
             $config = $this->getEncoderConfigFromAlgorithm($config);
         }
         if (!isset($config['class'])) {
-            throw new \InvalidArgumentException(sprintf('"class" must be set in %s.', json_encode($config)));
+            throw new \InvalidArgumentException('"class" must be set in '.json_encode($config));
         }
         if (!isset($config['arguments'])) {
-            throw new \InvalidArgumentException(sprintf('"arguments" must be set in %s.', json_encode($config)));
+            throw new \InvalidArgumentException('"arguments" must be set in '.json_encode($config));
         }
 
         $encoder = new $config['class'](...$config['arguments']);

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ private function createEncoder(array $config, bool $isExtra = false): PasswordEn`
`72`	`72`	`$config = $this->getEncoderConfigFromAlgorithm($config);`
`73`	`73`	`}`
`74`	`74`	`if (!isset($config['class'])) {`
`75`		`- throw new \InvalidArgumentException(sprintf('"class" must be set in %s.', json_encode($config)));`
	`75`	`+ throw new \InvalidArgumentException('"class" must be set in '.json_encode($config));`
`76`	`76`	`}`
`77`	`77`	`if (!isset($config['arguments'])) {`
`78`		`- throw new \InvalidArgumentException(sprintf('"arguments" must be set in %s.', json_encode($config)));`
	`78`	`+ throw new \InvalidArgumentException('"arguments" must be set in '.json_encode($config));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`$encoder = new $config['class'](...$config['arguments']);`