Added test for locator-aware functionality

test/PluginBrokerTest.php

@@ -21,7 +21,8 @@
 
 namespace ZendTest\Loader;
 
-use Zend\Loader\PluginBroker,
+use stdClass,
+    Zend\Loader\PluginBroker,
     Zend\Loader\PluginClassLoader;
 
 /**
@@ -274,4 +275,18 @@ public function testAllowsConfigurationViaConstructor()
         $loader = $broker->getClassLoader();
         $this->assertInstanceOf('ZendTest\Loader\TestAsset\CustomClassLoader', $loader);
     }
+
+    public function testWillPullFromLocatorIfAttached()
+    {
+        $locator = new TestAsset\ServiceLocator();
+        $plugin  = new stdClass;
+        $locator->set('ZendTest\Loader\TestAsset\Foo', $plugin);
+
+        $loader = $this->broker->getClassLoader();
+        $loader->registerPlugin('foo', 'ZendTest\Loader\TestAsset\Foo');
+        $this->broker->setLocator($locator);
+
+        $test = $this->broker->load('foo');
+        $this->assertSame($plugin, $test);
+    }
 }

test/TestAsset/ServiceLocator.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace ZendTest\Loader\TestAsset;
+
+use Zend\Di\Locator;
+
+class ServiceLocator implements Locator
+{
+    protected $services = array();
+
+    public function get($name, array $params = array())
+    {
+        if (!isset($this->services[$name])) {
+            return null;
+        }
+
+        return $this->services[$name];
+    }
+
+    public function set($name, $object)
+    {
+        $this->services[$name] = $object;
+    }
+}