Merge branch 'di-renamed-interfaces' of https://github.com/prolic/zf2 …

…into feature/zen27-di

Conflicts:
	library/Zend/Mvc/Application.php
	library/Zend/Mvc/ApplicationInterface.php
	library/Zend/Mvc/Controller/ActionController.php
	library/Zend/Mvc/Controller/Plugin/Forward.php
	library/Zend/Mvc/Controller/RestfulController.php

src/LocatorAware.php

@@ -2,10 +2,10 @@
 
 namespace Zend\Loader;
 
-use Zend\Di\Locator;
+use Zend\Di\LocatorInterface;
 
 interface LocatorAware
 {
-    public function setLocator(Locator $locator);
+    public function setLocator(LocatorInterface $locator);
     public function getLocator();
 }

src/PluginBroker.php

@@ -21,7 +21,7 @@
 
 namespace Zend\Loader;
 
-use Zend\Di\Locator;
+use Zend\Di\LocatorInterface;
 
 /**
  * Plugin broker base implementation
@@ -59,7 +59,7 @@ class PluginBroker implements Broker, LocatorAware
     protected $validator;
 
     /**
-     * @var Zend\Di\Locator
+     * @var Zend\Di\LocatorInterface
      */
     protected $locator;
 
@@ -395,7 +395,7 @@ protected function isAssocArray($value)
     /**
      * Get locator. 
      * 
-     * @return Zend\Di\Locator
+     * @return Zend\Di\LocatorInterface
      */
     public function getLocator()
     {
@@ -405,9 +405,9 @@ public function getLocator()
     /**
      * Set locator.
      *
-     * @param Zend\Di\Locator $locator
+     * @param Zend\Di\LocatorInterface $locator
      */
-    public function setLocator(Locator $locator)
+    public function setLocator(LocatorInterface $locator)
     {
         $this->locator = $locator;
         return $this;

test/TestAsset/ServiceLocator.php

@@ -2,9 +2,9 @@
 
 namespace ZendTest\Loader\TestAsset;
 
-use Zend\Di\Locator;
+use Zend\Di\LocatorInterface;
 
-class ServiceLocator implements Locator
+class ServiceLocator implements LocatorInterface
 {
     protected $services = array();