Merge branch 'develop' of github.com:WsdlToPhp/PackageBase into develop

Author: mikaelcom

.php_cs

@@ -1,10 +1,18 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
+$finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
-    ->exclude('Tests/resources')
+    ->exclude('tests')
     ->in(__DIR__);
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->finder($finder);
+return PhpCsFixer\Config::create()
+	->setUsingCache(false)
+    ->setRules(array(
+        '@PSR2' => true,
+        'binary_operator_spaces' => true,
+        'no_whitespace_in_blank_line' => true,
+        'ternary_operator_spaces' => true,
+        'cast_spaces' => true,
+        'trailing_comma_in_multiline_array' => true
+	))
+    ->setFinder($finder);

CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.0.7
+- Issue #3 - More than one SoapClient in Project
+
+## 1.0.6
+- Pull request #4: Rename $optioName to $optionName
+
+## 1.0.5
+- Update readme
+
+## 1.0.4
+- Issue #2 - Var name change request from $methoName to $methodName
+
 ## 1.0.3
 - Add utility methods **getStreamContext()** and **getStreamContextOptions()** to AbstractSoapClientbase class
 

README.md

@@ -1,5 +1,6 @@
 # Package Base
 [![Latest Stable Version](https://poser.pugx.org/wsdltophp/packagebase/version.png)](https://packagist.org/packages/wsdltophp/packagebase)
+[![Total Downloads](https://poser.pugx.org/wsdltophp/packagebase/downloads)](https://packagist.org/packages/wsdltophp/packagebase)
 [![Build Status](https://api.travis-ci.org/WsdlToPhp/PackageBase.svg)](https://travis-ci.org/WsdlToPhp/PackageBase)
 [![PHP 7 ready](http://php7ready.timesplinter.ch/WsdlToPhp/PackageBase/badge.svg)](https://travis-ci.org/WsdlToPhp/PackageBase)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/)
@@ -33,10 +34,10 @@ There is at least/most one method that must be implemented so it's pretty fast t
 
 ### StructArrayInterface
 #### Description
-This interface must be used to define a new ArrayType class. The goal is to provide utility methods around Array Structs defined by the Wsdl in order to ease the handling of its content. Therefore, this interface inherits from our [StructInterface](#structinterface) interface interface plus the native [ArrayAccess](http://php.net/manual/en/class.arrayaccess.php), [Iterator](http://php.net/manual/en/class.iterator.php) and [Countable](http://php.net/manual/en/class.countable.php) PHP interfaces
+This interface must be used to define a new ArrayType class. The goal is to provide utility methods around Array Structs defined by the Wsdl in order to ease the handling of its content. Therefore, this interface inherits from our [StructInterface](#structinterface) interface plus the native [ArrayAccess](http://php.net/manual/en/class.arrayaccess.php), [Iterator](http://php.net/manual/en/class.iterator.php) and [Countable](http://php.net/manual/en/class.countable.php) PHP interfaces
 
 #### What has to be implemented?
-The only method that must implement would be **getAttributeName** but be aware that it is implemented in every generated ArrayType class so no need to define it. It's just a reminder of what is available in ArrayType classes.
+The only method that must be implemented would be **getAttributeName** but be aware that it is implemented in every generated ArrayType class so no need to define it. It's just a reminder of what is available in ArrayType classes.
 
 So, basically, you MUST at least override the methods declared by the PHP interfaces from which this interface inherits
 
@@ -81,7 +82,7 @@ Here are the methods that must be implemented and why:
 - **getSoapClient()**: must return the [SoapClient](http://php.net/manual/en/class.soapclient.php) object that is responsible fo sending the requests.
 - **setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false, $actor = null)**: look to [AbstractSoapClientBase](#abstractsoapclientbase) part that details this method. Basically, it allows to define [SoapHeader](http://php.net/manual/en/class.soapheader.php)s for the request
 - **getLastError()**: must return the last error, its format is up to you
-- **saveLastError($methoName, \SoapFault $soapFault)**: look to [AbstractSoapClientBase](#abstractsoapclientbase) part that details this method. Basically, it must allow to store a catched [Soapfault](http://php.net/manual/en/class.soapfault.php) object when a request has failed
+- **saveLastError($methodName, \SoapFault $soapFault)**: look to [AbstractSoapClientBase](#abstractsoapclientbase) part that details this method. Basically, it must allow to store a catched [Soapfault](http://php.net/manual/en/class.soapfault.php) object when a request has failed
 - **getResult()**: should return the Soap Web Service response, it's up to you
 - **setResult($result)**: must accept any parameter type as it should received the Soap Web Service response
 
@@ -201,7 +202,7 @@ $items->initInternArray(array(
 #### Description
 This class is the base class for any ```ServiceType``` class generated by [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator).
 Its goal is to provide utility/handful methods by implementing our [SoapClientInterface](#soapclientinterface) interface.
-It's basically a decorator design pattern as the class has the [SoapClient](http://php.net/manual/en/class.soapclient.php) object as a static property in order to be able apply methods on it. It is static property in order to have a singleton between multiple calls. It can be reset by passing true as the second parameter.
+It's basically a decorator design pattern as the class has the [SoapClient](http://php.net/manual/en/class.soapclient.php) object as a static property in order to be able to apply methods on it. It is a static property in order to have a singleton between multiple calls (allowing to send cookies automatically between calls). It can be reset by passing true as the second parameter.
 
 #### Usage
 Let's say you have this type of generate ```ServiceType``` class:
@@ -241,7 +242,7 @@ Then call any of these base methods:
 - **getLastRequestHeaders($asArray = false)**: returns either the HTTP request's headers as a string or as an array (each HTTP header is parsed)
 - **getLastResponseHeaders($asArray = false)**: returns either the HTTP response's headers as a string or as an array
 - **getLastError**: automatically populated with an error when ```$this->saveLastError(__METHOD__, $soapFault)``` is called
-- **getLastErrorForMethod($methoName)** : returns the error associated to the called method. It should return a ```SoapFault``` object
+- **getLastErrorForMethod($methodName)** : returns the error associated to the called method. It should return a ```SoapFault``` object
 ```php
 $result = $update->UpdateBulkOrder(new \Api\StructType\ApiUpdateBulkOrder())
 if ($result !== false) {

composer.json

@@ -10,6 +10,11 @@
             "name": "Mikaël DELSOL",
             "email": "[email protected]",
             "role": "Owner"
+        },
+        {
+            "name": "Luke Rodgers",
+            "email": "[email protected]",
+            "role": "Contributor"
         }
     ],
     "support" : {
@@ -19,7 +24,7 @@
         "php" : ">=5.3.3"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "~1.8",
+        "friendsofphp/php-cs-fixer": "~2.0",
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {

src/AbstractSoapClientBase.php

@@ -66,19 +66,19 @@ public static function setSoapClient(\SoapClient $soapClient)
     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];
+        $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];
             } 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)) {
             $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));
         }
     }
     /**
@@ -132,30 +132,31 @@ public function getSoapClientClassName($soapClientClassName = null)
     public static function getDefaultWsdlOptions()
     {
         return array(
-                    self::WSDL_CLASSMAP => null,
-                    self::WSDL_CACHE_WSDL => WSDL_CACHE_NONE,
-                    self::WSDL_COMPRESSION => null,
-                    self::WSDL_CONNECTION_TIMEOUT => null,
-                    self::WSDL_ENCODING => null,
-                    self::WSDL_EXCEPTIONS => true,
-                    self::WSDL_FEATURES => SOAP_SINGLE_ELEMENT_ARRAYS | SOAP_USE_XSI_ARRAY_TYPE,
-                    self::WSDL_LOCATION => null,
-                    self::WSDL_LOGIN => null,
-                    self::WSDL_PASSWORD => null,
-                    self::WSDL_SOAP_VERSION => null,
-                    self::WSDL_STREAM_CONTEXT => null,
-                    self::WSDL_TRACE => true,
-                    self::WSDL_TYPEMAP => null,
-                    self::WSDL_URL => null,
-                    self::WSDL_USER_AGENT => null,
-                    self::WSDL_PROXY_HOST => null,
-                    self::WSDL_PROXY_PORT => null,
-                    self::WSDL_PROXY_LOGIN => null,
-                    self::WSDL_PROXY_PASSWORD => null,
-                    self::WSDL_LOCAL_CERT => null,
-                    self::WSDL_PASSPHRASE => null,
-                    self::WSDL_AUTHENTICATION => null,
-                    self::WSDL_SSL_METHOD => null);
+            self::WSDL_CLASSMAP => null,
+            self::WSDL_CACHE_WSDL => WSDL_CACHE_NONE,
+            self::WSDL_COMPRESSION => null,
+            self::WSDL_CONNECTION_TIMEOUT => null,
+            self::WSDL_ENCODING => null,
+            self::WSDL_EXCEPTIONS => true,
+            self::WSDL_FEATURES => SOAP_SINGLE_ELEMENT_ARRAYS | SOAP_USE_XSI_ARRAY_TYPE,
+            self::WSDL_LOCATION => null,
+            self::WSDL_LOGIN => null,
+            self::WSDL_PASSWORD => null,
+            self::WSDL_SOAP_VERSION => null,
+            self::WSDL_STREAM_CONTEXT => null,
+            self::WSDL_TRACE => true,
+            self::WSDL_TYPEMAP => null,
+            self::WSDL_URL => null,
+            self::WSDL_USER_AGENT => null,
+            self::WSDL_PROXY_HOST => null,
+            self::WSDL_PROXY_PORT => null,
+            self::WSDL_PROXY_LOGIN => null,
+            self::WSDL_PROXY_PASSWORD => null,
+            self::WSDL_LOCAL_CERT => null,
+            self::WSDL_PASSPHRASE => null,
+            self::WSDL_AUTHENTICATION => null,
+            self::WSDL_SSL_METHOD => null,
+        );
     }
     /**
      * Allows to set the SoapClient location to call
@@ -166,8 +167,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;
     }
@@ -205,8 +206,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;
     }
@@ -243,9 +244,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;
     }
@@ -292,21 +293,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;
     }
@@ -322,7 +323,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();
@@ -360,12 +361,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']);
                 }
             }
         }
@@ -377,7 +378,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
@@ -412,23 +413,23 @@ private function setLastError($lastError)
     }
     /**
      * Method saving the last error returned by the SoapClient
-     * @param string $methoName the method called when the error occurred
+     * @param string $methodName the method called when the error occurred
      * @param \SoapFault $soapFault l'objet de l'erreur
      * @return AbstractSoapClientBase
      */
-    public function saveLastError($methoName, \SoapFault $soapFault)
+    public function saveLastError($methodName, \SoapFault $soapFault)
     {
-        $this->lastError[$methoName] = $soapFault;
+        $this->lastError[$methodName] = $soapFault;
         return $this;
     }
     /**
      * Method getting the last error for a certain method
-     * @param string $methoName method name to get error from
+     * @param string $methodName method name to get error from
      * @return \SoapFault|null
      */
-    public function getLastErrorForMethod($methoName)
+    public function getLastErrorForMethod($methodName)
     {
-        return array_key_exists($methoName, $this->lastError) ? $this->lastError[$methoName] : null;
+        return array_key_exists($methodName, $this->lastError) ? $this->lastError[$methodName] : null;
     }
     /**
      * Method returning current result from Soap call

src/AbstractStructBase.php

@@ -15,7 +15,7 @@ public static function __set_state(array $array)
     {
         $className = get_called_class();
         $object = @new $className();
-        foreach ($array as $name=>$value) {
+        foreach ($array as $name => $value) {
             $object->_set($name, $value);
         }
         return $object;

src/SoapClientInterface.php

@@ -168,11 +168,11 @@ public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false,
     public function getLastError();
     /**
      * Method saving the last error returned by the SoapClient
-     * @param string $methoName the method called when the error occurred
+     * @param string $methodName the method called when the error occurred
      * @param \SoapFault $soapFault l'objet de l'erreur
      * @return SoapClientInterface
      */
-    public function saveLastError($methoName, \SoapFault $soapFault);
+    public function saveLastError($methodName, \SoapFault $soapFault);
     /**
      * Method returning current result from Soap call
      * @return mixed

tests/SoapClientTest.php

@@ -2,7 +2,6 @@
 
 namespace WsdlToPhp\PackageBase\Tests;
 
-
 use WsdlToPhp\PackageBase\Utils;
 use WsdlToPhp\PackageBase\Tests\SoapClient;
 
@@ -339,7 +338,7 @@ public function testGetStreamContext()
     /**
      *
      */
-    public function testGetStreamContextAsNill()
+    public function testGetStreamContextAsNull()
     {
         $soapClient = new SoapClient(array(
             SoapClient::WSDL_URL => __DIR__ . '/resources/bingsearch.wsdl',