Merge branch 'master' into v2

Author: cmgmyr

.github/stale.yml

@@ -0,0 +1,26 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - bug
+  - feedback
+  - "in progress"
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Limit to only `issues` or `pulls`
+only: issues

.scrutinizer.yml

@@ -1,27 +1,34 @@
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+
 filter:
-    excluded_paths:
-        - 'tests/*'
-        - 'examples/*'
-        - 'config/*'
-        - 'migrations/*'
+  excluded_paths:
+    - 'tests/*'
+    - 'examples/*'
+    - 'config/*'
+    - 'migrations/*'
 
 checks:
-    php:
-        remove_extra_empty_lines: true
-        remove_php_closing_tag: true
-        remove_trailing_whitespace: true
-        fix_use_statements:
-            remove_unused: true
-            preserve_multiple: false
-            preserve_blanklines: true
-            order_alphabetically: true
-        fix_php_opening_tag: true
-        fix_linefeed: true
-        fix_line_ending: true
-        fix_identation_4spaces: true
-        fix_doc_comments: true
+  php:
+    remove_extra_empty_lines: true
+    remove_php_closing_tag: true
+    remove_trailing_whitespace: true
+    fix_use_statements:
+      remove_unused: true
+      preserve_multiple: false
+      preserve_blanklines: true
+      order_alphabetically: true
+    fix_php_opening_tag: true
+    fix_linefeed: true
+    fix_line_ending: true
+    fix_identation_4spaces: true
+    fix_doc_comments: true
 
 tools:
-    external_code_coverage:
-        timeout: 1800
-        runs: 3
+  external_code_coverage:
+    timeout: 1800
+    runs: 3

.travis.yml

@@ -4,20 +4,20 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - nightly
 
 matrix:
+  include:
+    - php: 7.1
+      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
   allow_failures:
   - php: nightly
 
-## Cache composer
 cache:
   directories:
     - $HOME/.composer/cache
 
 before_script:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
-  - composer dumpautoload -o
 
 script:
   - vendor/bin/php-cs-fixer fix .

composer.json

@@ -21,7 +21,7 @@
         "adamwathan/faktory": "0.3.*",
         "friendsofphp/php-cs-fixer": "^2.5",
         "orchestra/testbench": "~3.0",
-        "phpunit/phpunit": "^7.0|^8.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -30,18 +30,22 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Cmgmyr\\Messenger\\Test\\": "tests/"
+            "Cmgmyr\\Messenger\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-coverage": "vendor/bin/phpunit --coverage-html build/coverage",
+        "format": "vendor/bin/php-cs-fixer fix"
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "laravel": {
             "providers": [
                 "Cmgmyr\\Messenger\\MessengerServiceProvider"
             ]
         }
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "minimum-stability": "stable"
+    }
 }

phpunit.xml

@@ -15,14 +15,12 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
         <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
         <server name="CACHE_DRIVER" value="array"/>
+        <server name="MAIL_DRIVER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="array"/>
-        <server name="QUEUE_DRIVER" value="sync"/>
     </php>
     <filter>
         <whitelist>
@@ -35,7 +33,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

src/Models/Models.php

@@ -83,11 +83,7 @@ public static function setTables(array $map)
      */
     public static function table($table)
     {
-        if (isset(static::$tables[$table])) {
-            return static::$tables[$table];
-        }
-
-        return $table;
+        return static::$tables[$table] ?? $table;
     }
 
     /**
@@ -98,11 +94,7 @@ public static function table($table)
      */
     public static function classname($model)
     {
-        if (isset(static::$models[$model])) {
-            return static::$models[$model];
-        }
-
-        return $model;
+        return static::$models[$model] ?? $model;
     }
 
     /**

src/Models/Thread.php

@@ -36,9 +36,9 @@ class Thread extends Eloquent
     /**
      * Internal cache for creator.
      *
-     * @var null|Models::user()
+     * @var null|Models::user()|\Illuminate\Database\Eloquent\Model
      */
-    protected $creatorCache = null;
+    protected $creatorCache;
 
     /**
      * {@inheritDoc}
@@ -99,11 +99,11 @@ public function users()
     /**
      * Returns the user object that created the thread.
      *
-     * @return Models::user()
+     * @return null|Models::user()|\Illuminate\Database\Eloquent\Model
      */
     public function creator()
     {
-        if (is_null($this->creatorCache)) {
+        if ($this->creatorCache === null) {
             $firstMessage = $this->messages()->withTrashed()->oldest()->first();
             $this->creatorCache = $firstMessage ? $firstMessage->user : Models::user();
         }
@@ -136,7 +136,7 @@ public static function getBySubject($subject)
     /**
      * Returns an array of user ids that are associated with the thread.
      *
-     * @param null $userId
+     * @param null|int $userId
      *
      * @return array
      */
@@ -146,7 +146,7 @@ public function participantsUserIds($userId = null)
             return $participant->user_id;
         });
 
-        if ($userId) {
+        if ($userId !== null) {
             $users->push($userId);
         }
 
@@ -168,7 +168,7 @@ public function scopeForUser(Builder $query, $userId)
 
         return $query->join($participantsTable, $this->getQualifiedKeyName(), '=', $participantsTable . '.thread_id')
             ->where($participantsTable . '.user_id', $userId)
-            ->where($participantsTable . '.deleted_at', null)
+            ->whereNull($participantsTable . '.deleted_at')
             ->select($threadsTable . '.*');
     }
 
@@ -351,11 +351,8 @@ public function participantsString($userId = null, $columns = ['name'])
     public function hasParticipant($userId)
     {
         $participants = $this->participants()->where('user_id', '=', $userId);
-        if ($participants->count() > 0) {
-            return true;
-        }
 
-        return false;
+        return $participants->count() > 0;
     }
 
     /**
@@ -398,7 +395,7 @@ protected function createSelectString($columns)
      */
     public function userUnreadMessages($userId)
     {
-        $messages = $this->messages()->get();
+        $messages = $this->messages()->where('user_id', '!=', $userId)->get();
 
         try {
             $participant = $this->getParticipantFromUser($userId);

tests/CustomModelsTest.php

@@ -6,9 +6,9 @@
 use Cmgmyr\Messenger\Models\Models;
 use Cmgmyr\Messenger\Models\Participant;
 use Cmgmyr\Messenger\Models\Thread;
-use Cmgmyr\Messenger\Test\Stubs\Models\CustomMessage;
-use Cmgmyr\Messenger\Test\Stubs\Models\CustomParticipant;
-use Cmgmyr\Messenger\Test\Stubs\Models\CustomThread;
+use Cmgmyr\Messenger\Tests\Stubs\Models\CustomMessage;
+use Cmgmyr\Messenger\Tests\Stubs\Models\CustomParticipant;
+use Cmgmyr\Messenger\Tests\Stubs\Models\CustomThread;
 
 class CustomModelsTest extends TestCase
 {

tests/EloquentThreadTest.php

@@ -413,6 +413,7 @@ public function it_should_get_all_unread_messages_for_user()
         $message_1 = $this->faktory->build('message', [
             'created_at' => Carbon::now(),
             'body' => 'Message 1',
+            'user_id' => $participant_1->user_id,
         ]);
 
         $thread->participants()->saveMany([$participant_1, $participant_2]);
@@ -426,28 +427,30 @@ public function it_should_get_all_unread_messages_for_user()
         $message_2 = $this->faktory->build('message', [
             'created_at' => Carbon::now(),
             'body' => 'Message 2',
+            'user_id' => $participant_1->user_id,
         ]);
 
         $thread->messages()->saveMany([$message_2]);
 
-        $this->assertEquals('Message 1', $thread->userUnreadMessages(1)->first()->body);
-        $this->assertCount(2, $thread->userUnreadMessages(1));
+        $this->assertCount(0, $thread->userUnreadMessages($participant_1->user_id));
 
-        $this->assertEquals('Message 2', $thread->userUnreadMessages(2)->first()->body);
-        $this->assertCount(1, $thread->userUnreadMessages(2));
+        $secondParticipantUnreadMessages = $thread->userUnreadMessages($participant_2->user_id);
+        $this->assertCount(1, $secondParticipantUnreadMessages);
+        $this->assertEquals('Message 2', $secondParticipantUnreadMessages->first()->body);
     }
 
     /** @test */
-    public function it_should_get_count_of_all_unread_messages_for_user()
+    public function it_should_get_all_unread_messages_for_user_when_dates_not_set()
     {
         $thread = $this->faktory->create('thread');
 
         $participant_1 = $this->faktory->build('participant');
         $participant_2 = $this->faktory->build('participant', ['user_id' => 2]);
 
         $message_1 = $this->faktory->build('message', [
-            'created_at' => Carbon::now(),
+//            'created_at' => Carbon::now(),
             'body' => 'Message 1',
+            'user_id' => $participant_1->user_id,
         ]);
 
         $thread->participants()->saveMany([$participant_1, $participant_2]);
@@ -459,15 +462,18 @@ public function it_should_get_count_of_all_unread_messages_for_user()
         sleep(1);
 
         $message_2 = $this->faktory->build('message', [
-            'created_at' => Carbon::now(),
+//            'created_at' => Carbon::now(),
             'body' => 'Message 2',
+            'user_id' => $participant_1->user_id,
         ]);
 
         $thread->messages()->saveMany([$message_2]);
 
-        $this->assertEquals(2, $thread->userUnreadMessagesCount(1));
+        $this->assertCount(0, $thread->userUnreadMessages($participant_1->user_id));
 
-        $this->assertEquals(1, $thread->userUnreadMessagesCount(2));
+        $secondParticipantUnreadMessages = $thread->userUnreadMessages($participant_2->user_id);
+        $this->assertCount(1, $secondParticipantUnreadMessages);
+        $this->assertEquals('Message 2', $secondParticipantUnreadMessages->first()->body);
     }
 
     /** @test */

tests/Stubs/Models/CustomMessage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Cmgmyr\Messenger\Test\Stubs\Models;
+namespace Cmgmyr\Messenger\Tests\Stubs\Models;
 
 use Cmgmyr\Messenger\Models\Message;