issue #13 - use short array notation, implement jsonSerialize method

Author: mikaelcom

src/AbstractSoapClientBase.php

@@ -26,9 +26,9 @@ abstract class AbstractSoapClientBase implements SoapClientInterface
      * @param array $wsdlOptions
      * @param bool $resetSoapClient allows to disable the SoapClient redefinition
      */
-    public function __construct(array $wsdlOptions = array(), $resetSoapClient = true)
+    public function __construct(array $wsdlOptions = [], $resetSoapClient = true)
     {
-        $this->setLastError(array());
+        $this->setLastError([]);
         /**
          * Init soap Client
          * Set default values
@@ -65,7 +65,7 @@ public static function setSoapClient(\SoapClient $soapClient)
      */
     public function initSoapClient(array $options)
     {
-        $wsdlOptions = array();
+        $wsdlOptions = [];
         $defaultWsdlOptions = static::getDefaultWsdlOptions();
         foreach ($defaultWsdlOptions as $optionName => $optionValue) {
             if (array_key_exists($optionName, $options) && !empty($options[$optionName])) {
@@ -131,7 +131,7 @@ public function getSoapClientClassName($soapClientClassName = null)
      */
     public static function getDefaultWsdlOptions()
     {
-        return array(
+        return [
             self::WSDL_CLASSMAP => null,
             self::WSDL_CACHE_WSDL => WSDL_CACHE_NONE,
             self::WSDL_COMPRESSION => null,
@@ -156,7 +156,7 @@ public static function getDefaultWsdlOptions()
             self::WSDL_PASSPHRASE => null,
             self::WSDL_AUTHENTICATION => null,
             self::WSDL_SSL_METHOD => null,
-        );
+        ];
     }
     /**
      * Allows to set the SoapClient location to call
@@ -270,7 +270,7 @@ public static function getFormatedXml($string, $asDomDocument = false)
     public static function convertStringHeadersToArray($headers)
     {
         $lines = explode("\r\n", $headers);
-        $headers = array();
+        $headers = [];
         foreach ($lines as $line) {
             if (strpos($line, ':')) {
                 $headerParts = explode(':', $line);
@@ -294,7 +294,7 @@ public static function convertStringHeadersToArray($headers)
     public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false, $actor = null)
     {
         if (static::getSoapClient()) {
-            $defaultHeaders = (isset(static::getSoapClient()->__default_headers) && is_array(static::getSoapClient()->__default_headers)) ? static::getSoapClient()->__default_headers : array();
+            $defaultHeaders = (isset(static::getSoapClient()->__default_headers) && is_array(static::getSoapClient()->__default_headers)) ? static::getSoapClient()->__default_headers : [];
             foreach ($defaultHeaders as $index => $soapHeader) {
                 if ($soapHeader->name === $name) {
                     unset($defaultHeaders[$index]);
@@ -326,13 +326,13 @@ public function setHttpHeader($headerName, $headerValue)
         if (static::getSoapClient() && !empty($headerName)) {
             $streamContext = $this->getStreamContext();
             if ($streamContext === null) {
-                $options = array();
-                $options['http'] = array();
+                $options = [];
+                $options['http'] = [];
                 $options['http']['header'] = '';
             } else {
                 $options = stream_context_get_options($streamContext);
                 if (!array_key_exists('http', $options) || !is_array($options['http'])) {
-                    $options['http'] = array();
+                    $options['http'] = [];
                     $options['http']['header'] = '';
                 } elseif (!array_key_exists('header', $options['http'])) {
                     $options['http']['header'] = '';
@@ -343,7 +343,7 @@ public function setHttpHeader($headerName, $headerValue)
                 /**
                  * Ensure there is only one header entry for this header name
                  */
-                $newLines = array();
+                $newLines = [];
                 foreach ($lines as $line) {
                     if (!empty($line) && strpos($line, $headerName) === false) {
                         array_push($newLines, $line);
@@ -386,7 +386,7 @@ public function getStreamContext()
      */
     public function getStreamContextOptions()
     {
-        $options = array();
+        $options = [];
         $context = $this->getStreamContext();
         if ($context !== null) {
             $options = stream_context_get_options($context);

src/AbstractStructArrayBase.php

@@ -115,7 +115,7 @@ public function add($item)
              * init array
              */
             if (!is_array($this->_get($this->getAttributeName()))) {
-                $this->_set($this->getAttributeName(), array());
+                $this->_set($this->getAttributeName(), []);
             }
             /**
              * current array
@@ -232,7 +232,7 @@ public function getInternArrayOffset()
      * @param bool $internCall indicates that methods is calling itself
      * @return AbstractStructArrayBase
      */
-    public function initInternArray($array = array(), $internCall = false)
+    public function initInternArray($array = [], $internCall = false)
     {
         if (stripos(get_called_class(), 'array') !== false) {
             if (is_array($array) && count($array) > 0) {

src/AbstractStructBase.php

@@ -2,8 +2,16 @@
 
 namespace WsdlToPhp\PackageBase;
 
-abstract class AbstractStructBase implements StructInterface
+abstract class AbstractStructBase implements StructInterface, \JsonSerializable
 {
+    /**
+     * Returns the properties of this object
+     * @return mixed[]
+     */
+    public function jsonSerialize()
+    {
+        return \get_object_vars($this);
+    }
     /**
      * Generic method called when an object has been exported with var_export() functions
      * It allows to return an object instantiated with the values

src/SoapClientInterface.php

@@ -144,7 +144,7 @@ interface SoapClientInterface
      * @param array $wsdlOptions
      * @param bool $resetSoapClient allows to disable the SoapClient redefinition
      */
-    public function __construct(array $wsdlOptions = array(), $resetSoapClient = true);
+    public function __construct(array $wsdlOptions = [], $resetSoapClient = true);
     /**
      * Static method getting current SoapClient
      * @return \SoapClient

tests/StructBaseTest.php

@@ -51,4 +51,15 @@ public function testSetGetWithException()
             ->setFoo('bar');
         $object->_get('sample');
     }
+    public function testJsonSerialize()
+    {
+        $object = new StructObject();
+        $object
+            ->setBar('foo')
+            ->setFoo('bar');
+        $this->assertSame([
+            'foo' => 'bar',
+            'bar' => 'foo',
+        ], $object->jsonSerialize());
+    }
 }