Merge branch 'hotfix/unused-use-statements' into develop

Close #2364
zendframework · Sep 17, 2012 · 7412923 · 7412923
2 parents 9eaa305 + b5310c2
commit 7412923
Show file tree

Hide file tree

Showing 28 changed files with 4 additions and 39 deletions.
diff --git a/library/Zend/Authentication/Storage/Session.php b/library/Zend/Authentication/Storage/Session.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Authentication\Storage;
 
-use Zend\Authentication\Storage\StorageInterface as AuthenticationStorage;
 use Zend\Session\Container as SessionContainer;
 use Zend\Session\ManagerInterface as SessionManager;
 

diff --git a/library/Zend/Cache/Storage/Adapter/Memcached.php b/library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -12,7 +12,6 @@
 
 use ArrayObject;
 use Memcached as MemcachedResource;
-use MemcachedException;
 use stdClass;
 use Traversable;
 use Zend\Cache\Exception;

diff --git a/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php b/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use Memcached as MemcachedResource;
 use Zend\Cache\Exception;
 use Zend\Validator\Hostname;
 

diff --git a/library/Zend/Code/Reflection/FileReflection.php b/library/Zend/Code/Reflection/FileReflection.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Code\Reflection;
 
-use Zend\Code\NameInformation;
 use Zend\Code\Scanner\CachingFileScanner;
 
 /**

diff --git a/library/Zend/Console/Request.php b/library/Zend/Console/Request.php
@@ -12,7 +12,6 @@
 
 use Zend\Stdlib\Message;
 use Zend\Stdlib\Parameters;
-use Zend\Stdlib\ParametersInterface;
 use Zend\Stdlib\RequestInterface;
 
 /**

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Result.php b/library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -11,7 +11,6 @@
 namespace Zend\Db\Adapter\Driver\Pdo;
 
 use Iterator;
-use PDO as PDOResource;
 use PDOStatement;
 use Zend\Db\Adapter\Driver\ResultInterface;
 use Zend\Db\Adapter\Exception;

diff --git a/library/Zend/Db/Metadata/Source/MysqlMetadata.php b/library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -11,7 +11,6 @@
 namespace Zend\Db\Metadata\Source;
 
 use Zend\Db\Adapter\Adapter;
-use Zend\Db\Metadata\MetadataInterface;
 use Zend\Db\Metadata\Object;
 
 /**

diff --git a/library/Zend/Db/Metadata/Source/SqlServerMetadata.php b/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -11,7 +11,6 @@
 namespace Zend\Db\Metadata\Source;
 
 use Zend\Db\Adapter\Adapter;
-use Zend\Db\Metadata\MetadataInterface;
 use Zend\Db\Metadata\Object;
 
 /**

diff --git a/library/Zend/Db/Metadata/Source/SqliteMetadata.php b/library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -11,7 +11,6 @@
 namespace Zend\Db\Metadata\Source;
 
 use Zend\Db\Adapter\Adapter;
-use Zend\Db\Metadata\MetadataInterface;
 use Zend\Db\Metadata\Object;
 use Zend\Db\ResultSet\ResultSetInterface;
 

diff --git a/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php
@@ -12,7 +12,6 @@
 
 use ArrayAccess;
 use ArrayObject;
-use SplPriorityQueue;
 use Traversable;
 use Zend\Stdlib\CallbackHandler;
 use Zend\Stdlib\PriorityQueue;

diff --git a/library/Zend/Form/View/Helper/FormCaptcha.php b/library/Zend/Form/View/Helper/FormCaptcha.php
@@ -13,7 +13,6 @@
 use Zend\Captcha\AdapterInterface as CaptchaAdapter;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
-use Zend\View\Helper\AbstractHelper as BaseAbstractHelper;
 
 /**
  * @category   Zend

diff --git a/library/Zend/Form/View/Helper/FormLabel.php b/library/Zend/Form/View/Helper/FormLabel.php
@@ -11,7 +11,6 @@
 namespace Zend\Form\View\Helper;
 
 use Zend\I18n\Translator\Translator;
-use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
 

diff --git a/library/Zend/Http/Client/Cookies.php b/library/Zend/Http/Client/Cookies.php
@@ -13,7 +13,6 @@
 use ArrayIterator;
 use Zend\Http\Header\Cookie;
 use Zend\Http\Response;
-use Zend\Stdlib\ParametersInterface;
 use Zend\Uri;
 
 /**

diff --git a/library/Zend/Memory/MemoryManager.php b/library/Zend/Memory/MemoryManager.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Memory;
 
-use Zend\Cache\Storage\ClearByNamespaceInterface;
 use Zend\Cache\Storage\ClearByNamespaceInterface as ClearByNamespaceCacheStorage;
 use Zend\Cache\Storage\FlushableInterface as FlushableCacheStorage;
 use Zend\Cache\Storage\StorageInterface as CacheStorage;

diff --git a/library/Zend/ModuleManager/Listener/ServiceListener.php b/library/Zend/ModuleManager/Listener/ServiceListener.php
@@ -12,7 +12,6 @@
 
 use Traversable;
 use Zend\EventManager\EventManagerInterface;
-use Zend\ModuleManager\Feature\ServiceProviderInterface;
 use Zend\ModuleManager\ModuleEvent;
 use Zend\ServiceManager\Config as ServiceConfig;
 use Zend\ServiceManager\ServiceManager;

diff --git a/library/Zend/ModuleManager/ModuleManagerInterface.php b/library/Zend/ModuleManager/ModuleManagerInterface.php
@@ -11,7 +11,6 @@
 namespace Zend\ModuleManager;
 
 use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventsCapableInterface;
 
 /**
  * Module manager interface

diff --git a/library/Zend/Mvc/Router/Console/SimpleRouteStack.php b/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
@@ -12,8 +12,6 @@
 
 use Traversable;
 use Zend\Mvc\Router\Exception;
-use Zend\Mvc\Router\Console\RouteInterface;
-use Zend\Mvc\Router\RouteInterface as BaseRoute;
 use Zend\Mvc\Router\SimpleRouteStack as BaseSimpleRouteStack;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\RequestInterface as Request;

diff --git a/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -12,8 +12,6 @@
 
 use Traversable;
 use Zend\Mvc\Router\Exception;
-use Zend\Mvc\Router\Http\RouteInterface;
-use Zend\Mvc\Router\RouteInterface as BaseRoute;
 use Zend\Mvc\Router\SimpleRouteStack;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\RequestInterface as Request;
@@ -124,9 +122,9 @@ protected function routeFromArray($specs)
     }
 
     /**
-     * match(): defined by BaseRoute interface.
+     * match(): defined by \Zend\Mvc\Router\RouteInterface
      *
-     * @see    BaseRoute::match()
+     * @see    \Zend\Mvc\Router\RouteInterface::match()
      * @param  Request $request
      * @return RouteMatch
      */
@@ -171,9 +169,9 @@ public function match(Request $request)
     }
 
     /**
-     * assemble(): defined by RouteInterface interface.
+     * assemble(): defined by \Zend\Mvc\Router\RouteInterface interface.
      *
-     * @see    BaseRoute::assemble()
+     * @see    \Zend\Mvc\Router\RouteInterface::assemble()
      * @param  array $params
      * @param  array $options
      * @return mixed

diff --git a/library/Zend/Mvc/Service/ModuleManagerFactory.php b/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -12,7 +12,6 @@
 
 use Zend\ModuleManager\Listener\DefaultListenerAggregate;
 use Zend\ModuleManager\Listener\ListenerOptions;
-use Zend\ModuleManager\Listener\ServiceListener;
 use Zend\ModuleManager\ModuleEvent;
 use Zend\ModuleManager\ModuleManager;
 use Zend\ServiceManager\FactoryInterface;

diff --git a/library/Zend/Mvc/View/Console/CreateViewModelListener.php b/library/Zend/Mvc/View/Console/CreateViewModelListener.php
@@ -24,7 +24,6 @@
 use Zend\EventManager\EventManagerInterface as Events;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\View\Http\CreateViewModelListener as HttpCreateViewModelListener;
 use Zend\Stdlib\ArrayUtils;
 use Zend\View\Model\ConsoleModel;
 

diff --git a/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php b/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
@@ -15,7 +15,6 @@
 use Zend\Mvc\MvcEvent;
 use Zend\Stdlib\ResponseInterface as Response;
 use Zend\Console\Response as ConsoleResponse;
-use Zend\Console\Request as ConsoleRequest;
 use Zend\View\Model\ConsoleModel as ConsoleViewModel;
 use Zend\View\Model\ModelInterface as ViewModel;
 use Zend\View\View;

diff --git a/library/Zend/Mvc/View/Console/ExceptionStrategy.php b/library/Zend/Mvc/View/Console/ExceptionStrategy.php
@@ -12,7 +12,6 @@
 
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Console\Response as ConsoleResponse;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
 use Zend\Stdlib\ResponseInterface as Response;

diff --git a/library/Zend/Mvc/View/Console/InjectViewModelListener.php b/library/Zend/Mvc/View/Console/InjectViewModelListener.php
@@ -10,11 +10,7 @@
 
 namespace Zend\Mvc\View\Console;
 
-use Zend\EventManager\EventManagerInterface as Events;
 use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Mvc\MvcEvent;
-use Zend\Mvc\Router\RouteMatch;
-use Zend\View\Model\ModelInterface as ViewModel;
 use Zend\Mvc\View\Http\InjectViewModelListener as HttpInjectViewModelListener;
 
 class InjectViewModelListener extends HttpInjectViewModelListener implements ListenerAggregateInterface

diff --git a/library/Zend/Mvc/View/Console/ViewManager.php b/library/Zend/Mvc/View/Console/ViewManager.php
@@ -17,10 +17,7 @@
 use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ArrayUtils;
 use Zend\View\Helper as ViewHelper;
-use Zend\View\HelperPluginManager as ViewHelperManager;
-use Zend\View\Renderer\PhpRenderer as ViewPhpRenderer;
 use Zend\View\Resolver as ViewResolver;
-use Zend\View\Strategy\PhpRendererStrategy;
 use Zend\View\View;
 
 /**

diff --git a/library/Zend/Mvc/View/Http/ViewManager.php b/library/Zend/Mvc/View/Http/ViewManager.php
@@ -14,7 +14,6 @@
 use Traversable;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Mvc\ApplicationInterface;
 use Zend\Mvc\Exception;
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\Router\RouteMatch;

diff --git a/library/Zend/ServiceManager/Di/DiServiceInitializer.php b/library/Zend/ServiceManager/Di/DiServiceInitializer.php
@@ -11,7 +11,6 @@
 namespace Zend\ServiceManager\Di;
 
 use Zend\Di\Di;
-use Zend\Di\Exception\ClassNotFoundException as DiClassNotFoundException;
 use Zend\ServiceManager\Exception;
 use Zend\ServiceManager\InitializerInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;

diff --git a/library/Zend/Stdlib/Hydrator/Reflection.php b/library/Zend/Stdlib/Hydrator/Reflection.php
@@ -12,7 +12,6 @@
 
 use ReflectionClass;
 use Zend\Stdlib\Exception;
-use Zend\Stdlib\Hydrator\HydratorInterface;
 
 class Reflection extends AbstractHydrator
 {

diff --git a/library/Zend/Validator/DateStep.php b/library/Zend/Validator/DateStep.php
@@ -11,7 +11,6 @@
 namespace Zend\Validator;
 
 use DateInterval;
-use DatePeriod;
 use DateTime;
 use DateTimeZone;
 use Traversable;