Merge branch 'develop' into trunk

.gitignore

@@ -25,3 +25,6 @@ npm-debug.log
 yarn-error.log
 .vscode/settings.json
 .npmrc
+.zshrc
+.composer/
+.npm/

app/Enums/Formularies/InputTypeEnum.php

@@ -30,7 +30,7 @@ enum InputTypeEnum: int
      */
     private const LABELS = [
         self::text->name           => 'texte',
-        self::email->name          => 'e-mail',
+        self::email->name          => 'email',
         self::phone->name          => 'téléphone',
         self::radio->name          => 'radio',
         self::select->name         => 'liste déroulante',

app/Models/Formulary.php

@@ -173,7 +173,7 @@ class Formulary extends Model
         // @phpcs:disable Generic.Files.LineLength.TooLong
         $array = [
             [
-                'name'        => 'e-mail',
+                'name'        => 'email',
                 'placeholder' => ['fr' => 'E-mail'],
                 'details'     => null,
                 'type'        => InputTypeEnum::email,

app/Providers/ViewServiceProvider.php

@@ -25,9 +25,9 @@ class ViewServiceProvider extends ServiceProvider
             } else {
                 Paginator::useBootstrap();
             }
-        }
-        if (Schema::hasTable('tenants')) {
-            View::share('tenantsGlobal', Tenant::getTenantsCached());
+            if (Schema::hasTable('tenants')) {
+                View::share('tenantsGlobal', Tenant::getTenantsCached());
+            }
         }
     }
 }

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "com-app-bo",
+    "name": "srcs",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {