Boyscout: correct exception messages for type conversion errors

No need to show a preferred datetime format when the value is not a datetime
OpenConext · Jul 28, 2016 · bd86705 · bd86705
1 parent 7e1714a
commit bd86705
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 42 deletions.
diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php
@@ -59,10 +59,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $authorityRole = new AuthorityRole($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $commonName = new CommonName($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php
@@ -65,10 +65,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $contactInformation = new ContactInformation($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php
@@ -65,10 +65,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $institution = new Institution($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php
@@ -65,10 +65,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $location = new Location($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $contactInformation = new ContactInformation($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $email = new Email($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $institution = new Institution($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocaleType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $locale = new Locale($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/LocationType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $location = new Location($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php
@@ -55,10 +55,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $nameId = new NameId($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/RaLocationNameType.php
@@ -65,10 +65,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $raLocationName = new RaLocationName($value);
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ShowRaaContactInformationOptionType.php
@@ -74,10 +74,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             );
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/UseRaLocationsOptionType.php
@@ -72,10 +72,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             $useRaLocationsOption = new UseRaLocationsOption($platform->convertFromBoolean($value));
         } catch (InvalidArgumentException $e) {
             // get nice standard message, so we can throw it keeping the exception chain
-            $doctrineExceptionMessage = ConversionException::conversionFailedFormat(
+            $doctrineExceptionMessage = ConversionException::conversionFailed(
                 $value,
-                $this->getName(),
-                $platform->getDateTimeFormatString()
+                $this->getName()
             )->getMessage();
 
             throw new ConversionException($doctrineExceptionMessage, 0, $e);