Merge branch '#ZF2-151' of github.com:robertboloc/zf2 into #ZF2-151

zendframework · Oct 9, 2012 · 261c157 · 261c157
commit 261c157
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -17,7 +17,6 @@
 use Traversable;
 use Zend\Cache\Storage\IteratorInterface as CacheIterator;
 use Zend\Cache\Storage\StorageInterface as CacheStorage;
-use Zend\Db\Sql;
 use Zend\Db\ResultSet\AbstractResultSet;
 use Zend\Filter\FilterInterface;
 use Zend\Json\Json;
@@ -335,7 +334,7 @@ public function __toString()
      */
     public function setCacheEnabled($enable)
     {
-        $this->cacheEnabled = (bool)$enable;
+        $this->cacheEnabled = (bool) $enable;
         return $this;
     }
 
@@ -720,7 +719,7 @@ public function getPageItemCache()
                 $tags = self::$cache->getTags($key);
                 if ($tags && in_array($this->_getCacheInternalId(), $tags)) {
                     if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) {
-                        $data[(int)substr($key, $prefixLength)] = $value;
+                        $data[(int) substr($key, $prefixLength)] = $value;
                     }
                 }
             }

diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
@@ -13,7 +13,6 @@
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Db\Sql\Select;
 use Zend\Db\Sql\Expression;
-use Zend\Db\Adapter\Adapter as DbAdapter;
 
 /**
  * @category   Zend

diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
@@ -13,7 +13,6 @@
 use ReflectionMethod;
 use stdClass;
 use Zend\Cache\StorageFactory as CacheFactory;
-use Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter;
 use Zend\Config;
 use Zend\Db\Adapter as DbAdapter;
 use Zend\Db\Sql;