Merge branch 'hotfix/129'

Close #237
Fixes #129

Author: weierophinney

CHANGELOG.md

@@ -23,6 +23,10 @@ Fifth release candidate.
 - [#234](https://github.com/zendframework/zend-expressive/pull/234) fixes the
   inheritance tree for `Zend\Expressive\Exception\RuntimeException` to inherit
   from `RuntimeException` and not `InvalidArgumentException`.
+- [#237](https://github.com/zendframework/zend-expressive/pull/237) updates the
+  Pimple documentation to recommend `xtreamwayz/pimple-container-interop`
+  instead of `mouf/pimple-interop`, as the latter consumed Pimple v1, instead of
+  the current stable v3.
 
 ## 1.0.0rc4 - 2015-12-09
 

README.md

@@ -72,8 +72,8 @@ can recommend the following implementations:
 
 - [zend-servicemanager](https://github.com/zendframework/zend-servicemanager):
   `composer require zendframework/zend-servicemanager`
-- [pimple-interop](https://github.com/moufmouf/pimple-interop):
-  `composer require mouf/pimple-interop`
+- [pimple-container-interop](https://github.com/xtreamwayz/pimple-container-interop):
+  `composer require xtreamwayz/pimple-container-interop`
 - [Aura.Di](https://github.com/auraphp/Aura.Di):
   `composer require aura/di:3.0.*@beta`
 

composer.json

@@ -52,7 +52,7 @@
         "zendframework/zend-expressive-twigrenderer": "^1.0 to use the Twig template renderer",
         "zendframework/zend-expressive-zendviewrenderer": "^1.0 to use the zend-view PhpRenderer template renderer",
         "aura/di": "3.0.*@beta to make use of Aura.Di dependency injection container",
-        "mouf/pimple-interop": "^1.0 to use Pimple for dependency injection",
+        "xtreamwayz/pimple-container-interop": "^1.0 to use Pimple for dependency injection",
         "zendframework/zend-servicemanager": "^2.5 to use zend-servicemanager for dependency injection"
     },
     "scripts": {

doc/book/container/pimple.md

@@ -14,11 +14,11 @@ Pimple only supports programmatic creation at this time.
 
 Pimple does not currently (as of v3) implement
 [container-interop](https://github.com/container-interop/container-interop); as
-such, you need to install the `mouf/pimple-interop` project, which provides a
-container-interop wrapper around Pimple:
+such, you need to install the `xtreamwayz/pimple-container-interop` project,
+which provides a container-interop wrapper around Pimple v3:
 
 ```bash
-$ composer require mouf/pimple-interop
+$ composer require xtreamwayz/pimple-container-interop
 ```
 
 ## Configuring Pimple
@@ -28,7 +28,7 @@ recommend doing this in a dedicated script that returns the Pimple instance; in
 this example, we'll have that in `config/services.php`.
 
 ```php
-use Interop\Container\Pimple\PimpleInterop as Pimple;
+use Xtreamwayz\Pimple\Container as Pimple;
 use Zend\Expressive\Container;
 use Zend\Expressive\Plates\PlatesRenderer;
 use Zend\Expressive\Router;