Merge pull request #260 from kawanks/issue_259

Atualizando para Laravel 10
uspdev · May 8, 2024 · 1c404c3 · 1c404c3
2 parents 795b5c9 + b01b428
commit 1c404c3
Show file tree

Hide file tree

Showing 18 changed files with 3,513 additions and 2,243 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,6 @@ npm-debug.log
 yarn-error.log
 
 /public/vendor
+
+.lando.yml
+Dockerfile.custom
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -15,7 +15,7 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -51,7 +51,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,

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers = 
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }
diff --git a/app/Http/Requests/VagaRequest.php b/app/Http/Requests/VagaRequest.php
@@ -31,7 +31,7 @@ public function rules()
             'salario' => 'required',
             'horario' => 'required',
             'beneficios' => 'required',
-            'divulgar_ate' => 'required|data',
+            'divulgar_ate' => 'required|date_format:d/m/Y',
             'status' => '',
             'justificativa' => 'nullable',
             'email' => 'required|email|max:255'

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -10,6 +10,8 @@
 class User extends Authenticatable
 {
     use HasFactory, Notifiable;
+    use \Spatie\Permission\Traits\HasRoles;
+    use \Uspdev\SenhaunicaSocialite\Traits\HasSenhaunica;
 
     /**
      * The attributes that are mass assignable.

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -24,8 +24,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
         Gate::define('admin', function ($user) {
             $admins = explode(',', trim(config('estagios.admins')));
             return in_array($user->codpes, $admins);

diff --git a/composer.json b/composer.json
@@ -8,34 +8,32 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5 || >=8.0",
         "barryvdh/laravel-debugbar": "^3.5",
-        "barryvdh/laravel-dompdf": "^0.8.6",
-        "doctrine/dbal": "^2.10",
-        "fideloper/proxy": "^4.2",
-        "fruitcake/laravel-cors": "^1.0",
+        "barryvdh/laravel-dompdf": "^2.1",
+        "doctrine/dbal": "^3.1",
         "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^10.0",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.0",
-        "laravellegends/pt-br-validator": "^7.0",
-        "owen-it/laravel-auditing": "^12.0",
-        "rap2hpoutre/fast-excel": "^3.0",
-        "rap2hpoutre/laravel-log-viewer": "^1.7",
+        "laravel/ui": "^4.0",
+        "laravellegends/pt-br-validator": "^10.0",
+        "owen-it/laravel-auditing": "^13.0",
+        "rap2hpoutre/fast-excel": "^5.4",
+        "rap2hpoutre/laravel-log-viewer": "^2.3",
         "spatie/laravel-settings": "^2.8",
         "uspdev/laravel-usp-faker": "^1.0",
         "uspdev/laravel-usp-theme": "^2.0",
         "uspdev/laravel-usp-validators": "^1.0",
-        "uspdev/replicado": "^1.5",
-        "uspdev/senhaunica-socialite": "^2.0",
+        "uspdev/replicado": "^1.22",
+        "uspdev/senhaunica-socialite": "^4.3",
         "uspdev/utils": "^1.0.4"
     },
     "require-dev": {
-        "facade/ignition": "^2.3.6",
+        "spatie/laravel-ignition": "^2.0",
         "fakerphp/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0"
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.0"
     },
     "config": {
         "optimize-autoloader": true,