merge all in develop also

.gitignore

@@ -19,4 +19,5 @@ public/css/app.css
 supervisord.log
 supervisord.pid
 **/.terraform/**/
-*.tfstate
+*.tfstate
+.phpunit.cache

app-dev.dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-fpm
+FROM php:8.4-fpm
 
 ARG USER
 ARG UID

app-prod.dockerfile

@@ -1,6 +1,6 @@
-FROM php:8.1-fpm
+FROM php:8.4-fpm
 
-RUN apt-get update && apt-get install -y procps libmcrypt-dev openssl libfreetype6-dev  mariadb-client libjpeg62-turbo-dev libgd-dev libpng-dev apt-utils libcurl4-openssl-dev pkg-config libssl-dev vim \
+RUN apt-get update && apt-get install -y procps libmcrypt-dev openssl libfreetype6-dev zip unzip git mariadb-client libjpeg62-turbo-dev libgd-dev libpng-dev apt-utils libcurl4-openssl-dev pkg-config libssl-dev vim \
     && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
     && docker-php-ext-install gd \
     && docker-php-ext-install pdo_mysql opcache

app/Console/Commands/ClearAccessToken.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands;
 
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use App\Http\Repositories\OAuthAccessTokenRepository;
 

app/Exceptions/Handler.php

@@ -60,7 +60,7 @@ public function render($request, Throwable $exception)
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         return !$request->expectsJson() && !collect($request->route()->middleware())->contains('api')
-            ? redirect()->guest($exception->redirectTo() ?? redirect('/'))
+            ? redirect()->guest($exception->redirectTo($request) ?? redirect('/'))
             : response()->json(['message' => $exception->getMessage()], 401);
     }
 }

app/Http/Controllers/EmailController.php

@@ -72,7 +72,7 @@ public function send(EmailRequest $request)
         }
 
 
-        $email = new Email($from, $sender, $to, $cc, $bcc, $replyTo, $subject, $body, $attachmentsDirectory);
+        $email = new Email($from, $to, $cc, $bcc, $sender, $replyTo, $subject, $body, $attachmentsDirectory);
 
         $mailable = new CustomEmail($email);
 

app/Http/Controllers/FailedJobController.php

@@ -4,8 +4,6 @@
 
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Artisan;
 use App\Http\Resources\FailedJobResource;
 use Illuminate\Support\Facades\Validator;

app/Http/Controllers/LoginController.php

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
 class LoginController extends Controller
 {

app/Http/Kernel.php

@@ -56,7 +56,7 @@ class Kernel extends HttpKernel
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Http/Repositories/FailedJobRepository.php

@@ -9,8 +9,8 @@ class FailedJobRepository
     /**
      * Find all the failed jobs
      *
-     * @param  String  $orderBy
-     * @param  String  $order
+     * @param  string  $orderBy
+     * @param  string  $order
      * @return \Illuminate\Database\Eloquent\Collection
      *
      */
@@ -22,14 +22,13 @@ public function all($orderBy = "id", $order = "ASC")
     /**
      * Find all the failed jobs paginated
      *
-     * @param  String  $query
-     * @param  String  $orderBy
-     * @param  String  $order
+     * @param  string  $query
+     * @param  string  $orderBy
+     * @param  string  $order
      * @param  int  $limit
-     * @return App\Models\FailedJob
      *
      */
-    public function allPaginated($query, $orderBy, $order, $limit)
+    public function allPaginated($query, $orderBy, $order, $limit): \Illuminate\Pagination\LengthAwarePaginator
     {
         if (!$query) {
             return FailedJob::orderBy($orderBy, $order)
@@ -45,7 +44,7 @@ public function allPaginated($query, $orderBy, $order, $limit)
      * Find a failed job by id
      *
      * @param  int  $id
-     * @return App\Models\FailedJob
+     * @return \App\Models\FailedJob
      *
      */
     public function find($id)
@@ -56,22 +55,18 @@ public function find($id)
     /**
      * Delete a failed job from the database
      *
-     * @param  App\Models\FailedJob $failedJob
-     * @return Response
+     * @param  \App\Models\FailedJob $failedJob
      *
      */
-    public function delete($failedJob)
+    public function delete($failedJob): bool|null
     {
         return $failedJob->delete();
     }
 
     /**
      * Count all failed job from the database
-     *
-     * @return int
-     *
      */
-    public function count()
+    public function count(): int
     {
         return FailedJob::count();
     }

app/Http/Repositories/OAuthAccessTokenRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Http\Repositories;
 
 use App\Models\OAuthAccessToken;
@@ -7,13 +8,9 @@ class OAuthAccessTokenRepository
 {
     /**
      * Delete a access tokens from the database
-     *
-     * @param  DateTime $dateTime
-     * @return Response
-     *
      */
-    public function deleteOlder($dateTime)
-    {        
+    public function deleteOlder(string $dateTime): bool|null
+    {
         return OAuthAccessToken::where('created_at', '<', $dateTime)->delete();
     }
 }

app/Http/Requests/EmailRequest.php

@@ -23,7 +23,7 @@ public function authorize()
      */
     public function rules()
     {
-        $formatEmail = 'regex:/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/';
+        $formatEmail = 'regex:/^((?!-)([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/';
         return [
             'to' => 'required|array|min:1',
             'to.*' => ['required', 'email', $formatEmail, 'max:320'],

app/Jobs/EmailSender.php

@@ -4,7 +4,6 @@
 
 use App\Mail\BaseEmail;
 use Illuminate\Bus\Queueable;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;

app/Models/Email.php

@@ -21,14 +21,14 @@ class Email
 
     public function __construct(
         string $from,
-        string $sender = null,
         array $to,
         array $cc = [],
         array $bcc = [],
-        string $replyTo = null,
-        string $subject = null,
-        string $body = null,
-        string $attachmentsDirectory = null
+        ?string $sender = null,
+        ?string $replyTo = null,
+        ?string $subject = null,
+        ?string $body = null,
+        ?string $attachmentsDirectory = null
     ) {
         $this->from = $from;
         $this->sender = $sender;

app/Providers/AuthServiceProvider.php

@@ -24,8 +24,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
         Gate::define('canUseAdmin', function ($user, $permission) {
             return in_array($permission, $user->permissions);
         });

composer.json

@@ -1,69 +1,67 @@
 {
-  "name": "laravel/laravel",
-  "type": "project",
-  "description": "The Laravel Framework.",
-  "keywords": [
-    "framework",
-    "laravel"
-  ],
-  "license": "MIT",
-  "require": {
-    "php": "^8.0.2",
-    "darkaonline/l5-swagger": "8.*",
-    "doctrine/dbal": "^3.3",
-    "fideloper/proxy": "^4.0",
-    "guzzlehttp/guzzle": "^7.0.1",
-    "laravel/framework": "^9.0",
-    "laravel/helpers": "^1.4",
-    "laravel/passport": "^11.2.1",
-    "laravel/telescope": "^4.0",
-    "lcobucci/jwt": "^4.2.1",
-    "predis/predis": "^2.0",
-    "zanichelli/idp-extensions": "^3.1",
-    "zircote/swagger-php": "4.*"
-  },
-  "require-dev": {
-    "beyondcode/laravel-dump-server": "^1.0",
-    "filp/whoops": "^2.0",
-    "fzaninotto/faker": "^1.4",
-    "mockery/mockery": "^1.0",
-    "nunomaduro/collision": "^6.1",
-    "phpunit/phpunit": "^9.5"
-  },
-  "config": {
-    "optimize-autoloader": true,
-    "preferred-install": "dist",
-    "sort-packages": true
-  },
-  "extra": {
-    "laravel": {
-      "dont-discover": []
-    }
-  },
-  "autoload": {
-    "psr-4": {
-      "App\\": "app/",
-      "Database\\Factories\\": "database/factories/",
-      "Database\\Seeders\\": "database/seeders/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Tests\\": "tests/"
-    }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "scripts": {
-    "post-autoload-dump": [
-      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover --ansi"
-    ],
-    "post-root-package-install": [
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-    "post-create-project-cmd": [
-      "@php artisan key:generate --ansi"
-    ]
-  }
+	"name": "laravel/laravel",
+	"type": "project",
+	"description": "The Laravel Framework.",
+	"keywords": [
+		"framework",
+		"laravel"
+	],
+	"license": "MIT",
+	"require": {
+		"php": "^8.2.0",
+		"darkaonline/l5-swagger": "^9.0",
+		"guzzlehttp/guzzle": "^7.9.2",
+		"laravel/framework": "^12.0",
+		"laravel/helpers": "^1.7",
+		"laravel/passport": "^12.0",
+		"laravel/telescope": "^5.5",
+		"lcobucci/jwt": "^4.2.1",
+		"predis/predis": "^2.0",
+		"zanichelli/idp-extensions": "^3.7",
+		"zircote/swagger-php": "^5.0"
+	},
+	"require-dev": {
+		"beyondcode/laravel-dump-server": "^2.0",
+		"filp/whoops": "^2.0",
+		"mockery/mockery": "^1.0",
+		"nunomaduro/collision": "^8.1",
+		"phpunit/phpunit": "^11.0",
+		"fakerphp/faker": "^1.23"
+	},
+	"config": {
+		"optimize-autoloader": true,
+		"preferred-install": "dist",
+		"sort-packages": true
+	},
+	"extra": {
+		"laravel": {
+			"dont-discover": []
+		}
+	},
+	"autoload": {
+		"psr-4": {
+			"App\\": "app/",
+			"Database\\Factories\\": "database/factories/",
+			"Database\\Seeders\\": "database/seeders/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Tests\\": "tests/"
+		}
+	},
+	"minimum-stability": "stable",
+	"prefer-stable": true,
+	"scripts": {
+		"post-autoload-dump": [
+			"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+			"@php artisan package:discover --ansi"
+		],
+		"post-root-package-install": [
+			"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+		],
+		"post-create-project-cmd": [
+			"@php artisan key:generate --ansi"
+		]
+	}
 }