Merge branch 'release/1.0.7'

mikaelcom · mikaelcom · commit 0e3cae9ccd07 · 2016-12-30T18:02:54.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.0.7
+- Issue #3 - More than one SoapClient in Project
+
 ## 1.0.6
 - Pull request #4: Rename $optioName to $optionName
 
diff --git a/src/AbstractSoapClientBase.php b/src/AbstractSoapClientBase.php
@@ -66,7 +66,7 @@ public static function setSoapClient(\SoapClient $soapClient)
     public function initSoapClient(array $options)
     {
         $wsdlOptions = array();
-        $defaultWsdlOptions = self::getDefaultWsdlOptions();
+        $defaultWsdlOptions = static::getDefaultWsdlOptions();
         foreach ($defaultWsdlOptions as $optionName => $optionValue) {
             if (array_key_exists($optionName, $options) && !empty($options[$optionName])) {
                 $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optionName)] = $options[$optionName];
@@ -78,7 +78,7 @@ public function initSoapClient(array $options)
             $wsdlUrl = $wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)];
             unset($wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)]);
             $soapClientClassName = $this->getSoapClientClassName();
-            self::setSoapClient(new $soapClientClassName($wsdlUrl, $wsdlOptions));
+            static::setSoapClient(new $soapClientClassName($wsdlUrl, $wsdlOptions));
         }
     }
     /**
@@ -165,8 +165,8 @@ public static function getDefaultWsdlOptions()
      */
     public function setLocation($location)
     {
-        if (self::getSoapClient() instanceof \SoapClient) {
-            self::getSoapClient()->__setLocation($location);
+        if (static::getSoapClient() instanceof \SoapClient) {
+            static::getSoapClient()->__setLocation($location);
         }
         return $this;
     }
@@ -204,8 +204,8 @@ public function getLastResponse($asDomDocument = false)
     protected function getLastXml($method, $asDomDocument = false)
     {
         $xml = null;
-        if (self::getSoapClient() instanceof \SoapClient) {
-            $xml = self::getFormatedXml(self::getSoapClient()->$method(), $asDomDocument);
+        if (static::getSoapClient() instanceof \SoapClient) {
+            $xml = static::getFormatedXml(static::getSoapClient()->$method(), $asDomDocument);
         }
         return $xml;
     }
@@ -242,9 +242,9 @@ public function getLastResponseHeaders($asArray = false)
      */
     protected function getLastHeaders($method, $asArray)
     {
-        $headers = self::getSoapClient() instanceof \SoapClient ? self::getSoapClient()->$method() : null;
+        $headers = static::getSoapClient() instanceof \SoapClient ? static::getSoapClient()->$method() : null;
         if (is_string($headers) && $asArray) {
-            return self::convertStringHeadersToArray($headers);
+            return static::convertStringHeadersToArray($headers);
         }
         return $headers;
     }
@@ -291,21 +291,21 @@ public static function convertStringHeadersToArray($headers)
      */
     public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false, $actor = null)
     {
-        if (self::getSoapClient()) {
-            $defaultHeaders = (isset(self::getSoapClient()->__default_headers) && is_array(self::getSoapClient()->__default_headers)) ? self::getSoapClient()->__default_headers : array();
+        if (static::getSoapClient()) {
+            $defaultHeaders = (isset(static::getSoapClient()->__default_headers) && is_array(static::getSoapClient()->__default_headers)) ? static::getSoapClient()->__default_headers : array();
             foreach ($defaultHeaders as $index => $soapHeader) {
                 if ($soapHeader->name === $name) {
                     unset($defaultHeaders[$index]);
                     break;
                 }
             }
-            self::getSoapClient()->__setSoapheaders(null);
+            static::getSoapClient()->__setSoapheaders(null);
             if (!empty($actor)) {
                 array_push($defaultHeaders, new \SoapHeader($nameSpace, $name, $data, $mustUnderstand, $actor));
             } else {
                 array_push($defaultHeaders, new \SoapHeader($nameSpace, $name, $data, $mustUnderstand));
             }
-            self::getSoapClient()->__setSoapheaders($defaultHeaders);
+            static::getSoapClient()->__setSoapheaders($defaultHeaders);
         }
         return $this;
     }
@@ -321,7 +321,7 @@ public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false,
     public function setHttpHeader($headerName, $headerValue)
     {
         $state = false;
-        if (self::getSoapClient() && !empty($headerName)) {
+        if (static::getSoapClient() && !empty($headerName)) {
             $streamContext = $this->getStreamContext();
             if ($streamContext === null) {
                 $options = array();
@@ -359,12 +359,12 @@ public function setHttpHeader($headerName, $headerValue)
                  * Create context if it does not exist
                  */
                 if ($streamContext === null) {
-                    $state = (self::getSoapClient()->_stream_context = stream_context_create($options)) ? true : false;
+                    $state = (static::getSoapClient()->_stream_context = stream_context_create($options)) ? true : false;
                 } else {
                     /**
                      * Set the new context http header option
                      */
-                    $state = stream_context_set_option(self::getSoapClient()->_stream_context, 'http', 'header', $options['http']['header']);
+                    $state = stream_context_set_option(static::getSoapClient()->_stream_context, 'http', 'header', $options['http']['header']);
                 }
             }
         }
@@ -376,7 +376,7 @@ public function setHttpHeader($headerName, $headerValue)
      */
     public function getStreamContext()
     {
-        return (self::getSoapClient() && isset(self::getSoapClient()->_stream_context) && is_resource(self::getSoapClient()->_stream_context)) ? self::getSoapClient()->_stream_context : null;
+        return (static::getSoapClient() && isset(static::getSoapClient()->_stream_context) && is_resource(static::getSoapClient()->_stream_context)) ? static::getSoapClient()->_stream_context : null;
     }
     /**
      * Returns current \SoapClient::_stream_context resource options or empty array

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static function setSoapClient(\SoapClient $soapClient)`
`66`	`66`	`public function initSoapClient(array $options)`
`67`	`67`	`{`
`68`	`68`	`$wsdlOptions = array();`
`69`		`- $defaultWsdlOptions = self::getDefaultWsdlOptions();`
	`69`	`+ $defaultWsdlOptions = static::getDefaultWsdlOptions();`
`70`	`70`	`foreach ($defaultWsdlOptions as $optionName => $optionValue) {`
`71`	`71`	`if (array_key_exists($optionName, $options) && !empty($options[$optionName])) {`
`72`	`72`	`$wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optionName)] = $options[$optionName];`
`@@ -78,7 +78,7 @@ public function initSoapClient(array $options)`
`78`	`78`	`$wsdlUrl = $wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)];`
`79`	`79`	`unset($wsdlOptions[str_replace(self::OPTION_PREFIX, '', self::WSDL_URL)]);`
`80`	`80`	`$soapClientClassName = $this->getSoapClientClassName();`
`81`		`- self::setSoapClient(new $soapClientClassName($wsdlUrl, $wsdlOptions));`
	`81`	`+ static::setSoapClient(new $soapClientClassName($wsdlUrl, $wsdlOptions));`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`/**`
`@@ -165,8 +165,8 @@ public static function getDefaultWsdlOptions()`
`165`	`165`	`*/`
`166`	`166`	`public function setLocation($location)`
`167`	`167`	`{`
`168`		`- if (self::getSoapClient() instanceof \SoapClient) {`
`169`		`- self::getSoapClient()->__setLocation($location);`
	`168`	`+ if (static::getSoapClient() instanceof \SoapClient) {`
	`169`	`+ static::getSoapClient()->__setLocation($location);`
`170`	`170`	`}`
`171`	`171`	`return $this;`
`172`	`172`	`}`
`@@ -204,8 +204,8 @@ public function getLastResponse($asDomDocument = false)`
`204`	`204`	`protected function getLastXml($method, $asDomDocument = false)`
`205`	`205`	`{`
`206`	`206`	`$xml = null;`
`207`		`- if (self::getSoapClient() instanceof \SoapClient) {`
`208`		`- $xml = self::getFormatedXml(self::getSoapClient()->$method(), $asDomDocument);`
	`207`	`+ if (static::getSoapClient() instanceof \SoapClient) {`
	`208`	`+ $xml = static::getFormatedXml(static::getSoapClient()->$method(), $asDomDocument);`
`209`	`209`	`}`
`210`	`210`	`return $xml;`
`211`	`211`	`}`
`@@ -242,9 +242,9 @@ public function getLastResponseHeaders($asArray = false)`
`242`	`242`	`*/`
`243`	`243`	`protected function getLastHeaders($method, $asArray)`
`244`	`244`	`{`
`245`		`- $headers = self::getSoapClient() instanceof \SoapClient ? self::getSoapClient()->$method() : null;`
	`245`	`+ $headers = static::getSoapClient() instanceof \SoapClient ? static::getSoapClient()->$method() : null;`
`246`	`246`	`if (is_string($headers) && $asArray) {`
`247`		`- return self::convertStringHeadersToArray($headers);`
	`247`	`+ return static::convertStringHeadersToArray($headers);`
`248`	`248`	`}`
`249`	`249`	`return $headers;`
`250`	`250`	`}`
`@@ -291,21 +291,21 @@ public static function convertStringHeadersToArray($headers)`
`291`	`291`	`*/`
`292`	`292`	`public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false, $actor = null)`
`293`	`293`	`{`
`294`		`- if (self::getSoapClient()) {`
`295`		`- $defaultHeaders = (isset(self::getSoapClient()->__default_headers) && is_array(self::getSoapClient()->__default_headers)) ? self::getSoapClient()->__default_headers : array();`
	`294`	`+ if (static::getSoapClient()) {`
	`295`	`+ $defaultHeaders = (isset(static::getSoapClient()->__default_headers) && is_array(static::getSoapClient()->__default_headers)) ? static::getSoapClient()->__default_headers : array();`
`296`	`296`	`foreach ($defaultHeaders as $index => $soapHeader) {`
`297`	`297`	`if ($soapHeader->name === $name) {`
`298`	`298`	`unset($defaultHeaders[$index]);`
`299`	`299`	`break;`
`300`	`300`	`}`
`301`	`301`	`}`
`302`		`- self::getSoapClient()->__setSoapheaders(null);`
	`302`	`+ static::getSoapClient()->__setSoapheaders(null);`
`303`	`303`	`if (!empty($actor)) {`
`304`	`304`	`array_push($defaultHeaders, new \SoapHeader($nameSpace, $name, $data, $mustUnderstand, $actor));`
`305`	`305`	`} else {`
`306`	`306`	`array_push($defaultHeaders, new \SoapHeader($nameSpace, $name, $data, $mustUnderstand));`
`307`	`307`	`}`
`308`		`- self::getSoapClient()->__setSoapheaders($defaultHeaders);`
	`308`	`+ static::getSoapClient()->__setSoapheaders($defaultHeaders);`
`309`	`309`	`}`
`310`	`310`	`return $this;`
`311`	`311`	`}`
`@@ -321,7 +321,7 @@ public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false,`
`321`	`321`	`public function setHttpHeader($headerName, $headerValue)`
`322`	`322`	`{`
`323`	`323`	`$state = false;`
`324`		`- if (self::getSoapClient() && !empty($headerName)) {`
	`324`	`+ if (static::getSoapClient() && !empty($headerName)) {`
`325`	`325`	`$streamContext = $this->getStreamContext();`
`326`	`326`	`if ($streamContext === null) {`
`327`	`327`	`$options = array();`
`@@ -359,12 +359,12 @@ public function setHttpHeader($headerName, $headerValue)`
`359`	`359`	`* Create context if it does not exist`
`360`	`360`	`*/`
`361`	`361`	`if ($streamContext === null) {`
`362`		`- $state = (self::getSoapClient()->_stream_context = stream_context_create($options)) ? true : false;`
	`362`	`+ $state = (static::getSoapClient()->_stream_context = stream_context_create($options)) ? true : false;`
`363`	`363`	`} else {`
`364`	`364`	`/**`
`365`	`365`	`* Set the new context http header option`
`366`	`366`	`*/`
`367`		`- $state = stream_context_set_option(self::getSoapClient()->_stream_context, 'http', 'header', $options['http']['header']);`
	`367`	`+ $state = stream_context_set_option(static::getSoapClient()->_stream_context, 'http', 'header', $options['http']['header']);`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`}`
`@@ -376,7 +376,7 @@ public function setHttpHeader($headerName, $headerValue)`
`376`	`376`	`*/`
`377`	`377`	`public function getStreamContext()`
`378`	`378`	`{`
`379`		`- return (self::getSoapClient() && isset(self::getSoapClient()->_stream_context) && is_resource(self::getSoapClient()->_stream_context)) ? self::getSoapClient()->_stream_context : null;`
	`379`	`+ return (static::getSoapClient() && isset(static::getSoapClient()->_stream_context) && is_resource(static::getSoapClient()->_stream_context)) ? static::getSoapClient()->_stream_context : null;`
`380`	`380`	`}`
`381`	`381`	`/**`
`382`	`382`	`* Returns current \SoapClient::_stream_context resource options or empty array`