[zen-49] Sort import statements

- Import statements should be sorted alphabetically - "implements" lists should as well
zendframework · Jul 9, 2012 · c2b67ca · c2b67ca
1 parent d5857c5
commit c2b67ca
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 48 deletions.
diff --git a/src/Pattern/AbstractPattern.php b/src/Pattern/AbstractPattern.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Cache\Pattern;
 
-use Zend\Cache\Exception;
 use Traversable;
+use Zend\Cache\Exception;
 
 /**
  * @category   Zend

diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -18,8 +18,8 @@
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\Event;
 use Zend\Cache\Storage\ExceptionEvent;
-use Zend\Cache\Storage\PostEvent;
 use Zend\Cache\Storage\Plugin;
+use Zend\Cache\Storage\PostEvent;
 use Zend\Cache\Storage\StorageInterface;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\EventsCapableInterface;

diff --git a/src/Storage/Adapter/AbstractZendServer.php b/src/Storage/Adapter/AbstractZendServer.php
@@ -12,8 +12,8 @@
 
 use ArrayObject;
 use stdClass;
-use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Exception;
+use Zend\Cache\Storage\Capabilities;
 
 /**
  * @category   Zend

diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
@@ -15,12 +15,12 @@
 use stdClass;
 use Traversable;
 use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\ClearByPrefixInterface;
 use Zend\Cache\Storage\ClearByNamespaceInterface;
 use Zend\Cache\Storage\FlushableInterface;
 use Zend\Cache\Storage\IterableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 
 /**
@@ -29,11 +29,11 @@
  * @subpackage Storage
  */
 class Apc extends AbstractAdapter implements
-    ClearByPrefixInterface,
+    AvailableSpaceCapableInterface,
     ClearByNamespaceInterface,
+    ClearByPrefixInterface,
     FlushableInterface,
     IterableInterface,
-    AvailableSpaceCapableInterface,
     TotalSpaceCapableInterface
 {
     /**

diff --git a/src/Storage/Adapter/ApcIterator.php b/src/Storage/Adapter/ApcIterator.php
@@ -11,7 +11,6 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use APCIterator as BaseApcIterator;
-use Zend\Cache\Storage\IterableInterface;
 use Zend\Cache\Storage\IteratorInterface;
 
 /**

diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
@@ -10,26 +10,26 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use stdClass,
-    Zend\Cache\Exception,
-    Zend\Cache\Storage\Capabilities,
-    Zend\Cache\Storage\ClearByPrefixInterface,
-    Zend\Cache\Storage\ClearByNamespaceInterface,
-    Zend\Cache\Storage\FlushableInterface,
-    Zend\Cache\Storage\IterableInterface,
-    Zend\Cache\Storage\AvailableSpaceCapableInterface,
-    Zend\Cache\Storage\TotalSpaceCapableInterface,
-    Zend\Cache\Storage\OptimizableInterface,
-    Zend\Stdlib\ErrorHandler;
+use stdClass;
+use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
+use Zend\Cache\Storage\Capabilities;
+use Zend\Cache\Storage\ClearByNamespaceInterface;
+use Zend\Cache\Storage\ClearByPrefixInterface;
+use Zend\Cache\Storage\FlushableInterface;
+use Zend\Cache\Storage\IterableInterface;
+use Zend\Cache\Storage\OptimizableInterface;
+use Zend\Cache\Storage\TotalSpaceCapableInterface;
+use Zend\Stdlib\ErrorHandler;
 
 class Dba extends AbstractAdapter implements
-    TotalSpaceCapableInterface,
     AvailableSpaceCapableInterface,
-    FlushableInterface,
     ClearByNamespaceInterface,
     ClearByPrefixInterface,
+    FlushableInterface,
+    IterableInterface,
     OptimizableInterface,
-    IterableInterface
+    TotalSpaceCapableInterface
 {
     /**
      * The DBA resource handle

diff --git a/src/Storage/Adapter/DbaIterator.php b/src/Storage/Adapter/DbaIterator.php
@@ -10,9 +10,8 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use Zend\Cache\Exception,
-    Zend\Cache\Storage\IterableInterface,
-    Zend\Cache\Storage\IteratorInterface;
+use Zend\Cache\Exception;
+use Zend\Cache\Storage\IteratorInterface;
 
 /**
  * @category   Zend

diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
@@ -11,20 +11,20 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use ArrayObject;
+use Exception as BaseException;
 use GlobIterator;
 use stdClass;
-use Exception as BaseException;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage;
-use Zend\Cache\Storage\StorageInterface;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
-use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\ClearByNamespaceInterface;
 use Zend\Cache\Storage\ClearByPrefixInterface;
+use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\FlushableInterface;
 use Zend\Cache\Storage\IterableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\OptimizableInterface;
+use Zend\Cache\Storage\StorageInterface;
 use Zend\Cache\Storage\TaggableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 use Zend\Stdlib\ErrorHandler;

diff --git a/src/Storage/Adapter/FilesystemIterator.php b/src/Storage/Adapter/FilesystemIterator.php
@@ -11,7 +11,6 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use GlobIterator;
-use Zend\Cache\Storage\IterableInterface;
 use Zend\Cache\Storage\IteratorInterface;
 
 /**

diff --git a/src/Storage/Adapter/KeyListIterator.php b/src/Storage/Adapter/KeyListIterator.php
@@ -11,7 +11,6 @@
 namespace Zend\Cache\Storage\Adapter;
 
 use Countable;
-use Zend\Cache\Storage\IterableInterface;
 use Zend\Cache\Storage\IteratorInterface;
 use Zend\Cache\Storage\StorageInterface;
 

diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
@@ -16,11 +16,11 @@
 use stdClass;
 use Traversable;
 use Zend\Cache\Exception;
-use Zend\Cache\Storage\Event;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\CallbackEvent;
 use Zend\Cache\Storage\Capabilities;
+use Zend\Cache\Storage\Event;
 use Zend\Cache\Storage\FlushableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 
 /**
@@ -29,8 +29,8 @@
  * @subpackage Storage
  */
 class Memcached extends AbstractAdapter implements
-    FlushableInterface,
     AvailableSpaceCapableInterface,
+    FlushableInterface,
     TotalSpaceCapableInterface
 {
     /**

diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
@@ -13,13 +13,13 @@
 use ArrayObject;
 use stdClass;
 use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
-use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\ClearByPrefixInterface;
+use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\FlushableInterface;
 use Zend\Cache\Storage\IterableInterface;
 use Zend\Cache\Storage\TaggableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 
 /**

diff --git a/src/Storage/Adapter/WinCache.php b/src/Storage/Adapter/WinCache.php
@@ -13,9 +13,9 @@
 use ArrayObject;
 use stdClass;
 use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\FlushableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 
 /**
@@ -24,8 +24,8 @@
  * @subpackage Storage
  */
 class WinCache extends AbstractAdapter implements
-    FlushableInterface,
     AvailableSpaceCapableInterface,
+    FlushableInterface,
     TotalSpaceCapableInterface
 {
 

diff --git a/src/Storage/Adapter/ZendServerDisk.php b/src/Storage/Adapter/ZendServerDisk.php
@@ -12,9 +12,9 @@
 
 use ArrayObject;
 use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\ClearByNamespaceInterface;
 use Zend\Cache\Storage\FlushableInterface;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 use Zend\Stdlib\ErrorHandler;
 
@@ -23,10 +23,11 @@
  * @package    Zend_Cache
  * @subpackage Storage
  */
-class ZendServerDisk
-    extends AbstractZendServer
-    implements FlushableInterface, ClearByNamespaceInterface,
-               AvailableSpaceCapableInterface, TotalSpaceCapableInterface
+class ZendServerDisk extends AbstractZendServer implements 
+    AvailableSpaceCapableInterface, 
+    ClearByNamespaceInterface,
+    FlushableInterface, 
+    TotalSpaceCapableInterface
 {
 
     /**

diff --git a/src/Storage/Adapter/ZendServerShm.php b/src/Storage/Adapter/ZendServerShm.php
@@ -21,9 +21,10 @@
  * @package    Zend_Cache
  * @subpackage Storage
  */
-class ZendServerShm
-    extends AbstractZendServer
-    implements FlushableInterface, ClearByNamespaceInterface, TotalSpaceCapableInterface
+class ZendServerShm extends AbstractZendServer implements 
+    ClearByNamespaceInterface,
+    FlushableInterface,
+    TotalSpaceCapableInterface
 {
 
     /**

diff --git a/src/Storage/IterableInterface.php b/src/Storage/IterableInterface.php
@@ -10,13 +10,15 @@
 
 namespace Zend\Cache\Storage;
 
+use IteratorAggregate;
+
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
  *
  * @method IteratorInterface getIterator() Get the storage iterator
  */
-interface IterableInterface extends \IteratorAggregate
+interface IterableInterface extends IteratorAggregate
 {
 }
diff --git a/src/Storage/IteratorInterface.php b/src/Storage/IteratorInterface.php
@@ -10,12 +10,14 @@
 
 namespace Zend\Cache\Storage;
 
+use Iterator;
+
 /**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage Storage
  */
-interface IteratorInterface extends \Iterator
+interface IteratorInterface extends Iterator
 {
 
     const CURRENT_AS_SELF     = 0;

diff --git a/src/Storage/Plugin/ClearExpiredByFactor.php b/src/Storage/Plugin/ClearExpiredByFactor.php
@@ -11,11 +11,11 @@
 namespace Zend\Cache\Storage\Plugin;
 
 use Traversable;
-use Zend\EventManager\EventManagerInterface;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\ClearExpiredInterface;
 use Zend\Cache\Storage\StorageInterface;
 use Zend\Cache\Storage\PostEvent;
+use Zend\EventManager\EventManagerInterface;
 
 /**
  * @category   Zend