Merge pull request #86 from thewilkybarkid/country-choice-optional

Allow the country choice widget to not be required
misd-service-development · Mar 31, 2016 · 87a58b5 · 87a58b5
2 parents 845897f + 85f0ebb
commit 87a58b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Form/DataTransformer/PhoneNumberToArrayTransformer.php b/Form/DataTransformer/PhoneNumberToArrayTransformer.php
@@ -74,7 +74,7 @@ public function reverseTransform($value)
             throw new TransformationFailedException('Expected an array.');
         }
 
-        if ('' === trim(implode('', $value))) {
+        if ('' === trim($value['number'])) {
             return null;
         }
 

diff --git a/Tests/Form/DataTransformer/PhoneNumberToArrayTransformerTest.php b/Tests/Form/DataTransformer/PhoneNumberToArrayTransformerTest.php
@@ -153,6 +153,11 @@ public function reverseTransformProvider()
                 array('country' => '', 'number' => ''),
                 null,
             ),
+            array(
+                array('GB'),
+                array('country' => 'GB', 'number' => ''),
+                null,
+            ),
             array(
                 array('GB'),
                 array('country' => '', 'number' => 'foo'),