Merge 8f22d17 into 32b20d2

prooph · Sep 18, 2015 · ac220b6 · ac220b6
2 parents 32b20d2 + 8f22d17
commit ac220b6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -21,11 +21,11 @@
         "prooph"
     ],
     "require": {
-        "php": ">=5.5"
+        "php": ">=5.5",
+        "prooph/event-store" : "^5.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.7",
-        "prooph/event-store" : "dev-master",
         "prooph/service-bus" : "dev-master",
         "fabpot/php-cs-fixer": "1.7.*",
         "satooshi/php-coveralls": "dev-master"

diff --git a/src/TransactionManager.php b/src/TransactionManager.php
@@ -118,10 +118,12 @@ public function onInitialize(ActionEvent $actionEvent)
      */
     public function onFinalize(ActionEvent $actionEvent)
     {
-        if ($actionEvent->getParam(CommandBus::EVENT_PARAM_EXCEPTION)) {
-            $this->eventStore->rollback();
-        } else {
-            $this->eventStore->commit();
+        if ($this->eventStore->isInTransaction()) {
+            if ($actionEvent->getParam(CommandBus::EVENT_PARAM_EXCEPTION)) {
+                $this->eventStore->rollback();
+            } else {
+                $this->eventStore->commit();
+            }
         }
 
         $this->currentCommand = null;

diff --git a/tests/TransactionManagerTest.php b/tests/TransactionManagerTest.php
@@ -103,6 +103,8 @@ public function it_commits_a_transaction_on_command_dispatch_finalize_if_no_exce
     {
         $eventStoreMock = $this->getEventStoreObjectProphecy();
 
+        $eventStoreMock->isInTransaction()->willReturn(true);
+
         $eventStoreMock->commit()->shouldBeCalled();
 
         $transactionManager = new TransactionManager($eventStoreMock->reveal());
@@ -121,6 +123,8 @@ public function it_rollback_a_transaction_on_command_dispatch_finalize_if_except
     {
         $eventStoreMock = $this->getEventStoreObjectProphecy();
 
+        $eventStoreMock->isInTransaction()->willReturn(true);
+
         $eventStoreMock->rollback()->shouldBeCalled();
 
         $transactionManager = new TransactionManager($eventStoreMock->reveal());
@@ -134,6 +138,28 @@ public function it_rollback_a_transaction_on_command_dispatch_finalize_if_except
         $transactionManager->onFinalize($actionEvent->reveal());
     }
 
+    /**
+     * @test
+     */
+    public function it_does_not_perform_rollback_after_transaction_commit()
+    {
+        $eventStoreMock = $this->getEventStoreObjectProphecy();
+
+        $eventStoreMock->isInTransaction()->willReturn(false);
+
+        $eventStoreMock->rollback()->shouldNotBeCalled();
+
+        $transactionManager = new TransactionManager($eventStoreMock->reveal());
+
+        $actionEvent = $this->prophesize(ActionEvent::class);
+
+        $exception = $this->prophesize(\Exception::class);
+
+        $actionEvent->getParam(CommandBus::EVENT_PARAM_EXCEPTION)->willReturn($exception->reveal());
+
+        $transactionManager->onFinalize($actionEvent->reveal());
+    }
+
     /**
      * @test
      */