Adhere to the interface and throw a TransformationFailedException whe…

…n not a PhoneNumber object
misd-service-development · Aug 1, 2014 · 49db55e · 49db55e
1 parent e0b45b4
commit 49db55e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Form/DataTransformer/PhoneNumberToStringTransformer.php b/Form/DataTransformer/PhoneNumberToStringTransformer.php
@@ -61,7 +61,7 @@ public function transform($phoneNumber)
         if (null === $phoneNumber) {
             return '';
         } elseif (false === $phoneNumber instanceof PhoneNumber) {
-            return $phoneNumber;
+            throw new TransformationFailedException('Expected a \libphonenumber\PhoneNumber.');
         }
 
         $util = PhoneNumberUtil::getInstance();

diff --git a/Tests/Form/DataTransformer/PhoneNumberToStringTransformerTest.php b/Tests/Form/DataTransformer/PhoneNumberToStringTransformerTest.php
@@ -49,7 +49,11 @@ public function testTransform($defaultRegion, $format, $actual, $expected)
             $phoneNumber = $actual;
         }
 
-        $transformed = $transformer->transform($phoneNumber);
+        try {
+            $transformed = $transformer->transform($phoneNumber);
+        } catch (TransformationFailedException $e) {
+            $transformed = self::TRANSFORMATION_FAILED;
+        }
 
         $this->assertSame($expected, $transformed);
     }
@@ -64,7 +68,7 @@ public function transformProvider()
     {
         return array(
             array(PhoneNumberUtil::UNKNOWN_REGION, PhoneNumberFormat::INTERNATIONAL, null, ''),
-            array(PhoneNumberUtil::UNKNOWN_REGION, PhoneNumberFormat::INTERNATIONAL, 'foo', 'foo'),
+            array(PhoneNumberUtil::UNKNOWN_REGION, PhoneNumberFormat::NATIONAL, 'foo', self::TRANSFORMATION_FAILED),
             array(
                 PhoneNumberUtil::UNKNOWN_REGION,
                 PhoneNumberFormat::INTERNATIONAL,