Adding PSR-11 support plus Symfony 2&3 Containers

Author: Nil Portugués Calderó

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/PHPMessageBus/messagebus.svg?branch=master)](https://travis-ci.org/PHPMessageBus/messagebus) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/PHPMessageBus/messagebus/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPMessageBus/messagebus/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/04e1a12f-e916-4ae6-875f-5e694fb71b6a/mini.png?)](https://insight.sensiolabs.com/projects/04e1a12f-e916-4ae6-875f-5e694fb71b6a) [![Latest Stable Version](https://poser.pugx.org/nilportugues/messagebus/v/stable?)](https://packagist.org/packages/nilportugues/messagebus) [![Total Downloads](https://poser.pugx.org/nilportugues/messagebus/downloads?)](https://packagist.org/packages/nilportugues/messagebus) [![License](https://poser.pugx.org/nilportugues/messagebus/license?)](https://packagist.org/packages/nilportugues/messagebus)
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.me/nilportugues)
 
-Implementation for the CommandBus, the QueryBus and the EventBus in PHP 7.
+Implementation for the CommandBus, the QueryBus and the EventBus in PHP 7 and using PSR-11.
 
 ---
 
@@ -157,7 +157,7 @@ final class RegisterUserHandler implements CommandHandler
 
 I'm assuming you're using some kind Service Container. Now it's time to register your CommandHandler. 
 
-For instance, in a `Interop\Container` compliant Service Container, we can do this as follows:
+For instance, in a `Psr\Container` compliant Service Container, we can do this as follows:
 
 ```php
 <?php
@@ -186,9 +186,9 @@ For custom strategies, you may write your own implementing the `NilPortugues\Mes
 
 Classes implementing this interface will be resolving the class for the instance required based on the output of the CommandTranslator used. 
 
-This package provides an implementation, `NilPortugues\MessageBus\CommandBus\Resolver\InteropContainerResolver`, that expects any Service Container implementing the `Interop\Container` interface.
+This package provides an implementation, `NilPortugues\MessageBus\CommandBus\Resolver\PsrContainerResolver`, that expects any Service Container implementing the `Psr\Container` interface.
 
-For custom strategies, such as Symfony Container, you may write your own implementing the `NilPortugues\MessageBus\CommandBus\Contracts\CommandHandlerResolver` interface.
+For Symfony 2 and 3 framework users up to version 3.2, you should use Symfony Container: `NilPortugues\MessageBus\CommandBus\Resolver\SymfonyContainerResolver`. For Symfony 3.3 and up use the PSR-11 ContainerResolver class.
 
 #### 1.1.5 - Registering the remaining CommandBus classes
 
@@ -203,7 +203,7 @@ $container['CommandTranslator'] = function($container) {
 };
 
 $container['CommandHandlerResolver'] = function($container) {
-    return new \NilPortugues\MessageBus\CommandBus\Resolver\InteropContainerResolver($container);
+    return new \NilPortugues\MessageBus\CommandBus\Resolver\PsrContainerResolver($container);
 };
 
 $container['CommandBusMiddleware'] = function($container) {
@@ -354,7 +354,7 @@ class UserQueryResponse implements QueryResponse
 
 I'm assuming you're using some kind Service Container. Now it's time to register your QueryHandler. 
 
-For instance, in a `Interop\Container` compliant Service Container, we can do this as follows:
+For instance, in a `Psr\Container` compliant Service Container, we can do this as follows:
 
 ```php
 <?php
@@ -382,10 +382,9 @@ For custom strategies, you may write your own implementing the `NilPortugues\Mes
 
 Classes implementing this interface will be resolving the class for the instance required based on the output of the QueryTranslator used. 
 
-This package provides an implementation, `NilPortugues\MessageBus\QueryBus\Resolver\InteropContainerResolver`, that expects any Service Container implementing the `Interop\Container` interface.
-
-For custom strategies, such as Symfony Container, you may write your own implementing the `NilPortugues\MessageBus\QueryBus\Contracts\QueryHandlerResolver` interface.
+This package provides an implementation, `NilPortugues\MessageBus\QueryBus\Resolver\PsrContainerResolver`, that expects any Service Container implementing the `Psr\Container` interface.
 
+For Symfony 2 and 3 framework users up to version 3.2, you should use Symfony Container: `NilPortugues\MessageBus\QueryBus\Resolver\SymfonyContainerResolver`. For Symfony 3.3 and up use the PSR-11 ContainerResolver class.
 
 #### 2.1.5 - Registering the remaining QueryBus classes
 
@@ -400,7 +399,7 @@ $container['QueryTranslator'] = function($container) {
 };
 
 $container['QueryHandlerResolver'] = function($container) {
-    return new \NilPortugues\MessageBus\QueryBus\Resolver\InteropContainerResolver($container);
+    return new \NilPortugues\MessageBus\QueryBus\Resolver\PsrContainerResolver($container);
 };
 
 $container['QueryBusMiddleware'] = function($container) {
@@ -627,7 +626,7 @@ final class SendWelcomeEmailHandler implements EventHandler, EventHandlerPriorit
 
 I'm assuming you're using some kind Service Container. Now it's time to register your Event Handlers.
 
-For instance, in a `Interop\Container` compliant Service Container, we can do this as follows:
+For instance, in a `Psr\Container` compliant Service Container, we can do this as follows:
 
 ```php
 <?php
@@ -671,9 +670,9 @@ Its implementation can be found at: `NilPortugues\MessageBus\EventBus\Translator
 
 Classes implementing this interface will be resolving the class for the instance required based on the output of the EventTranslator used. 
 
-This package provides an implementation, `NilPortugues\MessageBus\EventBus\Resolver\InteropContainerResolver`, that expects any Service Container implementing the `Interop\Container` interface.
+This package provides an implementation, `NilPortugues\MessageBus\EventBus\Resolver\PsrContainerResolver`, that expects any Service Container implementing the `Psr\Container` interface.
 
-For custom strategies, such as Symfony Container, you may write your own implementing the `NilPortugues\MessageBus\EventBus\Contracts\EventHandlerResolver` interface.
+For Symfony 2 and 3 framework users up to version 3.2, you should use Symfony Container: `NilPortugues\MessageBus\EventBus\Resolver\SymfonyContainerResolver`. For Symfony 3.3 and up use the PSR-11 ContainerResolver class. 
 
 #### 3.1.6 - Registering the remaining EventBus classes
 
@@ -694,7 +693,7 @@ $container['EventTranslator'] = function($container) {
 };
 
 $container['EventHandlerResolver'] = function($container) {
-    return new \NilPortugues\MessageBus\EventBus\Resolver\InteropContainerResolver($container);
+    return new \NilPortugues\MessageBus\EventBus\Resolver\PsrContainerResolver($container);
 };
 
 $container['EventBusMiddleware'] = function($container) {

composer.json

@@ -12,15 +12,17 @@
   ],
   "require": {
     "php": ">=7",
-    "container-interop/container-interop": "1.1.*",
-    "nilportugues/assert": "1.0.*",
-    "nilportugues/serializer": "1.1.*",
-    "psr/log": "1.0.*",
-    "psr/cache": "1.0.*"
+    "container-interop/container-interop": "^1.2",
+    "nilportugues/assert": "^1.0",
+    "nilportugues/serializer": "^1.2",
+    "psr/container": "^1.0",
+    "psr/log": "^1.0",
+    "psr/cache": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "5.2.*",
-    "fabpot/php-cs-fixer": "~1.9"
+    "fabpot/php-cs-fixer": "~1.9",
+    "symfony/dependency-injection": "~2.7|~3.0"
   },
   "prefer-stable": true,
   "autoload": {

src/CommandBus/Contracts/Command.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**

src/CommandBus/Contracts/CommandBusMiddleware.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**

src/CommandBus/Contracts/CommandHandler.php

@@ -7,12 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**
  * Interface CommandHandler.
  */
 interface CommandHandler
 {
-
 }

src/CommandBus/Resolver/InteropContainerResolver.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\CommandBus\Resolver;
 
 use Interop\Container\ContainerInterface;

src/CommandBus/Resolver/PsrContainerResolver.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Author: Nil Portugués Calderó <[email protected]>
+ * Date: 23/03/16
+ * Time: 22:11.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NilPortugues\MessageBus\CommandBus\Resolver;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * Class PsrContainerResolver.
+ */
+class PsrContainerResolver extends InteropContainerResolver
+{
+    /**
+     * PsrContainerResolver constructor.
+     *
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+}

src/CommandBus/Resolver/SymfonyContainerResolver.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Author: Nil Portugués Calderó <[email protected]>
+ * Date: 15/02/17
+ * Time: 11:13.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NilPortugues\MessageBus\CommandBus\Resolver;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use InvalidArgumentException;
+use NilPortugues\MessageBus\CommandBus\Contracts\CommandHandler;
+use NilPortugues\MessageBus\CommandBus\Contracts\CommandHandlerResolver;
+
+/**
+ * Class SymfonyContainerResolver.
+ */
+class SymfonyContainerResolver implements CommandHandlerResolver
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    /**
+     * SymfonyContainerResolver constructor.
+     *
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Given a string to identify the Command Handler, return the instance.
+     *
+     * @param string $handler
+     *
+     * @return CommandHandler
+     */
+    public function instantiate(string $handler) : CommandHandler
+    {
+        if (false === $this->container->has($handler)) {
+            throw new InvalidArgumentException(
+                sprintf('Handler %s could not be found. Did you register it?', $handler)
+            );
+        }
+
+        return $this->container->get($handler);
+    }
+}

src/EventBus/Contracts/Event.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**

src/EventBus/Contracts/EventBusMiddleware.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**

src/EventBus/Contracts/EventHandler.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**

src/EventBus/Resolver/InteropContainerResolver.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\EventBus\Resolver;
 
 use Interop\Container\ContainerInterface;

src/EventBus/Resolver/PsrContainerResolver.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Author: Nil Portugués Calderó <[email protected]>
+ * Date: 23/03/16
+ * Time: 22:11.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NilPortugues\MessageBus\EventBus\Resolver;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * Class PsrContainerResolver.
+ */
+class PsrContainerResolver extends InteropContainerResolver
+{
+    /**
+     * PsrContainerResolver constructor.
+     *
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+}

src/EventBus/Resolver/SymfonyContainerResolver.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Author: Nil Portugués Calderó <[email protected]>
+ * Date: 23/03/16
+ * Time: 22:11.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NilPortugues\MessageBus\EventBus\Resolver;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use InvalidArgumentException;
+use NilPortugues\MessageBus\EventBus\Contracts\EventHandler;
+use NilPortugues\MessageBus\EventBus\Contracts\EventHandlerResolver;
+
+/**
+ * Class SymfonyContainerResolver.
+ */
+class SymfonyContainerResolver implements EventHandlerResolver
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    /**
+     * SymfonyContainerResolver constructor.
+     *
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Given a string to identify the Event Handler, return the instance.
+     *
+     * @param string $handler
+     *
+     * @return EventHandler
+     */
+    public function instantiate(string $handler) : EventHandler
+    {
+        if (false === $this->container->has($handler)) {
+            throw new InvalidArgumentException(
+                sprintf('Handler %s could not be found. Did you register it?', $handler)
+            );
+        }
+
+        return $this->container->get($handler);
+    }
+}

src/QueryBus/Contracts/Query.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**

src/QueryBus/Contracts/QueryBusMiddleware.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**

src/QueryBus/Contracts/QueryHandler.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**

src/QueryBus/Contracts/QueryResponse.php

@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**