Merge pull request #13 from HijenHEK/dev

laravel 11 upgrade
HijenHEK · Apr 1, 2024 · 88d1d6c · 88d1d6c
2 parents 81248a8 + 18aa904
commit 88d1d6c
Show file tree

Hide file tree

Showing 5 changed files with 405 additions and 333 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -73,11 +73,11 @@ public function isAdmin()
      */
     public function uploads()
     {
-        return $this->hasMany(Attachment::class , 'owner_id');
+        return $this->hasMany(Attachment::class, 'owner_id');
     }
 
 
-        /**
+    /**
      * Create a new personal access token for the user.
      * -- Overrides HasApiToken method
      * @param  string  $name
@@ -104,4 +104,9 @@ public function createToken(string $name, array $abilities = ['*'])
 
         return new NewAccessToken($token, $token->getKey() . '|' . $plainTextToken);
     }
+
+    public function getAuthPasswordName()
+    {
+        return 'password';
+    }
 }
diff --git a/composer.json b/composer.json
@@ -7,15 +7,15 @@
     "require": {
         "php": "^8.2",
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^10.0",
-        "laravel/sanctum": "^3.2",
+        "laravel/framework": "^11.0",
+        "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.7"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.0",
+        "nunomaduro/collision": "^8.1",
         "phpunit/phpunit": "^10.0",
         "spatie/laravel-ignition": "^2.0"
     },