Merge pull request #4 from ARCANEDEV/dev

Updating the package
ARCANEDEV · Feb 11, 2017 · 14874e2 · 14874e2
2 parents 1ab9a2d + d1df89a
commit 14874e2
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 88 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
 script:
   - composer validate
   - mkdir -p build/logs
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+  - ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
   - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi

diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
         "arcanedev/support": "~3.0"
     },
     "require-dev": {
-        "phpunit/phpcov":    "~2.0|~3.0",
-        "phpunit/phpunit":   "~4.0|~5.0"
+        "phpunit/phpcov":    "~3.0",
+        "phpunit/phpunit":   "~5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Bases/Migration.php b/src/Bases/Migration.php
@@ -11,15 +11,15 @@
  */
 abstract class Migration extends BaseMigration
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Traits
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     use ConfigHelper;
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Migration constructor.

diff --git a/src/Bases/Model.php b/src/Bases/Model.php
@@ -17,9 +17,9 @@ abstract class Model extends BaseModel
      */
     use ConfigHelper;
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Create a new Eloquent model instance.

diff --git a/src/Contracts/Discussion.php b/src/Contracts/Discussion.php
@@ -26,9 +26,9 @@
  */
 interface Discussion
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Relationships
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Participants relationship.
@@ -44,16 +44,23 @@ public function participants();
      */
     public function messages();
 
+    /**
+     * User's relationship.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function users();
+
     /**
      * Get the user that created the first message.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function creator();
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Scopes
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Scope discussions that the user is associated with.
@@ -96,9 +103,9 @@ public function scopeBetween(Builder $query, array $userIds);
      */
     public function scopeSubject(Builder $query, $subject, $strict = false);
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Get the latest_message attribute.
@@ -107,9 +114,9 @@ public function scopeSubject(Builder $query, $subject, $strict = false);
      */
     public function getLatestMessageAttribute();
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Returns all of the latest discussions by `updated_at` date.

diff --git a/src/Contracts/Message.php b/src/Contracts/Message.php
@@ -20,9 +20,9 @@
  */
 interface Message
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Relationships
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Discussion relationship.
@@ -52,9 +52,9 @@ public function user();
      */
     public function participants();
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Recipients of this message.

diff --git a/src/Contracts/Participant.php b/src/Contracts/Participant.php
@@ -18,9 +18,9 @@
  */
 interface Participant
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Relationships
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Discussion relationship.
@@ -36,9 +36,9 @@ public function discussion();
      */
     public function user();
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Get the participant string info.
@@ -47,9 +47,9 @@ public function user();
      */
     public function stringInfo();
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Restore a soft-deleted model instance.

diff --git a/src/LaravelMessengerServiceProvider.php b/src/LaravelMessengerServiceProvider.php
@@ -1,19 +1,19 @@
 <?php namespace Arcanedev\LaravelMessenger;
 
 use Arcanedev\LaravelMessenger\Contracts as MessengerContracts;
-use Arcanedev\Support\PackageServiceProvider as ServiceProvider;
+use Arcanedev\Support\PackageServiceProvider;
 
 /**
  * Class     LaravelMessengerServiceProvider
  *
  * @package  Arcanedev\LaravelMessenger
  * @author   ARCANEDEV <[email protected]>
  */
-class LaravelMessengerServiceProvider extends ServiceProvider
+class LaravelMessengerServiceProvider extends PackageServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Package name.
@@ -22,9 +22,9 @@ class LaravelMessengerServiceProvider extends ServiceProvider
      */
     protected $package = 'laravel-messenger';
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Get the base path of the package.
@@ -36,15 +36,17 @@ public function getBasePath()
         return dirname(__DIR__);
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Register the service provider.
      */
     public function register()
     {
+        parent::register();
+
         $this->registerConfig();
         $this->bindModels();
     }
@@ -74,9 +76,9 @@ public function provides()
         ];
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Other Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Other Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Bind the models.

diff --git a/src/Models/Discussion.php b/src/Models/Discussion.php
@@ -34,15 +34,15 @@
  */
 class Discussion extends Model implements DiscussionContract
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Traits
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     use SoftDeletes;
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * The attributes that can be set with Mass Assignment.
@@ -67,9 +67,9 @@ class Discussion extends Model implements DiscussionContract
         'id' => 'integer',
     ];
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Create a new Eloquent model instance.
@@ -85,9 +85,9 @@ public function __construct(array $attributes = [])
         parent::__construct($attributes);
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Relationships
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Participants relationship.
@@ -113,6 +113,21 @@ public function messages()
         );
     }
 
+    /**
+     * User's relationship.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function users()
+    {
+        return $this->belongsToMany(
+            $this->getModelFromConfig('users', \App\User::class),
+            'participants',
+            'discussion_id',
+            'user_id'
+        );
+    }
+
     /**
      * Get the user that created the first message.
      *
@@ -123,9 +138,9 @@ public function creator()
         return $this->messages()->oldest()->first()->user();
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Scopes
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Scope discussions that the user is associated with.
@@ -215,9 +230,9 @@ public function scopeSubject(Builder $query, $subject, $strict = false)
         return $query->where('subject', 'like', $subject);
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Get the latest_message attribute.
@@ -229,9 +244,9 @@ public function getLatestMessageAttribute()
         return $this->messages->sortByDesc('created_at')->first();
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Returns all of the latest discussions by `updated_at` date.

diff --git a/src/Models/Message.php b/src/Models/Message.php
@@ -23,9 +23,9 @@
  */
 class Message extends Model implements MessageContract
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * The relationships that should be touched on save.
@@ -50,9 +50,9 @@ class Message extends Model implements MessageContract
         'id' => 'integer',
     ];
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Create a new Eloquent model instance.
@@ -68,9 +68,9 @@ public function __construct(array $attributes = [])
         parent::__construct($attributes);
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Relationships
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Discussion relationship.
@@ -120,9 +120,9 @@ public function participants()
         );
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Recipients of this message.