Merge branch 'hotfix/7' into develop

Forward port #7
zendframework · Apr 11, 2016 · 738d731 · 738d731
2 parents 29b97d6 + ad720bb
commit 738d731
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#7](https://github.com/zendframework/zend-paginator/pull/7) adds aliases for
+  the old `Null` adapter, mapping them to the new `NullFill` adapter.
 
 ## 2.6.0 - 2016-02-23
 

diff --git a/src/AdapterPluginManager.php b/src/AdapterPluginManager.php
@@ -48,6 +48,7 @@ class AdapterPluginManager extends AbstractPluginManager
         'Array'          => Adapter\ArrayAdapter::class,
         'iterator'       => Adapter\Iterator::class,
         'Iterator'       => Adapter\Iterator::class,
+        'zendpaginatoradapternull' => Adapter\NullFill::class,
     ];
 
     /**