Merge pull request #39 from TheDragonCode/3.x

Added Laravel 11 support

Author: andrey-helldar

composer.json

@@ -39,16 +39,15 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "illuminate/container": ">=6.0 <11.0",
-        "illuminate/database": ">=6.0 <11.0",
-        "illuminate/http": ">=6.0 <11.0",
-        "illuminate/support": ">=6.0 <11.0",
+        "illuminate/container": ">=6.0 <12.0",
+        "illuminate/database": ">=6.0 <12.0",
+        "illuminate/http": ">=6.0 <12.0",
+        "illuminate/support": ">=6.0 <12.0",
         "ramsey/uuid": "^3.7 || ^4.0",
-        "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0"
+        "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "laravel/framework": ">=6.0 <11.0",
-        "laravel/lumen-framework": ">=6.0 <11.0"
+        "laravel/framework": ">=6.0 <12.0"
     },
     "conflict": {
         "andrey-helldar/laravel-support": "*"

src/Eloquent/Concerns/HasCustomRelationships.php

@@ -24,7 +24,7 @@ protected function hasManyCustom(string $related, ?string $foreign_key = null, ?
         return $this->newHasManyCustom(
             $instance->newQuery(),
             $model,
-            "{$foreign_table}.{$foreign_key}",
+            "$foreign_table.$foreign_key",
             $local_key
         );
     }

src/Support/AppVersion.php

@@ -35,6 +35,11 @@ public function is10x(): bool
         return $this->major() === 10;
     }
 
+    public function is11x(): bool
+    {
+        return $this->major() === 11;
+    }
+
     public function major(): int
     {
         return (int) Str::before($this->version(), '.');