[zen-49] Correct import statements across framework

- Ran a script that would create multiple import statements out of multi-line
  import statements, and which would sort all import statements in alphabetic
  order. Script is at https://gist.github.com/3079222 and was run by dropping
  into the library/Zend folder and typing (in zsh)
  "for file in **/*.php;do php /path/to/replace-uses.php $file; done"

src/AutoDiscover.php

@@ -10,15 +10,15 @@
 
 namespace Zend\Soap;
 
-use Zend\Uri,
-    Zend\Soap\Wsdl,
-    Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy,
-    Zend\Server\Reflection\AbstractFunction,
-    Zend\Server\Reflection,
-    Zend\Server\Reflection\Prototype,
-    Zend\Server\Reflection\ReflectionParameter,
-    Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery,
-    Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
+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;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
+use Zend\Uri;
 
 /**
  * \Zend\Soap\AutoDiscover

src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php

@@ -10,9 +10,9 @@
 
 namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
 
-use Zend\Server\Reflection\AbstractFunction,
-    Zend\Server\Reflection\Prototype,
-    Zend\Server\Reflection\ReflectionParameter;
+use Zend\Server\Reflection\AbstractFunction;
+use Zend\Server\Reflection\Prototype;
+use Zend\Server\Reflection\ReflectionParameter;
 
 /**
  * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.

src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php

@@ -10,9 +10,9 @@
 
 namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
 
-use Zend\Server\Reflection\AbstractFunction,
-    Zend\Server\Reflection\Prototype,
-    Zend\Server\Reflection\ReflectionParameter;
+use Zend\Server\Reflection\AbstractFunction;
+use Zend\Server\Reflection\Prototype;
+use Zend\Server\Reflection\ReflectionParameter;
 
 /**
  * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.

src/Client.php

@@ -11,8 +11,8 @@
 namespace Zend\Soap;
 
 use Traversable;
-use Zend\Stdlib\ArrayUtils;
 use Zend\Server\Client as ServerClient;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * \Zend\Soap\Client\Client

src/Client/DotNet.php

@@ -10,8 +10,8 @@
 
 namespace Zend\Soap\Client;
 
-use Zend\Soap\Client as SOAPClient,
-    Zend\Soap\Exception;
+use Zend\Soap\Client as SOAPClient;
+use Zend\Soap\Exception;
 
 /**
  * .NET SOAP client

src/Client/Local.php

@@ -10,8 +10,8 @@
 
 namespace Zend\Soap\Client;
 
-use Zend\Soap\Client as SOAPClient,
-    Zend\Soap\Server as SOAPServer;
+use Zend\Soap\Client as SOAPClient;
+use Zend\Soap\Server as SOAPServer;
 
 /**
  * \Zend\Soap\Client\Local

src/Server.php

@@ -10,12 +10,12 @@
 
 namespace Zend\Soap;
 
+use DOMDocument;
+use DOMNode;
+use SimpleXMLElement;
+use stdClass;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use DOMDocument,
-    DOMNode,
-    SimpleXMLElement,
-    stdClass;
 
 /**
  * Zend_Soap_Server

src/Server/DocumentLiteralWrapper.php

@@ -10,10 +10,10 @@
 
 namespace Zend\Soap\Server;
 
-use ReflectionClass,
-    ReflectionObject,
-    Zend\Soap\Exception\UnexpectedValueException,
-    Zend\Soap\Exception\BadMethodCallException;
+use ReflectionClass;
+use ReflectionObject;
+use Zend\Soap\Exception\BadMethodCallException;
+use Zend\Soap\Exception\UnexpectedValueException;
 
 /**
  * Wraps WSDL Document/Literal Style service objects to hide SOAP request

src/Wsdl.php

@@ -10,10 +10,10 @@
 
 namespace Zend\Soap;
 
-use DOMDocument,
-    DOMElement,
-    Zend\Uri\Uri,
-    Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
+use DOMDocument;
+use DOMElement;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
+use Zend\Uri\Uri;
 
 /**
  * \Zend\Soap\Wsdl

src/Wsdl/ComplexTypeStrategy/Composite.php

@@ -10,9 +10,9 @@
 
 namespace Zend\Soap\Wsdl\ComplexTypeStrategy;
 
-use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy,
-    Zend\Soap\Exception,
-    Zend\Soap\Wsdl;
+use Zend\Soap\Exception;
+use Zend\Soap\Wsdl;
+use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
 
 /**
  * Zend_Soap_Wsdl_Strategy_Composite