From 226dc094f366f52a7195181c80200ce96bdaad80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 28 Apr 2013 19:35:44 +0200 Subject: [PATCH] Alphabetically order use statements (related to #4338) --- .../Zend/Authentication/Adapter/Http/ApacheResolver.php | 2 +- library/Zend/Authentication/Storage/Chain.php | 2 +- library/Zend/Cache/Service/StorageCacheFactory.php | 2 +- library/Zend/Cache/Storage/Adapter/Redis.php | 1 - library/Zend/Cache/Storage/Adapter/RedisOptions.php | 3 +-- library/Zend/Captcha/AbstractWord.php | 2 +- library/Zend/Code/Generator/DocBlock/Tag.php | 4 ++-- library/Zend/Code/Reflection/DocBlock/TagManager.php | 2 +- library/Zend/Code/Reflection/DocBlockReflection.php | 2 +- library/Zend/Console/Adapter/WindowsAnsicon.php | 2 +- library/Zend/Console/Prompt/AbstractPrompt.php | 2 +- library/Zend/Crypt/PublicKey/Rsa.php | 2 +- library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php | 2 +- library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php | 2 +- library/Zend/Db/Adapter/Platform/Postgresql.php | 2 +- library/Zend/Db/Sql/AbstractSql.php | 2 +- library/Zend/Db/Sql/Delete.php | 2 +- library/Zend/Db/Sql/Insert.php | 2 +- library/Zend/Db/Sql/Platform/AbstractPlatform.php | 4 ++-- library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php | 2 +- library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php | 2 +- .../Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php | 2 +- library/Zend/Db/Sql/Predicate/In.php | 2 +- library/Zend/Db/Sql/Update.php | 2 +- library/Zend/Db/TableGateway/Feature/SequenceFeature.php | 2 +- library/Zend/Di/Config.php | 2 +- library/Zend/Dom/NodeList.php | 2 +- library/Zend/Filter/UriNormalize.php | 2 +- library/Zend/Filter/Word/AbstractSeparator.php | 2 +- library/Zend/Form/Element/DateSelect.php | 2 +- library/Zend/Form/Element/DateTimeSelect.php | 4 ++-- library/Zend/Form/Element/Email.php | 2 +- library/Zend/Form/Element/File.php | 2 +- library/Zend/Form/Element/MonthSelect.php | 2 +- library/Zend/Form/Element/Password.php | 2 +- library/Zend/Form/Fieldset.php | 2 +- library/Zend/Form/FormAbstractServiceFactory.php | 2 +- library/Zend/Http/Header/AbstractLocation.php | 4 ++-- library/Zend/InputFilter/Factory.php | 2 +- library/Zend/InputFilter/Input.php | 2 +- library/Zend/Log/Writer/FilterPluginManager.php | 4 ++-- library/Zend/Log/Writer/FingersCrossed.php | 6 +++--- library/Zend/Log/Writer/FirePhp.php | 2 +- library/Zend/Log/Writer/FormatterPluginManager.php | 4 ++-- library/Zend/Log/Writer/Syslog.php | 2 +- .../Zend/ModuleManager/Listener/ModuleLoaderListener.php | 4 ++-- .../Mvc/Controller/Plugin/AcceptableViewModelSelector.php | 7 +++---- .../Mvc/Controller/Plugin/Service/IdentityFactory.php | 2 +- library/Zend/Mvc/ResponseSender/HttpResponseSender.php | 2 +- .../Mvc/ResponseSender/PhpEnvironmentResponseSender.php | 2 +- library/Zend/Mvc/Router/Console/Catchall.php | 4 ++-- library/Zend/Mvc/Router/Console/Simple.php | 8 ++++---- library/Zend/Mvc/SendResponseListener.php | 2 +- library/Zend/Mvc/Service/ConsoleAdapterFactory.php | 4 ++-- .../Zend/Mvc/Service/DiStrictAbstractServiceFactory.php | 8 ++++---- library/Zend/Mvc/Service/RequestFactory.php | 4 ++-- library/Zend/Mvc/Service/ResponseFactory.php | 4 ++-- library/Zend/Mvc/Service/RouterFactory.php | 4 ++-- library/Zend/Mvc/Service/ServiceListenerFactory.php | 4 ++-- library/Zend/Mvc/Service/ViewResolverFactory.php | 2 +- .../Zend/Mvc/Service/ViewTemplateMapResolverFactory.php | 2 +- library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php | 2 +- .../Zend/Mvc/View/Console/DefaultRenderingStrategy.php | 2 +- .../Mvc/View/Console/InjectNamedConsoleParamsListener.php | 2 +- .../Zend/Mvc/View/Http/InjectRoutematchParamsListener.php | 2 +- library/Zend/Navigation/Page/Mvc.php | 2 +- library/Zend/Paginator/Adapter/DbSelect.php | 2 +- library/Zend/Serializer/Adapter/PythonPickle.php | 4 ++-- library/Zend/Server/Reflection/AbstractFunction.php | 2 +- library/Zend/ServiceManager/Proxy/LazyServiceFactory.php | 2 +- .../ServiceManager/Proxy/LazyServiceFactoryFactory.php | 1 - library/Zend/Session/AbstractContainer.php | 2 +- library/Zend/Session/Config/StandardConfig.php | 2 +- library/Zend/Session/Storage/StorageInterface.php | 4 ++-- library/Zend/Stdlib/Hydrator/ClassMethods.php | 2 +- .../Stdlib/Hydrator/Filter/NumberOfParameterFilter.php | 2 +- library/Zend/Validator/Barcode/Code128.php | 2 +- library/Zend/Validator/Db/AbstractDb.php | 2 +- 78 files changed, 101 insertions(+), 105 deletions(-) diff --git a/library/Zend/Authentication/Adapter/Http/ApacheResolver.php b/library/Zend/Authentication/Adapter/Http/ApacheResolver.php index 22c945caac4..b5a9dd9b23a 100644 --- a/library/Zend/Authentication/Adapter/Http/ApacheResolver.php +++ b/library/Zend/Authentication/Adapter/Http/ApacheResolver.php @@ -9,9 +9,9 @@ namespace Zend\Authentication\Adapter\Http; +use Zend\Authentication\Result as AuthResult; use Zend\Crypt\Password\Apache as ApachePassword; use Zend\Stdlib\ErrorHandler; -use Zend\Authentication\Result as AuthResult; /** * Apache Authentication Resolver diff --git a/library/Zend/Authentication/Storage/Chain.php b/library/Zend/Authentication/Storage/Chain.php index 2f6c9f6c22e..3893586f69c 100644 --- a/library/Zend/Authentication/Storage/Chain.php +++ b/library/Zend/Authentication/Storage/Chain.php @@ -9,8 +9,8 @@ namespace Zend\Authentication\Storage; -use Zend\Stdlib\PriorityQueue; use Zend\Authentication\Storage\StorageInterface; +use Zend\Stdlib\PriorityQueue; class Chain implements StorageInterface { diff --git a/library/Zend/Cache/Service/StorageCacheFactory.php b/library/Zend/Cache/Service/StorageCacheFactory.php index 88c13d9dffc..745ca022cf1 100644 --- a/library/Zend/Cache/Service/StorageCacheFactory.php +++ b/library/Zend/Cache/Service/StorageCacheFactory.php @@ -9,9 +9,9 @@ namespace Zend\Cache\Service; +use Zend\Cache\StorageFactory; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Cache\StorageFactory; /** * Storage cache factory. diff --git a/library/Zend/Cache/Storage/Adapter/Redis.php b/library/Zend/Cache/Storage/Adapter/Redis.php index e64c13e3f6b..0f061a0adca 100644 --- a/library/Zend/Cache/Storage/Adapter/Redis.php +++ b/library/Zend/Cache/Storage/Adapter/Redis.php @@ -11,7 +11,6 @@ use Redis as RedisResource; use RedisException as RedisResourceException; - use stdClass; use Zend\Cache\Storage\Adapter\AbstractAdapter; use Zend\Cache\Exception; diff --git a/library/Zend/Cache/Storage/Adapter/RedisOptions.php b/library/Zend/Cache/Storage/Adapter/RedisOptions.php index a182d789ede..1b90cd95a05 100644 --- a/library/Zend/Cache/Storage/Adapter/RedisOptions.php +++ b/library/Zend/Cache/Storage/Adapter/RedisOptions.php @@ -9,9 +9,8 @@ namespace Zend\Cache\Storage\Adapter; -use Zend\Cache\Storage\Adapter\AdapterOptions; - use Redis as RedisResource; +use Zend\Cache\Storage\Adapter\AdapterOptions; class RedisOptions extends AdapterOptions { diff --git a/library/Zend/Captcha/AbstractWord.php b/library/Zend/Captcha/AbstractWord.php index fa0ba1d3320..d9c7d802fc4 100644 --- a/library/Zend/Captcha/AbstractWord.php +++ b/library/Zend/Captcha/AbstractWord.php @@ -9,8 +9,8 @@ namespace Zend\Captcha; -use Zend\Session\Container; use Zend\Math\Rand; +use Zend\Session\Container; /** * AbstractWord-based captcha adapter diff --git a/library/Zend/Code/Generator/DocBlock/Tag.php b/library/Zend/Code/Generator/DocBlock/Tag.php index 6df058fb851..5478b329db3 100644 --- a/library/Zend/Code/Generator/DocBlock/Tag.php +++ b/library/Zend/Code/Generator/DocBlock/Tag.php @@ -9,10 +9,10 @@ namespace Zend\Code\Generator\DocBlock; -use Zend\Code\Generator\AbstractGenerator; -use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag; use ReflectionClass; use ReflectionMethod; +use Zend\Code\Generator\AbstractGenerator; +use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag; class Tag extends AbstractGenerator { diff --git a/library/Zend/Code/Reflection/DocBlock/TagManager.php b/library/Zend/Code/Reflection/DocBlock/TagManager.php index 5496a439550..761b39c6a1c 100644 --- a/library/Zend/Code/Reflection/DocBlock/TagManager.php +++ b/library/Zend/Code/Reflection/DocBlock/TagManager.php @@ -9,9 +9,9 @@ namespace Zend\Code\Reflection\DocBlock; -use Zend\Code\Reflection\Exception; use Zend\Code\Reflection\DocBlock\Tag\GenericTag; use Zend\Code\Reflection\DocBlock\Tag\TagInterface; +use Zend\Code\Reflection\Exception; class TagManager { diff --git a/library/Zend/Code/Reflection/DocBlockReflection.php b/library/Zend/Code/Reflection/DocBlockReflection.php index bf539337144..3b2257e927f 100644 --- a/library/Zend/Code/Reflection/DocBlockReflection.php +++ b/library/Zend/Code/Reflection/DocBlockReflection.php @@ -9,10 +9,10 @@ namespace Zend\Code\Reflection; +use Reflector; use Zend\Code\Reflection\DocBlock\Tag\TagInterface as DocBlockTagInterface; use Zend\Code\Reflection\DocBlock\TagManager as DocBlockTagManager; use Zend\Code\Scanner\DocBlockScanner; -use Reflector; class DocBlockReflection implements ReflectionInterface { diff --git a/library/Zend/Console/Adapter/WindowsAnsicon.php b/library/Zend/Console/Adapter/WindowsAnsicon.php index 9621c828a15..850c8f11fd7 100644 --- a/library/Zend/Console/Adapter/WindowsAnsicon.php +++ b/library/Zend/Console/Adapter/WindowsAnsicon.php @@ -9,9 +9,9 @@ namespace Zend\Console\Adapter; +use Zend\Console\Charset; use Zend\Console\Charset\CharsetInterface; use Zend\Console\Exception; -use Zend\Console\Charset; /** * MS Windows with ANSICON console adapter diff --git a/library/Zend/Console/Prompt/AbstractPrompt.php b/library/Zend/Console/Prompt/AbstractPrompt.php index 1b675258cd9..7ccb28ce0f4 100644 --- a/library/Zend/Console/Prompt/AbstractPrompt.php +++ b/library/Zend/Console/Prompt/AbstractPrompt.php @@ -10,8 +10,8 @@ namespace Zend\Console\Prompt; use ReflectionClass; -use Zend\Console\Console; use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter; +use Zend\Console\Console; use Zend\Console\Exception; abstract class AbstractPrompt implements PromptInterface diff --git a/library/Zend/Crypt/PublicKey/Rsa.php b/library/Zend/Crypt/PublicKey/Rsa.php index 873ca3f0513..03b1f177514 100644 --- a/library/Zend/Crypt/PublicKey/Rsa.php +++ b/library/Zend/Crypt/PublicKey/Rsa.php @@ -10,8 +10,8 @@ namespace Zend\Crypt\PublicKey; use Traversable; -use Zend\Crypt\PublicKey\RsaOptions; use Zend\Crypt\PublicKey\Rsa\Exception; +use Zend\Crypt\PublicKey\RsaOptions; use Zend\Stdlib\ArrayUtils; /** diff --git a/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php index 4683fb2f39b..362f7a8896f 100755 --- a/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php +++ b/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php @@ -10,8 +10,8 @@ namespace Zend\Db\Adapter\Driver\IbmDb2; use Zend\Db\Adapter\Driver\StatementInterface; -use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Exception; +use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Profiler; class Statement implements StatementInterface, Profiler\ProfilerAwareInterface diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php index 2de47273041..ac790652cef 100644 --- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php +++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php @@ -9,8 +9,8 @@ namespace Zend\Db\Adapter\Driver\Sqlsrv; -use Zend\Db\Adapter\Driver\Sqlsrv\Exception\ErrorException; use Zend\Db\Adapter\Driver\ConnectionInterface; +use Zend\Db\Adapter\Driver\Sqlsrv\Exception\ErrorException; use Zend\Db\Adapter\Exception; use Zend\Db\Adapter\Profiler; diff --git a/library/Zend/Db/Adapter/Platform/Postgresql.php b/library/Zend/Db/Adapter/Platform/Postgresql.php index 6e1bc09d890..71247a5fc41 100644 --- a/library/Zend/Db/Adapter/Platform/Postgresql.php +++ b/library/Zend/Db/Adapter/Platform/Postgresql.php @@ -10,8 +10,8 @@ namespace Zend\Db\Adapter\Platform; use Zend\Db\Adapter\Driver\DriverInterface; -use Zend\Db\Adapter\Driver\Pgsql; use Zend\Db\Adapter\Driver\Pdo; +use Zend\Db\Adapter\Driver\Pgsql; use Zend\Db\Adapter\Exception; class Postgresql implements PlatformInterface diff --git a/library/Zend/Db/Sql/AbstractSql.php b/library/Zend/Db/Sql/AbstractSql.php index b8f2dc18107..5153e26b96c 100644 --- a/library/Zend/Db/Sql/AbstractSql.php +++ b/library/Zend/Db/Sql/AbstractSql.php @@ -10,9 +10,9 @@ namespace Zend\Db\Sql; use Zend\Db\Adapter\Driver\DriverInterface; -use Zend\Db\Adapter\StatementContainer; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; +use Zend\Db\Adapter\StatementContainer; abstract class AbstractSql { diff --git a/library/Zend/Db/Sql/Delete.php b/library/Zend/Db/Sql/Delete.php index 6f7fd0e670b..d7452f9688d 100644 --- a/library/Zend/Db/Sql/Delete.php +++ b/library/Zend/Db/Sql/Delete.php @@ -10,10 +10,10 @@ namespace Zend\Db\Sql; use Zend\Db\Adapter\AdapterInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; use Zend\Db\Adapter\Platform\Sql92; +use Zend\Db\Adapter\StatementContainerInterface; /** * diff --git a/library/Zend/Db/Sql/Insert.php b/library/Zend/Db/Sql/Insert.php index f46be6580c4..1af38099e68 100644 --- a/library/Zend/Db/Sql/Insert.php +++ b/library/Zend/Db/Sql/Insert.php @@ -10,10 +10,10 @@ namespace Zend\Db\Sql; use Zend\Db\Adapter\AdapterInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; use Zend\Db\Adapter\Platform\Sql92; +use Zend\Db\Adapter\StatementContainerInterface; class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface { diff --git a/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/library/Zend/Db/Sql/Platform/AbstractPlatform.php index f6bba5449ec..b65c404ab42 100644 --- a/library/Zend/Db/Sql/Platform/AbstractPlatform.php +++ b/library/Zend/Db/Sql/Platform/AbstractPlatform.php @@ -10,11 +10,11 @@ namespace Zend\Db\Sql\Platform; use Zend\Db\Adapter\AdapterInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\Platform\PlatformInterface; +use Zend\Db\Adapter\StatementContainerInterface; +use Zend\Db\Sql\Exception; use Zend\Db\Sql\PreparableSqlInterface; use Zend\Db\Sql\SqlInterface; -use Zend\Db\Sql\Exception; class AbstractPlatform implements PlatformDecoratorInterface, PreparableSqlInterface, SqlInterface { diff --git a/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php b/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php index 84263f90b02..5046f74876d 100644 --- a/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php +++ b/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php @@ -13,8 +13,8 @@ use Zend\Db\Adapter\Driver\DriverInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; -use Zend\Db\Sql\Platform\PlatformDecoratorInterface; use Zend\Db\Adapter\StatementContainerInterface; +use Zend\Db\Sql\Platform\PlatformDecoratorInterface; use Zend\Db\Sql\Select; class SelectDecorator extends Select implements PlatformDecoratorInterface diff --git a/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php b/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php index ba2c5700f8e..5de73fc6a4e 100755 --- a/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php +++ b/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php @@ -11,9 +11,9 @@ use Zend\Db\Adapter\AdapterInterface; use Zend\Db\Adapter\Driver\DriverInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; +use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Sql\ExpressionInterface; use Zend\Db\Sql\Platform\PlatformDecoratorInterface; use Zend\Db\Sql\Select; diff --git a/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php index 1ea32925920..2b649cdcdf6 100644 --- a/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php +++ b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php @@ -11,9 +11,9 @@ use Zend\Db\Adapter\AdapterInterface; use Zend\Db\Adapter\Driver\DriverInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; +use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Sql\Platform\PlatformDecoratorInterface; use Zend\Db\Sql\Select; diff --git a/library/Zend/Db/Sql/Predicate/In.php b/library/Zend/Db/Sql/Predicate/In.php index 6d765f58c26..5928ecf002b 100644 --- a/library/Zend/Db/Sql/Predicate/In.php +++ b/library/Zend/Db/Sql/Predicate/In.php @@ -9,8 +9,8 @@ namespace Zend\Db\Sql\Predicate; -use Zend\Db\Sql\Select; use Zend\Db\Sql\Exception; +use Zend\Db\Sql\Select; class In implements PredicateInterface { diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php index 8d4c6759c06..b5455f0045c 100644 --- a/library/Zend/Db/Sql/Update.php +++ b/library/Zend/Db/Sql/Update.php @@ -10,10 +10,10 @@ namespace Zend\Db\Sql; use Zend\Db\Adapter\AdapterInterface; -use Zend\Db\Adapter\StatementContainerInterface; use Zend\Db\Adapter\ParameterContainer; use Zend\Db\Adapter\Platform\PlatformInterface; use Zend\Db\Adapter\Platform\Sql92; +use Zend\Db\Adapter\StatementContainerInterface; /** * diff --git a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php index 1122ccfe02d..b5d8ab6cf27 100644 --- a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php +++ b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php @@ -10,8 +10,8 @@ namespace Zend\Db\TableGateway\Feature; use Zend\Db\Sql\Insert; -use Zend\Db\Adapter\Driver\StatementInterface; use Zend\Db\Adapter\Driver\ResultInterface; +use Zend\Db\Adapter\Driver\StatementInterface; class SequenceFeature extends AbstractFeature { diff --git a/library/Zend/Di/Config.php b/library/Zend/Di/Config.php index 180ef81b79b..7a94729d79f 100644 --- a/library/Zend/Di/Config.php +++ b/library/Zend/Di/Config.php @@ -10,9 +10,9 @@ namespace Zend\Di; use Traversable; -use Zend\Stdlib\ArrayUtils; use Zend\Di\Definition\ArrayDefinition; use Zend\Di\Definition\RuntimeDefinition; +use Zend\Stdlib\ArrayUtils; /** * Configures Di instances diff --git a/library/Zend/Dom/NodeList.php b/library/Zend/Dom/NodeList.php index 5ada8646dd2..395bd97948a 100644 --- a/library/Zend/Dom/NodeList.php +++ b/library/Zend/Dom/NodeList.php @@ -9,12 +9,12 @@ namespace Zend\Dom; +use ArrayAccess; use Countable; use DOMDocument; use DOMNodeList; use DOMNode; use Iterator; -use ArrayAccess; /** * Nodelist for DOM XPath query diff --git a/library/Zend/Filter/UriNormalize.php b/library/Zend/Filter/UriNormalize.php index 8ba185c4c4e..9056ccbf0f1 100644 --- a/library/Zend/Filter/UriNormalize.php +++ b/library/Zend/Filter/UriNormalize.php @@ -11,9 +11,9 @@ use Zend\Filter\AbstractFilter; use Zend\Filter\Exception\InvalidArgumentException; +use Zend\Uri\Exception\ExceptionInterface as UriException; use Zend\Uri\UriFactory; use Zend\Uri\Uri; -use Zend\Uri\Exception\ExceptionInterface as UriException; class UriNormalize extends AbstractFilter { diff --git a/library/Zend/Filter/Word/AbstractSeparator.php b/library/Zend/Filter/Word/AbstractSeparator.php index 2d8bf6f4a8f..3ea8a7262fe 100644 --- a/library/Zend/Filter/Word/AbstractSeparator.php +++ b/library/Zend/Filter/Word/AbstractSeparator.php @@ -9,8 +9,8 @@ namespace Zend\Filter\Word; -use Zend\Filter\Exception; use Zend\Filter\AbstractFilter; +use Zend\Filter\Exception; abstract class AbstractSeparator extends AbstractFilter { diff --git a/library/Zend/Form/Element/DateSelect.php b/library/Zend/Form/Element/DateSelect.php index c1afb1600c2..5605ea784fb 100644 --- a/library/Zend/Form/Element/DateSelect.php +++ b/library/Zend/Form/Element/DateSelect.php @@ -10,10 +10,10 @@ namespace Zend\Form\Element; use DateTime as PhpDateTime; +use Zend\Form\Exception\InvalidArgumentException; use Zend\Form\FormInterface; use Zend\Validator\ValidatorInterface; use Zend\Validator\Date as DateValidator; -use Zend\Form\Exception\InvalidArgumentException; use Exception; class DateSelect extends MonthSelect diff --git a/library/Zend/Form/Element/DateTimeSelect.php b/library/Zend/Form/Element/DateTimeSelect.php index c2c16004f36..43c47910d96 100644 --- a/library/Zend/Form/Element/DateTimeSelect.php +++ b/library/Zend/Form/Element/DateTimeSelect.php @@ -10,11 +10,11 @@ namespace Zend\Form\Element; use DateTime as PhpDateTime; +use Exception; use Zend\Form\FormInterface; +use Zend\Form\Exception\InvalidArgumentException; use Zend\Validator\ValidatorInterface; use Zend\Validator\Date as DateValidator; -use Zend\Form\Exception\InvalidArgumentException; -use Exception; class DateTimeSelect extends DateSelect { diff --git a/library/Zend/Form/Element/Email.php b/library/Zend/Form/Element/Email.php index 2d7164d5570..3f818c8f14b 100644 --- a/library/Zend/Form/Element/Email.php +++ b/library/Zend/Form/Element/Email.php @@ -11,8 +11,8 @@ use Zend\Form\Element; use Zend\InputFilter\InputProviderInterface; -use Zend\Validator\Regex as RegexValidator; use Zend\Validator\Explode as ExplodeValidator; +use Zend\Validator\Regex as RegexValidator; use Zend\Validator\ValidatorInterface; class Email extends Element implements InputProviderInterface diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php index b65c4cafebb..bff2af42e59 100644 --- a/library/Zend/Form/Element/File.php +++ b/library/Zend/Form/Element/File.php @@ -18,9 +18,9 @@ namespace Zend\Form\Element; -use Zend\Form\FormInterface; use Zend\Form\Element; use Zend\Form\ElementPrepareAwareInterface; +use Zend\Form\FormInterface; use Zend\InputFilter\InputProviderInterface; /** diff --git a/library/Zend/Form/Element/MonthSelect.php b/library/Zend/Form/Element/MonthSelect.php index 6ab28de442e..950678c522a 100644 --- a/library/Zend/Form/Element/MonthSelect.php +++ b/library/Zend/Form/Element/MonthSelect.php @@ -14,8 +14,8 @@ use Zend\Form\ElementPrepareAwareInterface; use Zend\Form\FormInterface; use Zend\InputFilter\InputProviderInterface; -use Zend\Validator\ValidatorInterface; use Zend\Validator\Regex as RegexValidator; +use Zend\Validator\ValidatorInterface; class MonthSelect extends Element implements InputProviderInterface, ElementPrepareAwareInterface { diff --git a/library/Zend/Form/Element/Password.php b/library/Zend/Form/Element/Password.php index 11d2896193a..ee514c69e9c 100644 --- a/library/Zend/Form/Element/Password.php +++ b/library/Zend/Form/Element/Password.php @@ -18,9 +18,9 @@ namespace Zend\Form\Element; -use Zend\Form\FormInterface; use Zend\Form\Element; use Zend\Form\ElementPrepareAwareInterface; +use Zend\Form\FormInterface; /** * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php index 58b86de777c..53ea961259e 100644 --- a/library/Zend/Form/Fieldset.php +++ b/library/Zend/Form/Fieldset.php @@ -11,9 +11,9 @@ use Traversable; use Zend\Stdlib\Hydrator; +use Zend\Stdlib\Hydrator\HydratorAwareInterface; use Zend\Stdlib\Hydrator\HydratorInterface; use Zend\Stdlib\PriorityQueue; -use Zend\Stdlib\Hydrator\HydratorAwareInterface; class Fieldset extends Element implements FieldsetInterface { diff --git a/library/Zend/Form/FormAbstractServiceFactory.php b/library/Zend/Form/FormAbstractServiceFactory.php index 1824dac52ac..b5d994789e8 100644 --- a/library/Zend/Form/FormAbstractServiceFactory.php +++ b/library/Zend/Form/FormAbstractServiceFactory.php @@ -9,9 +9,9 @@ namespace Zend\Form; +use Zend\Form\Factory; use Zend\ServiceManager\AbstractFactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Form\Factory; /** * Abstract form factory. diff --git a/library/Zend/Http/Header/AbstractLocation.php b/library/Zend/Http/Header/AbstractLocation.php index 8898a39ac4d..9aa6151321a 100644 --- a/library/Zend/Http/Header/AbstractLocation.php +++ b/library/Zend/Http/Header/AbstractLocation.php @@ -10,9 +10,9 @@ namespace Zend\Http\Header; use Zend\Uri\Exception as UriException; -use Zend\Uri\UriInterface; -use Zend\Uri\UriFactory; use Zend\Uri\Uri; +use Zend\Uri\UriFactory; +use Zend\Uri\UriInterface; /** diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php index 77b2f865851..89584853707 100644 --- a/library/Zend/InputFilter/Factory.php +++ b/library/Zend/InputFilter/Factory.php @@ -12,8 +12,8 @@ use Traversable; use Zend\Filter\FilterChain; use Zend\Stdlib\ArrayUtils; -use Zend\Validator\ValidatorChain; use Zend\Validator\ValidatorInterface; +use Zend\Validator\ValidatorChain; class Factory { diff --git a/library/Zend/InputFilter/Input.php b/library/Zend/InputFilter/Input.php index 759e44b1914..e4cf2bf0bd8 100644 --- a/library/Zend/InputFilter/Input.php +++ b/library/Zend/InputFilter/Input.php @@ -10,8 +10,8 @@ namespace Zend\InputFilter; use Zend\Filter\FilterChain; -use Zend\Validator\ValidatorChain; use Zend\Validator\NotEmpty; +use Zend\Validator\ValidatorChain; class Input implements InputInterface, EmptyContextInterface { diff --git a/library/Zend/Log/Writer/FilterPluginManager.php b/library/Zend/Log/Writer/FilterPluginManager.php index bb41b6f1c78..4bb59c92295 100644 --- a/library/Zend/Log/Writer/FilterPluginManager.php +++ b/library/Zend/Log/Writer/FilterPluginManager.php @@ -9,9 +9,9 @@ namespace Zend\Log\Writer; -use Zend\ServiceManager\AbstractPluginManager; -use Zend\Log\Filter; use Zend\Log\Exception; +use Zend\Log\Filter; +use Zend\ServiceManager\AbstractPluginManager; class FilterPluginManager extends AbstractPluginManager { diff --git a/library/Zend/Log/Writer/FingersCrossed.php b/library/Zend/Log/Writer/FingersCrossed.php index b1ab12c1f6c..270fa451fde 100644 --- a/library/Zend/Log/Writer/FingersCrossed.php +++ b/library/Zend/Log/Writer/FingersCrossed.php @@ -10,13 +10,13 @@ use Traversable; use Zend\Stdlib\ArrayUtils; -use Zend\Log\Filter\Priority as PriorityFilter; +use Zend\Log\Exception; use Zend\Log\Filter\FilterInterface; +use Zend\Log\Filter\Priority as PriorityFilter; use Zend\Log\Formatter\FormatterInterface; -use Zend\Log\Exception; use Zend\Log\Logger; -use Zend\Log\Writer\WriterInterface; use Zend\Log\Writer\AbstractWriter; +use Zend\Log\Writer\WriterInterface; use Zend\Log\WriterPluginManager; /** diff --git a/library/Zend/Log/Writer/FirePhp.php b/library/Zend/Log/Writer/FirePhp.php index cf4f2e98cf4..8539420f64f 100644 --- a/library/Zend/Log/Writer/FirePhp.php +++ b/library/Zend/Log/Writer/FirePhp.php @@ -11,9 +11,9 @@ use Traversable; use FirePHP as FirePHPService; +use Zend\Log\Exception; use Zend\Log\Formatter\FirePhp as FirePhpFormatter; use Zend\Log\Logger; -use Zend\Log\Exception; use FirePhp\FirePhpInterface; class FirePhp extends AbstractWriter diff --git a/library/Zend/Log/Writer/FormatterPluginManager.php b/library/Zend/Log/Writer/FormatterPluginManager.php index 4d2ec2638cc..3abc4487260 100644 --- a/library/Zend/Log/Writer/FormatterPluginManager.php +++ b/library/Zend/Log/Writer/FormatterPluginManager.php @@ -9,9 +9,9 @@ namespace Zend\Log\Writer; -use Zend\ServiceManager\AbstractPluginManager; -use Zend\Log\Formatter; use Zend\Log\Exception; +use Zend\Log\Formatter; +use Zend\ServiceManager\AbstractPluginManager; class FormatterPluginManager extends AbstractPluginManager { diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php index e8133316f87..51f50c3c909 100644 --- a/library/Zend/Log/Writer/Syslog.php +++ b/library/Zend/Log/Writer/Syslog.php @@ -11,8 +11,8 @@ use Traversable; use Zend\Log\Exception; -use Zend\Log\Logger; use Zend\Log\Formatter\Simple as SimpleFormatter; +use Zend\Log\Logger; /** * Writes log messages to syslog diff --git a/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php b/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php index 120274aeee1..7d81df55b32 100644 --- a/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php +++ b/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php @@ -9,10 +9,10 @@ namespace Zend\ModuleManager\Listener; -use Zend\Loader\ModuleAutoloader; -use Zend\ModuleManager\ModuleEvent; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\Loader\ModuleAutoloader; +use Zend\ModuleManager\ModuleEvent; /** * Module loader listener diff --git a/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php b/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php index 101d0521649..1f38960bcbd 100644 --- a/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php +++ b/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php @@ -9,15 +9,14 @@ namespace Zend\Mvc\Controller\Plugin; -use Zend\Http\Request; use Zend\Http\Header\Accept\FieldValuePart\AbstractFieldValuePart; +use Zend\Http\Request; use Zend\Mvc\Controller\Plugin\AbstractPlugin; -use Zend\View\Model\ModelInterface; use Zend\Mvc\InjectApplicationEventInterface; use Zend\Mvc\MvcEvent; -use Zend\Mvc\Exception\InvalidArgumentException; use Zend\Mvc\Exception\DomainException; - +use Zend\Mvc\Exception\InvalidArgumentException; +use Zend\View\Model\ModelInterface; /** * Controller Plugin to assist in selecting an appropriate View Model type based on the diff --git a/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php b/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php index ef068c84c62..24f18260ee4 100644 --- a/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php +++ b/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Controller\Plugin\Service; +use Zend\Mvc\Controller\Plugin\Identity; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Mvc\Controller\Plugin\Identity; class IdentityFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/ResponseSender/HttpResponseSender.php b/library/Zend/Mvc/ResponseSender/HttpResponseSender.php index 54d9b4caed6..46d8fb4b163 100644 --- a/library/Zend/Mvc/ResponseSender/HttpResponseSender.php +++ b/library/Zend/Mvc/ResponseSender/HttpResponseSender.php @@ -9,8 +9,8 @@ namespace Zend\Mvc\ResponseSender; -use Zend\Mvc\ResponseSender\SendResponseEvent; use Zend\Http\Response; +use Zend\Mvc\ResponseSender\SendResponseEvent; class HttpResponseSender extends AbstractResponseSender { diff --git a/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php b/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php index 4a5d22f05c3..fd178a5f55e 100644 --- a/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php +++ b/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php @@ -9,8 +9,8 @@ namespace Zend\Mvc\ResponseSender; -use Zend\Mvc\ResponseSender\SendResponseEvent; use Zend\Http\PhpEnvironment\Response; +use Zend\Mvc\ResponseSender\SendResponseEvent; class PhpEnvironmentResponseSender extends HttpResponseSender { diff --git a/library/Zend/Mvc/Router/Console/Catchall.php b/library/Zend/Mvc/Router/Console/Catchall.php index fadcafb6c28..5fb85f4298d 100644 --- a/library/Zend/Mvc/Router/Console/Catchall.php +++ b/library/Zend/Mvc/Router/Console/Catchall.php @@ -22,10 +22,10 @@ namespace Zend\Mvc\Router\Console; use Traversable; -use Zend\Stdlib\RequestInterface as Request; -use Zend\Mvc\Router\Exception; use Zend\Console\Request as ConsoleRequest; use Zend\Filter\FilterChain; +use Zend\Mvc\Router\Exception; +use Zend\Stdlib\RequestInterface as Request; use Zend\Validator\ValidatorChain; /** diff --git a/library/Zend/Mvc/Router/Console/Simple.php b/library/Zend/Mvc/Router/Console/Simple.php index 597bfb671ea..039cd368894 100644 --- a/library/Zend/Mvc/Router/Console/Simple.php +++ b/library/Zend/Mvc/Router/Console/Simple.php @@ -22,13 +22,13 @@ namespace Zend\Mvc\Router\Console; use Traversable; -use Zend\Stdlib\ArrayUtils; -use Zend\Stdlib\RequestInterface as Request; -use Zend\Mvc\Router\Exception; use Zend\Console\Request as ConsoleRequest; use Zend\Filter\FilterChain; -use Zend\Validator\ValidatorChain; use Zend\Mvc\Exception\InvalidArgumentException; +use Zend\Mvc\Router\Exception; +use Zend\Stdlib\ArrayUtils; +use Zend\Stdlib\RequestInterface as Request; +use Zend\Validator\ValidatorChain; /** * Segment route. diff --git a/library/Zend/Mvc/SendResponseListener.php b/library/Zend/Mvc/SendResponseListener.php index ccee3427622..c01084d65d1 100644 --- a/library/Zend/Mvc/SendResponseListener.php +++ b/library/Zend/Mvc/SendResponseListener.php @@ -17,8 +17,8 @@ use Zend\Mvc\ResponseSender\ConsoleResponseSender; use Zend\Mvc\ResponseSender\HttpResponseSender; use Zend\Mvc\ResponseSender\PhpEnvironmentResponseSender; -use Zend\Mvc\ResponseSender\SimpleStreamResponseSender; use Zend\Mvc\ResponseSender\SendResponseEvent; +use Zend\Mvc\ResponseSender\SimpleStreamResponseSender; use Zend\Stdlib\ResponseInterface as Response; class SendResponseListener implements diff --git a/library/Zend/Mvc/Service/ConsoleAdapterFactory.php b/library/Zend/Mvc/Service/ConsoleAdapterFactory.php index 57834defb58..08571bd8d78 100644 --- a/library/Zend/Mvc/Service/ConsoleAdapterFactory.php +++ b/library/Zend/Mvc/Service/ConsoleAdapterFactory.php @@ -10,10 +10,10 @@ namespace Zend\Mvc\Service; use stdClass; +use Zend\Console\Adapter\AdapterInterface; +use Zend\Console\Console; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Console\Console; -use Zend\Console\Adapter\AdapterInterface; class ConsoleAdapterFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php index 26e87c069db..1d043be806c 100644 --- a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php +++ b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php @@ -9,13 +9,13 @@ namespace Zend\Mvc\Service; -use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\ServiceManager\AbstractFactoryInterface; -use Zend\ServiceManager\AbstractPluginManager; -use Zend\ServiceManager\Exception; use Zend\Di\Di; use Zend\Di\Exception\ClassNotFoundException; use Zend\Mvc\Exception\DomainException; +use Zend\ServiceManager\AbstractFactoryInterface; +use Zend\ServiceManager\AbstractPluginManager; +use Zend\ServiceManager\Exception; +use Zend\ServiceManager\ServiceLocatorInterface; class DiStrictAbstractServiceFactory extends Di implements AbstractFactoryInterface { diff --git a/library/Zend/Mvc/Service/RequestFactory.php b/library/Zend/Mvc/Service/RequestFactory.php index 02f984890bb..729a71ecada 100644 --- a/library/Zend/Mvc/Service/RequestFactory.php +++ b/library/Zend/Mvc/Service/RequestFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Service; -use Zend\Http\PhpEnvironment\Request as HttpRequest; -use Zend\Console\Request as ConsoleRequest; use Zend\Console\Console; +use Zend\Console\Request as ConsoleRequest; +use Zend\Http\PhpEnvironment\Request as HttpRequest; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/library/Zend/Mvc/Service/ResponseFactory.php b/library/Zend/Mvc/Service/ResponseFactory.php index 59c2963cfb0..fa66f8fca57 100644 --- a/library/Zend/Mvc/Service/ResponseFactory.php +++ b/library/Zend/Mvc/Service/ResponseFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Service; -use Zend\Http\PhpEnvironment\Response as HttpResponse; -use Zend\Console\Response as ConsoleResponse; use Zend\Console\Console; +use Zend\Console\Response as ConsoleResponse; +use Zend\Http\PhpEnvironment\Response as HttpResponse; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/library/Zend/Mvc/Service/RouterFactory.php b/library/Zend/Mvc/Service/RouterFactory.php index ea838ff43e6..7b10a90f587 100644 --- a/library/Zend/Mvc/Service/RouterFactory.php +++ b/library/Zend/Mvc/Service/RouterFactory.php @@ -9,11 +9,11 @@ namespace Zend\Mvc\Service; -use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter; +use Zend\Console\Console; use Zend\Mvc\Router\Console\SimpleRouteStack as ConsoleRouter; +use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -use Zend\Console\Console; class RouterFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/Service/ServiceListenerFactory.php b/library/Zend/Mvc/Service/ServiceListenerFactory.php index df16af4a29b..5f5ade47571 100644 --- a/library/Zend/Mvc/Service/ServiceListenerFactory.php +++ b/library/Zend/Mvc/Service/ServiceListenerFactory.php @@ -9,10 +9,10 @@ namespace Zend\Mvc\Service; -use Zend\Mvc\Exception\RuntimeException; -use Zend\Mvc\Exception\InvalidArgumentException; use Zend\ModuleManager\Listener\ServiceListener; use Zend\ModuleManager\Listener\ServiceListenerInterface; +use Zend\Mvc\Exception\InvalidArgumentException; +use Zend\Mvc\Exception\RuntimeException; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/library/Zend/Mvc/Service/ViewResolverFactory.php b/library/Zend/Mvc/Service/ViewResolverFactory.php index 9ab20c570c8..981651f7942 100644 --- a/library/Zend/Mvc/Service/ViewResolverFactory.php +++ b/library/Zend/Mvc/Service/ViewResolverFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Service; -use Zend\View\Resolver as ViewResolver; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; +use Zend\View\Resolver as ViewResolver; class ViewResolverFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php b/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php index 657fa1ceccf..b49c1e65d04 100644 --- a/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php +++ b/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Service; -use Zend\View\Resolver as ViewResolver; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; +use Zend\View\Resolver as ViewResolver; class ViewTemplateMapResolverFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php b/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php index b5a227f3c4e..ce507cac8bd 100644 --- a/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php +++ b/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php @@ -9,9 +9,9 @@ namespace Zend\Mvc\Service; -use Zend\View\Resolver as ViewResolver; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; +use Zend\View\Resolver as ViewResolver; class ViewTemplatePathStackFactory implements FactoryInterface { diff --git a/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php b/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php index de409510a98..4fd597f4d0d 100644 --- a/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php +++ b/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php @@ -9,12 +9,12 @@ namespace Zend\Mvc\View\Console; +use Zend\Console\Response as ConsoleResponse; use Zend\EventManager\AbstractListenerAggregate; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; use Zend\Mvc\MvcEvent; use Zend\Stdlib\ResponseInterface as Response; -use Zend\Console\Response as ConsoleResponse; use Zend\View\Model\ConsoleModel as ConsoleViewModel; class DefaultRenderingStrategy extends AbstractListenerAggregate diff --git a/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php b/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php index 57c158905e9..39901af241b 100644 --- a/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php +++ b/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php @@ -9,10 +9,10 @@ namespace Zend\Mvc\View\Console; +use Zend\Console\Request as ConsoleRequest; use Zend\EventManager\AbstractListenerAggregate; use Zend\EventManager\EventManagerInterface as Events; use Zend\Mvc\MvcEvent; -use Zend\Console\Request as ConsoleRequest; class InjectNamedConsoleParamsListener extends AbstractListenerAggregate { diff --git a/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php b/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php index fc6916e1b9f..d1403876b60 100644 --- a/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php +++ b/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php @@ -9,10 +9,10 @@ namespace Zend\Mvc\View\Http; +use Zend\Console\Request as ConsoleRequest; use Zend\EventManager\AbstractListenerAggregate; use Zend\EventManager\EventManagerInterface; use Zend\Http\Request as HttpRequest; -use Zend\Console\Request as ConsoleRequest; use Zend\Mvc\MvcEvent; class InjectRoutematchParamsListener extends AbstractListenerAggregate diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php index f9d99da6b1a..a7509c0208b 100644 --- a/library/Zend/Navigation/Page/Mvc.php +++ b/library/Zend/Navigation/Page/Mvc.php @@ -9,10 +9,10 @@ namespace Zend\Navigation\Page; +use Zend\Mvc\ModuleRouteListener; use Zend\Mvc\Router\RouteMatch; use Zend\Mvc\Router\RouteStackInterface; use Zend\Navigation\Exception; -use Zend\Mvc\ModuleRouteListener; /** * Represents a page that is defined using controller, action, route diff --git a/library/Zend/Paginator/Adapter/DbSelect.php b/library/Zend/Paginator/Adapter/DbSelect.php index 05c66336c32..eb20f01f7e5 100644 --- a/library/Zend/Paginator/Adapter/DbSelect.php +++ b/library/Zend/Paginator/Adapter/DbSelect.php @@ -13,8 +13,8 @@ use Zend\Db\Sql\Sql; use Zend\Db\Sql\Expression; use Zend\Db\Sql\Select; -use Zend\Db\ResultSet\ResultSetInterface; use Zend\Db\ResultSet\ResultSet; +use Zend\Db\ResultSet\ResultSetInterface; class DbSelect implements AdapterInterface { diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php index 4cd157ee29a..35eabc6788d 100644 --- a/library/Zend/Serializer/Adapter/PythonPickle.php +++ b/library/Zend/Serializer/Adapter/PythonPickle.php @@ -11,9 +11,9 @@ use stdClass; use Traversable; -use Zend\Stdlib\ArrayUtils; -use Zend\Serializer\Exception; use Zend\Math\BigInteger; +use Zend\Serializer\Exception; +use Zend\Stdlib\ArrayUtils; /** * @link http://www.python.org diff --git a/library/Zend/Server/Reflection/AbstractFunction.php b/library/Zend/Server/Reflection/AbstractFunction.php index 932f607bb19..828a0d6b2ea 100644 --- a/library/Zend/Server/Reflection/AbstractFunction.php +++ b/library/Zend/Server/Reflection/AbstractFunction.php @@ -9,9 +9,9 @@ namespace Zend\Server\Reflection; -use ReflectionFunctionAbstract; use ReflectionClass as PhpReflectionClass; use ReflectionFunction as PhpReflectionFunction; +use ReflectionFunctionAbstract; use ReflectionMethod as PhpReflectionMethod; use Zend\Code\Reflection\DocBlockReflection; diff --git a/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php b/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php index d49fe917e42..eb033680b91 100644 --- a/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php +++ b/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php @@ -13,8 +13,8 @@ use ProxyManager\Proxy\LazyLoadingInterface; use Zend\ServiceManager\DelegatorFactoryInterface; -use Zend\ServiceManager\ServiceLocatorInterface; use Zend\ServiceManager\Exception; +use Zend\ServiceManager\ServiceLocatorInterface; /** * Delegator factory responsible of instantiating lazy loading value holder proxies of diff --git a/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php b/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php index ef8414c6789..6861d6e9820 100644 --- a/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php +++ b/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php @@ -11,7 +11,6 @@ use ProxyManager\Configuration; use ProxyManager\Factory\LazyLoadingValueHolderFactory; - use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/library/Zend/Session/AbstractContainer.php b/library/Zend/Session/AbstractContainer.php index 68f8740cc01..28611a2086a 100644 --- a/library/Zend/Session/AbstractContainer.php +++ b/library/Zend/Session/AbstractContainer.php @@ -9,12 +9,12 @@ namespace Zend\Session; -use Zend\Stdlib\ArrayObject; use ArrayIterator; use Iterator; use Traversable; use Zend\Session\ManagerInterface as Manager; use Zend\Session\Storage\StorageInterface as Storage; +use Zend\Stdlib\ArrayObject; /** * Session storage container diff --git a/library/Zend/Session/Config/StandardConfig.php b/library/Zend/Session/Config/StandardConfig.php index 9424a8b2c77..64bafc61ac0 100644 --- a/library/Zend/Session/Config/StandardConfig.php +++ b/library/Zend/Session/Config/StandardConfig.php @@ -9,10 +9,10 @@ namespace Zend\Session\Config; +use Traversable; use Zend\Session\Config\ConfigInterface; use Zend\Session\Exception; use Zend\Validator\Hostname as HostnameValidator; -use Traversable; /** * Standard session configuration diff --git a/library/Zend/Session/Storage/StorageInterface.php b/library/Zend/Session/Storage/StorageInterface.php index 7096692768b..2fff8ddf304 100644 --- a/library/Zend/Session/Storage/StorageInterface.php +++ b/library/Zend/Session/Storage/StorageInterface.php @@ -9,10 +9,10 @@ namespace Zend\Session\Storage; -use Traversable; use ArrayAccess; -use Serializable; use Countable; +use Serializable; +use Traversable; /** * Session storage interface diff --git a/library/Zend/Stdlib/Hydrator/ClassMethods.php b/library/Zend/Stdlib/Hydrator/ClassMethods.php index c50d821d0fc..7f1952f7051 100644 --- a/library/Zend/Stdlib/Hydrator/ClassMethods.php +++ b/library/Zend/Stdlib/Hydrator/ClassMethods.php @@ -15,10 +15,10 @@ use Zend\Stdlib\ArrayUtils; use Zend\Stdlib\Hydrator\Filter\FilterComposite; use Zend\Stdlib\Hydrator\Filter\FilterProviderInterface; -use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter; use Zend\Stdlib\Hydrator\Filter\GetFilter; use Zend\Stdlib\Hydrator\Filter\HasFilter; use Zend\Stdlib\Hydrator\Filter\IsFilter; +use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter; use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter; class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface diff --git a/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php index c9e2dd5a35a..e3b8c1c9f34 100644 --- a/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php +++ b/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php @@ -9,8 +9,8 @@ namespace Zend\Stdlib\Hydrator\Filter; -use ReflectionMethod; use ReflectionException; +use ReflectionMethod; use Zend\Stdlib\Exception\InvalidArgumentException; use Zend\Stdlib\Hydrator\Filter\FilterInterface; diff --git a/library/Zend/Validator/Barcode/Code128.php b/library/Zend/Validator/Barcode/Code128.php index d07213698fb..4382c7ca4ad 100644 --- a/library/Zend/Validator/Barcode/Code128.php +++ b/library/Zend/Validator/Barcode/Code128.php @@ -9,9 +9,9 @@ namespace Zend\Validator\Barcode; -use Zend\Validator\Exception; use Zend\Stdlib\StringUtils; use Zend\Stdlib\StringWrapper\StringWrapperInterface; +use Zend\Validator\Exception; class Code128 extends AbstractAdapter { diff --git a/library/Zend/Validator/Db/AbstractDb.php b/library/Zend/Validator/Db/AbstractDb.php index 5e94df15d81..aeab82a98ce 100644 --- a/library/Zend/Validator/Db/AbstractDb.php +++ b/library/Zend/Validator/Db/AbstractDb.php @@ -12,8 +12,8 @@ use Traversable; use Zend\Db\Adapter\Adapter as DbAdapter; use Zend\Db\Adapter\Driver\DriverInterface as DbDriverInterface; -use Zend\Db\Sql\Sql; use Zend\Db\Sql\Select; +use Zend\Db\Sql\Sql; use Zend\Db\Sql\TableIdentifier; use Zend\Stdlib\ArrayUtils; use Zend\Validator\AbstractValidator;