Merge branch 'master' of git://github.com/zendframework/zf2

src/Adapter/ArrayAdapter.php

@@ -37,7 +37,7 @@ class ArrayAdapter implements AdapterInterface
      *
      * @param array $array ArrayAdapter to paginate
      */
-    public function __construct(array $array)
+    public function __construct(array $array = array())
     {
         $this->_array = $array;
         $this->_count = count($array);

src/Adapter/Null.php

@@ -31,7 +31,7 @@ class Null implements AdapterInterface
      * @param integer $count Total item count (Optional)
      */
     public function __construct($count = 0)
-    {;
+    {
         $this->_count = $count;
     }
 

src/AdapterPluginManager.php

@@ -0,0 +1,79 @@
+<?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-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Paginator;
+
+use Zend\ServiceManager\AbstractPluginManager;
+
+/**
+ * Plugin manager implementation for pagination adapters
+ *
+ * Enforces that adapters retrieved are instances of
+ * Adapter\AdapterInterface. Additionally, it registers a number 
+ * of default adapters available.
+ *
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class AdapterPluginManager extends AbstractPluginManager
+{
+    /**
+     * Default set of adapters
+     * 
+     * @var array
+     */
+    protected $invokableClasses = array(
+        'array'         => 'Zend\Paginator\Adapter\ArrayAdapter',
+        'dbselect'      => 'Zend\Paginator\Adapter\DbSelect',
+        'dbtableselect' => 'Zend\Paginator\Adapter\DbTableSelect',
+        'iterator'      => 'Zend\Paginator\Adapter\Iterator',
+        'null'          => 'Zend\Paginator\Adapter\Null',
+    );
+
+    /**
+     * @var bool Do not share by default
+     */
+    protected $shareByDefault = false;
+
+    /**
+     * Validate the plugin
+     *
+     * Checks that the adapter loaded is an instance of Adapter\AdapterInterface.
+     * 
+     * @param  mixed $plugin 
+     * @return void
+     * @throws Exception\InvalidArgumentException if invalid
+     */
+    public function validatePlugin($plugin)
+    {
+        if ($plugin instanceof Adapter\AdapterInterface) {
+            // we're okay
+            return;
+        }
+
+        throw new Exception\InvalidArgumentException(sprintf(
+            'Plugin of type %s is invalid; must implement %s\Adapter\AdapterInterface',
+            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+            __NAMESPACE__
+        ));
+    }
+}