Merge pull request #17 from ARCANEDEV/patch-fixing_config_key

Fixing the config key
ARCANEDEV · Jun 3, 2019 · 8302725 · 8302725
2 parents 122122a + 284e482
commit 8302725
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/database/migrations/2016_08_01_000001_create_discussions_table.php b/database/migrations/2016_08_01_000001_create_discussions_table.php
@@ -25,7 +25,7 @@ public function __construct()
         parent::__construct();
 
         $this->setTable(
-            config('laravel-messenger.discussions.table', 'discussions')
+            config('messenger.discussions.table', 'discussions')
         );
     }
 

diff --git a/database/migrations/2016_08_01_000002_create_messages_table.php b/database/migrations/2016_08_01_000002_create_messages_table.php
@@ -25,7 +25,7 @@ public function __construct()
         parent::__construct();
 
         $this->setTable(
-            config('laravel-messenger.messages.table', 'messages')
+            config('messenger.messages.table', 'messages')
         );
     }
 
@@ -42,7 +42,7 @@ public function up()
         $this->createSchema(function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('discussion_id');
-            $table->morphs(config("laravel-messenger.users.morph", 'participable'));
+            $table->morphs(config('messenger.users.morph', 'participable'));
             $table->text('body');
             $table->timestamps();
         });

diff --git a/database/migrations/2016_08_01_000003_create_participations_table.php b/database/migrations/2016_08_01_000003_create_participations_table.php
@@ -25,7 +25,7 @@ public function __construct()
         parent::__construct();
 
         $this->setTable(
-            config('laravel-messenger.participations.table', 'participations')
+            config('messenger.participations.table', 'participations')
         );
     }
 
@@ -42,7 +42,7 @@ public function up()
         $this->createSchema(function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('discussion_id');
-            $table->morphs(config("laravel-messenger.users.morph", 'participable'));
+            $table->morphs(config('messenger.users.morph', 'participable'));
             $table->timestamp('last_read')->nullable();
             $table->timestamps();
             $table->softDeletes();

diff --git a/src/Bases/Migration.php b/src/Bases/Migration.php
@@ -20,11 +20,7 @@ abstract class Migration extends BaseMigration
      */
     public function __construct()
     {
-        $this->setConnection(
-            config('laravel-messenger.database.connection')
-        );
-        $this->setPrefix(
-            config('laravel-messenger.database.prefix')
-        );
+        $this->setConnection(config('messenger.database.connection'));
+        $this->setPrefix(config('messenger.database.prefix'));
     }
 }
diff --git a/src/Models/Message.php b/src/Models/Message.php
@@ -70,7 +70,7 @@ class Message extends Model implements MessageContract
     public function __construct(array $attributes = [])
     {
         $this->setTable(
-            config('messenger.messeges.table', 'messages')
+            config('messenger.messages.table', 'messages')
         );
 
         parent::__construct($attributes);

diff --git a/src/Models/Model.php b/src/Models/Model.php
@@ -22,12 +22,8 @@ abstract class Model extends BaseModel
      */
     public function __construct(array $attributes = [])
     {
-        $this->setConnection(
-            config('messenger.database.connection')
-        );
-        $this->setPrefix(
-            config('messenger.database.prefix')
-        );
+        $this->setConnection(config('messenger.database.connection'));
+        $this->setPrefix(config('messenger.database.prefix'));
 
         parent::__construct($attributes);
     }