Merge branch 'master' into markup

Conflicts:
	library/Zend/Markup/Parser/Textile.php
	library/Zend/Markup/Renderer/AbstractRenderer.php
	library/Zend/Markup/Renderer/Html.php

src/Adapter.php

@@ -13,35 +13,28 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Paginator
+ * @package    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
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\Paginator;
+      use \Countable;
 
 /**
  * Interface for pagination adapters.
  *
  * @uses       Countable
  * @category   Zend
- * @package    Zend_Paginator
+ * @package    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
  */
-interface Adapter extends \Countable
+interface Adapter extends Countable
 {
-    /**
-     * Returns the total number of rows in the collection.
-     *
-     * @return integer
-     */
-    //public function count();
-
     /**
      * Returns an collection of items for a page.
      *

src/Adapter/ArrayAdapter.php

@@ -13,23 +13,21 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Paginator
+ * @package    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
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\Paginator\Adapter;
-
-use Zend\Paginator\Adapter;
+      use Zend\Paginator\Adapter;
 
 /**
  * @uses       \Zend\Paginator\Adapter
  * @category   Zend
- * @package    Zend_Paginator
+ * @package    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
  */

src/Adapter/DbSelect.php

@@ -16,7 +16,6 @@
  * @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
- * @version    $Id$
  */
 
 /**
@@ -27,14 +26,14 @@
 use Zend\Db\Select,
     Zend\Db,
     Zend\Paginator\Adapter,
-    Zend\Paginator\Exception as PaginatorException;
+    Zend\Paginator\Adapter\Exception;
 
 /**
  * @uses       \Zend\Db\Db
  * @uses       \Zend\Db\Expr
  * @uses       \Zend\Db\Select
  * @uses       \Zend\Paginator\Adapter
- * @uses       \Zend\Paginator\Exception
+ * @uses       Zend\Paginator\Adapter\Exception
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
@@ -93,7 +92,7 @@ public function __construct(Select $select)
      * @param  \Zend\Db\Select|integer $totalRowCount Total row count integer
      *                                               or query
      * @return \Zend\Paginator\Adapter\DbSelect $this
-     * @throws \Zend\Paginator\Exception
+     * @throws \Zend\Paginator\Adapter\Exception
      */
     public function setRowCount($rowCount)
     {
@@ -110,7 +109,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 PaginatorException('Row count column not found');
+                throw new Exception\InvalidArgumentException('Row count column not found');
             }
 
             $result = $rowCount->query(Db\Db::FETCH_ASSOC)->fetch();
@@ -119,7 +118,7 @@ public function setRowCount($rowCount)
         } else if (is_integer($rowCount)) {
             $this->_rowCount = $rowCount;
         } else {
-            throw new PaginatorException('Invalid row count');
+            throw new Exception\InvalidArgumentException('Invalid row count');
         }
 
         return $this;

src/Adapter/DbTableSelect.php

@@ -16,7 +16,6 @@
  * @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
- * @version    $Id$
  */
 
 /**

src/Adapter/Exception.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Paginator\Adapter;
+
+/**
+ * @uses       Zend\Paginator\Exception
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage Adapter
+ * @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 Exception extends \Zend\Paginator\Exception
+{}

src/Adapter/Exception/InvalidArgumentException.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Paginator\Adapter\Exception;
+
+/**
+ * @uses       Zend\Paginator\Adapter\Exception
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @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 InvalidArgumentException
+    extends \Zend\Paginator\Exception\InvalidArgumentException
+    implements \Zend\Paginator\Adapter\Exception
+{}

src/Adapter/Exception/RuntimeException.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Paginator\Adapter\Exception;
+
+/**
+ * @uses       Zend\Paginator\Adapter\Exception
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @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 RuntimeException
+    extends \Zend\Paginator\Exception\RuntimeException
+    implements \Zend\Paginator\Adapter\Exception
+{}

src/Adapter/Exception/UnexpectedValueException.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Paginator\Adapter\Exception;
+
+/**
+ * @uses       Zend\Paginator\Adapter\Exception
+ * @category   Zend
+ * @package    Zend\Paginator\Adapter
+ * @subpackage Exception
+ * @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 UnexpectedValueException extends \UnexpectedValueException implements \Zend\Paginator\Adapter\Exception
+{}

src/Adapter/Iterator.php

@@ -16,7 +16,6 @@
  * @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
- * @version    $Id$
  */
 
 /**
@@ -28,7 +27,7 @@
 
 /**
  * @uses       \Zend\Paginator\Adapter
- * @uses       \Zend\Paginator\Exception
+ * @uses       \Zend\Paginator\Adapter\Exception
  * @uses       \Zend\Paginator\SerializableLimitIterator
  * @category   Zend
  * @package    Zend_Paginator
@@ -55,12 +54,12 @@ class Iterator implements Adapter
      * Constructor.
      *
      * @param  Iterator $iterator Iterator to paginate
-     * @throws \Zend\Paginator\Exception
+     * @throws \Zend\Paginator\Adapter\Exception
      */
     public function __construct(\Iterator $iterator)
     {
         if (!$iterator instanceof \Countable) {
-            throw new \Zend\Paginator\Exception('Iterator must implement Countable');
+            throw new Exception\InvalidArgumentException('Iterator must implement Countable');
         }
 
         $this->_iterator = $iterator;

src/Adapter/Null.php

@@ -16,7 +16,6 @@
  * @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
- * @version    $Id$
  */
 
 /**

src/AdapterAggregate.php

@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

src/AdapterBroker.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @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
+ */
+
+namespace Zend\Paginator;
+
+use Zend\Loader\PluginBroker;
+
+/**
+ * Broker for pagination adapter instances
+ *
+ * @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 AdapterBroker extends PluginBroker
+{
+    /**
+     * @var string Default plugin loading strategy
+     */
+    protected $defaultClassLoader = 'Zend\Paginator\AdapterLoader';
+
+    /**
+     * Determine if we have a valid adapter
+     * 
+     * @param  mixed $plugin 
+     * @return true
+     * @throws Exception
+     */
+    protected function validatePlugin($plugin)
+    {
+        if (!$plugin instanceof Adapter) {
+            throw new Exception('Pagination adapters must implement Zend\Paginator\Adapter');
+        }
+        return true;
+    }
+}