Moved code from Util.php to BaseSoapClient, no need for Util.php anymore, cleaner structure.

Author: fabiankessler

src/org/nameapi/client/services/BaseSoapClient.php

@@ -3,7 +3,6 @@
 namespace org\nameapi\client\services;
 
 require_once('ServiceFactory.php');
-require_once('Util.php');
 
 if (!extension_loaded('soap')) {
     exit("Error: missing php_soap library, enable it in php.ini!");
@@ -14,9 +13,27 @@
 abstract class BaseSoapClient extends \SoapClient {
 
     public function __construct($wsdl, array $classmap=array(), array $options=array()) {
-        Util::mergeClassmap($options, $classmap, ServiceFactory::$classmap);
+        BaseSoapClient::mergeClassmap($options, $classmap, ServiceFactory::$classmap);
         $options['features'] = SOAP_SINGLE_ELEMENT_ARRAYS;
         parent::__construct($wsdl, $options);
     }
 
+
+    private static function mergeClassmap(&$options, $map1, $map2) {
+        if (!isset($options['classmap'])) {
+            $options['classmap'] = array();
+        }
+        $array = &$options['classmap'];
+        BaseSoapClient::mergeMap($array, $map1);
+        BaseSoapClient::mergeMap($array, $map2);
+    }
+    private static function mergeMap(&$array, $map) {
+        foreach ($map as $key => $value) {
+            if (isset($array[$key])) {
+                throw new \Exception("Already defined key ".$key. " for value: ".$array[$key]);
+            }
+            $array[$key] = $value;
+        }
+    }
+
 }

src/org/nameapi/client/services/Util.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__ . '/../../../Util.php');
 require_once('DisposableEmailAddressDetectorArguments.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');
 

src/org/nameapi/client/services/email/disposableemailaddressdetector/wsdl/SoapDisposableEmailAddressDetectorService.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__ . '/../../../Util.php');
 require_once('EmailNameParserServiceArguments.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');
 

src/org/nameapi/client/services/email/emailnameparser/wsdl/SoapEmailNameParserService.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__ . '/../../../Util.php');
 require_once('FormatNameFieldArguments.php');
 require_once(__DIR__ . '/../../wsdl/SoapFormatterProperties.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');

src/org/nameapi/client/services/formatter/namefieldformatter/wsdl/SoapNameFieldFormatterService.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__ . '/../../../Util.php');
 require_once('FormatPersonNameArguments.php');
 require_once(__DIR__ . '/../../wsdl/SoapFormatterProperties.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');

src/org/nameapi/client/services/formatter/personnameformatter/wsdl/SoapPersonNameFormatterService.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__.'/../../../Util.php');
 require_once('AssessArguments.php');
 require_once('AssessResponse.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');

src/org/nameapi/client/services/genderizer/persongenderizer/wsdl/SoapPersonGenderizerService.php

@@ -4,7 +4,6 @@
 
 use org\nameapi\client\services\BaseSoapClient;
 
-require_once(__DIR__.'/../../../Util.php');
 require_once('PingArguments.php');
 require_once('PingResponse.php');
 require_once(__DIR__ . '/../../../BaseSoapClient.php');