Merge branch 'feature/7263'

Adds PHP 7 support.

Close zendframework/zendframework#7366
Fixes zendframework/zendframework#7270
Fixes zendframework/zendframework#7263

src/Adapter/Null.php

@@ -9,51 +9,22 @@
 
 namespace Zend\Paginator\Adapter;
 
-class Null implements AdapterInterface
+class Null extends NullFill
 {
     /**
-     * Item count
-     *
-     * @var int
-     */
-    protected $count = null;
-
-    /**
-     * Constructor.
-     *
-     * @param int $count Total item count (Optional)
+     * {@inheritdoc}
      */
     public function __construct($count = 0)
     {
-        $this->count = $count;
-    }
-
-    /**
-     * Returns an array of items for a page.
-     *
-     * @param  int $offset Page offset
-     * @param  int $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        if ($offset >= $this->count()) {
-            return array();
-        }
-
-        $remainItemCount  = $this->count() - $offset;
-        $currentItemCount = $remainItemCount > $itemCountPerPage ? $itemCountPerPage : $remainItemCount;
-
-        return array_fill(0, $currentItemCount, null);
-    }
+        trigger_error(
+            sprintf(
+                'The class %s has been deprecated; please use %s\\NullFill',
+                __CLASS__,
+                __NAMESPACE__
+            ),
+            E_USER_DEPRECATED
+        );
 
-    /**
-     * Returns the total number of rows in the array.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->count;
+        parent::__construct($count);
     }
 }

src/Adapter/NullFill.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Paginator\Adapter;
+
+class NullFill implements AdapterInterface
+{
+    /**
+     * Item count
+     *
+     * @var int
+     */
+    protected $count = null;
+
+    /**
+     * Constructor.
+     *
+     * @param int $count Total item count (Optional)
+     */
+    public function __construct($count = 0)
+    {
+        $this->count = $count;
+    }
+
+    /**
+     * Returns an array of items for a page.
+     *
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
+     * @return array
+     */
+    public function getItems($offset, $itemCountPerPage)
+    {
+        if ($offset >= $this->count()) {
+            return array();
+        }
+
+        $remainItemCount  = $this->count() - $offset;
+        $currentItemCount = $remainItemCount > $itemCountPerPage ? $itemCountPerPage : $remainItemCount;
+
+        return array_fill(0, $currentItemCount, null);
+    }
+
+    /**
+     * Returns the total number of rows in the array.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return $this->count;
+    }
+}

src/AdapterPluginManager.php

@@ -20,6 +20,19 @@
  */
 class AdapterPluginManager extends AbstractPluginManager
 {
+    /**
+     * Default aliases
+     *
+     * Primarily for ensuring previously defined adapters select their
+     * current counterparts.
+     *
+     * @var array
+     */
+    protected $aliases = array(
+        'null'                        => 'nullfill',
+        'Zend\Paginator\Adapter\Null' => 'nullfill',
+    );
+
     /**
      * Default set of adapters
      *
@@ -28,7 +41,7 @@ class AdapterPluginManager extends AbstractPluginManager
     protected $invokableClasses = array(
         'array'         => 'Zend\Paginator\Adapter\ArrayAdapter',
         'iterator'      => 'Zend\Paginator\Adapter\Iterator',
-        'null'          => 'Zend\Paginator\Adapter\Null',
+        'nullfill'      => 'Zend\Paginator\Adapter\NullFill',
     );
 
     /**

test/Adapter/NullFillTest.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Paginator\Adapter;
+
+use Zend\Paginator\Adapter;
+use Zend\Paginator;
+
+/**
+ * @group      Zend_Paginator
+ */
+class NullFillTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Zend\Paginator\Adapter\Array
+     */
+    private $adapter;
+
+    /**
+     * Prepares the environment before running a test.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->adapter = new Adapter\NullFill(101);
+    }
+    /**
+     * Cleans up the environment after running a test.
+     */
+    protected function tearDown()
+    {
+        $this->adapter = null;
+        parent::tearDown();
+    }
+
+    public function testGetsItems()
+    {
+        $actual = $this->adapter->getItems(0, 10);
+        $this->assertEquals(array_fill(0, 10, null), $actual);
+    }
+
+    public function testReturnsCorrectCount()
+    {
+        $this->assertEquals(101, $this->adapter->count());
+    }
+
+    /**
+     * @group ZF-3873
+     */
+    public function testAdapterReturnsCorrectValues()
+    {
+        $paginator = new Paginator\Paginator(new Adapter\NullFill(2));
+        $paginator->setCurrentPageNumber(1);
+        $paginator->setItemCountPerPage(5);
+
+        $pages = $paginator->getPages();
+
+        $this->assertEquals(2, $pages->currentItemCount);
+        $this->assertEquals(2, $pages->lastItemNumber);
+
+        $paginator = new Paginator\Paginator(new Adapter\NullFill(19));
+        $paginator->setCurrentPageNumber(4);
+        $paginator->setItemCountPerPage(5);
+
+        $pages = $paginator->getPages();
+
+        $this->assertEquals(4, $pages->currentItemCount);
+        $this->assertEquals(19, $pages->lastItemNumber);
+    }
+
+    /**
+     * @group ZF-4151
+     */
+    public function testEmptySet()
+    {
+        $this->adapter = new Adapter\NullFill(0);
+        $actual = $this->adapter->getItems(0, 10);
+        $this->assertEquals(array(), $actual);
+    }
+
+    /**
+     * Verify that the fix for ZF-4151 doesn't create an OBO error
+     */
+    public function testSetOfOne()
+    {
+        $this->adapter = new Adapter\NullFill(1);
+        $actual = $this->adapter->getItems(0, 10);
+        $this->assertEquals(array_fill(0, 1, null), $actual);
+    }
+}

test/Adapter/NullTest.php

@@ -10,87 +10,22 @@
 namespace ZendTest\Paginator\Adapter;
 
 use Zend\Paginator\Adapter;
-use Zend\Paginator;
 
 /**
  * @group      Zend_Paginator
  */
 class NullTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Zend\Paginator\Adapter\Array
-     */
-    private $adapter;
-
-    /**
-     * Prepares the environment before running a test.
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->adapter = new Adapter\Null(101);
-    }
-    /**
-     * Cleans up the environment after running a test.
-     */
-    protected function tearDown()
-    {
-        $this->adapter = null;
-        parent::tearDown();
-    }
-
-    public function testGetsItems()
-    {
-        $actual = $this->adapter->getItems(0, 10);
-        $this->assertEquals(array_fill(0, 10, null), $actual);
-    }
-
-    public function testReturnsCorrectCount()
-    {
-        $this->assertEquals(101, $this->adapter->count());
-    }
-
-    /**
-     * @group ZF-3873
-     */
-    public function testAdapterReturnsCorrectValues()
-    {
-        $paginator = new Paginator\Paginator(new Adapter\Null(2));
-        $paginator->setCurrentPageNumber(1);
-        $paginator->setItemCountPerPage(5);
-
-        $pages = $paginator->getPages();
-
-        $this->assertEquals(2, $pages->currentItemCount);
-        $this->assertEquals(2, $pages->lastItemNumber);
-
-        $paginator = new Paginator\Paginator(new Adapter\Null(19));
-        $paginator->setCurrentPageNumber(4);
-        $paginator->setItemCountPerPage(5);
-
-        $pages = $paginator->getPages();
-
-        $this->assertEquals(4, $pages->currentItemCount);
-        $this->assertEquals(19, $pages->lastItemNumber);
-    }
-
-    /**
-     * @group ZF-4151
-     */
-    public function testEmptySet()
+    public function setUp()
     {
-        $this->adapter = new Adapter\Null(0);
-        $actual = $this->adapter->getItems(0, 10);
-        $this->assertEquals(array(), $actual);
+        if (version_compare(PHP_VERSION, '7.0', '>=')) {
+            $this->markTestSkipped('Cannot test Null adapter under PHP 7; reserved keyword');
+        }
     }
 
-    /**
-     * Verify that the fix for ZF-4151 doesn't create an OBO error
-     */
-    public function testSetOfOne()
+    public function testRaisesNoticeOnInstantiation()
     {
-        $this->adapter = new Adapter\Null(1);
-        $actual = $this->adapter->getItems(0, 10);
-        $this->assertEquals(array_fill(0, 1, null), $actual);
+        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        new Adapter\Null();
     }
 }

test/AdapterPluginManagerTest.php

@@ -56,7 +56,7 @@ public function testCanRetrieveAdapterPlugin()
         $plugin = $this->adapaterPluginManager->get('dbselect', array($this->mockSelect, $this->mockAdapter));
         $this->assertInstanceOf('Zend\Paginator\Adapter\DbSelect', $plugin);
         $plugin = $this->adapaterPluginManager->get('null', 101);
-        $this->assertInstanceOf('Zend\Paginator\Adapter\Null', $plugin);
+        $this->assertInstanceOf('Zend\Paginator\Adapter\NullFill', $plugin);
 
         //test dbtablegateway
         $mockStatement = $this->getMock('Zend\Db\Adapter\Driver\StatementInterface');
@@ -79,7 +79,10 @@ public function testCanRetrieveAdapterPlugin()
         $order  = "foo";
         $group  = "foo";
         $having = "count(foo)>0";
-        $plugin = $this->adapaterPluginManager->get('dbtablegateway', array($mockTableGateway, $where, $order, $group, $having));
+        $plugin = $this->adapaterPluginManager->get(
+            'dbtablegateway',
+            array($mockTableGateway, $where, $order, $group, $having)
+        );
         $this->assertInstanceOf('Zend\Paginator\Adapter\DbTableGateway', $plugin);
 
         //test callback