Skip to content

Commit

Permalink
Merge pull request #11 from ARCANEDEV/patch-1
Browse files Browse the repository at this point in the history
Updating the package
  • Loading branch information
arcanedev-maroc authored Feb 20, 2018
2 parents 56df628 + d055e3d commit 030fcf2
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 135 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/vendor/
/composer.lock
/composer.phar
/phpunit.xml
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ checks:
tools:
external_code_coverage:
timeout: 600
runs: 2
runs: 3
php_code_sniffer:
enabled: true
config:
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ sudo: false
php:
- 7.0
- 7.1
- 7.2
- nightly

matrix:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 ARCANEDEV - Laravel Messenger
Copyright (c) 2016-2018 ARCANEDEV - Laravel Messenger

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave
* Easy setup & configuration.
* Well documented & IDE Friendly.
* Well tested with maximum code quality.
* Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
* Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5` are supported.
* Made with :heart: & :coffee:.

## Table of contents
Expand All @@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
- [All Contributors][link-contributors]
- [cmgmyr/laravel-messenger](https://github.com/cmgmyr/laravel-messenger)

[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.4-orange.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.5-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_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMessenger.svg?style=flat-square
Expand Down
2 changes: 1 addition & 1 deletion _docs/0-Home.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave
* Easy setup & configuration.
* Well documented & IDE Friendly.
* Well tested with maximum code quality.
* Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
* Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5` are supported.
* Made with :heart: & :coffee:.

## Table of contents
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"require-dev": {
"orchestra/testbench": "~3.5.0",
"orchestra/database": "~3.5.0",
"phpunit/phpcov": "~4.0",
"phpunit/phpunit": "~6.0"
"phpunit/phpunit": "~6.0",
"phpunit/phpcov": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion config/laravel-messenger.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

'database' => [
'connection' => config('database.default'),
'connection' => env('DB_CONNECTION', 'mysql'),
],

/* -----------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function up()
$table->increments('id');
$table->unsignedInteger('discussion_id');
$table->unsignedInteger('user_id');
$table->dateTime('last_read')->nullable();
$table->timestamp('last_read')->nullable();
$table->timestamps();
$table->softDeletes();
});
Expand Down
3 changes: 3 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>
<php>
<env name="DB_CONNECTION" value="testing"/>
</php>
<logging>
<log type="coverage-clover" target="build/logs/clover.xml"/>
<log type="coverage-text" target="build/logs/coverage.txt"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Bases/Migration.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php namespace Arcanedev\LaravelMessenger\Bases;

use Arcanedev\LaravelMessenger\Traits\ConfigHelper;
use Arcanedev\Support\Bases\Migration as BaseMigration;
use Arcanedev\Support\Database\Migration as BaseMigration;

/**
* Class Migration
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Discussion.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function messages()
public function users()
{
return $this->belongsToMany(
$this->getModelFromConfig('users', \App\User::class),
$this->getModelFromConfig('users'),
$this->getTableFromConfig('participants', 'participants'),
'discussion_id',
'user_id'
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Model.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php namespace Arcanedev\LaravelMessenger\Models;

use Arcanedev\LaravelMessenger\Traits\ConfigHelper;
use Arcanedev\Support\Bases\Model as BaseModel;
use Arcanedev\Support\Database\Model as BaseModel;

/**
* Class Model
Expand Down
4 changes: 2 additions & 2 deletions tests/LaravelMessengerServiceProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function it_can_be_instantiated()
];

foreach ($expectations as $expected) {
$this->assertInstanceOf($expected, $this->provider);
static::assertInstanceOf($expected, $this->provider);
}
}

Expand All @@ -66,6 +66,6 @@ public function it_can_provides()
\Arcanedev\LaravelMessenger\Contracts\Participant::class,
];

$this->assertSame($expected, $this->provider->provides());
static::assertSame($expected, $this->provider->provides());
}
}
Loading

0 comments on commit 030fcf2

Please sign in to comment.