Replaced toString() methods with (string) casting, kept __toString(). This seems to be more PHP-like.

Author: fabiankessler

src/org/nameapi/client/services/email/disposableemailaddressdetector/DisposableEmailAddressDetectorService.php

@@ -15,7 +15,7 @@
  * HOW TO USE:
  * $deaDetector = $myServiceFactory->emailServices()->disposableEmailAddressDetector();
  * $result = $deaDetector->isDisposable("[email protected]");
- * echo $result->getDisposable()->toString()); //will print 'YES'
+ * echo (string)$result->getDisposable()); //prints 'YES'
  */
 class DisposableEmailAddressDetectorService {
 

src/org/nameapi/client/services/email/disposableemailaddressdetector/Maybe.php

@@ -25,11 +25,8 @@ public function __construct($value) {
 
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 }

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

@@ -24,11 +24,8 @@ public function __construct($value) {
     }
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 } 

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

@@ -57,11 +57,8 @@ public function __construct($value) {
     }
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 }

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

@@ -14,7 +14,7 @@
  * HOW TO USE:
  * $emailNameParser = $myServiceFactory->emailServices()->emailNameParser();
  * $result = $emailNameParser->parse("[email protected]");
- * echo $result->getDisposable()->toString()); //will print 'YES'
+ * echo (string)$result->getDisposable()); //prints 'YES'
  */
 class EmailNameParserService {
 

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

@@ -42,14 +42,9 @@ public function getNameType() {
 
 
     public function __toString() {
-//        $ret  = 'NameFromEmailAddress{';
-//        $ret .= 'name='.$this->name;
-//        $ret .= ', nameType='.$this->nameType;
-//        return $ret.'}';
-
         $ret = $this->name;
-        if ($this->nameType->toString()!='NAME') {
-            $ret .= ' (type='.$this->nameType->toString().')';
+        if ((string)$this->nameType != 'NAME') {
+            $ret .= ' (type=' . (string)$this->nameType .')';
         }
         return $ret;
     }

src/org/nameapi/client/services/genderizer/persongenderizer/PersonGenderizerService.php

@@ -16,7 +16,7 @@
  * HOW TO USE:
  * $personGenderizer = $myServiceFactory->genderizerServices()->personGenderizer();
  * $personGenderResult = $personGenderizer->assess($inputPerson);
- * echo $personGenderResult->getGender()->toString(); //will print 'MALE'
+ * echo (string)$personGenderResult->getGender(); //prints 'MALE'
  */
 class PersonGenderizerService {
 

src/org/nameapi/client/services/matcher/AgeMatch.php

@@ -24,11 +24,8 @@ public function __construct($value) {
 
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 }

src/org/nameapi/client/services/matcher/GenderMatchType.php

@@ -23,11 +23,8 @@ public function __construct($value) {
     }
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 }

src/org/nameapi/client/services/matcher/PersonNameMatchType.php

@@ -23,11 +23,8 @@ public function __construct($value) {
     }
 
 
-    public function toString() {
-        return $this->value;
-    }
     public function __toString() {
-        return $this->toString();
+        return $this->value;
     }
 
 }