Feature/upgrade to laravel10

development.docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   web:
-    image: webdevops/php-nginx:8.0-alpine
+    image: webdevops/php-nginx:8.1-alpine
     restart: ${SERVICES_RESTART}
     working_dir: /var/www
     depends_on:

web/Dockerfile

@@ -1,10 +1,10 @@
-FROM webdevops/php:8.0-alpine AS builder
+FROM webdevops/php:8.1-alpine AS builder
 WORKDIR /app
 COPY src .
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 RUN composer install --no-dev
 
-FROM webdevops/php-nginx:8.0-alpine
+FROM webdevops/php-nginx:8.1-alpine
 WORKDIR /var/www
 COPY --from=builder /app .
 # prepare laravel app

web/src/app/Console/Commands/FtpAccountAddCommand.php

@@ -6,19 +6,19 @@
 use App\Features\CreateAccountFeature;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
-use Lucid\Foundation\ServesFeaturesTrait;
+use Lucid\Bus\ServesFeatures;
 
 class FtpAccountAddCommand extends BaseCommand
 {
-    use ServesFeaturesTrait;
+    use ServesFeatures;
 
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'ftp:account:add {domain} {login} 
-                                                {--dir=/} 
+    protected $signature = 'ftp:account:add {domain} {login}
+                                                {--dir=/}
                                                 {--desc=}
                                                 {--pass=secret}
                                                 {--status=1}';

web/src/app/Console/Commands/FtpAccountChangeCommand.php

@@ -7,19 +7,19 @@
 use App\Features\UpdateAccountFeature;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
-use Lucid\Foundation\ServesFeaturesTrait;
+use Lucid\Bus\ServesFeatures;
 
 class FtpAccountChangeCommand extends BaseCommand
 {
-    use ServesFeaturesTrait;
+    use ServesFeatures;
 
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'ftp:account:change {login}
-                                                {--dir=/} 
+                                                {--dir=/}
                                                 {--desc=}
                                                 {--pass=secret}
                                                 {--status=1}';

web/src/app/Console/Commands/FtpAccountListCommand.php

@@ -7,11 +7,11 @@
 use App\Data\Repositories\Interfaces\DomainRepository;
 use App\Features\ListAccountsFeature;
 use Illuminate\Http\Request;
-use Lucid\Foundation\ServesFeaturesTrait;
+use Lucid\Bus\ServesFeatures;
 
 class FtpAccountListCommand extends BaseCommand
 {
-    use ServesFeaturesTrait;
+    use ServesFeatures;
 
     /**
      * The name and signature of the console command.

web/src/app/Console/Commands/FtpAccountRmCommand.php

@@ -9,11 +9,11 @@
 use App\Features\DeleteAccountFeature;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
-use Lucid\Foundation\ServesFeaturesTrait;
+use Lucid\Bus\ServesFeatures;
 
 class FtpAccountRmCommand extends BaseCommand
 {
-    use ServesFeaturesTrait;
+    use ServesFeatures;
 
     /**
      * The name and signature of the console command.

web/src/app/Console/Commands/FtpDomainListCommand.php

@@ -6,11 +6,11 @@
 use App\Features\ListDomainsFeature;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
-use Lucid\Foundation\ServesFeaturesTrait;
+use Lucid\Bus\ServesFeatures;
 
 class FtpDomainListCommand extends BaseCommand
 {
-    use ServesFeaturesTrait;
+    use ServesFeatures;
 
     /**
      * The name and signature of the console command.

web/src/app/Domains/Account/Jobs/CreateAccountJob.php

@@ -3,7 +3,7 @@
 
 use App\Data\Repositories\Interfaces\AccountRepository;
 use App\Http\Requests\CreateAccountRequest;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class CreateAccountJob extends Job
 {

web/src/app/Domains/Account/Jobs/DeleteAccountJob.php

@@ -4,7 +4,7 @@
 use App\Data\Criteria\DomainIDCriteria;
 use App\Data\Repositories\Interfaces\AccountRepository;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class DeleteAccountJob extends Job
 {

web/src/app/Domains/Account/Jobs/GetAccountJob.php

@@ -4,7 +4,7 @@
 use App\Data\Criteria\DomainIDCriteria;
 use App\Data\Repositories\Interfaces\AccountRepository;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class GetAccountJob extends Job
 {

web/src/app/Domains/Account/Jobs/GetAccountsJob.php

@@ -3,7 +3,7 @@
 
 use App\Data\Criteria\DomainIDCriteria;
 use App\Data\Repositories\Interfaces\AccountRepository;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class GetAccountsJob extends Job
 {

web/src/app/Domains/Account/Jobs/GetDomainIDJob.php

@@ -2,7 +2,7 @@
 namespace App\Domains\Account\Jobs;
 
 use Illuminate\Http\Request;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 use Illuminate\Contracts\Auth\Guard;
 
 class GetDomainIDJob extends Job

web/src/app/Domains/Account/Jobs/UpdateAccountJob.php

@@ -5,7 +5,7 @@
 use App\Data\Models\Account;
 use App\Data\Repositories\Interfaces\AccountRepository;
 use App\Http\Requests\UpdateAccountRequest;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class UpdateAccountJob extends Job
 {

web/src/app/Domains/Domain/Jobs/GetDomainsJob.php

@@ -3,7 +3,7 @@
 
 use App\Data\Criteria\IDCriteria;
 use App\Data\Repositories\Interfaces\DomainRepository;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class GetDomainsJob extends Job
 {

web/src/app/Domains/Health/Jobs/CheckDBJob.php

@@ -2,7 +2,7 @@
 namespace App\Domains\Health\Jobs;
 
 use App\Data\Repositories\Interfaces\AccountRepository;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 
 class CheckDBJob extends Job
 {

web/src/app/Domains/Health/Jobs/CheckFTPJob.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Domains\Health\Jobs;
 
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 use \FtpClient\FtpClient;
 
 class CheckFTPJob extends Job

web/src/app/Domains/Health/Jobs/CheckSSLJob.php

@@ -2,7 +2,7 @@
 namespace App\Domains\Health\Jobs;
 
 use Carbon\Carbon;
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 use Spatie\SslCertificate\SslCertificate;
 
 class CheckSSLJob extends Job

web/src/app/Domains/Http/Jobs/RespondWithJsonJob.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Domains\Http\Jobs;
 
-use Lucid\Foundation\Job;
+use Lucid\Units\Job;
 use Illuminate\Routing\ResponseFactory;
 
 class RespondWithJsonJob extends Job

web/src/app/Features/CheckHealthFeature.php

@@ -5,7 +5,7 @@
 use App\Domains\Health\Jobs\CheckFTPJob;
 use App\Domains\Health\Jobs\CheckSSLJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 use Illuminate\Http\Request;
 
 class CheckHealthFeature extends Feature

web/src/app/Features/CreateAccountFeature.php

@@ -5,7 +5,7 @@
 use App\Domains\Account\Jobs\GetDomainIDJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class CreateAccountFeature extends Feature
 {

web/src/app/Features/DeleteAccountFeature.php

@@ -4,7 +4,7 @@
 use App\Domains\Account\Jobs\DeleteAccountJob;
 use App\Domains\Account\Jobs\GetDomainIDJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class DeleteAccountFeature extends Feature
 {

web/src/app/Features/ListAccountsFeature.php

@@ -5,7 +5,7 @@
 use App\Domains\Account\Jobs\GetDomainIDJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class ListAccountsFeature extends Feature
 {

web/src/app/Features/ListDomainsFeature.php

@@ -5,7 +5,7 @@
 use App\Domains\Domain\Jobs\GetDomainsJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class ListDomainsFeature extends Feature
 {

web/src/app/Features/ShowAccountFeature.php

@@ -4,7 +4,7 @@
 use App\Domains\Account\Jobs\GetAccountJob;
 use App\Domains\Account\Jobs\GetDomainIDJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class ShowAccountFeature extends Feature
 {

web/src/app/Features/UpdateAccountFeature.php

@@ -5,7 +5,7 @@
 use App\Domains\Account\Jobs\UpdateAccountJob;
 use App\Domains\Http\Jobs\RespondWithJsonJob;
 use Illuminate\Http\Request;
-use Lucid\Foundation\Feature;
+use Lucid\Units\Feature;
 
 class UpdateAccountFeature extends Feature
 {

web/src/app/Http/Controllers/Controller.php

@@ -5,7 +5,7 @@
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Lucid\Foundation\Http\Controller as LucidController;
+use Lucid\Units\Controller as LucidController;
 
 /**
  * @OA\OpenApi(

web/src/app/Http/Middleware/TrustProxies.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {

web/src/app/Providers/AuthServiceProvider.php

@@ -24,8 +24,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
         Auth::viaRequest('bearer-token', function($request){
             // remove "Bearer " from start
             $token = substr($request->header('Authorization'), 7);

web/src/composer.json

@@ -3,24 +3,28 @@
     "description": "The Laravel Framework.",
     "license": "MIT",
     "type": "project",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/ksimenic/lucid"
+        }
+    ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "darkaonline/l5-swagger": "^8.0",
-        "fideloper/proxy": "^4.4",
-        "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^v8.26",
+        "laravel/framework": "^10.0",
         "laravel/tinker": "^2.5",
-        "lucid-arch/laravel-foundation": "^8.0",
+        "lucidarch/lucid": "dev-latest",
         "nicolab/php-ftp-client": "^1.5",
         "prettus/l5-repository": "^2.7",
         "spatie/ssl-certificate": "^1.22"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
-        "fzaninotto/faker": "^1.9.1",
+        "spatie/laravel-ignition": "^2.0",
+        "fakerphp/faker": "^1.0",
         "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.1",
+        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.3.3"
     },
     "autoload": {
@@ -60,6 +64,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }