Merge branch 'develop' into trunk

app/Enums/Role.php

@@ -2,14 +2,14 @@
 
 namespace App\Enums;
 
-use Kwaadpepper\Enum\BaseEnum;
+use Kwaadpepper\Enum\BaseEnumRoutable;
 
 /**
  * @method static self admin()
  * @method static self rh()
  */
 
-class Role extends BaseEnum
+class Role extends BaseEnumRoutable
 {
     protected static function values(): array
     {

app/Enums/TypeSondage.php

@@ -2,14 +2,14 @@
 
 namespace App\Enums;
 
-use Kwaadpepper\Enum\BaseEnum;
+use Kwaadpepper\Enum\BaseEnumRoutable;
 
 /**
  * @method static self radio()
  * @method static self checkbox()
  */
 
-class TypeSondage extends BaseEnum
+class TypeSondage extends BaseEnumRoutable
 {
     protected static function values(): array
     {

app/Exceptions/Handler.php

@@ -2,10 +2,7 @@
 
 namespace App\Exceptions;
 
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Support\Facades\Mail;
-use RuntimeException;
-use Throwable;
+use Kwaadpepper\ExceptionHandler\Exceptions\ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
@@ -37,28 +34,5 @@ class Handler extends ExceptionHandler
      */
     public function register()
     {
-        $this->reportable(function (Throwable $e) {
-            try {
-                if (!config('app.debug')) {
-                    if ($this->shouldntReport($e)) {
-                        return false;
-                    }
-                    Mail::send([
-                        'html' => 'emails.exception',
-                        'text' => 'emails.exception-plain'
-                    ], [
-                        'exception' => $e,
-                        'appName' => config('app.name')
-                    ], function ($m) {
-                        $m->to(
-                            config('mail.contactsList.serviceweb'),
-                            sprintf('%s Exception Handler', config('app.name'))
-                        )->subject('Need help !, an error occured in your application, please check Logs ASAP');
-                    });
-                }
-            } finally {
-                return true;
-            }
-        });
     }
 }

app/Http/Controllers/SondagesController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\SondageResponsesRequest;
-use App\Http\Requests\UpdateCrudModel;
 use App\Http\Requests\UpdateSondage;
 use App\Models\ReponseSondage;
 use App\Models\Sondage;

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

app/Jobs/SendEmployeeCreatedAccountMail.php

@@ -5,10 +5,8 @@ namespace App\Jobs;
 use App\Mail\EmployeeCreatedMail;
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Mail\Mailable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;

app/Jobs/SendEmployeeInfoMailToSiteRH.php

@@ -4,7 +4,6 @@ namespace App\Jobs;
 
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Mail\Mailable;

app/Jobs/SendEmployeeLockedDownMailToEmployee.php

@@ -4,7 +4,6 @@ namespace App\Jobs;
 
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Mail\Mailable;

app/Jobs/SendEmployeeLockedDownMailToSiteRH.php

@@ -4,7 +4,6 @@ namespace App\Jobs;
 
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Mail\Mailable;

app/Jobs/SendMailConfirmToEmployee.php

@@ -5,7 +5,6 @@ namespace App\Jobs;
 use App\Mail\EmployeeConfirmMail;
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;

app/Jobs/SendMailResetPasswordToEmployee.php

@@ -5,7 +5,6 @@ namespace App\Jobs;
 use App\Mail\EmployeePasswordResetMail;
 use App\Models\Employee;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 
@@ -26,11 +27,27 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Carbon::setLocale(config('app.locale'));
-        setlocale(LC_ALL, 'fr_FR');
+        // LOCAL HTTPS FIX
         if (config('app.env') !== 'local') {
             URL::forceScheme('https');
         }
+        // HA PROXY FIX
+        App::singleton('clientIp', function () {
+            if (config('app.env') === 'local') {
+                return request()->getClientIp();
+            } else {
+                return request()->server('HTTP_X_FORWARDED_FOR') ??
+                request()->getClientIp();
+            }
+        });
+        // LOCAL FORCE (eg: for Carbon)
+        setlocale(LC_ALL, \sprintf(
+            '%s_%s.UTF-8',
+            config('app.locale'),
+            \strtoupper(config('app.locale'))
+        ));
+        Carbon::setLocale(config('app.locale'));
+        // FORCE BOOTSTRAP PAGINATOR
         if (!app()->runningInConsole()) {
             Paginator::useBootstrap();
         }

app/Providers/AuthServiceProvider.php

@@ -3,7 +3,6 @@
 namespace App\Providers;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {

app/Providers/EventServiceProvider.php

@@ -5,7 +5,6 @@ namespace App\Providers;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

app/Providers/RouteServiceProvider.php

@@ -15,7 +15,6 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvi
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Session;
 
 class RouteServiceProvider extends ServiceProvider
 {

composer.json

@@ -12,8 +12,9 @@
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "htmlmin/htmlmin": "^8.0",
-        "kwaadpepper/crud-policies": "^0.1.12",
-        "kwaadpepper/enum": "^0.1.4",
+        "kwaadpepper/crud-policies": "^0.1.16",
+        "kwaadpepper/enum": "^2.0",
+        "kwaadpepper/exception-handler": "^0.0.1",
         "kwaadpepper/image-resizer": "^0.0.3",
         "laravel/framework": "^8.12",
         "laravel/tinker": "^2.5",
@@ -30,6 +31,7 @@
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.3.3",
+        "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

config/app.php

@@ -93,7 +93,7 @@ return [
     |
     */
 
-    'fallback_locale' => 'fr',
+    'fallback_locale' => 'en',
 
     /*
     |--------------------------------------------------------------------------

config/exception-handler.php

@@ -0,0 +1,17 @@
+<?php
+
+return [
+    /**
+     * Send mail when app debug is turn off
+     * so you can be warned if an unhandled exception occurs
+     */
+    'enableMaiLog' => !config('app.debug'),
+
+    /**
+     * Put a developper secured mailbox in here
+     * so you can receive email if things go mad
+     */
+    'contactsList' => [
+        'serviceweb' => env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr')
+    ]
+];

database/factories/UserFactory.php

@@ -5,7 +5,6 @@ namespace Database\Factories;
 use App\Enums\Role;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 class UserFactory extends Factory
 {

database/seeders/DatabaseSeeder.php

@@ -12,7 +12,6 @@ use App\Models\Societe;
 use App\Models\Sondage;
 use App\Models\User;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\App;
 
 class DatabaseSeeder extends Seeder
 {

phpcs.xml

@@ -80,6 +80,7 @@
     </rule>
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing" />
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses" />
 
 
     <!-- For Laravel migrations -->