Merge branch 'develop' into trunk

app/Models/Site.php

@@ -206,7 +206,7 @@ class Site extends Model
      */
     public function users()
     {
-        return $this->belongsToMany(Site::class);
+        return $this->belongsToMany(User::class, 'user_site');
     }
 
     /**

app/Providers/AppServiceProvider.php

@@ -28,9 +28,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         // LOCAL HTTPS FIX
-        if (config('app.env') !== 'local') {
-            URL::forceScheme('https');
-        }
+        URL::forceScheme('https');
         // HA PROXY FIX
         App::singleton('clientIp', function () {
             if (config('app.env') === 'local') {

composer.json

@@ -12,9 +12,9 @@
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "htmlmin/htmlmin": "^8.0",
-        "kwaadpepper/crud-policies": "^0.2.0",
-        "kwaadpepper/enum": "^2.0",
-        "kwaadpepper/exception-handler": "^0.0.1",
+        "kwaadpepper/crud-policies": "^0.4.5",
+        "kwaadpepper/enum": "^2.1",
+        "kwaadpepper/exception-handler": "^0.0.9",
         "kwaadpepper/image-resizer": "^0.0.3",
         "laravel/framework": "^8.12",
         "laravel/tinker": "^2.5",
@@ -66,7 +66,11 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

config/exception-handler.php

@@ -12,6 +12,6 @@ return [
      * so you can receive email if things go mad
      */
     'contactsList' => [
-        'serviceweb' => env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr')
+        env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr')
     ]
 ];

database/migrations/2022_06_17_103722_change_delete_restiction_pivot_user_site.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeDeleteRestictionPivotUserSite extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_site', function (Blueprint $table) {
+            $table->dropForeign(['site_id']);
+            $table->foreign('site_id')->references('id')->on('sites')
+                ->cascadeOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

resources/lang/en/models.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'classes' => [
+        'societes' => 'Societies',
+        'employees' => 'Employees',
+        'plannings' => 'Plannings',
+        'poles' => 'Poles',
+        'sites' => 'Sites',
+        'sondages' => 'Sondages',
+        'users' => 'Users',
+    ]
+];

resources/lang/fr/models.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'classes' => [
+        'societes' => 'Sociétés',
+        'employees' => 'Salariés',
+        'plannings' => 'Plannings',
+        'poles' => 'Poles',
+        'sites' => 'Sites',
+        'sondages' => 'Sondages',
+        'users' => 'Utilisateurs',
+    ]
+];