Merge branch 'hotfix/167' into develop

Forward port #167

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -51,7 +51,7 @@ All notable changes to this project will be documented in this file, in reverse
   factory, using a previous instance when detected. You may still use multiple
   discrete instances, however.
 
-## 3.1.2 - TBD
+## 3.1.2 - 2016-12-19
 
 ### Added
 
@@ -67,7 +67,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#167](https://github.com/zendframework/zend-servicemanager/pull/167) fixes
+  how exception codes are provided to ServiceNotCreatedException. Previously,
+  the code was provided as-is. However, some PHP internal exception classes,
+  notably PDOException, can sometimes return other values (such as strings),
+  which can lead to fatal errors when instantiating the new exception. The
+  patch provided casts exception codes to integers to prevent these errors.
 
 ## 3.1.1 - 2016-07-15
 

src/ServiceManager.php

@@ -766,7 +766,7 @@ private function doCreate($resolvedName, array $options = null)
                 'Service with name "%s" could not be created. Reason: %s',
                 $resolvedName,
                 $exception->getMessage()
-            ), $exception->getCode(), $exception);
+            ), (int) $exception->getCode(), $exception);
         }
 
         foreach ($this->initializers as $initializer) {

test/CommonServiceLocatorBehaviorsTrait.php

@@ -22,6 +22,7 @@
 use ZendTest\ServiceManager\TestAsset\CallTimesAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\FailingAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\FailingFactory;
+use ZendTest\ServiceManager\TestAsset\FailingExceptionWithStringAsCodeFactory;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\SimpleAbstractFactory;
 
@@ -262,6 +263,19 @@ public function testThrowExceptionIfServiceCannotBeCreated()
         $serviceManager->get(stdClass::class);
     }
 
+    public function testThrowExceptionWithStringAsCodeIfServiceCannotBeCreated()
+    {
+        $serviceManager = $this->createContainer([
+            'factories' => [
+                stdClass::class => FailingExceptionWithStringAsCodeFactory::class
+            ]
+        ]);
+
+        $this->setExpectedException(ServiceNotCreatedException::class);
+
+        $serviceManager->get(stdClass::class);
+    }
+
     public function testConfigureCanAddNewServices()
     {
         $serviceManager = $this->createContainer([

test/TestAsset/ExceptionWithStringAsCode.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use Exception;
+
+class ExceptionWithStringAsCode extends Exception
+{
+    /** @var string */
+    protected $code = 'ExceptionString';
+}

test/TestAsset/FailingExceptionWithStringAsCodeFactory.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class FailingExceptionWithStringAsCodeFactory implements FactoryInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        throw (new ExceptionWithStringAsCode('There is an error'));
+    }
+}