Merge branch 'release/1.0.0'

PandawanTechnology · Jun 6, 2019 · 4c94581 · 4c94581
2 parents 109b80b + 3beef84
commit 4c94581
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/EmailAddressTransformer.php b/src/EmailAddressTransformer.php
@@ -35,16 +35,10 @@ public function transformUnique($input): Address
         $input = current($input);
 
         if (\is_string($input)) {
-            return \is_int($key) ? new Address($input) : new NamedAddress($input, $key);
+            return \is_int($key) ? new Address($input) : new NamedAddress($key, $input);
         }
 
-        if ($input instanceof NamedAddress) {
-            return $input;
-        }
-
-        // If a string has been provided as the key, we want to convert the Address object into a NamedAddress instance
-        // unless it is already one
-        return \is_int($key) ? $input : new NamedAddress($input->getAddress(), $key);
+        return $input;
     }
 
     /**

diff --git a/tests/EmailAddressTransformerTest.php b/tests/EmailAddressTransformerTest.php
@@ -52,26 +52,26 @@ public function dataProviderTransformUnique(): array
             ],
             // 3. An à-la swiftmailer array with one entry
             [
-                ['Testing is great' => '[email protected]'],
+                ['[email protected]' => 'Testing is great'],
                 new NamedAddress('[email protected]', 'Testing is great')
             ],
             // 4. An array of strings
             [
                 ['[email protected]', '[email protected]'],
                 new Address('[email protected]')
             ],
-            // 4. An array containing an Address object as first value **SHOULD BE** overwritten.
+            // 4. An array containing an Address object as first value should remain unchanged
             [
                 [
-                    'Passing Master' => new Address('[email protected]'),
+                    '[email protected]' => new Address('[email protected]'),
                     '[email protected]'
                 ],
-                new NamedAddress('[email protected]', 'Passing Master')
+                new Address('[email protected]')
             ],
-            // 5. An array containing a NamedAddress object as first value **SHOULD NOT BE** overwritten.
+            // 5. An array containing a NamedAddress object as first value should remain unchanged
             [
                 [
-                    'Ignored Senor' => new NamedAddress('[email protected]', 'Toto'),
+                    new NamedAddress('[email protected]', 'Toto'),
                     '[email protected]'
                 ],
                 new NamedAddress('[email protected]', 'Toto')