Changed method order so all getters appears before setters in SoapOptions.

Minor text fixes.

Author: Bilge

src/Net/Soap/SoapOptions.php

@@ -141,6 +141,14 @@ public function getProxyHost()
         return $this->get('proxy_host');
     }
 
+    /**
+     * @return int
+     */
+    public function getProxyPort()
+    {
+        return $this->get('proxy_port');
+    }
+
     /**
      * @param int $port
      *
@@ -152,11 +160,11 @@ public function setProxyPort($port)
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getProxyPort()
+    public function getProxyLogin()
     {
-        return $this->get('proxy_port');
+        return $this->get('proxy_login');
     }
 
     /**
@@ -172,9 +180,9 @@ public function setProxyLogin($login)
     /**
      * @return string
      */
-    public function getProxyLogin()
+    public function getProxyPassword()
     {
-        return $this->get('proxy_login');
+        return $this->get('proxy_password');
     }
 
     /**
@@ -190,27 +198,29 @@ public function setProxyPassword($password)
     /**
      * @return string
      */
-    public function getProxyPassword()
+    public function getEncoding()
     {
-        return $this->get('proxy_password');
+        return $this->get('encoding');
     }
 
     /**
-     * @param string $encoding A valid system encoding; e.g. utf-8, iso-8859-1.
+     * Sets the character encoding for strings.
+     *
+     * @param string $encoding Character encoding, e.g. utf-8.
      *
-     * @return void
+     * @return $this
      */
     public function setEncoding($encoding)
     {
         return $this->set('encoding', "$encoding");
     }
 
     /**
-     * @return string
+     * @return bool
      */
-    public function getEncoding()
+    public function getTrace()
     {
-        return $this->get('encoding');
+        return $this->get('trace');
     }
 
     /**
@@ -226,9 +236,9 @@ public function setTrace($trace)
     /**
      * @return bool
      */
-    public function getTrace()
+    public function getExceptions()
     {
-        return $this->get('trace');
+        return $this->get('exceptions');
     }
 
     /**
@@ -242,11 +252,11 @@ public function setExceptions($exceptions)
     }
 
     /**
-     * @return bool
+     * @return array
      */
-    public function getExceptions()
+    public function getClassmap()
     {
-        return $this->get('exceptions');
+        return $this->get('classmap');
     }
 
     /**
@@ -260,11 +270,11 @@ public function setClassmap(array $classmap)
     }
 
     /**
-     * @return array
+     * @return int
      */
-    public function getClassmap()
+    public function getConnectionTimeout()
     {
-        return $this->get('classmap');
+        return $this->get('connection_timeout');
     }
 
     /**
@@ -278,11 +288,11 @@ public function setConnectionTimeout($timeout)
     }
 
     /**
-     * @return int
+     * @return array
      */
-    public function getConnectionTimeout()
+    public function getTypemap()
     {
-        return $this->get('connection_timeout');
+        return $this->get('typemap');
     }
 
     /**
@@ -296,30 +306,31 @@ public function setTypemap(array $typemap)
     }
 
     /**
-     * @return array
+     * @return int
      */
-    public function getTypemap()
+    public function getCacheWsdl()
     {
-        return $this->get('typemap');
+        return $this->get('cache_wsdl');
     }
 
     /**
-     * @param int $cacheWsdl Sets the WSDL caching mode to one of WSDL_CACHE_NONE, WSDL_CACHE_DISK, WSDL_CACHE_MEMORY
-     * or WSDL_CACHE_BOTH.
+     * Sets the WSDL caching mode.
+     *
+     * @param int $cacheMode One of WSDL_CACHE_NONE, WSDL_CACHE_DISK, WSDL_CACHE_MEMORY or WSDL_CACHE_BOTH.
      *
      * @return $this
      */
-    public function setCacheWsdl($cacheWsdl)
+    public function setCacheWsdl($cacheMode)
     {
-        return $this->set('cache_wsdl', $cacheWsdl|0);
+        return $this->set('cache_wsdl', $cacheMode|0);
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getCacheWsdl()
+    public function getUserAgent()
     {
-        return $this->get('cache_wsdl');
+        return $this->get('user_agent');
     }
 
     /**
@@ -333,11 +344,11 @@ public function setUserAgent($userAgent)
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getUserAgent()
+    public function getFeatures()
     {
-        return $this->get('user_agent');
+        return $this->get('features');
     }
 
     /**
@@ -354,9 +365,9 @@ public function setFeatures($features)
     /**
      * @return int
      */
-    public function getFeatures()
+    public function getSslMethod()
     {
-        return $this->get('features');
+        return $this->get('ssl_method');
     }
 
     /**
@@ -370,14 +381,6 @@ public function setSslMethod($method)
         return $this->set('ssl_method', $method|0);
     }
 
-    /**
-     * @return int
-     */
-    public function getSslMethod()
-    {
-        return $this->get('ssl_method');
-    }
-
     /**
      * Extracts a list of SOAP Client options only.
      *

test/Functional/Porter/Net/Http/HttpConnectorTest.php

@@ -49,7 +49,7 @@ public function testConnectionTimeout()
             return;
         }
 
-        self::fail('Expected exception not thrown.');
+        self::fail('Expected exception was not thrown.');
     }
 
     public function testErrorResponse()
@@ -66,7 +66,7 @@ public function testErrorResponse()
             $this->stopServer($server);
         }
 
-        self::fail('Expected exception not thrown.');
+        self::fail('Expected exception was not thrown.');
     }
 
     public function testOneTry()