Merge branch 'develop' into trunk

app/Console/Commands/CreateUser.php

@@ -3,10 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Enums\Role;
-use App\Models\Site;
 use App\Models\User;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Hash;
 
 class CreateUser extends Command

app/Http/Controllers/TicketController.php

@@ -165,10 +165,6 @@ class TicketController extends Controller
             $ticket->file2 = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket2);
         }
 
-        if ($request->type === TicketType::evolution()) {
-            $ticket->status = TicketStatus::estimateTodo();
-        }
-
         $ticket->user()->associate(auth()->user());
         $ticket->saveOrFail();
         /** @var \App\Models\User */

app/Http/Middleware/IsAdmin.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use App\Enums\Role;
 use Closure;
 use Illuminate\Http\Request;
 

app/Http/Requests/ChangeTicketStatus.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\Role;
 use App\Enums\TicketStatus;
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Requests/CreateMessage.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\Role;
 use Illuminate\Foundation\Http\FormRequest;
 
 class CreateMessage extends FormRequest

app/Http/Requests/StoreTicket.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\Role;
 use App\Enums\TicketStatus;
 use App\Enums\TicketType;
 use Illuminate\Foundation\Http\FormRequest;

app/Http/Requests/UpdateTicket.php

@@ -2,9 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\Role;
-use App\Enums\TicketStatus;
-
 class UpdateTicket extends StoreTicket
 {
     public function authorize()

app/Listeners/SendNotificationMailToTicketCreator.php

@@ -4,9 +4,6 @@ namespace App\Listeners;
 
 use App\Events\NotifyTicketCreator;
 use App\Mail\TicketUpdate;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
 
 class SendNotificationMailToTicketCreator

app/Listeners/SendSubscriptionsNotificationsMail.php

@@ -4,8 +4,6 @@ namespace App\Listeners;
 
 use App\Events\NotifySubscriptions;
 use App\Mail\TicketUpdate;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
 

app/Mail/NewTicket.php

@@ -3,7 +3,6 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 

app/Mail/TicketUpdate.php

@@ -5,7 +5,6 @@ namespace App\Mail;
 use App\Lib\Utils;
 use App\Models\Ticket;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 

app/Models/User.php

@@ -127,7 +127,7 @@ class User extends Authenticatable
                 ]
             ],
             'sites' => [
-                'label' => trans('Projets'),
+                'label' => trans('Sites'),
                 'type' => CrudType::belongsToMany(),
                 'belongsToMany' => Site::class,
                 'belongsToManyLabel' => 'name',

app/Policies/TicketPolicy.php

@@ -2,14 +2,11 @@
 
 namespace App\Policies;
 
-use App\Enums\TicketStatus;
-use App\Models\Ticket;
 use App\Models\User;
 use App\Policies\Rules\SiteStaticRules as SSR;
 use App\Policies\Rules\TicketStaticRules;
 use App\Policies\Rules\UserRoleRules as URR;
 use Illuminate\Auth\Access\HandlesAuthorization;
-use Illuminate\Auth\Access\Response;
 use Illuminate\Database\Eloquent\Model;
 use Kwaadpepper\CrudPolicies\Policies\RootPolicy;
 use Kwaadpepper\CrudPolicies\Policies\Rules\StaticRules;

app/Providers/EventServiceProvider.php

@@ -10,7 +10,6 @@ use App\Events\SiteUpdated;
 use App\Events\TicketStatusChanged;
 use App\Listeners\AddStatusMessages;
 use App\Listeners\HandleLoggable;
-use App\Listeners\SendNotificationMail;
 use App\Listeners\SendNotificationMailToTicketCreator;
 use App\Listeners\SendSubscriptionsNotificationsMail;
 use Illuminate\Auth\Events\Registered;

resources/views/ticket/show.blade.php

@@ -105,7 +105,7 @@
                 @if ($message->file !== null)
                 <br><a data-fslightbox="gallery" href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
                 @endif<br><br>
-                <small class="text-muted fw-bold">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par <b>{{ $ticket->user ? $ticket->user->name : __('Utilisateur supprimé') }}</b></small>
+                <small class="text-muted fw-bold">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par <b>{{ $message->user ? $message->user->name : __('Utilisateur supprimé') }}</b></small>
             </div>
             @endif
         @endforeach

routes/web.php

@@ -3,7 +3,6 @@
 use App\Http\Controllers\FileController;
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\LogController;
-use App\Http\Controllers\LoginController;
 use App\Http\Controllers\ProjectController;
 use App\Http\Controllers\SiteController;
 use App\Http\Controllers\TicketController;

tests/Feature/ExampleTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Feature;
 
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class ExampleTest extends TestCase