From fb3848797959c6f772e566572656f5381992950f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 9 Jul 2012 16:46:59 -0500 Subject: [PATCH] [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 | 18 +++++++++--------- .../DiscoveryStrategyInterface.php | 6 +++--- .../DiscoveryStrategy/ReflectionDiscovery.php | 6 +++--- src/Client.php | 2 +- src/Client/DotNet.php | 4 ++-- src/Client/Local.php | 4 ++-- src/Server.php | 8 ++++---- src/Server/DocumentLiteralWrapper.php | 8 ++++---- src/Wsdl.php | 8 ++++---- src/Wsdl/ComplexTypeStrategy/Composite.php | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php index 84ff38e8..230d74e1 100644 --- a/src/AutoDiscover.php +++ b/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 diff --git a/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php index 9c5e84c5..e02ff7f8 100644 --- a/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php +++ b/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. diff --git a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php index ff97f74c..bc025d2b 100644 --- a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php +++ b/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. diff --git a/src/Client.php b/src/Client.php index a912a07b..47856030 100644 --- a/src/Client.php +++ b/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 diff --git a/src/Client/DotNet.php b/src/Client/DotNet.php index 1bb485be..855ab102 100644 --- a/src/Client/DotNet.php +++ b/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 diff --git a/src/Client/Local.php b/src/Client/Local.php index e481f51c..6d90484f 100644 --- a/src/Client/Local.php +++ b/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 diff --git a/src/Server.php b/src/Server.php index 56b44e52..2103efce 100644 --- a/src/Server.php +++ b/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 diff --git a/src/Server/DocumentLiteralWrapper.php b/src/Server/DocumentLiteralWrapper.php index 7017b509..646f7bc9 100644 --- a/src/Server/DocumentLiteralWrapper.php +++ b/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 diff --git a/src/Wsdl.php b/src/Wsdl.php index ea4b790a..f604cf2c 100644 --- a/src/Wsdl.php +++ b/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 diff --git a/src/Wsdl/ComplexTypeStrategy/Composite.php b/src/Wsdl/ComplexTypeStrategy/Composite.php index 9a70225f..9cd20820 100644 --- a/src/Wsdl/ComplexTypeStrategy/Composite.php +++ b/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