Merge branch 'release/v4.0.4'

Author: Omranic

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v4.0.4] - 2020-04-09
+- Tweak artisan command registration
+- Reverse commit "Convert database int fields into bigInteger"
+- Refactor publish command and allow multiple resource values
+
 ## [v4.0.3] - 2020-04-04
 - Fix namespace issue
 
@@ -135,6 +140,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v0.0.1 - 2017-04-08
 - Rename package to "rinvex/attributable" from "rinvex/sparse" based on 715a831
 
+[v4.0.4]: https://github.com/rinvex/laravel-attributes/compare/v4.0.3...v4.0.4
 [v4.0.3]: https://github.com/rinvex/laravel-attributes/compare/v4.0.2...v4.0.3
 [v4.0.2]: https://github.com/rinvex/laravel-attributes/compare/v4.0.1...v4.0.2
 [v4.0.1]: https://github.com/rinvex/laravel-attributes/compare/v4.0.0...v4.0.1

database/migrations/2020_01_01_000001_create_attributes_table.php

@@ -17,7 +17,7 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attributes'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->string('slug');
             $table->{$this->jsonable()}('name');
             $table->{$this->jsonable()}('description')->nullable();

database/migrations/2020_01_01_000002_create_attribute_text_values_table.php

@@ -17,10 +17,10 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_text_values'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->text('content');
-            $table->bigInteger('attribute_id')->unsigned();
-            $table->bigInteger('entity_id')->unsigned();
+            $table->integer('attribute_id')->unsigned();
+            $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
             $table->timestamps();
 

database/migrations/2020_01_01_000003_create_attribute_boolean_values_table.php

@@ -17,10 +17,10 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_boolean_values'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->boolean('content');
-            $table->bigInteger('attribute_id')->unsigned();
-            $table->bigInteger('entity_id')->unsigned();
+            $table->integer('attribute_id')->unsigned();
+            $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
             $table->timestamps();
 

database/migrations/2020_01_01_000004_create_attribute_datetime_values_table.php

@@ -17,10 +17,10 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_datetime_values'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->dateTime('content');
-            $table->bigInteger('attribute_id')->unsigned();
-            $table->bigInteger('entity_id')->unsigned();
+            $table->integer('attribute_id')->unsigned();
+            $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
             $table->timestamps();
 

database/migrations/2020_01_01_000005_create_attribute_integer_values_table.php

@@ -17,10 +17,10 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_integer_values'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
-            $table->bigInteger('content');
-            $table->bigInteger('attribute_id')->unsigned();
-            $table->bigInteger('entity_id')->unsigned();
+            $table->increments('id');
+            $table->integer('content');
+            $table->integer('attribute_id')->unsigned();
+            $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
             $table->timestamps();
 

database/migrations/2020_01_01_000006_create_attribute_varchar_values_table.php

@@ -17,10 +17,10 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_varchar_values'), function (Blueprint $table) {
             // Columns
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->string('content');
-            $table->bigInteger('attribute_id')->unsigned();
-            $table->bigInteger('entity_id')->unsigned();
+            $table->integer('attribute_id')->unsigned();
+            $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
             $table->timestamps();
 

database/migrations/2020_01_01_000007_create_attribute_entity_table.php

@@ -17,9 +17,9 @@ public function up(): void
     {
         Schema::create(config('rinvex.attributes.tables.attribute_entity'), function (Blueprint $table) {
             // Columns
-            $table->bigInteger('attribute_id')->unsigned();
+            $table->integer('attribute_id')->unsigned();
             $table->string('entity_type');
-            $table->bigInteger('entity_id')->unsigned()->nullable(); // TODO: Making this nullable for now as it breaks the basic features
+            $table->integer('entity_id')->unsigned()->nullable(); // TODO: Making this nullable for now as it breaks the basic features
             $table->timestamps();
 
             // Indexes

src/Console/Commands/PublishCommand.php

@@ -13,7 +13,7 @@ class PublishCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'rinvex:publish:attributes {--f|force : Overwrite any existing files.} {--r|resource=all}';
+    protected $signature = 'rinvex:publish:attributes {--f|force : Overwrite any existing files.} {--r|resource=* : Specify which resources to publish.}';
 
     /**
      * The console command description.
@@ -31,18 +31,9 @@ public function handle(): void
     {
         $this->alert($this->description);
 
-        switch ($this->option('resource')) {
-            case 'config':
-                $this->call('vendor:publish', ['--tag' => 'rinvex/attributes::config', '--force' => $this->option('force')]);
-                break;
-            case 'migrations':
-                $this->call('vendor:publish', ['--tag' => 'rinvex/attributes::migrations', '--force' => $this->option('force')]);
-                break;
-            default:
-                $this->call('vendor:publish', ['--tag' => 'rinvex/attributes::config', '--force' => $this->option('force')]);
-                $this->call('vendor:publish', ['--tag' => 'rinvex/attributes::migrations', '--force' => $this->option('force')]);
-                break;
-        }
+        collect($this->option('resource') ?: ['config', 'migrations'])->each(function ($resource) {
+            $this->call('vendor:publish', ['--tag' => "rinvex/attributes::{$resource}", '--force' => $this->option('force')]);
+        });
 
         $this->line('');
     }

src/Providers/AttributesServiceProvider.php

@@ -48,7 +48,7 @@ public function register()
         });
 
         // Register console commands
-        ! $this->app->runningInConsole() || $this->registerCommands();
+        $this->registerCommands();
     }
 
     /**