cleanup

conedevelopment · Mar 29, 2021 · f18af8f · f18af8f
1 parent feb5b76
commit f18af8f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/src/Bazar.php b/src/Bazar.php
@@ -5,7 +5,6 @@
 use Bazar\Exceptions\InvalidCurrencyException;
 use Bazar\Http\Middleware\HandleInertiaRequests;
 use Closure;
-use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 
@@ -21,9 +20,9 @@ abstract class Bazar
     /**
      * The default currency.
      *
-     * @var string|null
+     * @var string
      */
-    protected static $currency = null;
+    protected static $currency;
 
     /**
      * Get the version.
@@ -74,14 +73,15 @@ public static function currency(string $currency = null): string
      */
     public static function routes(Closure $callback): void
     {
-        Route::as('bazar.')->prefix('bazar')->middleware([
-            'web',
-            'auth',
-            'verified',
-            'can:manage-bazar',
-            HandleInertiaRequests::class,
-        ])->group(static function (Router $router) use ($callback): void {
-            $callback($router);
-        });
+        Route::as('bazar.')
+            ->prefix('bazar')
+            ->middleware([
+                'web',
+                'auth',
+                'verified',
+                'can:manage-bazar',
+                HandleInertiaRequests::class,
+            ])
+            ->group($callback);
     }
 }
diff --git a/src/BazarServiceProvider.php b/src/BazarServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Gate;
@@ -106,15 +105,13 @@ protected function registerRoutes(): void
     public function registerRouteBindings(): void
     {
         foreach ($this->bindings as $contract => $abstract) {
-            if (is_subclass_of($abstract, Model::class)) {
-                $key = strtolower(class_basename($contract));
+            $key = strtolower(class_basename($contract));
 
-                $this->app['router']->bind($key, static function (string $value, Route $route) use ($key, $abstract) {
-                    return Str::is('bazar.*', $route->getName())
-                        ? $abstract::proxy()->resolveRouteBinding($value, $route->bindingFieldFor($key))
-                        : $value;
-                });
-            }
+            $this->app['router']->bind($key, static function (string $value, Route $route) use ($key, $abstract) {
+                return Str::is('bazar.*', $route->getName())
+                    ? $abstract::proxy()->resolveRouteBinding($value, $route->bindingFieldFor($key))
+                    : $value;
+            });
         }
     }
 

diff --git a/src/Contracts/Models/Shipping.php b/src/Contracts/Models/Shipping.php
@@ -7,7 +7,7 @@
 
 interface Shipping extends Taxable
 {
-        /**
+    /**
      * Get the shippable model for the shipping.
      *
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo