Fixes for Laravel 8

composer.json

@@ -28,6 +28,11 @@
             "AltThree\\Bus\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "AltThree\\Tests\\Bus\\": "tests/"
+        }
+    },
     "config": {
         "preferred-install": "dist"
     },

src/Dispatcher.php

@@ -48,7 +48,7 @@ public function hasCommandHandler($command)
 
         $callback = $this->mapper;
 
-        if (!$callback || method_exists($command, 'handle')) {
+        if ($callback === null || method_exists($command, 'handle') || (method_exists($this, 'dispatchSync') && method_exists($command, '__invoke'))) {
             return false;
         }
 

tests/BusDispatcherTest.php

@@ -15,6 +15,14 @@
 namespace AltThree\Tests\Bus;
 
 use AltThree\Bus\Dispatcher;
+use AltThree\Tests\Bus\Stubs\BusDispatcherBasicCommand;
+use AltThree\Tests\Bus\Stubs\BusDispatcherTestBasicCommand;
+use AltThree\Tests\Bus\Stubs\BusDispatcherTestCustomQueueCommand;
+use AltThree\Tests\Bus\Stubs\BusInjectionStub;
+use AltThree\Tests\Bus\Stubs\BusDispatcherTestSpecificQueueAndDelayCommand;
+use AltThree\Tests\Bus\Stubs\Handlers\BusDispatcherTestBasicCommandHandler;
+use AltThree\Tests\Bus\Stubs\StandAloneCommand;
+use AltThree\Tests\Bus\Stubs\StandAloneHandler;
 use GrahamCampbell\TestBenchCore\MockeryTrait;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Queue\Queue;
@@ -35,19 +43,20 @@ class BusDispatcherTest extends TestCase
     public function testBasicDispatchingOfCommandsToHandlers()
     {
         $container = new Container();
-        $handler = Mockery::mock('StdClass');
-        $handler->shouldReceive('handle')->twice()->andReturn('foo');
-        $container->instance('AltThree\Foo\BusDispatcherTestBasicCommandHandler', $handler);
+        $handler = new BusDispatcherTestBasicCommandHandler();
+        $container->instance(BusDispatcherTestBasicCommandHandler::class, $handler);
         $dispatcher = new Dispatcher($container);
         $dispatcher->mapUsing(function ($command) {
-            return Dispatcher::simpleMapping($command, 'AltThree\Tests\Bus', 'AltThree\Foo');
+            return Dispatcher::simpleMapping($command, 'AltThree\Tests\Bus\Stubs', 'AltThree\Tests\Bus\Stubs\Handlers');
         });
 
         $result = $dispatcher->dispatch(new BusDispatcherTestBasicCommand());
-        $this->assertEquals('foo', $result);
+        $this->assertSame('foo', $result);
 
         $result = $dispatcher->dispatch(new BusDispatcherTestBasicCommand());
-        $this->assertEquals('foo', $result);
+        $this->assertSame('foo', $result);
+
+        $this->assertSame(2, $handler->count);
     }
 
     public function testCommandsThatShouldQueueIsQueued()
@@ -120,52 +129,3 @@ public function testDispatcherCanDispatchStandAloneHandler()
         $this->assertInstanceOf(StandAloneCommand::class, $response);
     }
 }
-
-class BusInjectionStub
-{
-}
-
-class BusDispatcherTestBasicCommand
-{
-}
-
-class BusDispatcherBasicCommand
-{
-    public $name;
-
-    public function __construct($name = null)
-    {
-        $this->name = $name;
-    }
-
-    public function handle(BusInjectionStub $stub)
-    {
-        //
-    }
-}
-
-class BusDispatcherTestCustomQueueCommand implements ShouldQueue
-{
-    public function queue($queue, $command)
-    {
-        $queue->push($command);
-    }
-}
-
-class BusDispatcherTestSpecificQueueAndDelayCommand implements ShouldQueue
-{
-    public $queue = 'foo';
-    public $delay = 10;
-}
-
-class StandAloneCommand
-{
-}
-
-class StandAloneHandler
-{
-    public function handle(StandAloneCommand $command)
-    {
-        return $command;
-    }
-}

tests/Stubs/BusDispatcherBasicCommand.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+class BusDispatcherBasicCommand
+{
+    public $name;
+
+    public function __construct($name = null)
+    {
+        $this->name = $name;
+    }
+
+    public function handle(BusInjectionStub $stub)
+    {
+        //
+    }
+}

tests/Stubs/BusDispatcherTestBasicCommand.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+class BusDispatcherTestBasicCommand
+{
+}

tests/Stubs/BusDispatcherTestCustomQueueCommand.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class BusDispatcherTestCustomQueueCommand implements ShouldQueue
+{
+    public function queue($queue, $command)
+    {
+        $queue->push($command);
+    }
+}

tests/Stubs/BusDispatcherTestSpecificQueueAndDelayCommand.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class BusDispatcherTestSpecificQueueAndDelayCommand implements ShouldQueue
+{
+    public $queue = 'foo';
+    public $delay = 10;
+}

tests/Stubs/BusInjectionStub.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+class BusInjectionStub
+{
+}

tests/Stubs/Handlers/BusDispatcherTestBasicCommandHandler.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs\Handlers;
+
+class BusDispatcherTestBasicCommandHandler
+{
+    public $count = 0;
+
+    public function handle()
+    {
+        $this->count++;
+
+        return 'foo';
+    }
+}

tests/Stubs/StandAloneCommand.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+class StandAloneCommand
+{
+}

tests/Stubs/StandAloneHandler.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Alt Three Bus.
+ *
+ * (c) Alt Three Services Limited
+ * (c) Taylor Otwell
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AltThree\Tests\Bus\Stubs;
+
+class StandAloneHandler
+{
+    public function handle(StandAloneCommand $command)
+    {
+        return $command;
+    }
+}