Merge branch 'feature/25' into develop

Close #25

Author: weierophinney

src/Exception/ExceptionInterface.php

@@ -11,6 +11,9 @@
 
 use Interop\Container\Exception\ContainerException;
 
+/**
+ * Base exception for all Zend\ServiceManager exceptions.
+ */
 interface ExceptionInterface extends ContainerException
 {
 }

src/Exception/InvalidArgumentException.php

@@ -11,6 +11,9 @@
 
 use InvalidArgumentException as SplInvalidArgumentException;
 
+/**
+ * @inheritDoc
+ */
 class InvalidArgumentException extends SplInvalidArgumentException implements ExceptionInterface
 {
 }

src/Exception/ServiceNotCreatedException.php

@@ -13,7 +13,8 @@
 use RuntimeException as SplRuntimeException;
 
 /**
- * This exception is thrown when the service locator do not manage to create the service (factory that has an error...)
+ * This exception is thrown when the service locator do not manage to create
+ * the service (factory that has an error...)
  */
 class ServiceNotCreatedException extends SplRuntimeException implements
     ContainerException,

src/Exception/ServiceNotFoundException.php

@@ -13,7 +13,8 @@
 use InvalidArgumentException as SplInvalidArgumentException;
 
 /**
- * This exception is thrown when the service locator do not manage to find a valid factory to create a service
+ * This exception is thrown when the service locator do not manage to find a
+ * valid factory to create a service
  */
 class ServiceNotFoundException extends SplInvalidArgumentException implements
     ExceptionInterface,

src/Factory/DelegatorFactoryInterface.php

@@ -10,6 +10,9 @@
 namespace Zend\ServiceManager\Factory;
 
 use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
 /**
  * Delegator factory interface.
@@ -29,6 +32,10 @@ interface DelegatorFactoryInterface
      * @param  callable           $callback
      * @param  null|array         $options
      * @return object
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when
+     *     creating a service.
+     * @throws ContainerException if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null);
 }

src/Factory/FactoryInterface.php

@@ -10,6 +10,9 @@
 namespace Zend\ServiceManager\Factory;
 
 use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
 /**
  * Interface for a factory
@@ -28,6 +31,10 @@ interface FactoryInterface
      * @param  string             $requestedName
      * @param  null|array         $options
      * @return object
+     * @throws ServiceNotFoundException if unable to resolve the service.
+     * @throws ServiceNotCreatedException if an exception is raised when
+     *     creating a service.
+     * @throws ContainerException if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null);
 }

src/PluginManagerInterface.php

@@ -9,6 +9,7 @@
 
 namespace Zend\ServiceManager;
 
+use Interop\Container\Exception\ContainerException;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 
 /**
@@ -25,6 +26,7 @@ interface PluginManagerInterface extends ServiceLocatorInterface
      * @return void
      * @throws InvalidServiceException If created instance does not respect the
      *     constraint on type imposed by the plugin manager
+     * @throws ContainerException if any other error occurs
      */
     public function validate($instance);
 }

src/ServiceLocatorInterface.php

@@ -10,6 +10,7 @@
 namespace Zend\ServiceManager;
 
 use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
 use Zend\ServiceManager\Exception;
 
 /**
@@ -27,6 +28,7 @@ interface ServiceLocatorInterface extends ContainerInterface
      *     factory could be found to create the instance.
      * @throws Exception\ServiceNotCreatedException If factory/delegator fails
      *     to create the instance.
+     * @throws ContainerException if any other error occurs
      */
     public function build($name, array $options = null);
 }

src/ServiceManager.php

@@ -505,6 +505,7 @@ private function createDelegatorFromName($name, array $options = null)
      * @throws ServiceNotFoundException if unable to resolve the service.
      * @throws ServiceNotCreatedException if an exception is raised when
      *     creating a service.
+     * @throws ContainerException if any other error occurs
      */
     private function doCreate($resolvedName, array $options = null)
     {