Merge pull request #372 from uspdev/pr-371

Fix do pull request #371

Author: masakik

app/Http/Kernel.php

@@ -50,7 +50,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/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;
 }

app/Models/User.php

@@ -30,9 +30,6 @@ class User extends Authenticatable
         'config->notifications->email->observador',
     ];
 
-    # colocando data aqui ele já envia um objeto carbon
-    protected $dates = ['last_login_at'];
-
     /**
      * The attributes that should be hidden for arrays.
      *
@@ -52,6 +49,7 @@ class User extends Authenticatable
      */
     protected $casts = [
         'email_verified_at' => 'datetime',
+        'last_login_at' => 'datetime',
         'config' => 'array',
     ];
 

app/Providers/AuthServiceProvider.php

@@ -24,8 +24,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
         Gate::define('admin', function ($user) {
             return $user->is_admin;
         });
@@ -65,7 +63,7 @@ public function boot()
             }
         });
 
-        
+
         Gate::define('trocarPerfil', function ($user) {
             return Gate::any(['admin', 'atendente']);
         });

app/Utils/JSONForms.php

@@ -2,7 +2,7 @@
 
 namespace App\Utils;
 
-use Form;
+/* use Form; */
 use Illuminate\Support\HtmlString;
 
 class JSONForms
@@ -43,7 +43,7 @@ protected static function JSON2Form($template, $data, $perfil)
             if (isset($json->validate) && strpos($json->validate, 'required') !== false) {
                 $label = '<i class="fas fa-star-of-life fa-sm text-danger"></i> ' . $label;
             }
-            $input[] = Form::label("extras[$key]", $label, ['class' => 'control-label']);
+            $input[] = html()->label($label)->for("extras[$key]")->attribute('class','control-label');
 
             # valores preenchidos
             # aqui temos de usar "or" pois "||" não preenche corretamente
@@ -52,19 +52,24 @@ protected static function JSON2Form($template, $data, $perfil)
             switch ($type) {
                 //caso seja um select passa o valor padrao
                 case 'select':
-                    $attrib = ['class' => 'form-control', 'placeholder' => 'Selecione...'];
+                    $fieldInput = html()->$type("extras[$key]", json_decode(json_encode($json->value), true))
+                        ->class('form-control')->placeholder('Selecione...');;
+
                     if (isset($json->validate) && strpos($json->validate, 'required') !== false) {
-                        $attrib['required'] = '';
+                        $fieldInput  = $fieldInput ->required();
                     }
-                    $input[] = Form::$type("extras[$key]", $json->value, $value, $attrib);
+
+                    $input[] = $fieldInput;
                     break;
 
                 default:
-                    $attrib = ['class' => 'form-control', 'rows' => '3'];
+                    $fieldInput = html()->textarea("extras[$key]", $value)->class('form-control')->rows(3);
+
                     if (isset($json->validate) && strpos($json->validate, 'required') !== false) {
-                        $attrib['required'] = '';
+                        $fieldInput  = $fieldInput ->required();
                     }
-                    $input[] = Form::$type("extras[$key]", $value, $attrib);
+
+                    $input[] = $fieldInput;
                     break;
             }
 

composer.json

@@ -8,31 +8,29 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.1",
-        "fideloper/proxy": "^4.2",
-        "fruitcake/laravel-cors": "^2.0",
-        "glorand/laravel-model-settings": "^4.2",
-        "graham-campbell/markdown": "^13.1",
+        "php": "^8.2",
+        "glorand/laravel-model-settings": "^8.0",
+        "graham-campbell/markdown": "^16.0",
         "guzzlehttp/guzzle": "^7.0",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^12.0",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.0",
-        "laravelcollective/html": "^6.2",
+        "laravel/ui": "^4.0",
+        "spatie/laravel-html": "^3.12",
         "masakik/supervisor": "dev-master",
-        "spatie/simple-excel": "^1.13",
+        "spatie/simple-excel": "^3.8",
         "uspdev/laravel-replicado": "^1.0",
         "uspdev/laravel-tools": "^1.3",
         "uspdev/laravel-usp-theme": "^2.8",
         "uspdev/laravel-usp-validators": "^1.0",
         "uspdev/senhaunica-socialite": "^4.3"
     },
     "require-dev": {
-        "facade/ignition": "^2.3.6",
+        "spatie/laravel-ignition": "^2.0",
         "fakerphp/faker": "^1.10",
         "lucascudo/laravel-pt-br-localization": "^1.1",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0",
+        "nunomaduro/collision": "^8.1",
+        "phpunit/phpunit": "^11.0",
         "uspdev/laravel-usp-faker": "^1.0"
     },
     "repositories": [
@@ -66,7 +64,7 @@
             "Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "scripts": {
         "post-autoload-dump": [