Created new Locator interface

- Defines get($name, array $params = null)
- ServiceLocation and DependencyInjection now extend this

src/DependencyInjection.php

@@ -2,22 +2,8 @@
 
 namespace Zend\Di;
 
-interface DependencyInjection
+interface DependencyInjection extends Locator
 {
-
-    /**
-     * Lazy-load a class
-     *
-     * Attempts to load the class (or service alias) provided. If it has been 
-     * loaded before, the previous instance will be returned (unless the service
-     * definition indicates shared instances should not be used).
-     * 
-     * @param  string $name Class name or service alias
-     * @param  null|array $params Parameters to pass to the constructor
-     * @return object|null
-     */
-    public function get($name, array $params = null);
-
     /**
      * Retrieve a new instance of a class
      *
@@ -29,5 +15,4 @@ public function get($name, array $params = null);
      * @return object|null
      */
     public function newInstance($name, array $params = null);
-
-}
+}

src/Locator.php

@@ -0,0 +1,14 @@
+<?php
+namespace Zend\Di;
+
+interface Locator
+{
+    /**
+     * Retrieve a class instance
+     * 
+     * @param  string $name Class name or service name
+     * @param  null|array $params Parameters to be used when instantiating a new instance of $name
+     * @return object|null
+     */
+    public function get($name, array $params = null);
+}

src/ServiceLocation.php

@@ -1,8 +1,7 @@
 <?php
 namespace Zend\Di;
 
-interface ServiceLocation
+interface ServiceLocation extends Locator
 {
     public function set($name, $service);
-    public function get($name, array $params = null);
 }