Merge branch 'master' into hotfix/translator-caching

zendframework · Sep 20, 2012 · 33e79d4 · 33e79d4
commit 33e79d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
@@ -54,6 +54,7 @@ class DbSelect implements AdapterInterface
      * @param Select $select The select query
      * @param Adapter|Sql $adapterOrSqlObject DB adapter or Sql object
      * @param null|ResultSetInterface $resultSetPrototype
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct(Select $select, $adapterOrSqlObject, ResultSetInterface $resultSetPrototype = null)
     {

diff --git a/src/Paginator.php b/src/Paginator.php
@@ -18,6 +18,7 @@
 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;
 use Zend\Paginator\Adapter\AdapterInterface;
@@ -826,11 +827,10 @@ public function toJson()
     {
         $currentItems = $this->getCurrentItems();
 
-        if ($currentItems instanceof DbAbstractRowset) {
+        if ($currentItems instanceof AbstractResultSet) {
             return Json::encode($currentItems->toArray());
-        } else {
-            return Json::encode($currentItems);
         }
+        return Json::encode($currentItems);
     }
 
     /**
@@ -892,7 +892,7 @@ protected function _calculatePageCount()
      * Creates the page collection.
      *
      * @param  string $scrollingStyle Scrolling style
-     * @return stdClass
+     * @return \stdClass
      */
     protected function _createPages($scrollingStyle = null)
     {