Skip to content

Another update to Laravel-mongodb #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ build:
environment:
mongodb: true
selenium: true
php:
# Install additional extensions from https://pecl.php.net
pecl_extensions:
- mongodb
tests:
override:
-
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ First, add the `Maklad\Permission\Traits\HasRoles` trait to your `User` model(s)

```php
use Illuminate\Auth\Authenticatable;
use Jenssegers\Mongodb\Eloquent\Model as Model;
use MongoDB\Laravel\Eloquent\Model as Model;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
Expand All @@ -251,7 +251,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
> Note: that if you need to use `HasRoles` trait with another model ex.`Page` you will also need to add `protected $guard_name = 'web';` as well to that model or you would get an error

```php
use Jenssegers\Mongodb\Eloquent\Model as Model;
use MongoDB\Laravel\Eloquent\Model as Model;
use Maklad\Permission\Traits\HasRoles;

class Page extends Model
Expand Down Expand Up @@ -830,5 +830,5 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
[link-contributors]: ../../contributors
[link-releases]: ../../releases
[link-laravel-permission]: https://github.com/spatie/laravel-permission
[link-laravel-mongodb]: https://github.com/jenssegers/laravel-mongodb
[link-laravel-mongodb]: https://github.com/mongodb/laravel-mongodb
[link-freekmurze]: https://github.com/freekmurze
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"mostafamaklad",
"maklad",
"mostafa",
"spatie",
"jenssegers"
"spatie"
],
"homepage": "https://github.com/mostafamaklad/laravel-permission-mongodb",
"license": "MIT",
Expand All @@ -34,7 +33,7 @@
"illuminate/auth": "^10.0",
"illuminate/container": "^10.0",
"illuminate/contracts": "^10.0",
"mongodb/laravel-mongodb": "^3.9"
"mongodb/laravel-mongodb": "4.3"
},
"require-dev": {
"monolog/monolog": "^3.2",
Expand Down
2 changes: 1 addition & 1 deletion database/migrations/create_permission_collections.php.stub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\Schema;
use Jenssegers\Mongodb\Schema\Blueprint;
use MongoDB\Laravel\Schema\Blueprint;

return new class extends Migration
{
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Maklad\Permission\Models;

use Illuminate\Support\Collection;
use Jenssegers\Mongodb\Eloquent\Model;
use MongoDB\Laravel\Eloquent\Model;
use Maklad\Permission\Contracts\PermissionInterface;
use Maklad\Permission\Exceptions\PermissionAlreadyExists;
use Maklad\Permission\Exceptions\PermissionDoesNotExist;
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Maklad\Permission\Models;

use Illuminate\Database\Eloquent\Builder;
use Jenssegers\Mongodb\Eloquent\Model;
use MongoDB\Laravel\Eloquent\Model;
use Maklad\Permission\Contracts\PermissionInterface;
use Maklad\Permission\Contracts\RoleInterface;
use Maklad\Permission\Exceptions\GuardDoesNotMatch;
Expand Down
4 changes: 2 additions & 2 deletions src/Traits/HasPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Maklad\Permission\Traits;

use Illuminate\Support\Collection;
use Jenssegers\Mongodb\Eloquent\Builder;
use Jenssegers\Mongodb\Eloquent\Model;
use MongoDB\Laravel\Eloquent\Builder;
use MongoDB\Laravel\Eloquent\Model;
use Maklad\Permission\Contracts\PermissionInterface;
use Maklad\Permission\Contracts\PermissionInterface as Permission;
use Maklad\Permission\Exceptions\GuardDoesNotMatch;
Expand Down
6 changes: 3 additions & 3 deletions src/Traits/HasRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace Maklad\Permission\Traits;

use Illuminate\Support\Collection;
use Jenssegers\Mongodb\Eloquent\Builder;
use Jenssegers\Mongodb\Eloquent\Model;
use Jenssegers\Mongodb\Relations\BelongsToMany;
use MongoDB\Laravel\Eloquent\Builder;
use MongoDB\Laravel\Eloquent\Model;
use MongoDB\Laravel\Relations\BelongsToMany;
use Maklad\Permission\Contracts\RoleInterface as Role;
use Maklad\Permission\Helpers;
use Maklad\Permission\PermissionRegistrar;
Expand Down
2 changes: 1 addition & 1 deletion tests/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Jenssegers\Mongodb\Eloquent\Model;
use MongoDB\Laravel\Eloquent\Model;
use Maklad\Permission\Traits\HasRoles;

class Admin extends Model implements AuthorizableContract, AuthenticatableContract
Expand Down
10 changes: 5 additions & 5 deletions tests/HasPermissionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Maklad\Permission\Exceptions\PermissionDoesNotExist;
use Maklad\Permission\Models\Permission;
use Maklad\Permission\Models\Role;
use Monolog\Logger;
use Monolog\Level;

class HasPermissionsTest extends TestCase
{
Expand Down Expand Up @@ -34,7 +34,7 @@ public function it_throws_an_exception_when_assigning_a_permission_that_does_not
$this->testUser->givePermissionTo('permission-does-not-exist');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('permission-does-not-exist', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -53,7 +53,7 @@ public function it_throws_an_exception_when_assigning_a_permission_to_a_user_fro
$this->testUser->givePermissionTo($this->testAdminPermission);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -327,7 +327,7 @@ public function it_throws_an_exception_when_the_permission_does_not_exist()
$this->testUser->hasPermissionTo('does-not-exist');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('does-not-exist', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -346,7 +346,7 @@ public function it_throws_an_exception_when_the_permission_does_not_exist_for_th
$this->testUser->hasPermissionTo('admin-permission');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('admin-permission', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/HasRolesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Maklad\Permission\Exceptions\GuardDoesNotMatch;
use Maklad\Permission\Exceptions\RoleDoesNotExist;
use Maklad\Permission\Models\Role;
use Monolog\Logger;
use Monolog\Level;

class HasRolesTest extends TestCase
{
Expand Down Expand Up @@ -73,7 +73,7 @@ public function it_throws_an_exception_when_assigning_a_role_that_does_not_exist
$this->testUser->assignRole('evil-emperor');
} finally {
$message = $this->helpers->getRoleDoesNotExistMessage('evil-emperor', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -92,7 +92,7 @@ public function it_can_only_assign_roles_from_the_correct_guard()
$this->testUser->assignRole('testAdminRole');
} finally {
$message = $this->helpers->getRoleDoesNotExistMessage('testAdminRole', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -111,7 +111,7 @@ public function it_throws_an_exception_when_assigning_a_role_from_a_different_gu
$this->testUser->assignRole($this->testAdminRole);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -176,7 +176,7 @@ public function it_throws_an_exception_when_syncing_a_role_from_another_guard()
$this->testUser->syncRoles('testRole', $this->testAdminRole);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions tests/MiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Maklad\Permission\Exceptions\UnauthorizedException;
use Maklad\Permission\Middlewares\PermissionMiddleware;
use Maklad\Permission\Middlewares\RoleMiddleware;
use Monolog\Logger;
use Monolog\Level;

class MiddlewareTest extends TestCase
{
Expand Down Expand Up @@ -41,7 +41,7 @@ public function a_guest_cannot_access_a_route_protected_by_the_role_middleware()
);

$message = $this->helpers->getUserNotLoggedINMessage();
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}

Expand Down Expand Up @@ -109,7 +109,7 @@ public function a_user_cannot_access_a_route_protected_by_the_role_middleware_if
config('permission.display_permission_in_exception', $show_permission);
$message = $this->helpers->getUnauthorizedRoleMessage('testRole2');
$this->assertShowPermission($message, 'testRole2');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -138,7 +138,7 @@ public function a_user_cannot_access_a_route_protected_by_role_middleware_if_hav
$message = $this->helpers->getUnauthorizedRoleMessage('testRole, testRole2');
$this->assertShowPermission($message, 'testRole');
$this->assertShowPermission($message, 'testRole2');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -166,7 +166,7 @@ public function a_user_cannot_access_a_route_protected_by_role_middleware_if_rol
config('permission.display_permission_in_exception', $show_permission);
$message = $this->helpers->getUnauthorizedRoleMessage('test');
$this->assertShowPermission($message, 'test');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -188,7 +188,7 @@ public function a_guest_cannot_access_a_route_protected_by_the_permission_middle
);

$message = $this->helpers->getUserNotLoggedINMessage();
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}

Expand Down Expand Up @@ -257,7 +257,7 @@ public function a_user_cannot_access_a_route_protected_by_the_permission_middlew
config('permission.display_permission_in_exception', $show_permission);
$message = $this->helpers->getUnauthorizedPermissionMessage('edit-news');
$this->assertShowPermission($message, 'edit-news');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -286,7 +286,7 @@ public function a_user_cannot_access_a_route_protected_by_permission_middleware_
$message = $this->helpers->getUnauthorizedPermissionMessage('edit-articles, edit-news');
$this->assertShowPermission($message, 'edit-articles');
$this->assertShowPermission($message, 'edit-news');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/PermissionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Maklad\Permission\Exceptions\PermissionAlreadyExists;
use Maklad\Permission\Models\Permission;
use Monolog\Logger;
use Monolog\Level;

class PermissionTest extends TestCase
{
Expand All @@ -23,7 +23,7 @@ public function it_throws_an_exception_when_the_permission_already_exists()
\app(\config('permission.models.permission'))->create(['name' => 'test-permission']);
} finally {
$message = $this->helpers->getPermissionAlreadyExistsMessage('test-permission', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions tests/RoleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Maklad\Permission\Exceptions\RoleAlreadyExists;
use Maklad\Permission\Models\Permission;
use Maklad\Permission\Models\Role;
use Monolog\Logger;
use Monolog\Level;

class RoleTest extends TestCase
{
Expand Down Expand Up @@ -50,7 +50,7 @@ public function it_throws_an_exception_when_the_role_already_exists()
\app(\config('permission.models.role'))->create(['name' => 'test-role']);
} finally {
$message = $this->helpers->getRoleAlreadyExistsMessage('test-role', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -77,7 +77,7 @@ public function it_throws_an_exception_when_given_a_permission_that_does_not_exi
$this->testUserRole->givePermissionTo('create-evil-empire');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('create-evil-empire', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -96,7 +96,7 @@ public function it_throws_an_exception_when_given_a_permission_that_belongs_to_a
$this->testUserRole->givePermissionTo($this->testAdminPermission);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -147,7 +147,7 @@ public function it_throws_an_exception_when_syncing_permissions_that_do_not_exis
$this->testUserRole->syncPermissions('permission-does-not-exist');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('permission-does-not-exist', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand All @@ -166,7 +166,7 @@ public function it_throws_an_exception_when_syncing_permissions_that_belong_to_a
$this->testUserRole->syncPermissions($this->testAdminPermission);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -227,7 +227,7 @@ public function it_throws_an_exception_if_the_permission_does_not_exist()
$this->testUserRole->hasPermissionTo('doesnt-exist');
} finally {
$message = $this->helpers->getPermissionDoesNotExistMessage('doesnt-exist', 'web');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down Expand Up @@ -256,7 +256,7 @@ public function it_throws_an_exception_when_a_permission_of_the_wrong_guard_is_p
$this->testUserRole->hasPermissionTo($permission);
} finally {
$message = $this->helpers->getGuardDoesNotMatchMessage(collect(['web']), 'admin');
$this->assertLogMessage($message, Logger::ALERT);
$this->assertLogMessage($message, Level::Alert);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Illuminate\Foundation\Application;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Jenssegers\Mongodb\MongodbServiceProvider;
use MongoDB\Laravel\MongoDBServiceProvider;
use Maklad\Permission\Helpers;
use Maklad\Permission\Models\Permission;
use Maklad\Permission\Models\Role;
Expand Down
2 changes: 1 addition & 1 deletion tests/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Jenssegers\Mongodb\Eloquent\Model;
use MongoDB\Laravel\Eloquent\Model;
use Maklad\Permission\Traits\HasRoles;

/**
Expand Down