Merge pull request #39 from tipoff/omnia/feature/#79-use-new-base-permissions-migration

use new BasePermissionsMigration

Author: drewroberts

composer.json

@@ -16,13 +16,13 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "tipoff/authorization": "^1.0.1",
-        "tipoff/refunds": "^1.1.1",
-        "tipoff/support": "^1.4.3",
-        "tipoff/locations": "^2.2.1"
+        "tipoff/authorization": "^2.3.0",
+        "tipoff/locations": "^2.3.2",
+        "tipoff/refunds": "^2.0.0",
+        "tipoff/support": "^1.5.5"
     },
     "require-dev": {
-        "tipoff/test-support": "^1.0.5"
+        "tipoff/test-support": "^1.1.2"
     },
     "autoload": {
         "psr-4": {

database/migrations/2021_02_13_163826_add_payment_permissions.php

@@ -2,23 +2,17 @@
 
 declare(strict_types=1);
 
-use Illuminate\Database\Migrations\Migration;
-use Spatie\Permission\Contracts\Permission;
-use Spatie\Permission\PermissionRegistrar;
+use Tipoff\Authorization\Permissions\BasePermissionsMigration;
 
-class AddPaymentPermissions extends Migration
+class AddPaymentPermissions extends BasePermissionsMigration
 {
     public function up()
     {
-        if (app()->has(Permission::class)) {
-            app(PermissionRegistrar::class)->forgetCachedPermissions();
-            
-            foreach ([
-                         'view payments',
-                         'update payments',
-                     ] as $name) {
-                app(Permission::class)::findOrCreate($name, null);
-            };
-        }
+        $permissions = [
+            'view payments',
+            'update payments',
+        ];
+
+        $this->createPermissions($permissions);
     }
 }

tests/TestCase.php

@@ -4,6 +4,8 @@
 
 namespace Tipoff\Payments\Tests;
 
+use Spatie\Permission\PermissionServiceProvider;
+use Tipoff\Authorization\AuthorizationServiceProvider;
 use Tipoff\Locations\LocationsServiceProvider;
 use Tipoff\Payments\PaymentsServiceProvider;
 use Tipoff\Support\SupportServiceProvider;
@@ -15,6 +17,8 @@ protected function getPackageProviders($app)
     {
         return [
             SupportServiceProvider::class,
+            AuthorizationServiceProvider::class,
+            PermissionServiceProvider::class,
             PaymentsServiceProvider::class,
             LocationsServiceProvider::class,
         ];