Merge pull request #23 from ARCANEDEV/update-github_actions

Using GitHub Actions for testing

.editorconfig

@@ -1,15 +1,15 @@
-# This file is for unifying the coding style for different editors and IDEs
-# editorconfig.org
-
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
+end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
-insert_final_newline = true
 
 [*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
 indent_size = 2

.gitattributes

@@ -7,6 +7,5 @@
 .gitattributes    export-ignore
 .gitignore        export-ignore
 .scrutinizer.yml  export-ignore
-.travis.yml       export-ignore
 phpunit.xml.dist  export-ignore
 CONTRIBUTING.md   export-ignore

.github/workflows/run-tests.yml

@@ -0,0 +1,46 @@
+name: run-tests
+
+on: [push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.2, 7.3, 7.4]
+        laravel: [6.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: |
+          mkdir -p build/logs
+          vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+
+      - name: Scrutinizer CI
+        run: |
+          wget https://scrutinizer-ci.com/ocular.phar
+          php ocular.phar code-coverage:upload --format=php-clover coverage.clover

.scrutinizer.yml

@@ -23,7 +23,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 2
+        runs: 6
     php_code_sniffer:
         enabled: true
         config:

README.md

@@ -1,6 +1,6 @@
 # Laravel Messenger [![Packagist License][badge_license]](LICENSE.md) [![For Laravel][badge_laravel]][link-github-repo]
 
-[![Travis Status][badge_build]][link-travis]
+[![Github Workflow Status][badge_build]][link-github-status]
 [![Coverage Status][badge_coverage]][link-scrutinizer]
 [![Scrutinizer Code Quality][badge_quality]][link-scrutinizer]
 [![SensioLabs Insight][badge_insight]][link-insight]
@@ -47,7 +47,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 
 [badge_laravel]:      https://img.shields.io/badge/Laravel-5.1%20to%206.x-orange.svg?style=flat-square
 [badge_license]:      https://img.shields.io/packagist/l/arcanedev/laravel-messenger.svg?style=flat-square
-[badge_build]:        https://img.shields.io/travis/ARCANEDEV/LaravelMessenger.svg?style=flat-square
+[badge_build]:        https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelMessenger/run-tests?style=flat-square
 [badge_coverage]:     https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMessenger.svg?style=flat-square
 [badge_quality]:      https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelMessenger.svg?style=flat-square
 [badge_insight]:      https://img.shields.io/sensiolabs/i/0fe62754-1219-409a-9d05-b6ae7e3e342f.svg?style=flat-square
@@ -58,6 +58,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 
 [link-author]:        https://github.com/arcanedev-maroc
 [link-github-repo]:   https://github.com/ARCANEDEV/LaravelMessenger
+[link-github-status]: https://github.com/ARCANEDEV/LaravelMessenger/actions
 [link-github-issues]: https://github.com/ARCANEDEV/LaravelMessenger/issues
 [link-contributors]:  https://github.com/ARCANEDEV/LaravelMessenger/graphs/contributors
 [link-packagist]:     https://packagist.org/packages/arcanedev/laravel-messenger

composer.json

@@ -17,10 +17,10 @@
     "license": "MIT",
     "require": {
         "php":               ">=7.2.0",
-        "arcanedev/support": "^5.0"
+        "arcanedev/support": "^5.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0",
+        "orchestra/testbench": "^4.6",
         "mockery/mockery":     "^1.2",
         "phpunit/phpunit":     "^8.0",
         "phpunit/phpcov":      "^6.0"

database/migrations/2016_08_01_000001_create_discussions_table.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Arcanedev\LaravelMessenger\Bases\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
@@ -25,7 +27,7 @@ public function __construct()
         parent::__construct();
 
         $this->setTable(
-            config('messenger.discussions.table', 'discussions')
+            (string) config('messenger.discussions.table', 'discussions')
         );
     }
 
@@ -37,9 +39,9 @@ public function __construct()
     /**
      * Run the migrations.
      */
-    public function up()
+    public function up(): void
     {
-        $this->createSchema(function (Blueprint $table) {
+        $this->createSchema(function (Blueprint $table): void {
             $table->increments('id');
             $table->string('subject')->nullable();
             $table->timestamps();

database/migrations/2016_08_01_000002_create_messages_table.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Arcanedev\LaravelMessenger\Bases\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
@@ -25,7 +27,7 @@ public function __construct()
         parent::__construct();
 
         $this->setTable(
-            config('messenger.messages.table', 'messages')
+            (string) config('messenger.messages.table', 'messages')
         );
     }
 
@@ -37,9 +39,9 @@ public function __construct()
     /**
      * Run the migrations.
      */
-    public function up()
+    public function up(): void
     {
-        $this->createSchema(function (Blueprint $table) {
+        $this->createSchema(function (Blueprint $table): void {
             $table->increments('id');
             $table->unsignedInteger('discussion_id');
             $table->morphs(config('messenger.users.morph', 'participable'));

database/migrations/2016_08_01_000003_create_participations_table.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Arcanedev\LaravelMessenger\Bases\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
@@ -37,9 +39,9 @@ public function __construct()
     /**
      * Run the migrations.
      */
-    public function up()
+    public function up(): void
     {
-        $this->createSchema(function (Blueprint $table) {
+        $this->createSchema(function (Blueprint $table): void {
             $table->increments('id');
             $table->unsignedInteger('discussion_id');
             $table->morphs(config('messenger.users.morph', 'participable'));

src/Bases/Migration.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger\Bases;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Bases;
 
 use Arcanedev\Support\Database\Migration as BaseMigration;
 

src/Contracts/Discussion.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Contracts;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;

src/Contracts/Message.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Contracts;
 
 /**
  * Interface  Message

src/Contracts/Participation.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Contracts;
 
 /**
  * Interface  Participation
@@ -49,16 +53,4 @@ public function participable();
      * @return string
      */
     public function stringInfo();
-
-    /* -----------------------------------------------------------------
-     |  Main Methods
-     | -----------------------------------------------------------------
-     */
-
-    /**
-     * Restore a soft-deleted model instance.
-     *
-     * @return bool|null
-     */
-    public function restore();
 }

src/LaravelMessengerServiceProvider.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger;
 
 use Arcanedev\Support\Providers\PackageServiceProvider;
 
@@ -44,9 +48,13 @@ public function register(): void
      */
     public function boot(): void
     {
-        $this->publishConfig();
+        if ($this->app->runningInConsole()) {
+            $this->publishConfig();
 
-        Messenger::$runsMigrations ? $this->loadMigrations() : $this->publishMigrations();
+            Messenger::$runsMigrations
+                ? $this->loadMigrations()
+                : $this->publishMigrations();
+        }
     }
 
     /**

src/Messenger.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger;
 
 /**
  * Class     Messenger

src/Models/Discussion.php

@@ -1,12 +1,14 @@
-<?php namespace Arcanedev\LaravelMessenger\Models;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Models;
 
 use Arcanedev\LaravelMessenger\Contracts\Discussion as DiscussionContract;
 use Arcanedev\LaravelMessenger\Contracts\Message as MessageContract;
 use Arcanedev\LaravelMessenger\Contracts\Participation as ParticipationContract;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 
@@ -29,9 +31,8 @@
  *
  * @method static  \Illuminate\Database\Eloquent\Builder|static  subject(string $subject, bool $strict)
  * @method static  \Illuminate\Database\Eloquent\Builder|static  between(\Illuminate\Support\Collection|array $participables)
- * @method static  \Illuminate\Database\Eloquent\Builder|static  forUser(\Illuminate\Database\Eloquent\Model $participable)
- * @method static  \Illuminate\Database\Eloquent\Builder|static  withParticipations()
- * @method static  \Illuminate\Database\Eloquent\Builder|static  forUserWithNewMessages(\Illuminate\Database\Eloquent\Model $participable)
+ * @method static  \Illuminate\Database\Eloquent\Builder|static  forUser(\Illuminate\Database\Eloquent\Model|mixed $participable)
+ * @method static  \Illuminate\Database\Eloquent\Builder|static  forUserWithNewMessages(\Illuminate\Database\Eloquent\Model|mixed $participable)
  */
 class Discussion extends Model implements DiscussionContract
 {
@@ -137,27 +138,14 @@ public function creator()
     public function scopeForUser(Builder $query, EloquentModel $participable)
     {
         $table = $this->getParticipationsTable();
+        $morph = config('messenger.users.morph', 'participable');
 
-        return $query->join($table, function (JoinClause $join) use ($table, $participable) {
-            $morph = config('messenger.users.morph', 'participable');
-
-            $join->on($this->getQualifiedKeyName(), '=', "{$table}.discussion_id")
-                 ->where("{$table}.{$morph}_type", '=', $participable->getMorphClass())
-                 ->where("{$table}.{$morph}_id", '=', $participable->getKey())
-                 ->whereNull("{$table}.deleted_at");
-        });
-    }
-
-    /**
-     * Scope discussions to load participations relationship.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     *
-     * @return \Illuminate\Database\Eloquent\Builder|static
-     */
-    public function scopeWithParticipations(Builder $query)
-    {
-        return $query->with(['participations']);
+        return $query
+            ->join($table, $this->getQualifiedKeyName(), '=', "{$table}.discussion_id")
+            ->where("{$table}.{$morph}_type", '=', $participable->getMorphClass())
+            ->where("{$table}.{$morph}_id", '=', $participable->getKey())
+            ->whereNull("{$table}.deleted_at")
+            ->select("{$this->getTable()}.*");
     }
 
     /**

src/Models/Message.php

@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelMessenger\Models;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelMessenger\Models;
 
 use Arcanedev\LaravelMessenger\Contracts\Message as MessageContract;