Email parser: toString improvements.

Author: fabiankessler

src/org/nameapi/client/services/email/emailnameparser/EmailNameParserMatch.php

@@ -58,10 +58,17 @@ public function getConfidence() {
     }
 
     public function __toString() {
-        $ret  = '{';
-        $ret .= 'givenNames='. implode(", ",$this->givenNames);
-        $ret .= ', surnames='. implode(", ",$this->surnames);
-        $ret .= ', confidence='.$this->confidence;
-        return $ret.'}';
+        $ret  = '';
+        if (count($this->givenNames) >0) {
+            if (!empty($ret)) $ret .= ', ';
+            $ret .= 'givenNames='. implode(", ",$this->givenNames);
+        }
+        if (count($this->surnames) >0) {
+            if (!empty($ret)) $ret .= ', ';
+            $ret .= 'surnames='. implode(", ",$this->surnames);
+        }
+        if (!empty($ret)) $ret .= ', ';
+        $ret .= 'confidence='.$this->confidence;
+        return '{'.$ret.'}';
     }
 } 

src/org/nameapi/client/services/email/emailnameparser/EmailNameParserResult.php

@@ -45,7 +45,9 @@ public function getMatches() {
     public function __toString() {
         $ret  = 'Result{';
         $ret .= 'type='.$this->resultType;
-        $ret .= ', matches='. implode(", ",$this->matches);
+        if (count($this->matches) >0) {
+            $ret .= ', matches='. implode(", ",$this->matches);
+        }
         return $ret.'}';
     }
 

tests/functional/org/nameapi/client/services/email/emailnameparser/EmailNameParserServiceTest.php

@@ -11,7 +11,6 @@ class EmailNameParserServiceTest extends BaseServiceTest {
     public function testParse_John_Doe() {
         $emailNameParser = $this->makeServiceFactory()->emailServices()->emailNameParser();
         $result = $emailNameParser->parse("[email protected]");
-        echo $result;
         $this->assertEquals('PERSON_NAME', (string)$result->getResultType());
         $firstMatch = $result->getMatches()[0];
         $this->assertEquals('john', $firstMatch->getGivenNames()[0]->getName());