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/Definition/ArrayDefinition.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-class ArrayDefinition implements Definition
+class ArrayDefinition implements DefinitionInterface
 {
 
     protected $dataArray = array();

src/Definition/BuilderDefinition.php

@@ -4,7 +4,7 @@
 
 use Zend\Di\Exception;
 
-class BuilderDefinition implements Definition
+class BuilderDefinition implements DefinitionInterface
 {
     protected $defaultClassBuilder = 'Zend\Di\Definition\Builder\PhpClass';
     protected $classes = array();

src/Definition/ClassDefinition.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-class ClassDefinition implements Definition, PartialMarker
+class ClassDefinition implements DefinitionInterface, PartialMarker
 {
 
     protected $class = null;

src/Definition/CompilerDefinition.php

@@ -12,7 +12,7 @@
     Zend\Code\Reflection,
     Zend\Code\Annotation\AnnotationCollection;
 
-class CompilerDefinition implements Definition
+class CompilerDefinition implements DefinitionInterface
 {
     protected $isCompiled = false;
 

src/Definition/Definition.php → src/Definition/DefinitionInterface.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-interface Definition
+interface DefinitionInterface
 {
     /**
      * @abstract

src/Definition/RuntimeDefinition.php

@@ -7,7 +7,7 @@
     Zend\Code\Annotation\AnnotationCollection,
     Zend\Code\Reflection;
 
-class RuntimeDefinition implements Definition
+class RuntimeDefinition implements DefinitionInterface
 {
 
     /**

src/DefinitionList.php

@@ -4,7 +4,7 @@
 
 use SplDoublyLinkedList;
 
-class DefinitionList extends SplDoublyLinkedList implements Definition\Definition
+class DefinitionList extends SplDoublyLinkedList implements Definition\DefinitionInterface
 {
 
     public function __construct($definitions)
@@ -17,7 +17,7 @@ public function __construct($definitions)
         }
     }
 
-    public function addDefinition(Definition\Definition $definition, $addToBackOfList = true)
+    public function addDefinition(Definition\DefinitionInterface $definition, $addToBackOfList = true)
     {
         if ($addToBackOfList) {
             $this->push($definition);
@@ -57,7 +57,7 @@ public function getDefinitionByType($type)
 
     public function getDefinitionForClass($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 return $definition;
@@ -75,7 +75,7 @@ public function forClass($class)
     public function getClasses()
     {
         $classes = array();
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             $classes = array_merge($classes, $definition->getClasses());
         }
@@ -84,7 +84,7 @@ public function getClasses()
 
     public function hasClass($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 return true;
@@ -96,7 +96,7 @@ public function hasClass($class)
     public function getClassSupertypes($class)
     {
         $supertypes = array();
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             $supertypes = array_merge($supertypes, $definition->getClassSupertypes($class));
         }
@@ -106,7 +106,7 @@ public function getClassSupertypes($class)
 
     public function getInstantiator($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 $value = $definition->getInstantiator($class);
@@ -122,7 +122,7 @@ public function getInstantiator($class)
 
     public function hasMethods($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 if ($definition->hasMethods($class) === false && $definition instanceof Definition\PartialMarker) {
@@ -137,7 +137,7 @@ public function hasMethods($class)
 
     public function hasMethod($class, $method)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 if ($definition->hasMethods($class) === false && $definition instanceof Definition\PartialMarker) {
@@ -152,7 +152,7 @@ public function hasMethod($class, $method)
 
     public function getMethods($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         $methods = array();
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
@@ -174,7 +174,7 @@ public function hasMethodParameters($class, $method)
 
     public function getMethodParameters($class, $method)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class) && $definition->hasMethod($class, $method) && $definition->hasMethodParameters($class, $method)) {
                 return $definition->getMethodParameters($class, $method);

src/DependencyInjection.php → src/DependencyInjectionInterface.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-interface DependencyInjection extends Locator
+interface DependencyInjectionInterface extends LocatorInterface
 {
     /**
      * Retrieve a new instance of a class

src/Di.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class Di implements DependencyInjection
+class Di implements DependencyInjectionInterface
 {
     /**
      * @var DefinitionList

src/Exception/CircularDependencyException.php

@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class CircularDependencyException extends DomainException implements Exception
+class CircularDependencyException extends DomainException implements ExceptionInterface
 {
 }

src/Exception/ClassNotFoundException.php

@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class ClassNotFoundException extends DomainException implements Exception
+class ClassNotFoundException extends DomainException implements ExceptionInterface
 {
 }

src/Exception/ExceptionInterface.php

@@ -0,0 +1,6 @@
+<?php
+namespace Zend\Di\Exception;
+
+interface ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -1,10 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidArgumentException 
-    extends \InvalidArgumentException 
-    implements Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {
 }

src/Exception/InvalidParamNameException.php

@@ -1,10 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidParamNameException 
-    extends InvalidArgumentException 
-    implements Exception
+class InvalidParamNameException extends InvalidArgumentException
 {
 }

src/Exception/InvalidPositionException.php

@@ -1,10 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidPositionException 
-    extends InvalidArgumentException 
-    implements Exception
+class InvalidPositionException extends InvalidArgumentException
 {
 }

src/Exception/MissingPropertyException.php

@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class MissingPropertyException extends DomainException implements Exception
+class MissingPropertyException extends DomainException implements ExceptionInterface
 {
 }

src/Exception/RuntimeException.php

@@ -1,8 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class RuntimeException extends \RuntimeException implements Exception
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }

src/Exception/UndefinedReferenceException.php

@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class UndefinedReferenceException extends DomainException implements Exception
+class UndefinedReferenceException extends DomainException implements ExceptionInterface
 {
 }

src/InstanceManager.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class InstanceManager /* implements InstanceCollection */
+class InstanceManager /* implements InstanceManagerInterface */
 {
     /**
      * Array of shared instances

src/Locator.php → src/LocatorInterface.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zend\Di;
 
-interface Locator
+interface LocatorInterface
 {
     /**
      * Retrieve a class instance

src/ServiceLocator.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class ServiceLocator implements ServiceLocation
+class ServiceLocator implements ServiceLocatorInterface
 {
     /**
      * Map of service names to methods

src/ServiceLocator/Generator.php

@@ -4,7 +4,7 @@
 
 use Zend\Di\Di,
     Zend\CodeGenerator\Php as CodeGen,
-    Zend\Di\DependencyInjection,
+    Zend\Di\DependencyInjectionInterface,
     Zend\Di\Exception;
 
 class Generator
@@ -20,7 +20,7 @@ class Generator
      *
      * Requires a DependencyInjection manager on which to operate.
      * 
-     * @param  DependencyInjection $injector 
+     * @param  DependencyInjectionInterface $injector
      * @return void
      */
     public function __construct(Di $injector)

src/ServiceLocation.php → src/ServiceLocatorInterface.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zend\Di;
 
-interface ServiceLocation extends Locator
+interface ServiceLocatorInterface extends LocatorInterface
 {
     public function set($name, $service);
 }

test/Definition/BuilderDefinitionTest.php

@@ -13,7 +13,7 @@ class BuilderDefinitionTest extends TestCase
     public function testBuilderImplementsDefinition()
     {
         $builder = new BuilderDefinition();
-        $this->assertInstanceOf('Zend\Di\Definition\Definition', $builder);
+        $this->assertInstanceOf('Zend\Di\Definition\DefinitionInterface', $builder);
     }
 
     public function testBuilderCanBuildClassWithMethods()