Upgrade to SimpleBus/MessageBus 2.0

Author: matthiasnoback

composer.json

@@ -15,9 +15,9 @@
     "require": {
         "php": ">=5.4",
         "beberlei/assert": "~2.0",
-        "simple-bus/message-bus": "~1.0",
-        "simple-bus/asynchronous": "~1.0",
-        "simple-bus/symfony-bridge": "^3.2.1",
+        "simple-bus/message-bus": "~2.0",
+        "simple-bus/asynchronous": "~2.0",
+        "simple-bus/symfony-bridge": "~4.0",
         "symfony/framework-bundle": "~2.0"
     },
     "suggest": {

src/Resources/config/asynchronous_commands.yml

@@ -19,13 +19,19 @@ services:
         tags:
             - { name: asynchronous_command_bus_middleware, priority: -1000 }
 
+    simple_bus.asynchronous.command_bus.callable_resolver:
+        class: SimpleBus\Message\CallableResolver\ServiceLocatorAwareCallableResolver
+        public: false
+        arguments:
+            - [@service_container, 'get']
+
     simple_bus.asynchronous.command_bus.command_handler_map:
-        class: SimpleBus\Message\Handler\Map\LazyLoadingMessageHandlerMap
+        class: SimpleBus\Message\CallableResolver\CallableMap
         public: false
         arguments:
             # collection of command handler service ids, will be provided by the RegisterHandlers compiler pass
             - []
-            - @simple_bus.asynchronous.command_bus.invokable_service_locator
+            - @simple_bus.asynchronous.command_bus.callable_resolver
 
     simple_bus.asynchronous.command_bus.command_handler_resolver:
         class: SimpleBus\Message\Handler\Resolver\NameBasedMessageHandlerResolver
@@ -34,12 +40,6 @@ services:
             - @simple_bus.asynchronous.command_bus.command_name_resolver
             - @simple_bus.asynchronous.command_bus.command_handler_map
 
-    simple_bus.asynchronous.command_bus.invokable_service_locator:
-        class: SimpleBus\SymfonyBridge\DependencyInjection\InvokableServiceLocator
-        public: false
-        arguments:
-            - @service_container
-
     simple_bus.asynchronous.command_bus.finishes_command_before_handling_next_middleware:
         class: SimpleBus\Message\Bus\Middleware\FinishesHandlingMessageBeforeHandlingNext
         public: false

src/Resources/config/asynchronous_events.yml

@@ -31,13 +31,19 @@ services:
         tags:
             - { name: asynchronous_event_bus_middleware, priority: -1000 }
 
+    simple_bus.asynchronous.event_bus.callable_resolver:
+        class: SimpleBus\Message\CallableResolver\ServiceLocatorAwareCallableResolver
+        public: false
+        arguments:
+            - [@service_container, 'get']
+
     simple_bus.asynchronous.event_bus.event_subscribers_collection:
-        class: SimpleBus\Message\Subscriber\Collection\LazyLoadingMessageSubscriberCollection
+        class: SimpleBus\Message\CallableResolver\CallableCollection
         public: false
         arguments:
             # collection of event subscriber services ids, will be provided by the RegisterSubscribers compiler pas
             - []
-            - @simple_bus.asynchronous.event_bus.invokable_service_locator
+            - @simple_bus.asynchronous.event_bus.callable_resolver
 
     simple_bus.asynchronous.event_bus.event_subscribers_resolver:
         class: SimpleBus\Message\Subscriber\Resolver\NameBasedMessageSubscriberResolver
@@ -46,12 +52,6 @@ services:
             - @simple_bus.asynchronous.event_bus.event_name_resolver
             - @simple_bus.asynchronous.event_bus.event_subscribers_collection
 
-    simple_bus.asynchronous.event_bus.invokable_service_locator:
-        class: SimpleBus\SymfonyBridge\DependencyInjection\InvokableServiceLocator
-        public: false
-        arguments:
-            - @service_container
-
     simple_bus.asynchronous.standard_serialized_event_envelope_consumer:
         class: SimpleBus\Asynchronous\Consumer\StandardSerializedEnvelopeConsumer
         public: false

tests/Functional/CommandHandlerSpy.php

@@ -2,14 +2,11 @@
 
 namespace SimpleBus\AsynchronousBundle\Tests\Functional;
 
-use SimpleBus\Message\Handler\MessageHandler;
-use SimpleBus\Message\Message;
-
-class CommandHandlerSpy implements MessageHandler
+class CommandHandlerSpy
 {
     private $handledCommands = [];
 
-    public function handle(Message $message)
+    public function handle($message)
     {
         $this->handledCommands[] = $message;
     }

tests/Functional/DummyCommand.php

@@ -2,8 +2,6 @@
 
 namespace SimpleBus\AsynchronousBundle\Tests\Functional;
 
-use SimpleBus\Message\Message;
-
-class DummyCommand implements Message
+class DummyCommand
 {
 }

tests/Functional/DummyEvent.php

@@ -2,8 +2,6 @@
 
 namespace SimpleBus\AsynchronousBundle\Tests\Functional;
 
-use SimpleBus\Message\Message;
-
-class DummyEvent implements Message
+class DummyEvent
 {
 }

tests/Functional/EventSubscriberSpy.php

@@ -2,14 +2,11 @@
 
 namespace SimpleBus\AsynchronousBundle\Tests\Functional;
 
-use SimpleBus\Message\Message;
-use SimpleBus\Message\Subscriber\MessageSubscriber;
-
-class EventSubscriberSpy implements MessageSubscriber
+class EventSubscriberSpy
 {
     private $notifiedEvents = [];
 
-    public function notify(Message $message)
+    public function notify($message)
     {
         $this->notifiedEvents[] = $message;
     }

tests/Functional/PublisherSpy.php

@@ -9,7 +9,7 @@ class PublisherSpy implements Publisher
 {
     private $publishedMessages = [];
 
-    public function publish(Message $message)
+    public function publish($message)
     {
         $this->publishedMessages[] = $message;
     }