From 6fdd74314d0848b60a475ee3ccfa42909baac176 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 30 Jun 2010 12:26:28 -0400
Subject: [PATCH 01/11] paginator cleanup

- Replaced reference to zend_db_table_rowset with namespaced version
---
 test/Adapter/DbTableSelect/OracleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Adapter/DbTableSelect/OracleTest.php b/test/Adapter/DbTableSelect/OracleTest.php
index 8206337..ce5c996 100644
--- a/test/Adapter/DbTableSelect/OracleTest.php
+++ b/test/Adapter/DbTableSelect/OracleTest.php
@@ -50,6 +50,6 @@ public function testSelectDoesReturnZendDbTableRowset()
         $adapter = new \Zend\Paginator\Adapter\DbTableSelect($query);
         $items   = $adapter->getItems(0, 10);
 
-        $this->assertType('Zend_Db_Table_Rowset', $items);
+        $this->assertType('Zend\DB\Table\Rowset\Rowset', $items);
     }
 }

From 2e29adcddd5fc5beaa33e45cfd505d8a7f9cb95a Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 30 Jun 2010 15:52:10 -0400
Subject: [PATCH 02/11] Dispatcher cleanup

- s/Zend\Controller\Dispatcher\DispatcherInterface/Zend\Controller\Dispatcher/
- updated all classes and tests referencing it
- updated migration classmap
---
 src/Paginator.php       |   4 ++--
 test/PaginatorTest.php  |   4 ++--
 test/_files/test.sqlite | Bin 10240 -> 10240 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Paginator.php b/src/Paginator.php
index 2aa2fc4..5badef2 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -28,7 +28,7 @@
 use Zend\JSON;
 
 /**
- * @uses       \Zend\Controller\Action\HelperBroker\HelperBroker
+ * @uses       \Zend\Controller\Action\HelperBroker
  * @uses       \Zend\JSON\JSON
  * @uses       \Zend\Loader\PluginLoader\PluginLoader
  * @uses       \Zend\Paginator\Exception
@@ -850,7 +850,7 @@ public function getPageItemCache()
     public function getView()
     {
         if ($this->_view === null) {
-            $viewRenderer = \Zend\Controller\Action\HelperBroker\HelperBroker::getStaticHelper('viewRenderer');
+            $viewRenderer = \Zend\Controller\Action\HelperBroker::getStaticHelper('viewRenderer');
             if ($viewRenderer->view === null) {
                 $viewRenderer->initView();
             }
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index 58a4ef7..e3a20a3 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -76,7 +76,7 @@ protected function setUp()
 
         $this->_config = new Config\Xml(__DIR__ . '/_files/config.xml');
         // get a fresh new copy of ViewRenderer in each tests
-        HelperBroker\HelperBroker::resetHelpers();
+        HelperBroker::resetHelpers();
 
         $fO = array('lifetime' => 3600, 'automatic_serialization' => true);
         $bO = array('cache_dir'=> $this->_getTmpDir());
@@ -597,7 +597,7 @@ public function testGetsItemCount()
 
     public function testGetsViewFromViewRenderer()
     {
-        $viewRenderer = HelperBroker\HelperBroker::getStaticHelper('viewRenderer');
+        $viewRenderer = HelperBroker::getStaticHelper('viewRenderer');
         $viewRenderer->setView(new View\View());
 
         $this->assertType('Zend\View\ViewInterface', $this->_paginator->getView());
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index c15e71a1edd222d740c257a4b4974737c25cb77e..cd35860e8ad3bdc6a6a454ba6d50f231b383ddde 100644
GIT binary patch
delta 49
ucmZn&Xb6}fEqIgx1u(tZsH4cl$T``MX+0y?=6_5avYXjdelagnU;zLCJ_{`X

delta 49
ucmZn&Xb6}fEx4Bf1u#9^sH4cl$TiuIX+0z7=6_5avYXjdelagnU;zOBeG4G~


From 0d2cf6e7d26a9f1a9058962a0a6475471ed4f3b2 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 1 Jul 2010 07:47:00 -0400
Subject: [PATCH 03/11] PluginLoader cleanup

- Added Zend\Loader\ShortNameLocater
- s/Zend\Loader\PluginLoader\PluginLoaderInterface/Zend\Loader\PrefixPathMapper/
  Extends Zend\Loader\ShortNameLocater
- s/Zend\Loader\PluginLoader\PluginLoader/Zend\Loader\PluginLoader/
  Implements Zend\Loader\PrefixPathMapper
- s/Zend\Loader\PluginLoader\Exception/Zend\Loader\PluginLoaderException/
- Updated all classes and tests to reflect the above
---
 src/Paginator.php       |  21 +++++++++++----------
 test/_files/test.sqlite | Bin 10240 -> 10240 bytes
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Paginator.php b/src/Paginator.php
index 5badef2..2b885f5 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -23,14 +23,15 @@
  * @namespace
  */
 namespace Zend\Paginator;
-use Zend\Loader\PluginLoader;
-use Zend\View;
-use Zend\JSON;
+
+use Zend\Loader\PluginLoader,
+    Zend\View,
+    Zend\JSON;
 
 /**
  * @uses       \Zend\Controller\Action\HelperBroker
  * @uses       \Zend\JSON\JSON
- * @uses       \Zend\Loader\PluginLoader\PluginLoader
+ * @uses       \Zend\Loader\PluginLoader
  * @uses       \Zend\Paginator\Exception
  * @uses       \Zend\View\Exception
  * @category   Zend
@@ -56,7 +57,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * Adapter plugin loader
      *
-     * @var \Zend\Loader\PluginLoader\PluginLoader
+     * @var \Zend\Loader\PrefixPathMapper
      */
     protected static $_adapterLoader = null;
 
@@ -84,7 +85,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * Scrolling style plugin loader
      *
-     * @var \Zend\Loader\PluginLoader\PluginLoader
+     * @var \Zend\Loader\PrefixPathMapper
      */
     protected static $_scrollingStyleLoader = null;
 
@@ -301,12 +302,12 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
     /**
      * Returns the adapter loader.  If it doesn't exist it's created.
      *
-     * @return \Zend\Loader\PluginLoader\PluginLoader
+     * @return \Zend\Loader\PrefixPathMapper
      */
     public static function getAdapterLoader()
     {
         if (self::$_adapterLoader === null) {
-            self::$_adapterLoader = new PluginLoader\PluginLoader(
+            self::$_adapterLoader = new PluginLoader(
                 array('Zend\Paginator\Adapter' => 'Zend/Paginator/Adapter')
             );
         }
@@ -396,12 +397,12 @@ public static function setDefaultScrollingStyle($scrollingStyle = 'Sliding')
      * Returns the scrolling style loader.  If it doesn't exist it's
      * created.
      *
-     * @return \Zend\Loader\PluginLoader\PluginLoader
+     * @return \Zend\Loader\PrefixPathMapper
      */
     public static function getScrollingStyleLoader()
     {
         if (self::$_scrollingStyleLoader === null) {
-            self::$_scrollingStyleLoader = new PluginLoader\PluginLoader(
+            self::$_scrollingStyleLoader = new PluginLoader(
                 array('Zend\Paginator\ScrollingStyle' => 'Zend/Paginator/ScrollingStyle')
             );
         }
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index cd35860e8ad3bdc6a6a454ba6d50f231b383ddde..a24e338855a0967d2461824540958defda3fb343 100644
GIT binary patch
delta 49
ucmZn&Xb6}fEqImz1u(tasH4cl$TiuIX+0z7=6_5avYXjdelagnU;zLD{0lh%

delta 49
ucmZn&Xb6}fEqIgx1u(tZsH4cl$T``MX+0y?=6_5avYXjdelagnU;zLCJ_{`X


From fe85484474e7f511c40e6318c6e206d10c11b437 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 1 Jul 2010 13:56:11 -0400
Subject: [PATCH 04/11] Zend\Paginator cleanup

- s/Paginator\Adapter\AdapterInterface/Paginator\Adapter/
- s/Paginator\ScrollingStyle\ScrollingStyleInterface/Paginator\ScrollingStyle/
- updated all classes and tests to reflect the above
---
 .../AdapterInterface.php => Adapter.php}      |   4 ++--
 src/Adapter/ArrayAdapter.php                  |   6 ++++--
 src/Adapter/DbSelect.php                      |  16 +++++++++-------
 src/Adapter/Iterator.php                      |   6 ++++--
 src/Adapter/Null.php                          |   6 ++++--
 src/Paginator.php                             |  10 +++++-----
 ...gStyleInterface.php => ScrollingStyle.php} |   6 +++---
 src/ScrollingStyle/All.php                    |   6 ++++--
 src/ScrollingStyle/Jumping.php                |   6 ++++--
 src/ScrollingStyle/Sliding.php                |   6 ++++--
 test/TestAsset/TestAdapter.php                |   2 +-
 test/_files/test.sqlite                       | Bin 10240 -> 10240 bytes
 12 files changed, 44 insertions(+), 30 deletions(-)
 rename src/{Adapter/AdapterInterface.php => Adapter.php} (94%)
 rename src/{ScrollingStyle/ScrollingStyleInterface.php => ScrollingStyle.php} (94%)

diff --git a/src/Adapter/AdapterInterface.php b/src/Adapter.php
similarity index 94%
rename from src/Adapter/AdapterInterface.php
rename to src/Adapter.php
index c1e9f28..fa89768 100644
--- a/src/Adapter/AdapterInterface.php
+++ b/src/Adapter.php
@@ -22,7 +22,7 @@
 /**
  * @namespace
  */
-namespace Zend\Paginator\Adapter;
+namespace Zend\Paginator;
 
 /**
  * Interface for pagination adapters.
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface AdapterInterface extends \Countable
+interface Adapter extends \Countable
 {
     /**
      * Returns the total number of rows in the collection.
diff --git a/src/Adapter/ArrayAdapter.php b/src/Adapter/ArrayAdapter.php
index c9de638..a97e9d0 100644
--- a/src/Adapter/ArrayAdapter.php
+++ b/src/Adapter/ArrayAdapter.php
@@ -24,14 +24,16 @@
  */
 namespace Zend\Paginator\Adapter;
 
+use Zend\Paginator\Adapter;
+
 /**
- * @uses       \Zend\Paginator\Adapter\AdapterInterface
+ * @uses       \Zend\Paginator\Adapter
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ArrayAdapter implements AdapterInterface
+class ArrayAdapter implements Adapter
 {
     /**
      * ArrayAdapter
diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
index a903a65..1e3ebc6 100644
--- a/src/Adapter/DbSelect.php
+++ b/src/Adapter/DbSelect.php
@@ -23,22 +23,24 @@
  * @namespace
  */
 namespace Zend\Paginator\Adapter;
-use Zend\DB\Select;
-use Zend\DB;
-use Zend\Paginator;
+
+use Zend\DB\Select,
+    Zend\DB,
+    Zend\Paginator\Adapter,
+    Zend\Paginator\Exception as PaginatorException;
 
 /**
  * @uses       \Zend\DB\DB
  * @uses       \Zend\DB\Expr
  * @uses       \Zend\DB\Select\Select
- * @uses       \Zend\Paginator\Adapter\AdapterInterface
+ * @uses       \Zend\Paginator\Adapter
  * @uses       \Zend\Paginator\Exception
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class DbSelect implements AdapterInterface
+class DbSelect implements Adapter
 {
     /**
      * Name of the row count column
@@ -108,7 +110,7 @@ public function setRowCount($rowCount)
 
             // The select query can contain only one column, which should be the row count column
             if (false === strpos($countColumnPart, $rowCountColumn)) {
-                throw new Paginator\Exception('Row count column not found');
+                throw new PaginatorException('Row count column not found');
             }
 
             $result = $rowCount->query(DB\DB::FETCH_ASSOC)->fetch();
@@ -117,7 +119,7 @@ public function setRowCount($rowCount)
         } else if (is_integer($rowCount)) {
             $this->_rowCount = $rowCount;
         } else {
-            throw new Paginator\Exception('Invalid row count');
+            throw new PaginatorException('Invalid row count');
         }
 
         return $this;
diff --git a/src/Adapter/Iterator.php b/src/Adapter/Iterator.php
index c840918..6926629 100644
--- a/src/Adapter/Iterator.php
+++ b/src/Adapter/Iterator.php
@@ -24,8 +24,10 @@
  */
 namespace Zend\Paginator\Adapter;
 
+use Zend\Paginator\Adapter;
+
 /**
- * @uses       \Zend\Paginator\Adapter\AdapterInterface
+ * @uses       \Zend\Paginator\Adapter
  * @uses       \Zend\Paginator\Exception
  * @uses       \Zend\Paginator\SerializableLimitIterator
  * @category   Zend
@@ -33,7 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Iterator implements AdapterInterface
+class Iterator implements Adapter
 {
     /**
      * Iterator which implements Countable
diff --git a/src/Adapter/Null.php b/src/Adapter/Null.php
index 5a53b51..12ce248 100644
--- a/src/Adapter/Null.php
+++ b/src/Adapter/Null.php
@@ -24,14 +24,16 @@
  */
 namespace Zend\Paginator\Adapter;
 
+use Zend\Paginator\Adapter;
+
 /**
- * @uses       \Zend\Paginator\Adapter\AdapterInterface
+ * @uses       \Zend\Paginator\Adapter
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Null implements AdapterInterface
+class Null implements Adapter
 {
     /**
      * Item count
diff --git a/src/Paginator.php b/src/Paginator.php
index 2b885f5..bdd6289 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -106,7 +106,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * Adapter
      *
-     * @var \Zend\Paginator\Adapter\AdapterInterface
+     * @var \Zend\Paginator\Adapter
      */
     protected $_adapter = null;
 
@@ -417,7 +417,7 @@ public static function getScrollingStyleLoader()
      */
     public function __construct($adapter)
     {
-        if ($adapter instanceof Adapter\AdapterInterface) {
+        if ($adapter instanceof Adapter) {
             $this->_adapter = $adapter;
         } else if ($adapter instanceof AdapterAggregate) {
             $this->_adapter = $adapter->getPaginatorAdapter();
@@ -546,7 +546,7 @@ public function getAbsoluteItemNumber($relativeItemNumber, $pageNumber = null)
     /**
      * Returns the adapter.
      *
-     * @return \Zend\Paginator\Adapter\AdapterInterface
+     * @return \Zend\Paginator\Adapter
      */
     public function getAdapter()
     {
@@ -1048,7 +1048,7 @@ protected function _createPages($scrollingStyle = null)
      * Loads a scrolling style.
      *
      * @param string $scrollingStyle
-     * @return \Zend\Paginator\ScrollingStyle\ScrollingStyleInterface
+     * @return \Zend\Paginator\ScrollingStyle
      */
     protected function _loadScrollingStyle($scrollingStyle = null)
     {
@@ -1058,7 +1058,7 @@ protected function _loadScrollingStyle($scrollingStyle = null)
 
         switch (strtolower(gettype($scrollingStyle))) {
             case 'object':
-                if (!$scrollingStyle instanceof ScrollingStyle\ScrollingStyleInterface) {
+                if (!$scrollingStyle instanceof ScrollingStyle) {
                     throw new View\Exception('Scrolling style must implement ' .
                         'Zend_Paginator_ScrollingStyle_Interface');
                 }
diff --git a/src/ScrollingStyle/ScrollingStyleInterface.php b/src/ScrollingStyle.php
similarity index 94%
rename from src/ScrollingStyle/ScrollingStyleInterface.php
rename to src/ScrollingStyle.php
index 0ab5ec7..bd71995 100644
--- a/src/ScrollingStyle/ScrollingStyleInterface.php
+++ b/src/ScrollingStyle.php
@@ -22,7 +22,7 @@
 /**
  * @namespace
  */
-namespace Zend\Paginator\ScrollingStyle;
+namespace Zend\Paginator;
 
 /**
  * @category   Zend
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface ScrollingStyleInterface
+interface ScrollingStyle
 {
     /**
      * Returns an array of "local" pages given a page number and range.
@@ -40,4 +40,4 @@ interface ScrollingStyleInterface
      * @return array
      */
     public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null);
-}
\ No newline at end of file
+}
diff --git a/src/ScrollingStyle/All.php b/src/ScrollingStyle/All.php
index 334e8b1..1a30891 100644
--- a/src/ScrollingStyle/All.php
+++ b/src/ScrollingStyle/All.php
@@ -24,18 +24,20 @@
  */
 namespace Zend\Paginator\ScrollingStyle;
 
+use Zend\Paginator\ScrollingStyle;
+
 /**
  * A scrolling style that returns every page in the collection.
  * Useful when it is necessary to make every page available at
  * once--for example, when using a dropdown menu pagination control.
  *
- * @uses       \Zend\Paginator\ScrollingStyle\ScrollingStyleInterface
+ * @uses       \Zend\Paginator\ScrollingStyle
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class All implements ScrollingStyleInterface
+class All implements ScrollingStyle
 {
     /**
      * Returns an array of all pages given a page number and range.
diff --git a/src/ScrollingStyle/Jumping.php b/src/ScrollingStyle/Jumping.php
index af49195..9ad74c1 100644
--- a/src/ScrollingStyle/Jumping.php
+++ b/src/ScrollingStyle/Jumping.php
@@ -24,18 +24,20 @@
  */
 namespace Zend\Paginator\ScrollingStyle;
 
+use Zend\Paginator\ScrollingStyle;
+
 /**
  * A scrolling style in which the cursor advances to the upper bound
  * of the page range, the page range "jumps" to the next section, and
  * the cursor moves back to the beginning of the range.
  *
- * @uses       \Zend\Paginator\ScrollingStyle\ScrollingStyleInterface
+ * @uses       \Zend\Paginator\ScrollingStyle
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Jumping implements ScrollingStyleInterface
+class Jumping implements ScrollingStyle
 {
     /**
      * Returns an array of "local" pages given a page number and range.
diff --git a/src/ScrollingStyle/Sliding.php b/src/ScrollingStyle/Sliding.php
index fcf0a7d..a3f650b 100644
--- a/src/ScrollingStyle/Sliding.php
+++ b/src/ScrollingStyle/Sliding.php
@@ -24,20 +24,22 @@
  */
 namespace Zend\Paginator\ScrollingStyle;
 
+use Zend\Paginator\ScrollingStyle;
+
 /**
  * A Yahoo! Search-like scrolling style.  The cursor will advance to
  * the middle of the range, then remain there until the user reaches
  * the end of the page set, at which point it will continue on to
  * the end of the range and the last page in the set.
  *
- * @uses       \Zend\Paginator\ScrollingStyle\ScrollingStyleInterface
+ * @uses       \Zend\Paginator\ScrollingStyle
  * @link       http://search.yahoo.com/search?p=Zend+Framework
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Sliding implements ScrollingStyleInterface
+class Sliding implements ScrollingStyle
 {
     /**
      * Returns an array of "local" pages given a page number and range.
diff --git a/test/TestAsset/TestAdapter.php b/test/TestAsset/TestAdapter.php
index 5c447c6..38a934e 100644
--- a/test/TestAsset/TestAdapter.php
+++ b/test/TestAsset/TestAdapter.php
@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class TestAdapter extends \ArrayObject implements \Zend\Paginator\Adapter\AdapterInterface
+class TestAdapter extends \ArrayObject implements \Zend\Paginator\Adapter
 {
     public function count()
     {
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index a24e338855a0967d2461824540958defda3fb343..b834faf92eae98eaaa305c8a9f1f5ab4e71ecf2e 100644
GIT binary patch
delta 49
ucmZn&Xb6}fEqIjy1u%WusH4cl$T``MX+0y?=6_5avYXjdelagnU;zLFt_wu~

delta 49
ucmZn&Xb6}fEqImz1u(tasH4cl$TiuIX+0z7=6_5avYXjdelagnU;zLD{0lh%


From b6a1d315b6d86d05aecdb57524e82a9e2c949da3 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Fri, 2 Jul 2010 09:21:54 -0400
Subject: [PATCH 05/11] Zend\DB cleanup

- Moved all subcomponents that consisted of a class and exception up one level
- Consistency in interface and abstract class naming
- updated all tests and code to reflect changes
---
 test/Adapter/DbSelect/OracleTest.php      | 12 +++++++-----
 test/Adapter/DbSelectTest.php             |  8 ++++----
 test/Adapter/DbTableSelect/OracleTest.php |  2 +-
 test/Adapter/DbTableSelectTest.php        |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/Adapter/DbSelect/OracleTest.php b/test/Adapter/DbSelect/OracleTest.php
index af1c0ee..d621b1a 100644
--- a/test/Adapter/DbSelect/OracleTest.php
+++ b/test/Adapter/DbSelect/OracleTest.php
@@ -24,8 +24,10 @@
  * @namespace
  */
 namespace ZendTest\Paginator\Adapter\DbSelect;
-use Zend\Paginator\Adapter;
-use Zend\DB\Statement\Oracle;
+
+use Zend\Paginator\Adapter,
+    Zend\DB\Statement\Oracle,
+    Zend\DB\Statement\OracleException;
 
 require_once 'Zend/Paginator/Adapter/DbSelectTest.php';
 require_once dirname(__FILE__) . '/../../_files/TestTable.php';
@@ -56,7 +58,7 @@ protected function setUp ()
             $this->markTestSkipped('Oracle is required');
         }
 
-        $this->_db = new \Zend\DB\Adapter\Oracle\Oracle(
+        $this->_db = new \Zend\DB\Adapter\Oracle(
                 array('host' => TESTS_ZEND_DB_ADAPTER_ORACLE_HOSTNAME ,
                         'username' => TESTS_ZEND_DB_ADAPTER_ORACLE_USERNAME ,
                         'password' => TESTS_ZEND_DB_ADAPTER_ORACLE_PASSWORD ,
@@ -118,10 +120,10 @@ protected function _dropTable ()
     {
         try {
             $this->_db->query('drop table "test"');
-        } catch (Oracle\Exception $e) {}
+        } catch (OracleException $e) {}
         try {
             $this->_db->query('drop table "test_empty"');
-        } catch (Oracle\Exception $e) {}
+        } catch (OracleException $e) {}
     }
 
     public function testGroupByQueryOnEmptyTableReturnsRowCountZero()
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
index b70920e..5e76224 100644
--- a/test/Adapter/DbSelectTest.php
+++ b/test/Adapter/DbSelectTest.php
@@ -148,10 +148,10 @@ public function testAcceptsQueryForRowCount()
         $expression = new DB\Expr("COUNT(*) AS $row_count_column");
 
         $rowCount = clone $this->_query;
-        $rowCount->reset(Select\Select::COLUMNS)
-                 ->reset(Select\Select::ORDER)        // ZF-3740
-                 ->reset(Select\Select::LIMIT_OFFSET) // ZF-3727
-                 ->reset(Select\Select::GROUP)        // ZF-4001
+        $rowCount->reset(Select::COLUMNS)
+                 ->reset(Select::ORDER)        // ZF-3740
+                 ->reset(Select::LIMIT_OFFSET) // ZF-3727
+                 ->reset(Select::GROUP)        // ZF-4001
                  ->columns($expression);
 
         $this->_adapter->setRowCount($rowCount);
diff --git a/test/Adapter/DbTableSelect/OracleTest.php b/test/Adapter/DbTableSelect/OracleTest.php
index ce5c996..ae9b1d9 100644
--- a/test/Adapter/DbTableSelect/OracleTest.php
+++ b/test/Adapter/DbTableSelect/OracleTest.php
@@ -50,6 +50,6 @@ public function testSelectDoesReturnZendDbTableRowset()
         $adapter = new \Zend\Paginator\Adapter\DbTableSelect($query);
         $items   = $adapter->getItems(0, 10);
 
-        $this->assertType('Zend\DB\Table\Rowset\Rowset', $items);
+        $this->assertType('Zend\DB\Table\Rowset', $items);
     }
 }
diff --git a/test/Adapter/DbTableSelectTest.php b/test/Adapter/DbTableSelectTest.php
index 6790149..2160a07 100644
--- a/test/Adapter/DbTableSelectTest.php
+++ b/test/Adapter/DbTableSelectTest.php
@@ -45,7 +45,7 @@ public function testSelectDoesReturnZendDbTableRowset()
         $adapter = new Adapter\DbTableSelect($query);
         $items   = $adapter->getItems(0, 10);
 
-        $this->assertType('Zend\DB\Table\Rowset\Rowset', $items);
+        $this->assertType('Zend\DB\Table\Rowset', $items);
     }
 
     public function testToJsonWithRowset()

From 30276d3f11c244fd78120b9bed7145cf3f84a680 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Sat, 3 Jul 2010 10:03:14 -0400
Subject: [PATCH 06/11] Zend\DB cleanup

- Moved all interfaces up a level
- Flattened Zend\DB\Table class hierarchy
- Cleaned up "orphaned" subcomponents
  - If they consisted of a class and an exception, moved them up a level
- Updated dependent code to reflect the above changes
---
 src/Adapter/DbSelect.php      | 44 +++++++++++++++++------------------
 src/Adapter/DbTableSelect.php |  2 +-
 src/Paginator.php             |  6 ++---
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
index 1e3ebc6..5846393 100644
--- a/src/Adapter/DbSelect.php
+++ b/src/Adapter/DbSelect.php
@@ -32,7 +32,7 @@
 /**
  * @uses       \Zend\DB\DB
  * @uses       \Zend\DB\Expr
- * @uses       \Zend\DB\Select\Select
+ * @uses       \Zend\DB\Select
  * @uses       \Zend\Paginator\Adapter
  * @uses       \Zend\Paginator\Exception
  * @category   Zend
@@ -52,14 +52,14 @@ class DbSelect implements Adapter
     /**
      * The COUNT query
      *
-     * @var \Zend\DB\Select\Select
+     * @var \Zend\DB\Select
      */
     protected $_countSelect = null;
 
     /**
      * Database query
      *
-     * @var \Zend\DB\Select\Select
+     * @var \Zend\DB\Select
      */
     protected $_select = null;
 
@@ -73,9 +73,9 @@ class DbSelect implements Adapter
     /**
      * Constructor.
      *
-     * @param \Zend\DB\Select\Select $select The select query
+     * @param \Zend\DB\Select $select The select query
      */
-    public function __construct(Select\Select $select)
+    public function __construct(Select $select)
     {
         $this->_select = $select;
     }
@@ -90,15 +90,15 @@ public function __construct(Select\Select $select)
      * Users are therefore encouraged to profile their queries to find
      * the solution that best meets their needs.
      *
-     * @param  \Zend\DB\Select\Select|integer $totalRowCount Total row count integer
+     * @param  \Zend\DB\Select|integer $totalRowCount Total row count integer
      *                                               or query
      * @return \Zend\Paginator\Adapter\DbSelect $this
      * @throws \Zend\Paginator\Exception
      */
     public function setRowCount($rowCount)
     {
-        if ($rowCount instanceof Select\Select) {
-            $columns = $rowCount->getPart(Select\Select::COLUMNS);
+        if ($rowCount instanceof Select) {
+            $columns = $rowCount->getPart(Select::COLUMNS);
 
             $countColumnPart = $columns[0][1];
 
@@ -162,7 +162,7 @@ public function count()
      * In that use-case I'm expecting problems when either GROUP BY or DISTINCT
      * has one column.
      *
-     * @return \Zend\DB\Select\Select
+     * @return \Zend\DB\Select
      */
     public function getCountSelect()
     {
@@ -182,7 +182,7 @@ public function getCountSelect()
         $countColumn = $db->quoteIdentifier($db->foldCase(self::ROW_COUNT_COLUMN));
         $countPart   = 'COUNT(1) AS ';
         $groupPart   = null;
-        $unionParts  = $rowCount->getPart(Select\Select::UNION);
+        $unionParts  = $rowCount->getPart(Select::UNION);
 
         /**
          * If we're dealing with a UNION query, execute the UNION as a subquery
@@ -193,10 +193,10 @@ public function getCountSelect()
 
             $rowCount = $db->select()->from($rowCount, $expression);
         } else {
-            $columnParts = $rowCount->getPart(Select\Select::COLUMNS);
-            $groupParts  = $rowCount->getPart(Select\Select::GROUP);
-            $havingParts = $rowCount->getPart(Select\Select::HAVING);
-            $isDistinct  = $rowCount->getPart(Select\Select::DISTINCT);
+            $columnParts = $rowCount->getPart(Select::COLUMNS);
+            $groupParts  = $rowCount->getPart(Select::GROUP);
+            $havingParts = $rowCount->getPart(Select::HAVING);
+            $isDistinct  = $rowCount->getPart(Select::DISTINCT);
 
             /**
              * If there is more than one column AND it's a DISTINCT query, more
@@ -208,7 +208,7 @@ public function getCountSelect()
             } else if ($isDistinct) {
                 $part = $columnParts[0];
 
-                if ($part[1] !== Select\Select::SQL_WILDCARD && !($part[1] instanceof DB\Expr)) {
+                if ($part[1] !== Select::SQL_WILDCARD && !($part[1] instanceof DB\Expr)) {
                     $column = $db->quoteIdentifier($part[1], true);
 
                     if (!empty($part[0])) {
@@ -217,7 +217,7 @@ public function getCountSelect()
 
                     $groupPart = $column;
                 }
-            } else if (!empty($groupParts) && $groupParts[0] !== Select\Select::SQL_WILDCARD &&
+            } else if (!empty($groupParts) && $groupParts[0] !== Select::SQL_WILDCARD &&
                        !($groupParts[0] instanceof DB\Expr)) {
                 $groupPart = $db->quoteIdentifier($groupParts[0], true);
             }
@@ -236,12 +236,12 @@ public function getCountSelect()
              */
             $expression = new DB\Expr($countPart . $countColumn);
 
-            $rowCount->reset(Select\Select::COLUMNS)
-                     ->reset(Select\Select::ORDER)
-                     ->reset(Select\Select::LIMIT_OFFSET)
-                     ->reset(Select\Select::GROUP)
-                     ->reset(Select\Select::DISTINCT)
-                     ->reset(Select\Select::HAVING)
+            $rowCount->reset(Select::COLUMNS)
+                     ->reset(Select::ORDER)
+                     ->reset(Select::LIMIT_OFFSET)
+                     ->reset(Select::GROUP)
+                     ->reset(Select::DISTINCT)
+                     ->reset(Select::HAVING)
                      ->columns($expression);
         }
 
diff --git a/src/Adapter/DbTableSelect.php b/src/Adapter/DbTableSelect.php
index 81d123c..491242e 100644
--- a/src/Adapter/DbTableSelect.php
+++ b/src/Adapter/DbTableSelect.php
@@ -38,7 +38,7 @@ class DbTableSelect extends DbSelect
      *
      * @param  integer $offset Page offset
      * @param  integer $itemCountPerPage Number of items per page
-     * @return \Zend\DB\Table\Rowset\AbstractRowset
+     * @return \Zend\DB\Table\AbstractRowset
      */
     public function getItems($offset, $itemCountPerPage)
     {
diff --git a/src/Paginator.php b/src/Paginator.php
index bdd6289..3366c11 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -271,9 +271,9 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
             if ($adapter == self::INTERNAL_ADAPTER) {
                 if (is_array($data)) {
                     $adapter = 'ArrayAdapter';
-                } else if ($data instanceof \Zend\DB\Table\Select\Select) {
+                } else if ($data instanceof \Zend\DB\Table\Select) {
                     $adapter = 'DbTableSelect';
-                } else if ($data instanceof \Zend\DB\Select\Select) {
+                } else if ($data instanceof \Zend\DB\Select) {
                     $adapter = 'DbSelect';
                 } else if ($data instanceof \Iterator) {
                     $adapter = 'Iterator';
@@ -940,7 +940,7 @@ public function toJson()
     {
         $currentItems = $this->getCurrentItems();
 
-        if ($currentItems instanceof \Zend\DB\Table\Rowset\AbstractRowset) {
+        if ($currentItems instanceof \Zend\DB\Table\AbstractRowset) {
             return JSON\JSON::encode($currentItems->toArray());
         } else {
             return JSON\JSON::encode($currentItems);

From 3421b6b9998a15daa02ad45e4433e5cc90260147 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 6 Jul 2010 13:16:47 -0400
Subject: [PATCH 07/11] Zend\View cleanup

- s/ViewInterface/ViewEngine/
- s/Helper\HelperInterface/Helper/
- fixed duplicate class/component names
- Updated all code and tests to reflect the above
---
 src/Paginator.php       |  12 ++++++------
 test/PaginatorTest.php  |   6 +++---
 test/_files/test.sqlite | Bin 10240 -> 10240 bytes
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Paginator.php b/src/Paginator.php
index 3366c11..4fb7132 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -170,7 +170,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * View instance used for self rendering
      *
-     * @var \Zend\View\ViewInterface
+     * @var \Zend\View\ViewEngine
      */
     protected $_view = null;
 
@@ -846,7 +846,7 @@ public function getPageItemCache()
      * Retrieves the view instance.  If none registered, attempts to pull f
      * rom ViewRenderer.
      *
-     * @return \Zend\View\ViewInterface|null
+     * @return \Zend\View\ViewEngine|null
      */
     public function getView()
     {
@@ -864,10 +864,10 @@ public function getView()
     /**
      * Sets the view object.
      *
-     * @param  \Zend\View\ViewInterface $view
+     * @param  \Zend\View\ViewEngine $view
      * @return \Zend\Paginator\Paginator
      */
-    public function setView(View\ViewInterface $view = null)
+    public function setView(View\ViewEngine $view = null)
     {
         $this->_view = $view;
 
@@ -917,10 +917,10 @@ public function normalizePageNumber($pageNumber)
     /**
      * Renders the paginator.
      *
-     * @param  \Zend\View\ViewInterface $view
+     * @param  \Zend\View\ViewEngine $view
      * @return string
      */
-    public function render(View\ViewInterface $view = null)
+    public function render(View\ViewEngine $view = null)
     {
         if (null !== $view) {
             $this->setView($view);
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index e3a20a3..2331bef 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -600,18 +600,18 @@ public function testGetsViewFromViewRenderer()
         $viewRenderer = HelperBroker::getStaticHelper('viewRenderer');
         $viewRenderer->setView(new View\View());
 
-        $this->assertType('Zend\View\ViewInterface', $this->_paginator->getView());
+        $this->assertType('Zend\View\ViewEngine', $this->_paginator->getView());
     }
 
     public function testGeneratesViewIfNonexistent()
     {
-        $this->assertType('Zend\View\ViewInterface', $this->_paginator->getView());
+        $this->assertType('Zend\View\ViewEngine', $this->_paginator->getView());
     }
 
     public function testGetsAndSetsView()
     {
         $this->_paginator->setView(new View\View());
-        $this->assertType('Zend\View\ViewInterface', $this->_paginator->getView());
+        $this->assertType('Zend\View\ViewEngine', $this->_paginator->getView());
     }
 
     public function testRenders()
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index b834faf92eae98eaaa305c8a9f1f5ab4e71ecf2e..c63c40916a5d574cddea3c372fd4f1bb97fefbd5 100644
GIT binary patch
delta 49
ucmZn&Xb6}fEqIp!1u%WvsH4cl$TiuIX+0z7=6_5avYXjdelagnU;zLHYzt8U

delta 49
ucmZn&Xb6}fEqIjy1u%WusH4cl$T``MX+0y?=6_5avYXjdelagnU;zLFt_wu~


From 99e2397629a16a5b2cf217507846a1e309251157 Mon Sep 17 00:00:00 2001
From: ramon <ramon@44c647ce-9c0f-0410-b52a-842ac1e357ba>
Date: Fri, 9 Jul 2010 19:41:46 +0000
Subject: [PATCH 08/11] [ZF-10127] Zend_Paginator:

- fixed doc-comment return type

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22542 44c647ce-9c0f-0410-b52a-842ac1e357ba
---
 src/AdapterAggregate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AdapterAggregate.php b/src/AdapterAggregate.php
index c70408c..81e7391 100644
--- a/src/AdapterAggregate.php
+++ b/src/AdapterAggregate.php
@@ -34,7 +34,7 @@ interface Zend_Paginator_AdapterAggregate
     /**
      * Return a fully configured Paginator Adapter from this method.
      *
-     * @return Zend_Paginator_Adapter_Abstract
+     * @return Zend_Paginator_Adapter_Interface
      */
     public function getPaginatorAdapter();
 }
\ No newline at end of file

From a96d3c6049e625b7e6b6601abff15ebea13814cf Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 12 Jul 2010 12:23:07 -0400
Subject: [PATCH 09/11] s/dirname(__FILE__)/__DIR__/g

- Replaced dirname(__FILE__) calls with __DIR__ throughout the codebase
---
 test/Adapter/DbSelect/OracleTest.php | 2 +-
 test/Adapter/DbSelectTest.php        | 6 +++---
 test/PaginatorTest.php               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/Adapter/DbSelect/OracleTest.php b/test/Adapter/DbSelect/OracleTest.php
index d621b1a..74986f8 100644
--- a/test/Adapter/DbSelect/OracleTest.php
+++ b/test/Adapter/DbSelect/OracleTest.php
@@ -30,7 +30,7 @@
     Zend\DB\Statement\OracleException;
 
 require_once 'Zend/Paginator/Adapter/DbSelectTest.php';
-require_once dirname(__FILE__) . '/../../_files/TestTable.php';
+require_once __DIR__ . '/../../_files/TestTable.php';
 
 /**
  * @category   Zend
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
index 5e76224..720d424 100644
--- a/test/Adapter/DbSelectTest.php
+++ b/test/Adapter/DbSelectTest.php
@@ -29,7 +29,7 @@
 use Zend\DB;
 use Zend\DB\Select;
 
-require_once dirname(__FILE__) . '/../_files/TestTable.php';
+require_once __DIR__ . '/../_files/TestTable.php';
 
 /**
  * @category   Zend
@@ -73,7 +73,7 @@ protected function setUp()
         parent::setUp();
 
         $this->_db = new PDO\SQLite(array(
-            'dbname' => dirname(__FILE__) . '/../_files/test.sqlite'
+            'dbname' => __DIR__ . '/../_files/test.sqlite'
         ));
 
         $this->_table = new \ZendTest\Paginator\TestAsset\TestTable($this->_db);
@@ -205,7 +205,7 @@ public function testGroupByQueryReturnsOneRow()
     public function testGroupByQueryOnEmptyTableReturnsRowCountZero()
     {
         $db = new PDO\SQLite(array(
-            'dbname' => dirname(__FILE__) . '/../_files/testempty.sqlite'
+            'dbname' => __DIR__ . '/../_files/testempty.sqlite'
         ));
 
         $query = $db->select()->from('test')
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index 18c9005..6420e65 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -425,7 +425,7 @@ public function testRendersWithPartial()
     {
         $view = new View\View();
         $view->addBasePath(__DIR__ . '/_files');
-        $view->addHelperPath(dirname(__FILE__) . '/../../../trunk/library/Zend/View/Helper', 'Zend\View\Helper');
+        $view->addHelperPath(__DIR__ . '/../../../trunk/library/Zend/View/Helper', 'Zend\View\Helper');
 
         Helper\PaginationControl::setDefaultViewPartial('partial.phtml');
 

From 1fabbdf7e5bea1ecb1971250721926ab4ae5c713 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 19 Jul 2010 13:54:03 -0400
Subject: [PATCH 10/11] DB -> Db

- Renamed Zend\DB to Zend\Db; updated all dependent classes
- Also renamed all adapters to use MixedCase instead of ACRONYM case (PDO,
  MySQLi, etc.)
---
 src/Adapter/DbSelect.php                  |  32 +++++++++++-----------
 src/Adapter/DbTableSelect.php             |   2 +-
 src/Paginator.php                         |   6 ++--
 test/Adapter/DbSelect/OracleTest.php      |  18 ++++++------
 test/Adapter/DbSelectTest.php             |  14 +++++-----
 test/Adapter/DbTableSelect/OracleTest.php |   4 +--
 test/Adapter/DbTableSelectTest.php        |   2 +-
 test/PaginatorTest.php                    |   2 +-
 test/TestAsset/TestTable.php              |   2 +-
 test/_files/test.sqlite                   | Bin 10240 -> 10240 bytes
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
index 5846393..bcd00d2 100644
--- a/src/Adapter/DbSelect.php
+++ b/src/Adapter/DbSelect.php
@@ -24,15 +24,15 @@
  */
 namespace Zend\Paginator\Adapter;
 
-use Zend\DB\Select,
-    Zend\DB,
+use Zend\Db\Select,
+    Zend\Db,
     Zend\Paginator\Adapter,
     Zend\Paginator\Exception as PaginatorException;
 
 /**
- * @uses       \Zend\DB\DB
- * @uses       \Zend\DB\Expr
- * @uses       \Zend\DB\Select
+ * @uses       \Zend\Db\Db
+ * @uses       \Zend\Db\Expr
+ * @uses       \Zend\Db\Select
  * @uses       \Zend\Paginator\Adapter
  * @uses       \Zend\Paginator\Exception
  * @category   Zend
@@ -52,14 +52,14 @@ class DbSelect implements Adapter
     /**
      * The COUNT query
      *
-     * @var \Zend\DB\Select
+     * @var \Zend\Db\Select
      */
     protected $_countSelect = null;
 
     /**
      * Database query
      *
-     * @var \Zend\DB\Select
+     * @var \Zend\Db\Select
      */
     protected $_select = null;
 
@@ -73,7 +73,7 @@ class DbSelect implements Adapter
     /**
      * Constructor.
      *
-     * @param \Zend\DB\Select $select The select query
+     * @param \Zend\Db\Select $select The select query
      */
     public function __construct(Select $select)
     {
@@ -90,7 +90,7 @@ public function __construct(Select $select)
      * Users are therefore encouraged to profile their queries to find
      * the solution that best meets their needs.
      *
-     * @param  \Zend\DB\Select|integer $totalRowCount Total row count integer
+     * @param  \Zend\Db\Select|integer $totalRowCount Total row count integer
      *                                               or query
      * @return \Zend\Paginator\Adapter\DbSelect $this
      * @throws \Zend\Paginator\Exception
@@ -102,7 +102,7 @@ public function setRowCount($rowCount)
 
             $countColumnPart = $columns[0][1];
 
-            if ($countColumnPart instanceof DB\Expr) {
+            if ($countColumnPart instanceof Db\Expr) {
                 $countColumnPart = $countColumnPart->__toString();
             }
 
@@ -113,7 +113,7 @@ public function setRowCount($rowCount)
                 throw new PaginatorException('Row count column not found');
             }
 
-            $result = $rowCount->query(DB\DB::FETCH_ASSOC)->fetch();
+            $result = $rowCount->query(Db\Db::FETCH_ASSOC)->fetch();
 
             $this->_rowCount = count($result) > 0 ? $result[$rowCountColumn] : 0;
         } else if (is_integer($rowCount)) {
@@ -162,7 +162,7 @@ public function count()
      * In that use-case I'm expecting problems when either GROUP BY or DISTINCT
      * has one column.
      *
-     * @return \Zend\DB\Select
+     * @return \Zend\Db\Select
      */
     public function getCountSelect()
     {
@@ -189,7 +189,7 @@ public function getCountSelect()
          * to the COUNT query.
          */
         if (!empty($unionParts)) {
-            $expression = new DB\Expr($countPart . $countColumn);
+            $expression = new Db\Expr($countPart . $countColumn);
 
             $rowCount = $db->select()->from($rowCount, $expression);
         } else {
@@ -208,7 +208,7 @@ public function getCountSelect()
             } else if ($isDistinct) {
                 $part = $columnParts[0];
 
-                if ($part[1] !== Select::SQL_WILDCARD && !($part[1] instanceof DB\Expr)) {
+                if ($part[1] !== Select::SQL_WILDCARD && !($part[1] instanceof Db\Expr)) {
                     $column = $db->quoteIdentifier($part[1], true);
 
                     if (!empty($part[0])) {
@@ -218,7 +218,7 @@ public function getCountSelect()
                     $groupPart = $column;
                 }
             } else if (!empty($groupParts) && $groupParts[0] !== Select::SQL_WILDCARD &&
-                       !($groupParts[0] instanceof DB\Expr)) {
+                       !($groupParts[0] instanceof Db\Expr)) {
                 $groupPart = $db->quoteIdentifier($groupParts[0], true);
             }
 
@@ -234,7 +234,7 @@ public function getCountSelect()
             /**
              * Create the COUNT part of the query
              */
-            $expression = new DB\Expr($countPart . $countColumn);
+            $expression = new Db\Expr($countPart . $countColumn);
 
             $rowCount->reset(Select::COLUMNS)
                      ->reset(Select::ORDER)
diff --git a/src/Adapter/DbTableSelect.php b/src/Adapter/DbTableSelect.php
index 491242e..058ce52 100644
--- a/src/Adapter/DbTableSelect.php
+++ b/src/Adapter/DbTableSelect.php
@@ -38,7 +38,7 @@ class DbTableSelect extends DbSelect
      *
      * @param  integer $offset Page offset
      * @param  integer $itemCountPerPage Number of items per page
-     * @return \Zend\DB\Table\AbstractRowset
+     * @return \Zend\Db\Table\AbstractRowset
      */
     public function getItems($offset, $itemCountPerPage)
     {
diff --git a/src/Paginator.php b/src/Paginator.php
index 08f33e2..11cef13 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -271,9 +271,9 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
             if ($adapter == self::INTERNAL_ADAPTER) {
                 if (is_array($data)) {
                     $adapter = 'ArrayAdapter';
-                } else if ($data instanceof \Zend\DB\Table\Select) {
+                } else if ($data instanceof \Zend\Db\Table\Select) {
                     $adapter = 'DbTableSelect';
-                } else if ($data instanceof \Zend\DB\Select) {
+                } else if ($data instanceof \Zend\Db\Select) {
                     $adapter = 'DbSelect';
                 } else if ($data instanceof \Iterator) {
                     $adapter = 'Iterator';
@@ -943,7 +943,7 @@ public function toJson()
     {
         $currentItems = $this->getCurrentItems();
 
-        if ($currentItems instanceof \Zend\DB\Table\AbstractRowset) {
+        if ($currentItems instanceof \Zend\Db\Table\AbstractRowset) {
             return JSON\JSON::encode($currentItems->toArray());
         } else {
             return JSON\JSON::encode($currentItems);
diff --git a/test/Adapter/DbSelect/OracleTest.php b/test/Adapter/DbSelect/OracleTest.php
index 74986f8..91b538a 100644
--- a/test/Adapter/DbSelect/OracleTest.php
+++ b/test/Adapter/DbSelect/OracleTest.php
@@ -26,8 +26,8 @@
 namespace ZendTest\Paginator\Adapter\DbSelect;
 
 use Zend\Paginator\Adapter,
-    Zend\DB\Statement\Oracle,
-    Zend\DB\Statement\OracleException;
+    Zend\Db\Statement\Oracle,
+    Zend\Db\Statement\OracleException;
 
 require_once 'Zend/Paginator/Adapter/DbSelectTest.php';
 require_once __DIR__ . '/../../_files/TestTable.php';
@@ -54,15 +54,15 @@ protected function setUp ()
             $this->markTestSkipped('Oci8 extension is not loaded');
         }
 
-        if (! TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED) {
+        if (! TESTS_ZEND_Db_ADAPTER_ORACLE_ENABLED) {
             $this->markTestSkipped('Oracle is required');
         }
 
-        $this->_db = new \Zend\DB\Adapter\Oracle(
-                array('host' => TESTS_ZEND_DB_ADAPTER_ORACLE_HOSTNAME ,
-                        'username' => TESTS_ZEND_DB_ADAPTER_ORACLE_USERNAME ,
-                        'password' => TESTS_ZEND_DB_ADAPTER_ORACLE_PASSWORD ,
-                        'dbname' => TESTS_ZEND_DB_ADAPTER_ORACLE_SID));
+        $this->_db = new \Zend\Db\Adapter\Oracle(
+                array('host' => TESTS_ZEND_Db_ADAPTER_ORACLE_HOSTNAME ,
+                        'username' => TESTS_ZEND_Db_ADAPTER_ORACLE_USERNAME ,
+                        'password' => TESTS_ZEND_Db_ADAPTER_ORACLE_PASSWORD ,
+                        'dbname' => TESTS_ZEND_Db_ADAPTER_ORACLE_SID));
 
         $this->_dropTable();
         $this->_createTable();
@@ -83,7 +83,7 @@ protected function setUp ()
      */
     protected function tearDown ()
     {
-        if (! TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED) {
+        if (! TESTS_ZEND_Db_ADAPTER_ORACLE_ENABLED) {
             return;
         }
 
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
index 720d424..f93fc25 100644
--- a/test/Adapter/DbSelectTest.php
+++ b/test/Adapter/DbSelectTest.php
@@ -24,10 +24,10 @@
  * @namespace
  */
 namespace ZendTest\Paginator\Adapter;
-use Zend\DB\Adapter\PDO;
+use Zend\Db\Adapter\Pdo;
 use Zend\Paginator\Adapter;
-use Zend\DB;
-use Zend\DB\Select;
+use Zend\Db;
+use Zend\Db\Select;
 
 require_once __DIR__ . '/../_files/TestTable.php';
 
@@ -72,7 +72,7 @@ protected function setUp()
 
         parent::setUp();
 
-        $this->_db = new PDO\SQLite(array(
+        $this->_db = new Pdo\Sqlite(array(
             'dbname' => __DIR__ . '/../_files/test.sqlite'
         ));
 
@@ -132,7 +132,7 @@ public function testThrowsExceptionIfInvalidQuerySuppliedForRowCount()
 
         try {
             $wrongcolumn = $this->_db->quoteIdentifier('wrongcolumn');
-            $expr = new DB\Expr("COUNT(*) AS $wrongcolumn");
+            $expr = new Db\Expr("COUNT(*) AS $wrongcolumn");
             $query = $this->_db->select($expr)->from('test');
 
             $this->_adapter->setRowCount($query);
@@ -145,7 +145,7 @@ public function testThrowsExceptionIfInvalidQuerySuppliedForRowCount()
     public function testAcceptsQueryForRowCount()
     {
         $row_count_column = $this->_db->quoteIdentifier(Adapter\DbSelect::ROW_COUNT_COLUMN);
-        $expression = new DB\Expr("COUNT(*) AS $row_count_column");
+        $expression = new Db\Expr("COUNT(*) AS $row_count_column");
 
         $rowCount = clone $this->_query;
         $rowCount->reset(Select::COLUMNS)
@@ -204,7 +204,7 @@ public function testGroupByQueryReturnsOneRow()
      */
     public function testGroupByQueryOnEmptyTableReturnsRowCountZero()
     {
-        $db = new PDO\SQLite(array(
+        $db = new Pdo\Sqlite(array(
             'dbname' => __DIR__ . '/../_files/testempty.sqlite'
         ));
 
diff --git a/test/Adapter/DbTableSelect/OracleTest.php b/test/Adapter/DbTableSelect/OracleTest.php
index ae9b1d9..87db47c 100644
--- a/test/Adapter/DbTableSelect/OracleTest.php
+++ b/test/Adapter/DbTableSelect/OracleTest.php
@@ -38,7 +38,7 @@ class OracleTest extends \ZendTest\Paginator\Adapter\DbSelect\OracleTest
 {
     public function setup()
     {
-        $this->markTestSkipped('Skipping until Zend\DB is refactored.');
+        $this->markTestSkipped('Skipping until Zend\Db is refactored.');
     }
     
     /**
@@ -50,6 +50,6 @@ public function testSelectDoesReturnZendDbTableRowset()
         $adapter = new \Zend\Paginator\Adapter\DbTableSelect($query);
         $items   = $adapter->getItems(0, 10);
 
-        $this->assertType('Zend\DB\Table\Rowset', $items);
+        $this->assertType('Zend\Db\Table\Rowset', $items);
     }
 }
diff --git a/test/Adapter/DbTableSelectTest.php b/test/Adapter/DbTableSelectTest.php
index 2160a07..811b76b 100644
--- a/test/Adapter/DbTableSelectTest.php
+++ b/test/Adapter/DbTableSelectTest.php
@@ -45,7 +45,7 @@ public function testSelectDoesReturnZendDbTableRowset()
         $adapter = new Adapter\DbTableSelect($query);
         $items   = $adapter->getItems(0, 10);
 
-        $this->assertType('Zend\DB\Table\Rowset', $items);
+        $this->assertType('Zend\Db\Table\Rowset', $items);
     }
 
     public function testToJsonWithRowset()
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index 6420e65..e08ce2a 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -65,7 +65,7 @@ protected function setUp()
            $this->markTestSkipped('Pdo_Sqlite extension is not loaded');
         }
 
-        $this->_adapter = new \Zend\DB\Adapter\PDO\SQLite(array(
+        $this->_adapter = new \Zend\Db\Adapter\Pdo\Sqlite(array(
             'dbname' => __DIR__ . '/_files/test.sqlite'
         ));
 
diff --git a/test/TestAsset/TestTable.php b/test/TestAsset/TestTable.php
index c449209..0bcf83b 100644
--- a/test/TestAsset/TestTable.php
+++ b/test/TestAsset/TestTable.php
@@ -2,7 +2,7 @@
 
 namespace ZendTest\Paginator\TestAsset;
 
-class TestTable extends \Zend\DB\Table\AbstractTable
+class TestTable extends \Zend\Db\Table\AbstractTable
 {
     protected $_primary = 'number';
     protected $_name = 'test';
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index c63c40916a5d574cddea3c372fd4f1bb97fefbd5..a90819304da5e37961b9ebad9f47c3db1c40df2d 100644
GIT binary patch
delta 49
ucmZn&Xb6}fE%=lH1u*^EsH4cl$T``MX+0y?=6_5avYXjdelagnU;zLJ9t&Ln

delta 49
ucmZn&Xb6}fEqIp!1u%WvsH4cl$TiuIX+0z7=6_5avYXjdelagnU;zLHYzt8U


From c73202b116524c9d5f388ed71e09f4154e7be753 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 20 Jul 2010 09:34:19 -0400
Subject: [PATCH 11/11] JSON -> Json

- Renamed all directories and filenames from JSON to Json
- renamed all namespaces and classnames from JSON to Json
- Renamed methods and options that contained the verbiage "JSON" to contain the
  verbiage "Json"
---
 src/Paginator.php       |   8 ++++----
 test/_files/test.sqlite | Bin 10240 -> 10240 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Paginator.php b/src/Paginator.php
index 11cef13..b2512b6 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -26,11 +26,11 @@
 
 use Zend\Loader\PluginLoader,
     Zend\View,
-    Zend\JSON;
+    Zend\Json;
 
 /**
  * @uses       \Zend\Controller\Action\HelperBroker
- * @uses       \Zend\JSON\JSON
+ * @uses       \Zend\Json\Json
  * @uses       \Zend\Loader\PluginLoader
  * @uses       \Zend\Paginator\Exception
  * @uses       \Zend\View\Exception
@@ -944,9 +944,9 @@ public function toJson()
         $currentItems = $this->getCurrentItems();
 
         if ($currentItems instanceof \Zend\Db\Table\AbstractRowset) {
-            return JSON\JSON::encode($currentItems->toArray());
+            return Json\Json::encode($currentItems->toArray());
         } else {
-            return JSON\JSON::encode($currentItems);
+            return Json\Json::encode($currentItems);
         }
     }
 
diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite
index a90819304da5e37961b9ebad9f47c3db1c40df2d..b7bbde40669237011c6ff88f48650f6c34774de6 100644
GIT binary patch
delta 49
ucmZn&Xb6}fE%=rJ1u*^FsH4cl$TiuIX+0z7=6_5avYXjdelagnU;zLK+zV*{

delta 49
ucmZn&Xb6}fE%=lH1u*^EsH4cl$T``MX+0y?=6_5avYXjdelagnU;zLJ9t&Ln