Switch type hinting for plugin loaders

- In most instances, switched from typehinting on PrefixPathMapper to use
  ShortNameLocater instead. For functionality depending on PrefixPathMapper
  definitions, added conditional logic.
- Re-fixed broken merge in Zend\Application\Resource\CacheManager tests and
  Zend\Cache\Cache front/backend loading

src/Paginator.php

@@ -25,6 +25,8 @@
 namespace Zend\Paginator;
 
 use Zend\Loader\PluginLoader,
+    Zend\Loader\PrefixPathMapper,
+    Zend\Loader\ShortNameLocater,
     Zend\View,
     Zend\Json;
 
@@ -57,7 +59,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * Adapter plugin loader
      *
-     * @var \Zend\Loader\PrefixPathMapper
+     * @var \Zend\Loader\ShortNameLocater
      */
     protected static $_adapterLoader = null;
 
@@ -85,7 +87,7 @@ class Paginator implements \Countable, \IteratorAggregate
     /**
      * Scrolling style plugin loader
      *
-     * @var \Zend\Loader\PrefixPathMapper
+     * @var \Zend\Loader\ShortNameLocater
      */
     protected static $_scrollingStyleLoader = null;
 
@@ -287,7 +289,7 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
 
             $pluginLoader = self::getAdapterLoader();
 
-            if (null !== $prefixPaths) {
+            if (null !== $prefixPaths && $pluginLoader instanceof PrefixPathMapper) {
                 foreach ($prefixPaths as $prefix => $path) {
                     $pluginLoader->addPrefixPath($prefix, $path);
                 }
@@ -299,17 +301,28 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
         }
     }
 
+    /**
+     * Set the adapter loader
+     * 
+     * @param  PluginLoader\ShortNameLocater $loader 
+     * @return void
+     */
+    public static function setAdapterLoader(ShortNameLocater $loader)
+    {
+        self::$_adapterLoader = $loader;
+    }
+
     /**
      * Returns the adapter loader.  If it doesn't exist it's created.
      *
-     * @return \Zend\Loader\PrefixPathMapper
+     * @return \Zend\Loader\ShortNameLocater
      */
     public static function getAdapterLoader()
     {
         if (self::$_adapterLoader === null) {
-            self::$_adapterLoader = new PluginLoader(
+            self::setAdapterLoader(new PluginLoader(
                 array('Zend\Paginator\Adapter' => 'Zend/Paginator/Adapter')
-            );
+            ));
         }
 
         return self::$_adapterLoader;
@@ -397,7 +410,7 @@ public static function setDefaultScrollingStyle($scrollingStyle = 'Sliding')
      * Returns the scrolling style loader.  If it doesn't exist it's
      * created.
      *
-     * @return \Zend\Loader\PrefixPathMapper
+     * @return \Zend\Loader\ShortNameLocater
      */
     public static function getScrollingStyleLoader()
     {

src/SerializableLimitIterator.php

@@ -127,7 +127,7 @@ public function offsetExists($offset)
                 $current = $this->current();
                 $this->seek($currentOffset);
                 return null !== $current;
-            } catch (OutOfBoundsException $e) {
+            } catch (\OutOfBoundsException $e) {
                 // reset position in case of exception is assigned null
                 $this->seek($currentOffset);
                 return false;

test/PaginatorTest.php

@@ -938,8 +938,8 @@ public function testInvalidDataInConstructor_ThrowsException()
      */
     public function testArrayAccessInClassSerializableLimitIterator()
     {
-        $iterator  = new ArrayIterator(array('zf9396', 'foo', null));
-        $paginator = Zend_Paginator::factory($iterator);
+        $iterator  = new \ArrayIterator(array('zf9396', 'foo', null));
+        $paginator = Paginator\Paginator::factory($iterator);
 
         $this->assertEquals('zf9396', $paginator->getItem(1));