Skip to content

Commit 4852ef3

Browse files
committed
Merge branch 'release/1.0.4', fixes #2
2 parents dac2d40 + 845b7b5 commit 4852ef3

File tree

5 files changed

+38
-32
lines changed

5 files changed

+38
-32
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ php:
77
- 5.4
88
- 5.5
99
- 5.6
10+
- 7
1011

1112
before_install:
1213
- composer self-update
@@ -19,4 +20,4 @@ script:
1920

2021
after_script:
2122
- wget https://scrutinizer-ci.com/ocular.phar
22-
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
23+
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# CHANGELOG
22

3+
## 1.0.4
4+
- Issue #2 - Var name change request from $methoName to $methodName
5+
36
## 1.0.3
47
- Add utility methods **getStreamContext()** and **getStreamContextOptions()** to AbstractSoapClientbase class
58

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Package Base
22
[![Latest Stable Version](https://poser.pugx.org/wsdltophp/packagebase/version.png)](https://packagist.org/packages/wsdltophp/packagebase)
33
[![Build Status](https://api.travis-ci.org/WsdlToPhp/PackageBase.svg)](https://travis-ci.org/WsdlToPhp/PackageBase)
4+
[![PHP 7 ready](http://php7ready.timesplinter.ch/WsdlToPhp/PackageBase/badge.svg)](https://travis-ci.org/WsdlToPhp/PackageBase)
45
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/)
56
[![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/badges/coverage.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/)
67
[![Dependency Status](https://www.versioneye.com/user/projects/55b10586643533001c00010f/badge.svg)](https://www.versioneye.com/user/projects/55b10586643533001c00010f)

src/AbstractSoapClientBase.php

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -131,29 +131,30 @@ public function getSoapClientClassName($soapClientClassName = null)
131131
public static function getDefaultWsdlOptions()
132132
{
133133
return array(
134-
self::WSDL_CLASSMAP => null,
135-
self::WSDL_CACHE_WSDL => WSDL_CACHE_NONE,
136-
self::WSDL_COMPRESSION => null,
137-
self::WSDL_CONNECTION_TIMEOUT => null,
138-
self::WSDL_ENCODING => null,
139-
self::WSDL_EXCEPTIONS => true,
140-
self::WSDL_FEATURES => SOAP_SINGLE_ELEMENT_ARRAYS | SOAP_USE_XSI_ARRAY_TYPE,
141-
self::WSDL_LOGIN => null,
142-
self::WSDL_PASSWORD => null,
143-
self::WSDL_SOAP_VERSION => null,
144-
self::WSDL_STREAM_CONTEXT => null,
145-
self::WSDL_TRACE => true,
146-
self::WSDL_TYPEMAP => null,
147-
self::WSDL_URL => null,
148-
self::WSDL_USER_AGENT => null,
149-
self::WSDL_PROXY_HOST => null,
150-
self::WSDL_PROXY_PORT => null,
151-
self::WSDL_PROXY_LOGIN => null,
152-
self::WSDL_PROXY_PASSWORD => null,
153-
self::WSDL_LOCAL_CERT => null,
154-
self::WSDL_PASSPHRASE => null,
155-
self::WSDL_AUTHENTICATION => null,
156-
self::WSDL_SSL_METHOD => null);
134+
self::WSDL_CLASSMAP => null,
135+
self::WSDL_CACHE_WSDL => WSDL_CACHE_NONE,
136+
self::WSDL_COMPRESSION => null,
137+
self::WSDL_CONNECTION_TIMEOUT => null,
138+
self::WSDL_ENCODING => null,
139+
self::WSDL_EXCEPTIONS => true,
140+
self::WSDL_FEATURES => SOAP_SINGLE_ELEMENT_ARRAYS | SOAP_USE_XSI_ARRAY_TYPE,
141+
self::WSDL_LOGIN => null,
142+
self::WSDL_PASSWORD => null,
143+
self::WSDL_SOAP_VERSION => null,
144+
self::WSDL_STREAM_CONTEXT => null,
145+
self::WSDL_TRACE => true,
146+
self::WSDL_TYPEMAP => null,
147+
self::WSDL_URL => null,
148+
self::WSDL_USER_AGENT => null,
149+
self::WSDL_PROXY_HOST => null,
150+
self::WSDL_PROXY_PORT => null,
151+
self::WSDL_PROXY_LOGIN => null,
152+
self::WSDL_PROXY_PASSWORD => null,
153+
self::WSDL_LOCAL_CERT => null,
154+
self::WSDL_PASSPHRASE => null,
155+
self::WSDL_AUTHENTICATION => null,
156+
self::WSDL_SSL_METHOD => null,
157+
);
157158
}
158159
/**
159160
* Allows to set the SoapClient location to call
@@ -410,23 +411,23 @@ private function setLastError($lastError)
410411
}
411412
/**
412413
* Method saving the last error returned by the SoapClient
413-
* @param string $methoName the method called when the error occurred
414+
* @param string $methodName the method called when the error occurred
414415
* @param \SoapFault $soapFault l'objet de l'erreur
415416
* @return AbstractSoapClientBase
416417
*/
417-
public function saveLastError($methoName, \SoapFault $soapFault)
418+
public function saveLastError($methodName, \SoapFault $soapFault)
418419
{
419-
$this->lastError[$methoName] = $soapFault;
420+
$this->lastError[$methodName] = $soapFault;
420421
return $this;
421422
}
422423
/**
423424
* Method getting the last error for a certain method
424-
* @param string $methoName method name to get error from
425+
* @param string $methodName method name to get error from
425426
* @return \SoapFault|null
426427
*/
427-
public function getLastErrorForMethod($methoName)
428+
public function getLastErrorForMethod($methodName)
428429
{
429-
return array_key_exists($methoName, $this->lastError) ? $this->lastError[$methoName] : null;
430+
return array_key_exists($methodName, $this->lastError) ? $this->lastError[$methodName] : null;
430431
}
431432
/**
432433
* Method returning current result from Soap call

src/SoapClientInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false,
163163
public function getLastError();
164164
/**
165165
* Method saving the last error returned by the SoapClient
166-
* @param string $methoName the method called when the error occurred
166+
* @param string $methodName the method called when the error occurred
167167
* @param \SoapFault $soapFault l'objet de l'erreur
168168
* @return SoapClientInterface
169169
*/
170-
public function saveLastError($methoName, \SoapFault $soapFault);
170+
public function saveLastError($methodName, \SoapFault $soapFault);
171171
/**
172172
* Method returning current result from Soap call
173173
* @return mixed

0 commit comments

Comments
 (0)