#17 remove command bus in favor of Laravel Pipeline class

#16 Upgrade passport to 3.0

Author: joselfonseca

app/Services/Installation/AppInstallationService.php

@@ -2,8 +2,8 @@
 
 namespace App\Services\Installation;
 
-use Joselfonseca\LaravelTactician\CommandBusInterface;
-use Joselfonseca\LaravelTactician\Middleware\DatabaseTransactions;
+use Illuminate\Pipeline\Pipeline;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Class AppInstallationService
@@ -12,25 +12,19 @@
 class AppInstallationService implements AppInstallationServiceContract
 {
 
-    /**
-     * @var CommandBusInterface
-     */
-    protected $bus;
+    protected $pipeline;
 
     /**
      * @var array
      */
     protected $middleware = [
-        DatabaseTransactions::class
+        InstallAppHandler::class
     ];
 
-    /**
-     * AppInstallationService constructor.
-     * @param CommandBusInterface $bus
-     */
-    public function __construct(CommandBusInterface $bus)
+
+    public function __construct(Pipeline $pipeline)
     {
-        $this->bus = $bus;
+        $this->pipeline = $pipeline;
     }
 
 
@@ -40,7 +34,12 @@ public function __construct(CommandBusInterface $bus)
      */
     public function installApp(array $installationData = [])
     {
-        $this->bus->addHandler(InstallAppCommand::class, InstallAppHandler::class);
-        return $this->bus->dispatch(InstallAppCommand::class, $installationData, $this->middleware);
+        return DB::transaction(function() use ($installationData) {
+            $this->pipeline->send((object) $installationData)
+                ->through($this->middleware)
+                ->then(function($installation) {
+                    return $installation;
+                });
+        });
     }
 }

app/Services/Installation/InstallAppHandler.php

@@ -5,8 +5,8 @@
 use App\Entities\Role;
 use App\Entities\User;
 use App\Entities\Permission;
-use App\Services\Installation\Events\ApplicationWasInstalled;
 use Illuminate\Validation\ValidationException;
+use App\Services\Installation\Events\ApplicationWasInstalled;
 
 /**
  * Class InstallAppHandler
@@ -57,19 +57,20 @@ public function __construct()
         $this->permissions = collect($this->permissions);
     }
 
+
     /**
-     * @param InstallAppCommand $command
+     * @param $installationData
      * @return $this
      */
-    public function handle(InstallAppCommand $command)
+    public function handle($installationData)
     {
         $this->createRoles()
             ->createPermissions()
-            ->createAdminUser((array) $command)
+            ->createAdminUser((array) $installationData)
             ->assignAdminRoleToAdminUser()
             ->assignAllPermissionsToAdminRole();
         event(new ApplicationWasInstalled($this->adminUser, $this->roles, $this->permissions));
-        return $this;
+        return $installationData;
     }
 
     /**

composer.json

@@ -15,8 +15,7 @@
     "require": {
         "php": ">=7.0.0",
         "laravel/framework": "5.4.*",
-        "laravel/passport": "^2.0",
-        "joselfonseca/laravel-tactician": "0.3.*",
+        "laravel/passport": "^3.0",
         "laravel/tinker": "~1.0",
         "predis/predis": "^1.1",
         "dingo/api": "1.0.*@dev",