Consistently throw exceptions on a single line

nicolas-grekas · nicolas-grekas · commit 82436bab2f23 · 2018-09-08T14:44:02.000+02:00
diff --git a/ChoiceList/ArrayKeyChoiceList.php b/ChoiceList/ArrayKeyChoiceList.php
@@ -70,10 +70,7 @@ class ArrayKeyChoiceList extends ArrayChoiceList
     public static function toArrayKey($choice)
     {
         if (!is_scalar($choice) && null !== $choice) {
-            throw new InvalidArgumentException(sprintf(
-                'The value of type "%s" cannot be converted to a valid array key.',
-                \gettype($choice)
-            ));
+            throw new InvalidArgumentException(sprintf('The value of type "%s" cannot be converted to a valid array key.', \gettype($choice)));
         }
 
         if (\is_bool($choice) || (string) (int) $choice === (string) $choice) {
diff --git a/Extension/Core/DataTransformer/ArrayToPartsTransformer.php b/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
@@ -76,9 +76,7 @@ public function reverseTransform($array)
                 return;
             }
 
-            throw new TransformationFailedException(
-                sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)
-            ));
+            throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));
         }
 
         return $result;
diff --git a/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -135,9 +135,7 @@ public function reverseTransform($value)
         }
 
         if (\count($emptyFields) > 0) {
-            throw new TransformationFailedException(
-                sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields)
-            ));
+            throw new TransformationFailedException(sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields)));
         }
 
         if (isset($value['month']) && !ctype_digit((string) $value['month'])) {
diff --git a/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php b/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php
@@ -81,12 +81,7 @@ public function reverseTransform($rfc3339)
 
         if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) {
             if (!checkdate($matches[2], $matches[3], $matches[1])) {
-                throw new TransformationFailedException(sprintf(
-                    'The date "%s-%s-%s" is not a valid date.',
-                    $matches[1],
-                    $matches[2],
-                    $matches[3]
-                ));
+                throw new TransformationFailedException(sprintf('The date "%s-%s-%s" is not a valid date.', $matches[1], $matches[2], $matches[3]));
             }
         }
 
diff --git a/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
@@ -126,12 +126,7 @@ public function reverseTransform($value)
         $lastErrors = \DateTime::getLastErrors();
 
         if (0 < $lastErrors['warning_count'] || 0 < $lastErrors['error_count']) {
-            throw new TransformationFailedException(
-                implode(', ', array_merge(
-                    array_values($lastErrors['warnings']),
-                    array_values($lastErrors['errors'])
-                ))
-            );
+            throw new TransformationFailedException(implode(', ', array_merge(array_values($lastErrors['warnings']), array_values($lastErrors['errors']))));
         }
 
         try {
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -225,9 +225,7 @@ public function reverseTransform($value)
             $remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0");
 
             if ('' !== $remainder) {
-                throw new TransformationFailedException(
-                    sprintf('The number contains unrecognized characters: "%s"', $remainder)
-                );
+                throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s"', $remainder));
             }
         }
 
diff --git a/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
@@ -64,9 +64,7 @@ public function reverseTransform($array)
         foreach ($this->keys as $key) {
             if (isset($array[$key]) && '' !== $array[$key] && false !== $array[$key] && array() !== $array[$key]) {
                 if ($array[$key] !== $result) {
-                    throw new TransformationFailedException(
-                        'All values in the array should be the same'
-                    );
+                    throw new TransformationFailedException('All values in the array should be the same');
                 }
             } else {
                 $emptyKeys[] = $key;
@@ -79,9 +77,7 @@ public function reverseTransform($array)
                 return;
             }
 
-            throw new TransformationFailedException(
-                 sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)
-            ));
+            throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));
         }
 
         return $result;
diff --git a/Extension/Core/EventListener/FixCheckboxInputListener.php b/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -66,10 +66,7 @@ public function preSubmit(FormEvent $event)
             }
 
             if (\count($submittedValues) > 0) {
-                throw new TransformationFailedException(sprintf(
-                    'The following choices were not found: "%s"',
-                    implode('", "', array_keys($submittedValues))
-                ));
+                throw new TransformationFailedException(sprintf('The following choices were not found: "%s"', implode('", "', array_keys($submittedValues))));
             }
         } elseif ('' === $data || null === $data) {
             // Empty values are always accepted.
diff --git a/Extension/Core/Type/ChoiceType.php b/Extension/Core/Type/ChoiceType.php
@@ -132,10 +132,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
                 // Throw exception if unknown values were submitted
                 if (\count($unknownValues) > 0) {
-                    throw new TransformationFailedException(sprintf(
-                        'The choices "%s" do not exist in the choice list.',
-                        implode('", "', array_keys($unknownValues))
-                    ));
+                    throw new TransformationFailedException(sprintf('The choices "%s" do not exist in the choice list.', implode('", "', array_keys($unknownValues))));
                 }
 
                 $event->setData($data);
diff --git a/Extension/DependencyInjection/DependencyInjectionExtension.php b/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -43,13 +43,7 @@ public function getType($name)
 
         // BC: validate result of getName() for legacy names (non-FQCN)
         if ($name !== \get_class($type) && $type->getName() !== $name) {
-            throw new InvalidArgumentException(
-                sprintf('The type name specified for the service "%s" does not match the actual name. Expected "%s", given "%s"',
-                    $this->typeServiceIds[$name],
-                    $name,
-                    $type->getName()
-                )
-            );
+            throw new InvalidArgumentException(sprintf('The type name specified for the service "%s" does not match the actual name. Expected "%s", given "%s"', $this->typeServiceIds[$name], $name, $type->getName()));
         }
 
         return $type;
@@ -70,13 +64,7 @@ public function getTypeExtensions($name)
 
                 // validate result of getExtendedType() to ensure it is consistent with the service definition
                 if ($extension->getExtendedType() !== $name) {
-                    throw new InvalidArgumentException(
-                        sprintf('The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".',
-                            $serviceId,
-                            $name,
-                            $extension->getExtendedType()
-                        )
-                    );
+                    throw new InvalidArgumentException(sprintf('The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".', $serviceId, $name, $extension->getExtendedType()));
                 }
             }
         }
diff --git a/Form.php b/Form.php
@@ -359,13 +359,7 @@ public function setData($modelData)
                     ? 'an instance of class '.\get_class($viewData)
                     : 'a(n) '.\gettype($viewData);
 
-                throw new LogicException(
-                    'The form\'s view data is expected to be an instance of class '.
-                    $dataClass.', but is '.$actualType.'. You can avoid this error '.
-                    'by setting the "data_class" option to null or by adding a view '.
-                    'transformer that transforms '.$actualType.' to an instance of '.
-                    $dataClass.'.'
-                );
+                throw new LogicException('The form\'s view data is expected to be an instance of class '.$dataClass.', but is '.$actualType.'. You can avoid this error by setting the "data_class" option to null or by adding a view transformer that transforms '.$actualType.' to an instance of '.$dataClass.'.');
             }
         }
 
@@ -915,11 +909,7 @@ public function add($child, $type = null, array $options = array())
                 $child = $this->config->getFormFactory()->createNamed($child, $type, null, $options);
             }
         } elseif ($child->getConfig()->getAutoInitialize()) {
-            throw new RuntimeException(sprintf(
-                'Automatic initialization is only supported on root forms. You '.
-                'should set the "auto_initialize" option to false on the field "%s".',
-                $child->getName()
-            ));
+            throw new RuntimeException(sprintf('Automatic initialization is only supported on root forms. You should set the "auto_initialize" option to false on the field "%s".', $child->getName()));
         }
 
         $this->children[$child->getName()] = $child;
@@ -1093,11 +1083,7 @@ private function modelToNorm($value)
                 $value = $transformer->transform($value);
             }
         } catch (TransformationFailedException $exception) {
-            throw new TransformationFailedException(
-                'Unable to transform value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(),
-                $exception->getCode(),
-                $exception
-            );
+            throw new TransformationFailedException('Unable to transform value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception);
         }
 
         return $value;
@@ -1121,11 +1107,7 @@ private function normToModel($value)
                 $value = $transformers[$i]->reverseTransform($value);
             }
         } catch (TransformationFailedException $exception) {
-            throw new TransformationFailedException(
-                'Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(),
-                $exception->getCode(),
-                $exception
-            );
+            throw new TransformationFailedException('Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception);
         }
 
         return $value;
@@ -1156,11 +1138,7 @@ private function normToView($value)
                 $value = $transformer->transform($value);
             }
         } catch (TransformationFailedException $exception) {
-            throw new TransformationFailedException(
-                'Unable to transform value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(),
-                $exception->getCode(),
-                $exception
-            );
+            throw new TransformationFailedException('Unable to transform value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception);
         }
 
         return $value;
@@ -1188,11 +1166,7 @@ private function viewToNorm($value)
                 $value = $transformers[$i]->reverseTransform($value);
             }
         } catch (TransformationFailedException $exception) {
-            throw new TransformationFailedException(
-                'Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(),
-                $exception->getCode(),
-                $exception
-            );
+            throw new TransformationFailedException('Unable to reverse value for property path "'.$this->getPropertyPath().'": '.$exception->getMessage(), $exception->getCode(), $exception);
         }
 
         return $value;
diff --git a/FormConfigBuilder.php b/FormConfigBuilder.php
@@ -821,11 +821,7 @@ public function setMethod($method)
         $upperCaseMethod = strtoupper($method);
 
         if (!\in_array($upperCaseMethod, self::$allowedMethods)) {
-            throw new InvalidArgumentException(sprintf(
-                'The form method is "%s", but should be one of "%s".',
-                $method,
-                implode('", "', self::$allowedMethods)
-            ));
+            throw new InvalidArgumentException(sprintf('The form method is "%s", but should be one of "%s".', $method, implode('", "', self::$allowedMethods)));
         }
 
         $this->method = $upperCaseMethod;
@@ -892,10 +888,7 @@ public static function validateName($name)
         }
 
         if (!self::isValidName($name)) {
-            throw new InvalidArgumentException(sprintf(
-                'The name "%s" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").',
-                $name
-            ));
+            throw new InvalidArgumentException(sprintf('The name "%s" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").', $name));
         }
     }
 
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
@@ -50,12 +50,7 @@ public function __construct(FormInterface $form, array $errors)
     {
         foreach ($errors as $error) {
             if (!($error instanceof FormError || $error instanceof self)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The errors must be instances of '.
-                    '"\Symfony\Component\Form\FormError" or "%s". Got: "%s".',
-                    __CLASS__,
-                    \is_object($error) ? \get_class($error) : \gettype($error)
-                ));
+                throw new InvalidArgumentException(sprintf('The errors must be instances of "Symfony\Component\Form\FormError" or "%s". Got: "%s".', __CLASS__, \is_object($error) ? \get_class($error) : \gettype($error)));
             }
         }
 
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
@@ -86,11 +86,7 @@ public function __construct(FormTypeInterface $innerType, array $typeExtensions
         // As of Symfony 2.8, getName() returns the FQCN by default
         // Otherwise check that the name matches the old naming restrictions
         if ($hasCustomName && !preg_match('/^[a-z0-9_]*$/i', $name)) {
-            throw new InvalidArgumentException(sprintf(
-                'The "%s" form type name ("%s") is not valid. Names must only contain letters, numbers, and "_".',
-                \get_class($innerType),
-                $name
-            ));
+            throw new InvalidArgumentException(sprintf('The "%s" form type name ("%s") is not valid. Names must only contain letters, numbers, and "_".', \get_class($innerType), $name));
         }
 
         foreach ($typeExtensions as $extension) {
diff --git a/Test/FormPerformanceTestCase.php b/Test/FormPerformanceTestCase.php
@@ -36,14 +36,7 @@ protected function runTest()
         $time = microtime(true) - $s;
 
         if (0 != $this->maxRunningTime && $time > $this->maxRunningTime) {
-            $this->fail(
-                sprintf(
-                    'expected running time: <= %s but was: %s',
-
-                    $this->maxRunningTime,
-                    $time
-                )
-            );
+            $this->fail(sprintf('expected running time: <= %s but was: %s', $this->maxRunningTime, $time));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,7 @@ class ArrayKeyChoiceList extends ArrayChoiceList`
`70`	`70`	`public static function toArrayKey($choice)`
`71`	`71`	`{`
`72`	`72`	`if (!is_scalar($choice) && null !== $choice) {`
`73`		`- throw new InvalidArgumentException(sprintf(`
`74`		`- 'The value of type "%s" cannot be converted to a valid array key.',`
`75`		`- \gettype($choice)`
`76`		`- ));`
	`73`	`+ throw new InvalidArgumentException(sprintf('The value of type "%s" cannot be converted to a valid array key.', \gettype($choice)));`
`77`	`74`	`}`
`78`	`75`
`79`	`76`	`if (\is_bool($choice) \|\| (string) (int) $choice === (string) $choice) {`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,7 @@ public function reverseTransform($array)`
`76`	`76`	`return;`
`77`	`77`	`}`
`78`	`78`
`79`		`- throw new TransformationFailedException(`
`80`		`- sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)`
`81`		`- ));`
	`79`	`+ throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,7 @@ public function reverseTransform($value)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (\count($emptyFields) > 0) {`
`138`		`- throw new TransformationFailedException(`
`139`		`- sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields)`
`140`		`- ));`
	`138`	`+ throw new TransformationFailedException(sprintf('The fields "%s" should not be empty', implode('", "', $emptyFields)));`
`141`	`139`	`}`
`142`	`140`
`143`	`141`	`if (isset($value['month']) && !ctype_digit((string) $value['month'])) {`
Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,7 @@ public function reverseTransform($rfc3339)`
`81`	`81`
`82`	`82`	`if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) {`
`83`	`83`	`if (!checkdate($matches[2], $matches[3], $matches[1])) {`
`84`		`- throw new TransformationFailedException(sprintf(`
`85`		`- 'The date "%s-%s-%s" is not a valid date.',`
`86`		`- $matches[1],`
`87`		`- $matches[2],`
`88`		`- $matches[3]`
`89`		`- ));`
	`84`	`+ throw new TransformationFailedException(sprintf('The date "%s-%s-%s" is not a valid date.', $matches[1], $matches[2], $matches[3]));`
`90`	`85`	`}`
`91`	`86`	`}`
`92`	`87`
Original file line number	Diff line number	Diff line change
`@@ -225,9 +225,7 @@ public function reverseTransform($value)`
`225`	`225`	`$remainder = trim($remainder, " \t\n\r\0\x0b\xc2\xa0");`
`226`	`226`
`227`	`227`	`if ('' !== $remainder) {`
`228`		`- throw new TransformationFailedException(`
`229`		`- sprintf('The number contains unrecognized characters: "%s"', $remainder)`
`230`		`- );`
	`228`	`+ throw new TransformationFailedException(sprintf('The number contains unrecognized characters: "%s"', $remainder));`
`231`	`229`	`}`
`232`	`230`	`}`
`233`	`231`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ public function reverseTransform($array)`
`64`	`64`	`foreach ($this->keys as $key) {`
`65`	`65`	`if (isset($array[$key]) && '' !== $array[$key] && false !== $array[$key] && array() !== $array[$key]) {`
`66`	`66`	`if ($array[$key] !== $result) {`
`67`		`- throw new TransformationFailedException(`
`68`		`- 'All values in the array should be the same'`
`69`		`- );`
	`67`	`+ throw new TransformationFailedException('All values in the array should be the same');`
`70`	`68`	`}`
`71`	`69`	`} else {`
`72`	`70`	`$emptyKeys[] = $key;`
`@@ -79,9 +77,7 @@ public function reverseTransform($array)`
`79`	`77`	`return;`
`80`	`78`	`}`
`81`	`79`
`82`		`- throw new TransformationFailedException(`
`83`		`- sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)`
`84`		`- ));`
	`80`	`+ throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,7 @@ public function preSubmit(FormEvent $event)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if (\count($submittedValues) > 0) {`
`69`		`- throw new TransformationFailedException(sprintf(`
`70`		`- 'The following choices were not found: "%s"',`
`71`		`- implode('", "', array_keys($submittedValues))`
`72`		`- ));`
	`69`	`+ throw new TransformationFailedException(sprintf('The following choices were not found: "%s"', implode('", "', array_keys($submittedValues))));`
`73`	`70`	`}`
`74`	`71`	`} elseif ('' === $data \|\| null === $data) {`
`75`	`72`	`// Empty values are always accepted.`