Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3362'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3362
  • Loading branch information
@weierophinney
weierophinney committed Jan 7, 2013
109 parents 48a3b96 + 5ec4274 + 1a8b800 + 045212a + c918e2c + 1d51877 + 073ffb1 + 6cc70c4 + cca448e + 5f78560 + 1c0be41 + 02f7335 + 88a04db + b1c3dd1 + f3d5365 + 88de986 + fb38487 + 7bfe758 + 2e55342 + 6a04f31 + 57ecc1a + b78abaa + 30a9569 + f96aa9d + 23f86e7 + d43d656 + 4de219f + 3c20bba + a0d3747 + 456d331 + e503406 + 95c2a28 + 1fc5b65 + bc3880f + 2989a80 + e8f73d2 + fcc59de + ad50dbb + a46cbd4 + 6192f93 + bb42677 + 02419fd + cf6df36 + 92345be + 737b39e + fde18af + 43ca092 + e3acc17 + b5bc61a + 30d69f9 + 7dbd12c + 9f45cc7 + 473bfa3 + 916cd80 + 5aac7b0 + 6f66646 + 12c90a3 + 435c161 + 9bb6b33 + 6c32cce + f3c637f + c54876c + e1d13eb + daa8e6c + 5570955 + 388a6c0 + ac33840 + 00e233b + 532572e + 1e1f8d2 + b636e56 + 18878ed + 79ce391 + 9db7d70 + 0c2ce53 + 8dbc4b8 + b8b5d22 + 3dac49c + c87ef97 + 1ffe869 + fbe0570 + 802848d + 9fd0967 + 537b471 + 8cc3c9d + 7f51755 + 71ea52c + f2338ea + 226aada + 6f2818d + fafc8ae + 06d397d + 42a5665 + 9b6e2d1 + 96a0498 + 8cc5c74 + e3d1211 + ec85470 + a6f2c9c + fd7b83c + 6d8b4af + b29c8c0 + 64f42ce + 8cb31b9 + 34aaa76 + a941379 + 1a82cad + becf6c6 + fad54a0 commit 298e4df
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 73 deletions.
66 changes: 33 additions & 33 deletions src/Client.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ class Client implements ServerClient
protected $use = null;
protected $login = null;
protected $password = null;
protected $proxy_host = null;
protected $proxy_port = null;
protected $proxy_login = null;
protected $proxy_password = null;
protected $local_cert = null;
protected $proxyHost = null;
protected $proxyPort = null;
protected $proxyLogin = null;
protected $proxyPassword = null;
protected $localCert = null;
protected $passphrase = null;
protected $compression = null;
protected $connection_timeout = null;
protected $stream_context = null;
protected $connectionTimeout = null;
protected $streamContext = null;
protected $features = null;
protected $cache_wsdl = null;
protected $user_agent = null;
protected $cacheWsdl = null;
protected $userAgent = null;

/**
* WSDL used to access server
Expand Down Expand Up @@ -250,7 +250,7 @@ public function setOptions($options)

// Not used now
// case 'connection_timeout':
// $this->connection_timeout = $value;
// $this->connectionTimeout = $value;
// break;

default:
Expand Down Expand Up @@ -288,7 +288,7 @@ public function getOptions()
$options['local_cert'] = $this->getHttpsCertificate();
$options['passphrase'] = $this->getHttpsCertPassphrase();
$options['compression'] = $this->getCompressionOptions();
//$options['connection_timeout'] = $this->connection_timeout;
//$options['connection_timeout'] = $this->connectionTimeout;
$options['stream_context'] = $this->getStreamContext();
$options['cache_wsdl'] = $this->getWSDLCache();
$options['features'] = $this->getSoapFeatures();
Expand Down Expand Up @@ -597,7 +597,7 @@ public function getHttpPassword()
*/
public function setProxyHost($proxyHost)
{
$this->proxy_host = $proxyHost;
$this->proxyHost = $proxyHost;

$this->soapClient = null;

Expand All @@ -611,7 +611,7 @@ public function setProxyHost($proxyHost)
*/
public function getProxyHost()
{
return $this->proxy_host;
return $this->proxyHost;
}

/**
Expand All @@ -622,7 +622,7 @@ public function getProxyHost()
*/
public function setProxyPort($proxyPort)
{
$this->proxy_port = (int) $proxyPort;
$this->proxyPort = (int) $proxyPort;

$this->soapClient = null;

Expand All @@ -636,7 +636,7 @@ public function setProxyPort($proxyPort)
*/
public function getProxyPort()
{
return $this->proxy_port;
return $this->proxyPort;
}

/**
Expand All @@ -647,7 +647,7 @@ public function getProxyPort()
*/
public function setProxyLogin($proxyLogin)
{
$this->proxy_login = $proxyLogin;
$this->proxyLogin = $proxyLogin;

$this->soapClient = null;

Expand All @@ -661,7 +661,7 @@ public function setProxyLogin($proxyLogin)
*/
public function getProxyLogin()
{
return $this->proxy_login;
return $this->proxyLogin;
}

/**
Expand All @@ -672,7 +672,7 @@ public function getProxyLogin()
*/
public function setProxyPassword($proxyPassword)
{
$this->proxy_password = $proxyPassword;
$this->proxyPassword = $proxyPassword;

$this->soapClient = null;

Expand All @@ -692,7 +692,7 @@ public function setHttpsCertificate($localCert)
throw new Exception\InvalidArgumentException('Invalid HTTPS client certificate path.');
}

$this->local_cert = $localCert;
$this->localCert = $localCert;

$this->soapClient = null;

Expand All @@ -706,7 +706,7 @@ public function setHttpsCertificate($localCert)
*/
public function getHttpsCertificate()
{
return $this->local_cert;
return $this->localCert;
}

/**
Expand Down Expand Up @@ -769,7 +769,7 @@ public function getCompressionOptions()
*/
public function getProxyPassword()
{
return $this->proxy_password;
return $this->proxyPassword;
}

/**
Expand All @@ -784,7 +784,7 @@ public function setStreamContext($context)
throw new Exception\InvalidArgumentException('Invalid stream context resource given.');
}

$this->stream_context = $context;
$this->streamContext = $context;
return $this;
}

Expand All @@ -795,7 +795,7 @@ public function setStreamContext($context)
*/
public function getStreamContext()
{
return $this->stream_context;
return $this->streamContext;
}

/**
Expand Down Expand Up @@ -831,9 +831,9 @@ public function getSoapFeatures()
public function setWSDLCache($caching)
{
if ($caching === null) {
$this->cache_wsdl = null;
$this->cacheWsdl = null;
} else {
$this->cache_wsdl = (int) $caching;
$this->cacheWsdl = (int) $caching;
}
return $this;
}
Expand All @@ -845,7 +845,7 @@ public function setWSDLCache($caching)
*/
public function getWSDLCache()
{
return $this->cache_wsdl;
return $this->cacheWsdl;
}

/**
Expand All @@ -857,9 +857,9 @@ public function getWSDLCache()
public function setUserAgent($userAgent)
{
if ($userAgent === null) {
$this->user_agent = null;
$this->userAgent = null;
} else {
$this->user_agent = (string) $userAgent;
$this->userAgent = (string) $userAgent;
}
return $this;
}
Expand All @@ -871,7 +871,7 @@ public function setUserAgent($userAgent)
*/
public function getUserAgent()
{
return $this->user_agent;
return $this->userAgent;
}

/**
Expand Down Expand Up @@ -951,16 +951,16 @@ public function getLastMethod()
* @param string $location
* @param string $action
* @param int $version
* @param int $one_way
* @param int $oneWay
* @return mixed
*/
public function _doRequest(Client\Common $client, $request, $location, $action, $version, $one_way = null)
public function _doRequest(Client\Common $client, $request, $location, $action, $version, $oneWay = null)
{
// Perform request as is
if ($one_way === null) {
if ($oneWay === null) {
return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
}
return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version, $one_way);
return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version, $oneWay);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Client/Common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ public function __construct($doRequestCallback, $wsdl, $options)
* @param string $location
* @param string $action
* @param int $version
* @param int $one_way
* @param int $oneWay
* @return mixed
*/
public function __doRequest($request, $location, $action, $version, $one_way = null)
public function __doRequest($request, $location, $action, $version, $oneWay = null)
{
if ($one_way === null) {
if ($oneWay === null) {
return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version);
}

return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version, $one_way);
return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version, $oneWay);
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/Client/Local.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ public function __construct(SOAPServer $server, $wsdl, $options = null)
* @param string $location
* @param string $action
* @param int $version
* @param int $one_way
* @param int $oneWay
* @return mixed
*/
public function _doRequest(Common $client, $request, $location, $action, $version, $one_way = null)
public function _doRequest(Common $client, $request, $location, $action, $version, $oneWay = null)
{
// Perform request as is
ob_start();
Expand Down
Loading

0 comments on commit 298e4df

Please sign in to comment.