Catch and re-throw ContainerExceptions

- to allow returning a ServiceNotFoundException.

Author: weierophinney

src/ServiceManager.php

@@ -11,6 +11,7 @@
 
 use Exception;
 use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
 use ProxyManager\Configuration as ProxyConfiguration;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
@@ -425,6 +426,8 @@ private function doCreate($resolvedName, array $options = null)
             } else {
                 $object = $this->createDelegatorFromName($resolvedName, $options);
             }
+        } catch (ContainerException $exception) {
+            throw $exception;
         } catch (Exception $exception) {
             throw new ServiceNotCreatedException(sprintf(
                 'Service with name "%s" could not be created. Reason: %s',

test/CommonServiceLocatorBehaviorsTrait.php

@@ -10,6 +10,7 @@
 namespace ZendTest\ServiceManager;
 
 use DateTime;
+use Interop\Container\Exception\ContainerException;
 use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
@@ -504,7 +505,7 @@ public function testPassingInvalidInitializerTypeViaConfigurationRaisesException
     public function testGetRaisesExceptionWhenNoFactoryIsResolved()
     {
         $serviceManager = $this->createContainer();
-        $this->setExpectedException(ServiceNotCreatedException::class, 'invalid or missing factory');
+        $this->setExpectedException(ContainerException::class, 'invalid or missing factory');
         $serviceManager->get('Some\Unknown\Service');
     }