Fixing QueryBus: when only QueryBusMiddleware is provided EmptyResponse was being returned

nilportugues · nilportugues · commit 1164163b1a46 · 2016-04-23T01:41:18.000+02:00
diff --git a/src/CommandBus/Contracts/Command.php b/src/CommandBus/Contracts/Command.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**
diff --git a/src/CommandBus/Contracts/CommandBusMiddleware.php b/src/CommandBus/Contracts/CommandBusMiddleware.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**
diff --git a/src/CommandBus/Contracts/CommandHandler.php b/src/CommandBus/Contracts/CommandHandler.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\CommandBus\Contracts;
 
 /**
diff --git a/src/CommandBus/Resolver/InteropContainerResolver.php b/src/CommandBus/Resolver/InteropContainerResolver.php
@@ -7,7 +7,6 @@
  * 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;
diff --git a/src/EventBus/Contracts/Event.php b/src/EventBus/Contracts/Event.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**
diff --git a/src/EventBus/Contracts/EventBusMiddleware.php b/src/EventBus/Contracts/EventBusMiddleware.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**
diff --git a/src/EventBus/Contracts/EventHandler.php b/src/EventBus/Contracts/EventHandler.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\EventBus\Contracts;
 
 /**
diff --git a/src/EventBus/Resolver/InteropContainerResolver.php b/src/EventBus/Resolver/InteropContainerResolver.php
@@ -7,7 +7,6 @@
  * 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;
diff --git a/src/QueryBus/Contracts/Query.php b/src/QueryBus/Contracts/Query.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**
diff --git a/src/QueryBus/Contracts/QueryBusMiddleware.php b/src/QueryBus/Contracts/QueryBusMiddleware.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**
diff --git a/src/QueryBus/Contracts/QueryHandler.php b/src/QueryBus/Contracts/QueryHandler.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**
diff --git a/src/QueryBus/Contracts/QueryResponse.php b/src/QueryBus/Contracts/QueryResponse.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Contracts;
 
 /**
diff --git a/src/QueryBus/EmptyResponse.php b/src/QueryBus/EmptyResponse.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus;
 
 use NilPortugues\MessageBus\QueryBus\Contracts\QueryResponse;
diff --git a/src/QueryBus/QueryBus.php b/src/QueryBus/QueryBus.php
@@ -34,20 +34,22 @@ public function __construct(array $middleware = [])
      */
     public function __invoke(Query $query, callable $next = null) : QueryResponse
     {
-        $response = EmptyResponse::create();
         $middleware = $this->middleware;
         $current = array_shift($middleware);
 
-        foreach ($middleware as $queryBusMiddleware) {
-            $callable = function ($query) use ($queryBusMiddleware) {
-                return $queryBusMiddleware->__invoke($query);
-            };
-
-            $response = $current->__invoke($query, $callable);
-            $current = $queryBusMiddleware;
+        if (!empty($middleware)) {
+            foreach ($middleware as $queryBusMiddleware) {
+                $callable = function ($query) use ($queryBusMiddleware) {
+                    return $queryBusMiddleware->__invoke($query);
+                };
+
+                $response = $current->__invoke($query, $callable);
+                $current = $queryBusMiddleware;
+            }
+        } elseif ($current) {
+            $response = $current->__invoke($query);
         }
-        unset($middleware);
 
-        return $response;
+        return (!empty($response)) ? $response : EmptyResponse::create();
     }
 }
diff --git a/src/QueryBus/Resolver/InteropContainerResolver.php b/src/QueryBus/Resolver/InteropContainerResolver.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Resolver;
 
 use Interop\Container\ContainerInterface;
diff --git a/tests/CommandBus/CommandBusTest.php b/tests/CommandBus/CommandBusTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\CommandBus;
 
 use NilPortugues\MessageBus\CommandBus\CommandBus;
diff --git a/tests/CommandBus/Resolver/InteropContainerResolverTest.php b/tests/CommandBus/Resolver/InteropContainerResolverTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\CommandBus\Resolver;
 
 use InvalidArgumentException;
diff --git a/tests/CommandBus/Resolver/SimpleArrayResolverTest.php b/tests/CommandBus/Resolver/SimpleArrayResolverTest.php
@@ -7,7 +7,6 @@
  * 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 InvalidArgumentException;
diff --git a/tests/CommandBus/SqliteCommand.php b/tests/CommandBus/SqliteCommand.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\CommandBus;
 
 use NilPortugues\MessageBus\CommandBus\Contracts\Command;
diff --git a/tests/CommandBus/TransactionalCommandBusMiddlewareTest.php b/tests/CommandBus/TransactionalCommandBusMiddlewareTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\CommandBus;
 
 use NilPortugues\MessageBus\CommandBus\Contracts\Command;
diff --git a/tests/ContainerException.php b/tests/ContainerException.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus;
 
 use InvalidArgumentException;
diff --git a/tests/EventBus/EventBusMiddlewareTest.php b/tests/EventBus/EventBusMiddlewareTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\EventBus;
 
 use NilPortugues\MessageBus\EventBus\EventBusMiddleware;
diff --git a/tests/EventBus/Resolver/InteropContainerResolverTest.php b/tests/EventBus/Resolver/InteropContainerResolverTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\EventBus\Resolver;
 
 use InvalidArgumentException;
diff --git a/tests/EventBus/Resolver/SimpleArrayResolverTest.php b/tests/EventBus/Resolver/SimpleArrayResolverTest.php
@@ -7,7 +7,6 @@
  * 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 InvalidArgumentException;
diff --git a/tests/EventBus/SqliteEvent.php b/tests/EventBus/SqliteEvent.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\EventBus;
 
 use NilPortugues\MessageBus\EventBus\Contracts\Event;
diff --git a/tests/EventBus/TransactionalEventBusMiddlewareTest.php b/tests/EventBus/TransactionalEventBusMiddlewareTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\EventBus;
 
 use NilPortugues\MessageBus\EventBus\Contracts\Event;
diff --git a/tests/InMemoryInteropContainer.php b/tests/InMemoryInteropContainer.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus;
 
 use Interop\Container\ContainerInterface;
diff --git a/tests/InMemoryLogger.php b/tests/InMemoryLogger.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus;
 
 use Psr\Log\AbstractLogger;
diff --git a/tests/NotFoundException.php b/tests/NotFoundException.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus;
 
 use InvalidArgumentException;
diff --git a/tests/QueryBus/DummyQuery.php b/tests/QueryBus/DummyQuery.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\QueryBus;
 
 use NilPortugues\MessageBus\QueryBus\Contracts\Query;
diff --git a/tests/QueryBus/DummyQueryHandler.php b/tests/QueryBus/DummyQueryHandler.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\QueryBus;
 
 use NilPortugues\MessageBus\QueryBus\Contracts\Query;
diff --git a/tests/QueryBus/QueryBusMiddlewareTest.php b/tests/QueryBus/QueryBusMiddlewareTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\QueryBus;
 
 use NilPortugues\MessageBus\QueryBus\Contracts\QueryResponse;
diff --git a/tests/QueryBus/QueryBusTest.php b/tests/QueryBus/QueryBusTest.php
@@ -4,8 +4,8 @@
 
 use NilPortugues\MessageBus\QueryBus\CacheQueryBusMiddleware;
 use NilPortugues\MessageBus\QueryBus\Contracts\QueryHandlerResolver;
-use NilPortugues\MessageBus\QueryBus\Contracts\QueryResponse;
 use NilPortugues\MessageBus\QueryBus\Contracts\QueryTranslator;
+use NilPortugues\MessageBus\QueryBus\EmptyResponse;
 use NilPortugues\MessageBus\QueryBus\LoggerQueryBusMiddleware;
 use NilPortugues\MessageBus\QueryBus\QueryBus;
 use NilPortugues\MessageBus\QueryBus\QueryBusMiddleware;
@@ -51,6 +51,20 @@ public function testItCanStackMiddleware()
         $queryBus = new QueryBus($middleware);
         $response = $queryBus->__invoke(new DummyQuery());
         $this->assertNotEmpty($logger->logs());
-        $this->assertInstanceOf(QueryResponse::class, $response);
+        $this->assertInstanceOf(DummyQueryResponse::class, $response);
+    }
+
+    public function testItWillReturnEmptyResponse()
+    {
+        $queryBus = new QueryBus([]);
+        $response = $queryBus->__invoke(new DummyQuery());
+        $this->assertInstanceOf(EmptyResponse::class, $response);
+    }
+
+    public function testItWillReturnDummyQueryResponse()
+    {
+        $queryBus = new QueryBus([new QueryBusMiddleware($this->translator, $this->resolver)]);
+        $response = $queryBus->__invoke(new DummyQuery());
+        $this->assertInstanceOf(DummyQueryResponse::class, $response);
     }
 }
diff --git a/tests/QueryBus/Resolver/InteropContainerResolverTest.php b/tests/QueryBus/Resolver/InteropContainerResolverTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\Tests\MessageBus\QueryBus\Resolver;
 
 use InvalidArgumentException;
diff --git a/tests/QueryBus/Resolver/SimpleArrayResolverTest.php b/tests/QueryBus/Resolver/SimpleArrayResolverTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace NilPortugues\MessageBus\QueryBus\Resolver;
 
 use InvalidArgumentException;
