Merge branch '#ZF2-151' of github.com:robertboloc/zf2 into #ZF2-151

zendframework · Oct 9, 2012 · c281e33 · c281e33
commit c281e33
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -13,7 +13,6 @@
 use Zend\Server\Reflection;
 use Zend\Server\Reflection\AbstractFunction;
 use Zend\Server\Reflection\Prototype;
-use Zend\Server\Reflection\ReflectionParameter;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
 use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
 use Zend\Soap\Wsdl;
@@ -191,7 +190,7 @@ public function getServiceName()
                                          ->getShortName();
             } else {
                 throw new Exception\RuntimeException(
-                    "No service name given. Call Autodiscover#setServiceName()."
+                    "No service name given. Call Autodiscover::setServiceName()."
                 );
             }
         }
@@ -228,7 +227,7 @@ public function setUri($uri)
     public function getUri()
     {
         if ($this->uri === null) {
-            throw new Exception\RuntimeException("Missing uri. You have to explicitly configure the Endpoint Uri by calling AutoDiscover#setUri().");
+            throw new Exception\RuntimeException("Missing uri. You have to explicitly configure the Endpoint Uri by calling AutoDiscover::setUri().");
         }
         if (is_string($this->uri)) {
             $this->uri = Uri\UriFactory::factory($this->uri);

diff --git a/src/Client.php b/src/Client.php
@@ -858,7 +858,7 @@ public function setUserAgent($userAgent)
         if ($userAgent === null) {
             $this->user_agent = null;
         } else {
-            $this->user_agent = (string)$userAgent;
+            $this->user_agent = (string) $userAgent;
         }
         return $this;
     }

diff --git a/src/Server/DocumentLiteralWrapper.php b/src/Server/DocumentLiteralWrapper.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Soap\Server;
 
-use ReflectionClass;
 use ReflectionObject;
 use Zend\Soap\Exception\BadMethodCallException;
 use Zend\Soap\Exception\UnexpectedValueException;

diff --git a/test/AutoDiscoverTest.php b/test/AutoDiscoverTest.php
@@ -14,7 +14,6 @@
 require_once 'TestAsset/commontypes.php';
 
 use Zend\Soap\AutoDiscover;
-use Zend\Soap\AutoDiscoverException;
 
 /** PHPUnit Test Case */
 

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -13,7 +13,6 @@
 require_once __DIR__ . '/TestAsset/commontypes.php';
 
 use Zend\Soap\Server;
-use Zend\Soap\ServerException;
 
 /**
  * Zend_Soap_Server