Merge branch 'release/1.0.6'

Author: mikaelcom

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.0.6
+- Pull request #4: Rename $optioName to $optionName
+
 ## 1.0.5
 - Update readme
 

composer.json

@@ -10,6 +10,11 @@
             "name": "Mikaël DELSOL",
             "email": "[email protected]",
             "role": "Owner"
+        },
+        {
+            "name": "Luke Rodgers",
+            "email": "[email protected]",
+            "role": "Contributor"
         }
     ],
     "support" : {

src/AbstractSoapClientBase.php

@@ -67,11 +67,11 @@ public function initSoapClient(array $options)
     {
         $wsdlOptions = array();
         $defaultWsdlOptions = self::getDefaultWsdlOptions();
-        foreach ($defaultWsdlOptions as $optioName => $optionValue) {
-            if (array_key_exists($optioName, $options) && !empty($options[$optioName])) {
-                $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optioName)] = $options[$optioName];
+        foreach ($defaultWsdlOptions as $optionName => $optionValue) {
+            if (array_key_exists($optionName, $options) && !empty($options[$optionName])) {
+                $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optionName)] = $options[$optionName];
             } elseif (!empty($optionValue)) {
-                $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optioName)] = $optionValue;
+                $wsdlOptions[str_replace(self::OPTION_PREFIX, '', $optionName)] = $optionValue;
             }
         }
         if (array_key_exists(str_replace(self::OPTION_PREFIX, '', self::WSDL_URL), $wsdlOptions)) {

tests/SoapClientTest.php

@@ -2,7 +2,6 @@
 
 namespace WsdlToPhp\PackageBase\Tests;
 
-
 use WsdlToPhp\PackageBase\Utils;
 use WsdlToPhp\PackageBase\Tests\SoapClient;
 
@@ -326,14 +325,18 @@ public function testGetStreamContext()
     /**
      *
      */
-    public function testGetStreamContextAsNill()
+    public function testGetStreamContextAsNull()
     {
         $soapClient = new SoapClient(array(
             SoapClient::WSDL_URL => __DIR__ . '/resources/bingsearch.wsdl',
             SoapClient::WSDL_CLASSMAP => self::classMap(),
         ));
 
-        $this->assertNull($soapClient->getStreamContext());
+        if (PHP_VERSION_ID < 70013) {
+            $this->assertNull($soapClient->getStreamContext());
+        } else {
+            $this->assertTrue(is_resource($soapClient->getStreamContext()));
+        }
     }
     /**
      *