Merge pull request #12 from kblais/11-add-support-for-laravel-7

Add compatibility for Laravel 7.*
kblais · Mar 6, 2020 · c5773fb · c5773fb
2 parents cb82f90 + 6284ea3
commit c5773fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -2,12 +2,12 @@
     "name": "kblais/laravel-helpers",
     "description": "A collection of helpers for your Laravel application.",
     "require": {
-        "illuminate/database": "^5.8|^6.0"
+        "illuminate/database": "^5.8|^6.0|^7.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8.0|^4.0",
+        "orchestra/testbench": "^3.8.0|^4.0|^5.0",
         "friendsofphp/php-cs-fixer": "^2.15",
-        "phpstan/phpstan": "^0.11.12"
+        "phpstan/phpstan": "^0.12"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Eloquent/OrderByDefaultOrderTrait.php b/src/Eloquent/OrderByDefaultOrderTrait.php
@@ -26,7 +26,7 @@ public static function bootOrderByDefaultOrderTrait()
      */
     public static function withoutDefaultOrder(): Builder
     {
-        return with(new static())->newQueryWithoutScope(static::getOrderScope());
+        return with(new self())->newQueryWithoutScope(static::getOrderScope());
     }
 
     public function getDefaultOrder(): array
@@ -46,7 +46,7 @@ public function getDefaultOrder(): array
      */
     protected static function getOrderScope(): Scope
     {
-        $defaultOrder = with(new static())->getDefaultOrder();
+        $defaultOrder = with(new self())->getDefaultOrder();
 
         return new OrderByScope(
             Arr::get($defaultOrder, 'column'),

diff --git a/src/Routing/Middleware/AreRelated.php b/src/Routing/Middleware/AreRelated.php
@@ -11,7 +11,6 @@ class AreRelated
      * Handle an incoming request.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
      * @param string                   $ownerParameter
      * @param string                   $foreignParameter
      * @param string                   $relationName