Merge pull request #77 from mostafamaklad/v1.9

V1.9.0
mostafamaklad · Nov 14, 2018 · 277238f · 277238f
2 parents 4ea8090 + 134d06d
commit 277238f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All Notable changes to `laravel-permission-mongodb` will be documented in this file.
 
+## 1.9.0 - 2018-09-14
+
+### Fixed
+ - Fix wrong BelongsTo relationship
+ - Config cleanup
+ - Fixes for Lumen 5.6 compatibility
+ - Fix classes resolution to config values
+ - Fix permissions via roles
+ - Fixed detection of Lumen
+
+### Added
+ - Add scrutinizer code intelligence
+
+### Changed
+ - Loose typing definitions for BelongsToMany
+
 ## 1.8.2 - 2018-08-14
 
 ### Changed

diff --git a/src/Exceptions/MakladException.php b/src/Exceptions/MakladException.php
@@ -18,7 +18,7 @@ class MakladException extends InvalidArgumentException
      * @param int $code
      * @param Throwable|null $previous
      */
-    public function __construct($message = '', $code = 0, Throwable $previous = null)
+    public function __construct(string $message = null, int $code = 0, Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 

diff --git a/src/Exceptions/UnauthorizedException.php b/src/Exceptions/UnauthorizedException.php
@@ -17,12 +17,16 @@ class UnauthorizedException extends HttpException
      * UnauthorizedException constructor.
      *
      * @param $statusCode
-     * @param null $message
+     * @param string $message
      * @param array $requiredRoles
      * @param array $requiredPermissions
      */
-    public function __construct($statusCode, $message = null, $requiredRoles = [], $requiredPermissions = [])
-    {
+    public function __construct(
+        $statusCode,
+        string $message = null,
+        array $requiredRoles = [],
+        array $requiredPermissions = []
+    ) {
         parent::__construct($statusCode, $message);
 
         if (\config('permission.log_registration_exception')) {

diff --git a/src/Exceptions/UnauthorizedPermission.php b/src/Exceptions/UnauthorizedPermission.php
@@ -12,10 +12,10 @@ class UnauthorizedPermission extends UnauthorizedException
      * UnauthorizedPermission constructor.
      *
      * @param $statusCode
-     * @param null $message
+     * @param string $message
      * @param array $requiredPermissions
      */
-    public function __construct($statusCode, $message = null, $requiredPermissions = [])
+    public function __construct($statusCode, string $message = null, array $requiredPermissions = [])
     {
         parent::__construct($statusCode, $message, [], $requiredPermissions);
     }

diff --git a/src/Exceptions/UnauthorizedRole.php b/src/Exceptions/UnauthorizedRole.php
@@ -12,10 +12,10 @@ class UnauthorizedRole extends UnauthorizedException
      * UnauthorizedPermission constructor.
      *
      * @param $statusCode
-     * @param null $message
+     * @param string $message
      * @param array $requiredRoles
      */
-    public function __construct($statusCode, $message = null, $requiredRoles = [])
+    public function __construct($statusCode, string $message = null, array $requiredRoles = [])
     {
         parent::__construct($statusCode, $message, $requiredRoles);
     }

diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -11,7 +11,6 @@
 use Maklad\Permission\Guard;
 use Maklad\Permission\Helpers;
 use Maklad\Permission\Models\Role;
-use Maklad\Permission\Models\PermissionRole;
 use Maklad\Permission\PermissionRegistrar;
 
 /**
@@ -317,7 +316,7 @@ public function getDirectPermissions(): Collection
      * Scope the model query to certain permissions only.
      *
      * @param Builder $query
-     * @param string|array|Permission|Collection $permissions
+     * @param string|array|\Maklad\Permission\Contracts\PermissionInterface|Collection $permissions
      *
      * @return Builder
      */