refactor: Обновить Laravel с 10 до 11, устранить несовместимости

kaivladimirv · Jan 16, 2025 · 874367f · 874367f
1 parent a230b5d
commit 874367f
Show file tree

Hide file tree

Showing 11 changed files with 761 additions and 604 deletions.
diff --git a/app/Models/Balance.php b/app/Models/Balance.php
@@ -6,6 +6,7 @@
 
 use App\Enums\LimitType;
 use App\Models\Traits\SerializeDate;
+use Database\Factories\BalanceFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -21,6 +22,7 @@
  */
 class Balance extends Model
 {
+    /** @use HasFactory<BalanceFactory> */
     use HasFactory;
     use SerializeDate;
 

diff --git a/app/Models/Company.php b/app/Models/Company.php
@@ -5,11 +5,13 @@
 namespace App\Models;
 
 use App\Models\Traits\SerializeDate;
+use Database\Factories\CompanyFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Hash;
+use Laravel\Sanctum\Contracts\HasAbilities;
 use Laravel\Sanctum\HasApiTokens;
 use Laravel\Sanctum\NewAccessToken;
 use Override;
@@ -29,7 +31,9 @@
  */
 class Company extends Authenticatable
 {
+    /** @use HasApiTokens<HasAbilities> */
     use HasApiTokens;
+    /** @use HasFactory<CompanyFactory> */
     use HasFactory;
     use Notifiable;
     use SerializeDate;
@@ -57,7 +61,7 @@ public function createAccessToken(): NewAccessToken
         return $this->createToken(
             'access_token',
             ['*'],
-            now()->addMinutes(env('API_TOKEN_EXPIRATION_MINUTES'))
+            now()->addMinutes((int) env('API_TOKEN_EXPIRATION_MINUTES'))
         );
     }
 

diff --git a/app/Models/Contract.php b/app/Models/Contract.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Models\Traits\SerializeDate;
+use Database\Factories\ContractFactory;
 use DateTimeImmutable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -26,6 +27,7 @@
  */
 class Contract extends Model
 {
+    /** @use HasFactory<ContractFactory> */
     use HasFactory;
     use SoftDeletes;
     use SerializeDate;

diff --git a/app/Models/ContractService.php b/app/Models/ContractService.php
@@ -6,6 +6,7 @@
 
 use App\Enums\LimitType;
 use App\Models\Traits\SerializeDate;
+use Database\Factories\ContractServiceFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -24,6 +25,7 @@
  */
 class ContractService extends Model
 {
+    /** @use HasFactory<ContractServiceFactory> */
     use HasFactory;
     use SerializeDate;
 

diff --git a/app/Models/InsuredPerson.php b/app/Models/InsuredPerson.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Models\Traits\SerializeDate;
+use Database\Factories\InsuredPersonFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -24,6 +25,7 @@
  */
 class InsuredPerson extends Model
 {
+    /** @use HasFactory<InsuredPersonFactory> */
     use HasFactory;
     use SerializeDate;
 

diff --git a/app/Models/Person.php b/app/Models/Person.php
@@ -7,6 +7,7 @@
 use App\Enums\NotifierType;
 use App\Enums\TelegramChatStatus;
 use App\Models\Traits\SerializeDate;
+use Database\Factories\PersonFactory;
 use DomainException;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -33,6 +34,7 @@
  */
 class Person extends Model
 {
+    /** @use HasFactory<PersonFactory> */
     use HasFactory;
     use SerializeDate;
     use Notifiable;

diff --git a/app/Models/ProvidedService.php b/app/Models/ProvidedService.php
@@ -6,6 +6,7 @@
 
 use App\Enums\LimitType;
 use App\Models\Traits\SerializeDate;
+use Database\Factories\ProvidedServiceFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -29,6 +30,7 @@
  */
 class ProvidedService extends Model
 {
+    /** @use HasFactory<ProvidedServiceFactory> */
     use HasFactory;
     use SoftDeletes;
     use SerializeDate;

diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Models\Traits\SerializeDate;
+use Database\Factories\ServiceFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -20,6 +21,7 @@
  */
 class Service extends Model
 {
+    /** @use HasFactory<ServiceFactory> */
     use HasFactory;
     use SerializeDate;
 

diff --git a/app/Models/TelegramSetting.php b/app/Models/TelegramSetting.php
@@ -5,12 +5,10 @@
 namespace App\Models;
 
 use App\Models\Traits\SerializeDate;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class TelegramSetting extends Model
 {
-    use HasFactory;
     use SerializeDate;
 
     protected $fillable = ['bot_last_update_id'];

diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         "guzzlehttp/guzzle": "^7.2",
         "kaivladimirv/laravel-specification-pattern": "^1.0",
         "laravel-notification-channels/telegram": "^5.0",
-        "laravel/framework": "^10.8",
-        "laravel/sanctum": "^3.2",
+        "laravel/framework": "^11.0",
+        "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.8",
         "rollbar/rollbar-laravel": "^8.0",
         "spatie/laravel-data": "^4.0",
@@ -27,14 +27,14 @@
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
-        "hedii/artisan-log-cleaner": "^6.1",
+        "hedii/artisan-log-cleaner": "^7.0",
         "infection/infection": "^0.29.10",
         "laravel/pint": "^1.17",
         "laravel/sail": "^1.18",
-        "laravel/telescope": "^5.1",
+        "laravel/telescope": "^5.0",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.10",
-        "phpunit/phpunit": "^10.1",
+        "nunomaduro/collision": "^8.1",
+        "phpunit/phpunit": "^11.0",
         "rector/rector": "^2.0",
         "spatie/laravel-ignition": "^2.0",
         "squizlabs/php_codesniffer": "^3.7",