cleanup

conedevelopment · Mar 14, 2024 · e0430d8 · e0430d8
1 parent e5341ec
commit e0430d8
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 39 deletions.
diff --git a/src/BazarServiceProvider.php b/src/BazarServiceProvider.php
@@ -2,14 +2,9 @@
 
 namespace Cone\Bazar;
 
-use Cone\Bazar\Resources\CategoryResource;
-use Cone\Bazar\Resources\OrderResource;
-use Cone\Bazar\Resources\ProductResource;
-use Cone\Bazar\Resources\PropertyResource;
-use Cone\Root\Root;
-use Cone\Root\Support\Filters;
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Foundation\Console\AboutCommand;
+use Illuminate\Foundation\Events\VendorTagPublished;
 use Illuminate\Support\ServiceProvider;
 
 class BazarServiceProvider extends ServiceProvider
@@ -71,7 +66,6 @@ public function boot(): void
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'bazar');
 
         $this->registerEvents();
-        $this->registerResources();
     }
 
     /**
@@ -99,6 +93,14 @@ protected function registerPublishes(): void
         $this->publishes([
             __DIR__.'/../resources/views' => $this->app->resourcePath('views/vendor/bazar'),
         ], 'bazar-views');
+
+        $this->publishes([
+            __DIR__.'/../stubs/BazarServiceProvider.stub' => $this->app->basePath('app/Providers/BazarServiceProvider.php'),
+            __DIR__.'/../stubs/CategoryResource.stub' => $this->app->basePath('app/Root/Resources/CategoryResource.php'),
+            __DIR__.'/../stubs/ProductResource.stub' => $this->app->basePath('app/Root/Resources/ProductResource.php'),
+            __DIR__.'/../stubs/PropertyResource.stub' => $this->app->basePath('app/Root/Resources/PropertyResource.php'),
+            __DIR__.'/../stubs/OrderResource.stub' => $this->app->basePath('app/Root/Resources/OrderResource.php'),
+        ], 'bazar-stubs');
     }
 
     /**
@@ -121,20 +123,6 @@ protected function registerEvents(): void
     {
         $this->app['events']->listen(Logout::class, Listeners\ClearCookies::class);
         $this->app['events']->listen(Events\PaymentCaptured::class, Listeners\RefreshInventory::class);
-    }
-
-    /**
-     * Register the resources.
-     */
-    protected function registerResources(): void
-    {
-        $resources = Filters::apply('bazar:resources', [
-            new CategoryResource(),
-            new ProductResource(),
-            new PropertyResource(),
-            new OrderResource(),
-        ]);
-
-        $this->app->make(Root::class)->resources->register($resources);
+        $this->app['events']->listen(VendorTagPublished::class, Listeners\FormatBazarStubs::class);
     }
 }
diff --git a/src/Console/Commands/Install.php b/src/Console/Commands/Install.php
@@ -2,6 +2,7 @@
 
 namespace Cone\Bazar\Console\Commands;
 
+use Cone\Bazar\BazarServiceProvider;
 use Illuminate\Console\Command;
 
 class Install extends Command
@@ -26,5 +27,10 @@ class Install extends Command
     public function handle(): void
     {
         $this->call('migrate');
+
+        $this->call('vendor:publish', [
+            '--provider' => BazarServiceProvider::class,
+            '--tag' => 'bazar-stubs',
+        ]);
     }
 }
diff --git a/src/Listeners/FormatBazarStubs.php b/src/Listeners/FormatBazarStubs.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Cone\Bazar\Listeners;
+
+use Illuminate\Foundation\Events\VendorTagPublished;
+use Illuminate\Support\Facades\App;
+
+class FormatBazarStubs
+{
+    /**
+     * Handle the event.
+     */
+    public function handle(VendorTagPublished $event): void
+    {
+        if ($event->tag === 'bazar-stubs') {
+            foreach ($event->paths as $from => $to) {
+                $contents = file_get_contents($to);
+
+                $contents = str_replace('{{ namespace }}', App::getNamespace(), $contents);
+
+                file_put_contents($to, $contents);
+            }
+        }
+    }
+}
diff --git a/src/Models/Address.php b/src/Models/Address.php
@@ -5,7 +5,6 @@
 use Closure;
 use Cone\Bazar\Database\Factories\AddressFactory;
 use Cone\Bazar\Interfaces\Models\Address as Contract;
-use Cone\Root\Support\Filters;
 use Cone\Root\Traits\InteractsWithProxy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -144,11 +143,7 @@ protected function alias(): Attribute
     {
         return new Attribute(
             get: function (?string $value): ?string {
-                return Filters::apply(
-                    'bazar:address.alias_attribute',
-                    $this->exists ? ($value ?: "#{$this->getKey()}") : $value,
-                    $this
-                );
+                return $this->exists ? ($value ?: "#{$this->getKey()}") : $value;
             }
         );
     }
@@ -162,11 +157,7 @@ protected function name(): Attribute
     {
         return new Attribute(
             get: function (mixed $value, array $attributes): string {
-                return Filters::apply(
-                    'bazar:address.name_attribute',
-                    trim(sprintf('%s %s', $attributes['first_name'], $attributes['last_name'])),
-                    $this
-                );
+                return trim(sprintf('%s %s', $attributes['first_name'], $attributes['last_name']));
             }
         );
     }

diff --git a/stubs/BazarServiceProvider.stub b/stubs/BazarServiceProvider.stub
@@ -0,0 +1,41 @@
+<?php
+
+namespace {{ namespace }}Providers;
+
+use {{ namespace }}Root\Resources\CategoryResource;
+use {{ namespace }}Root\Resources\OrderResource;
+use {{ namespace }}Root\Resources\ProductResource;
+use {{ namespace }}Root\Resources\PropertyResource;
+use Cone\Root\Root;
+use Illuminate\Support\ServiceProvider;
+
+class BazarServiceProvider extends ServiceProvider
+{
+    /**
+     * All of the container bindings that should be registered.
+     */
+    public array $bindings = [
+        //
+    ];
+
+    /**
+     * Register any application services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap any application services.
+     */
+    public function boot(): void
+    {
+        Root::instance()->resources->register([
+            new CategoryResource(),
+            new ProductResource(),
+            new PropertyResource(),
+            new OrderResource(),
+        ]);
+    }
+}
diff --git a/src/Resources/CategoryResource.php → stubs/CategoryResource.stub b/src/Resources/CategoryResource.php → stubs/CategoryResource.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cone\Bazar\Resources;
+namespace {{ namespace }}Root\Resources;
 
 use Cone\Bazar\Models\Category;
 use Cone\Root\Fields\Editor;

diff --git a/src/Resources/OrderResource.php → stubs/OrderResource.stub b/src/Resources/OrderResource.php → stubs/OrderResource.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cone\Bazar\Resources;
+namespace {{ namespace }}Root\Resources;
 
 use Cone\Bazar\Actions\SendOrderDetails;
 use Cone\Bazar\Bazar;

diff --git a/src/Resources/ProductResource.php → stubs/ProductResource.stub b/src/Resources/ProductResource.php → stubs/ProductResource.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cone\Bazar\Resources;
+namespace {{ namespace }}Root\Resources;
 
 use Cone\Bazar\Bazar;
 use Cone\Bazar\Fields\Inventory;
@@ -49,7 +49,7 @@ public function getModel(): string
      */
     public function fields(Request $request): array
     {
-        return array_merge(parent::fields($request), [
+        return [
             ID::make(),
 
             Text::make(__('Name'), 'name')
@@ -76,6 +76,6 @@ public function fields(Request $request): array
                 ->groupOptionsBy('property.name'),
 
             Variants::make(),
-        ]);
+        ];
     }
 }
diff --git a/src/Resources/PropertyResource.php → stubs/PropertyResource.stub b/src/Resources/PropertyResource.php → stubs/PropertyResource.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cone\Bazar\Resources;
+namespace {{ namespace }}Root\Resources;
 
 use Cone\Bazar\Models\Property;
 use Cone\Root\Fields\HasMany;