Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Possibility to use camelCase for all soap client options #4605

Closed
wants to merge 1 commit into from

3 participants

Nicolas Eeckeloo Ralph Schindler Matthew Weier O'Phinney
Nicolas Eeckeloo

No description provided.

Ralph Schindler
Collaborator

Is this just a personal preference thing? Our standards say moving forward, all options should be under_score.

Matthew Weier O'Phinney

@ralphschindler Actually, this just makes it consistent with the other options in the soap client -- we already have things like the following:

case 'classmap':
case 'class_map':
    // do some stuff
    break;

This is done to allow either underscore separated, all lower case, all upper case, or camelcased.

We apparently missed it with some of the ones added later.

Nicolas Eeckeloo

Personaly, I usually use underscore but it's only purpose of code consistency as @weierophinney says.

Deleted user Unknown referenced this pull request from a commit
Matthew Weier O'Phinney weierophinney Merge branch 'hotfix/4605'
Close #4605
8babc4b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 8 additions and 1 deletion.
  1. +8 −1 library/Zend/Soap/Client.php
9 library/Zend/Soap/Client.php
View
@@ -213,22 +213,27 @@ public function setOptions($options)
$this->setHttpPassword($value);
break;
+ case 'proxyhost':
case 'proxy_host':
$this->setProxyHost($value);
break;
+ case 'proxyport':
case 'proxy_port':
$this->setProxyPort($value);
break;
+ case 'proxylogin':
case 'proxy_login':
$this->setProxyLogin($value);
break;
+ case 'proxypassword':
case 'proxy_password':
$this->setProxyPassword($value);
break;
+ case 'localcert':
case 'local_cert':
$this->setHttpsCertificate($value);
break;
@@ -241,6 +246,7 @@ public function setOptions($options)
$this->setCompressionOptions($value);
break;
+ case 'streamcontext':
case 'stream_context':
$this->setStreamContext($value);
break;
@@ -249,6 +255,7 @@ public function setOptions($options)
$this->setSoapFeatures($value);
break;
+ case 'cachewsdl':
case 'cache_wsdl':
$this->setWSDLCache($value);
break;
@@ -258,8 +265,8 @@ public function setOptions($options)
$this->setUserAgent($value);
break;
- case 'type_map':
case 'typemap':
+ case 'type_map':
$this->setTypemap($value);
break;
Something went wrong with that request. Please try again.