.browserslistrc

@@ -1,13 +1,5 @@
 # Browsers that we support
 
-# https://github.com/browserslist/browserslist#readme
-
->= 0.5%
-last 2 major versions
-not dead
-Chrome >= 60
-Firefox >= 60
-Firefox ESR
-iOS >= 12
-Safari >= 12
-not Explorer <= 11
+last 3 version
+> 0.3%
+not dead # no browsers without security updates

.env.example

@@ -60,30 +60,3 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 # Sentry
 SENTRY_LARAVEL_DSN=
-
-# Matomo
-MATOMO_SITE_ID=id
-
-# MAILS
-MAIL_CONTACT_REMARK="equipe.web@ldc.fr"
-MAIL_CONTACT_SPONSORING="equipe.web@ldc.fr"
-MAIL_CONTACT_SERVICE="equipe.web@ldc.fr"
-MAIL_CONTACT_OTHER="equipe.web@ldc.fr"
-
-# GOOGLE
-# - RECAPTCHA
-GOOGLE_RECAPTCHA_PUBLIC=
-GOOGLE_RECAPTCHA_PRIVATE=
-GOOGLE_RECAPTCHA_VERSION=
-
-
-SAML2_DEFAULT_TENANT_UUID=
-SAML2_SP_CERT_x509=
-SAML2_SP_CERT_PRIVATEKEY=
-SAML2_CONTACT_TECHNICAL_EMAIL=
-
-# UWIL ADMIN SECURE
-# - LIST SEPARATED WITH ',' (Required)
-UWIL_ADMIN_SECURE_CIDR_LIST=""
-# - LIST SEPARATED WITH ',' (Optional)
-UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST=""

.eslintrc.json

@@ -45,6 +45,9 @@
         "vue/script-indent": ["error", 2, { "baseIndent": 0, "switchCase": 1 }],
         "vue/one-component-per-file": "off"
     },
+    "globals": {
+        "require": true
+    },
     "settings": {
         "import/resolver": {
             "node": {

.gitignore

@@ -8,7 +8,6 @@
 /.phpunit.cache
 /.vscode
 /node_modules
-/bootstrap
 /public/build
 /public/cache
 /public/hot
@@ -23,19 +22,3 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .npmrc
-.zshrc
-.npm/
-.composer/
-
-# Ignore public favicon
-/public/android-chrome-192x192.png
-/public/android-chrome-512x512.png
-/public/apple-touch-icon.png
-/public/browserconfig.xml
-/public/browserconfig.xml
-/public/favicon-16x16.png
-/public/favicon-32x32.png
-/public/favicon.ico
-/public/mstile-150x150.png
-/public/safari-pinned-tab.svg
-/public/site.webmanifest

.gitlab-ci.yml

@@ -1,23 +1,24 @@
 include:
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "lint/lint.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "security/security.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "build/docker-multistage.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "test/test.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "deploy/deploy.yml"
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'lint/lint.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'security/security.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'build/build.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'test/test.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'deploy/deploy.yml'
+
 
 stages:
-  - lint
-  - security
-  - build
-  - test
-  - deploy
+    - lint
+    - security
+    - build
+    - test
+    - deploy

.husky/commit-msg

@@ -1,2 +0,0 @@
-#!/bin/sh
-npx commitlint --config node_modules/@uwil/husky-config/commitlint.config.js --edit $1

.vscode/extensions.json

@@ -0,0 +1,21 @@
+{
+    "recommendations": [
+        "esbenp.prettier-vscode",
+        "rvest.vs-code-prettier-eslint",
+        "onecentlin.laravel-extension-pack",
+        "johnpapa.vscode-peacock",
+        "xdebug.php-debug",
+        "neilbrayfield.php-docblocker",
+        "bmewburn.vscode-intelephense-client",
+        "valeryanm.vscode-phpsab",
+        "shevaua.phpcs",
+        "syler.sass-indented",
+        "sibiraj-s.vscode-scss-formatter",
+        "mrmlnc.vscode-scss",
+        "stylelint.vscode-stylelint",
+        "vue.vscode-typescript-vue-plugin",
+        "wscats.vue",
+        "vue.volar",
+        "misterj.vue-volar-extention-pack"
+    ]
+}

.vscode/settings.json

@@ -20,7 +20,7 @@
         "commandCenter.border": "#e7e7e799"
     },
     "peacock.remoteColor": "#103251",
-    "intelephense.environment.phpVersion": "8.3.0",
+    "intelephense.environment.phpVersion": "8.2.0",
     "intelephense.completion.fullyQualifyGlobalConstantsAndFunctions": true,
     "intelephense.phpdoc.useFullyQualifiedNames": true
 }

Dockerfile

@@ -1,46 +0,0 @@
-FROM composer:2.8 AS vendor
-
-ARG GITLAB_USER
-ARG GITLAB_PASSWORD
-
-COPY database/ database/
-
-COPY composer.json composer.json
-COPY composer.lock composer.lock
-
-RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD}
-RUN composer install \
-    --ignore-platform-reqs \
-    --no-interaction \
-    --no-plugins \
-    --no-scripts \
-    --no-dev \
-    --prefer-dist
-
-FROM node:20.18 AS frontend
-
-ARG GITLAB_PASSWORD
-
-RUN mkdir -p /app/public/build
-
-COPY package*.json tsconfig.json vite.config.ts .eslintrc.json .stylelintrc.json /app/
-COPY resources/ /app/resources/
-WORKDIR /app
-RUN npm config set @ldc-web:registry https://lab.s-web.fr/api/v4/packages/npm/
-RUN npm config set -- '//lab.s-web.fr/api/v4/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
-RUN npm config set @uwil:registry https://lab.s-web.fr/api/v4/groups/ldc-web/-/packages/npm/
-RUN npm config set -- '//lab.s-web.fr/api/v4/groups/ldc-web/-/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
-RUN npm ci --no-audit --no-fund --loglevel=error && npm run prod
-
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
-
-ARG USER=www-data
-
-COPY --chown=${USER}:${USER} . /app/srcs
-COPY --from=vendor --chown=${USER}:${USER} /app/vendor/ /app/srcs/vendor/
-COPY --from=frontend --chown=${USER}:${USER}  /app/public/build/ /app/srcs/public/build/
-COPY --chown=${USER}:${USER} ./resources/favicon /app/srcs/public
-
-USER root
-RUN chmod -R 755 /app/srcs/storage
-USER ${USER}

app/Console/Commands/CleanOldActivities.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Jobs\CleanOldActivities as CleanOldActivitiesJob;
-use Illuminate\Console\Command;
-
-class CleanOldActivities extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'uwil:activity-logs:clean {--force : Delete all activity logs regardless of date.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Clean all logs older than one year. Use --force to delete all logs.';
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        $messageTitle = "<comment>activity logs</comment>";
-        $this->components->info("Cleaning {$messageTitle}...");
-
-        $force = $this->option('force');
-
-        if ($force && !$this->confirm('Are you sure you want to delete all activity logs ? This cannot be undone.')) {
-            $this->components->error("Clean of {$messageTitle} aborted.");
-            return;
-        }
-
-        (new CleanOldActivitiesJob(force: $force))->handle();
-
-        $messageContent = $force ? "All {$messageTitle} deleted" : "Old {$messageTitle} cleaned";
-        $this->components->success($messageContent);
-    }
-}

app/Console/Commands/MakeUser.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Enums\Users\RoleEnum;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
-use Illuminate\Support\Str;
-
-/**
- * Artisan command to create a backend admin user.
- */
-class MakeUser extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'uwil:make:user';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new backend admin user.';
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        $this->components->info("Creating a new <comment>backend user</comment>...");
-
-        $firstName = $this->askValid(
-            'first_name',
-            'First name',
-            'Admin',
-            ['required', 'min:3', 'max:255']
-        );
-        $lastName  = $this->askValid(
-            'last_name',
-            'Last name',
-            'Saïtama',
-            ['required', 'min:3', 'max:255']
-        );
-        $email     = $this->askValid(
-            'email',
-            'Email',
-            'equipe.web@ldc.fr',
-            ['required', 'unique:users,email', 'email:rfc,strict,dns,spoof,filter']
-        );
-        $role      = $this->askRole();
-
-        $user = new User([
-            'first_name'   => $firstName,
-            'last_name'    => $lastName,
-            'email'        => $email,
-            'role'         => $role,
-            'published'    => true,
-            'published_at' => Carbon::now(),
-        ]);
-        $user->saveOrFail();
-
-        $this->components->success("User <comment>{$firstName} {$lastName}</comment> created successfully.");
-    }
-
-    /**
-     * Ask for a value and validate it, re-prompting on failure.
-     *
-     * @param string             $field
-     * @param string             $label
-     * @param string             $default
-     * @param array<int, string> $rules
-     * @return string
-     */
-    private function askValid(string $field, string $label, string $default, array $rules): string
-    {
-        try {
-            $value     = $this->ask(sprintf("Type the wanted user %s", $label), $default);
-            $validator = Validator::make([$field => $value], [$field => $rules]);
-            $validator->validate();
-            return $value;
-        } catch (ValidationException $e) {
-            $this->components->error(
-                collect($e->errors())->flatten()->first()
-            );
-            return $this->askValid($field, $label, $default, $rules);
-        }
-    }
-
-    /**
-     * Ask for a role and return the corresponding RoleEnum.
-     *
-     * @return \App\Enums\Users\RoleEnum
-     */
-    private function askRole(): \App\Enums\Users\RoleEnum
-    {
-        $options = collect([
-            RoleEnum::conceptor,
-            RoleEnum::admin,
-            RoleEnum::visitor,
-        ])->mapWithKeys(fn(RoleEnum $role) => [
-            Str::ucFirst($role->label()) => $role
-        ]);
-
-        /** @var string $choice */
-        $choice = $this->choice('Role', $options->keys()->all(), Str::ucFirst(RoleEnum::visitor->label()));
-        return $options->get($choice);
-    }
-}

app/Console/Commands/UpdatePlanificatedStatus.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Jobs\UpdatePlanificatedStatus as UpdatePlanificatedStatusJob;
-use Illuminate\Console\Command;
-
-class UpdatePlanificatedStatus extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'uwil:update-planificated-status';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update models planificated status.';
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        (new UpdatePlanificatedStatusJob())->handle();
-        $this->info('Models\' planificated status updated 👌');
-    }
-}

app/Console/Commands/UserCreate.php

@@ -0,0 +1,231 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\Users\RoleEnum;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+class UserCreate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'uwil:user:create';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a backend admin user';
+
+    /**
+     * The first name of the new user.
+     *
+     * @var string
+     */
+    protected $first_name;
+
+    /**
+     * The last name of the new user.
+     *
+     * @var string
+     */
+    protected $last_name;
+
+    /**
+     * The email of the new user.
+     *
+     * @var string
+     */
+    protected $email;
+
+    /**
+     * The password of the new user.
+     *
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * The role of the new user.
+     *
+     * @var string
+     */
+    protected $role;
+
+    /**
+     * Execute the console command.
+     *
+     * @return integer
+     */
+    public function handle(): int
+    {
+        $this->first_name = null;
+        $this->addFirstName();
+
+        $this->last_name = null;
+        $this->addLastName();
+
+        $this->email = null;
+        $this->addEmail();
+
+        $this->password = null;
+        $this->addPassword();
+
+        $this->role = null;
+        $this->addRole();
+
+        $user = new User([
+            'first_name' => $this->first_name,
+            'last_name' => $this->last_name,
+            'email' => $this->email,
+            'password' => $this->password,
+            'role' => $this->role,
+            'published' => true,
+            'published_at' => Carbon::now(),
+        ]);
+        $user->saveOrFail();
+
+        $this->info('User created 👌');
+
+        return 0;
+    }
+
+    /**
+     * Add a first name to the user.
+     *
+     * @return void
+     */
+    private function addFirstName(): void
+    {
+        while (is_null($this->first_name)) {
+            try {
+                $tmp       = $this->ask('Type the wanted user first name', 'Admin');
+                $validator = Validator::make(['first_name' => $tmp], [
+                    'first_name' => 'required|min:3|max:255'
+                ]);
+                $validator->validate();
+                $this->first_name = $tmp;
+            } catch (ValidationException $e) {
+                $this->error(sprintf(
+                    'Please provide a valid first name %s',
+                    \implode(',', collect($e->errors())->flatten()->all())
+                ));
+                continue;
+            } //end try
+        }; //end while
+    }
+
+    /**
+     * Add a last name to the user.
+     *
+     * @return void
+     */
+    private function addLastName(): void
+    {
+        while (is_null($this->last_name)) {
+            try {
+                $tmp       = $this->ask('Type the wanted user last name', 'Saïtama');
+                $validator = Validator::make(['last_name' => $tmp], [
+                    'last_name' => 'required|min:3|max:255'
+                ]);
+                $validator->validate();
+                $this->last_name = $tmp;
+            } catch (ValidationException $e) {
+                $this->error(sprintf(
+                    'Please provide a valid last_name %s',
+                    \implode(',', collect($e->errors())->flatten()->all())
+                ));
+                continue;
+            } //end try
+        }; //end while
+    }
+
+    /**
+     * Add an email to the user.
+     *
+     * @return void
+     */
+    private function addEmail(): void
+    {
+        while (is_null($this->email)) {
+            try {
+                $tmp       = $this->ask('Type the wanted user email', 'equipe.web@ldc.fr');
+                $validator = Validator::make(['email' => $tmp], [
+                    'email' => 'required|unique:users,email|email:rfc,dns'
+                ]);
+                $validator->validate();
+                $this->email = $tmp;
+            } catch (ValidationException $e) {
+                $this->error(sprintf(
+                    'Please provide a valid email %s',
+                    \implode(',', collect($e->errors())->flatten()->all())
+                ));
+                continue;
+            } //end try
+        }; //end while
+    }
+
+    /**
+     * Add a password to the user.
+     *
+     * @return void
+     */
+    private function addPassword(): void
+    {
+        while (
+            ($this->password = $this->secret(
+                (!\is_null($this->password) ? 'Failed to confirm, ' : '') . 'Type the wanted user password'
+            )) !== $this->secret('Confirm the password')
+        ) {
+            continue;
+        }; //end while
+    }
+
+    /**
+     * Add a role to the user.
+     *
+     * @return void
+     */
+    private function addRole(): void
+    {
+        while (is_null($this->role)) {
+            try {
+                $tmp                         = $this->choice(
+                    'Select his role',
+                    [RoleEnum::conceptor->name, RoleEnum::admin->name, RoleEnum::visitor->name],
+                    RoleEnum::visitor->name,
+                    $maxAttempts             = null,
+                    $allowMultipleSelections = false
+                );
+                if ($tmp === RoleEnum::conceptor->name) {
+                    $tmp = RoleEnum::conceptor;
+                }
+                if ($tmp === RoleEnum::admin->name) {
+                    $tmp = RoleEnum::admin;
+                }
+                if ($tmp === RoleEnum::visitor->name) {
+                    $tmp = RoleEnum::visitor;
+                }
+                $validator = Validator::make(['role' => $tmp], [
+                    'role' => 'required'
+                ]);
+                $validator->validate();
+                $this->role = $tmp;
+            } catch (ValidationException $e) {
+                $this->error(sprintf(
+                    'Please choose from the selection',
+                    \implode(',', collect($e->errors())->flatten()->all())
+                ));
+                continue;
+            } //end try
+        }; //end while
+    }
+}

app/Console/Kernel.php

@@ -2,8 +2,6 @@
 
 namespace App\Console;
 
-use App\Jobs\CleanOldActivities;
-use App\Jobs\UpdatePlanificatedStatus;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -15,10 +13,8 @@ class Kernel extends ConsoleKernel
      * @param  \Illuminate\Console\Scheduling\Schedule $schedule
      * @return void
      */
-    protected function schedule(Schedule $schedule): void
+    protected function schedule(Schedule $schedule)
     {
-        $schedule->job(CleanOldActivities::class)->daily();
-        $schedule->job(UpdatePlanificatedStatus::class)->everyFiveMinutes();
     }
 
     /**
@@ -26,7 +22,7 @@ class Kernel extends ConsoleKernel
      *
      * @return void
      */
-    protected function commands(): void
+    protected function commands()
     {
         $this->load(__DIR__ . '/Commands');
 

app/Enums/ActivityLogs/ActivityLogsEventEnum.php

@@ -14,9 +14,7 @@ enum ActivityLogsEventEnum: int
     case deleted    = 4;
 
     /**
-     * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
+     * Optionnal labels definition
      */
     private const LABELS = [
         self::created->name    => 'Création',
@@ -27,7 +25,7 @@ enum ActivityLogsEventEnum: int
 
 
     /**
-     * Custom added classes definition.
+     * Custom added classes definition
      */
     private const BOOTSTRAPCLASS = [
         self::created->name    => 'success',
@@ -37,7 +35,7 @@ enum ActivityLogsEventEnum: int
     ];
 
     /**
-     * Get Class.
+     * Get Class
      *
      * @return string
      */

app/Enums/CkEditorConfigName.php

@@ -9,19 +9,15 @@ enum CkEditorConfigName: int
     use BaseEnum;
 
     case minimal  = 1;
-    case basic    = 2;
+    case base     = 2;
     case advanced = 3;
 
-
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::minimal->name  => 'minimal',
-        self::basic->name    => 'basic',
+        self::base->name     => 'base',
         self::advanced->name => 'advanced',
-
     ];
 }

app/Enums/Country.php

@@ -260,8 +260,6 @@ enum Country: int
 
     /**
      * Optionnal labels definition
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::afghanistan->name                            => 'Afghanistan',
@@ -357,9 +355,9 @@ enum Country: int
         self::guatemala->name                              => 'Guatemala',
         self::guernsey->name                               => 'Guernsey',
         self::guinea->name                                 => 'Guinea',
-        self::guineaBissau->name                           => 'Guinea Bissau',
+        self::guineaBissau->name                           => 'GuineaBissau',
         self::guyana->name                                 => 'Guyana',
-        self::haiti->name                                  => 'Haïti',
+        self::haiti->name                                  => 'Haiti',
         self::heardIslandAndMcdonaldIslands->name          => 'Heard Island and McDonald Islands',
         self::holySeeVaticanCityState->name                => 'Holy See (Vatican City State)',
         self::honduras->name                               => 'Honduras',
@@ -518,7 +516,7 @@ enum Country: int
     /**
      * Get Valid Shipping Countries
      *
-     * @return array<int, self>
+     * @return array
      */
     public static function validShippingCountries(): array
     {
@@ -544,7 +542,7 @@ enum Country: int
     /**
      * Get Valid Shipping Countries
      *
-     * @return array<int, self>
+     * @return array
      */
     public static function validBillingCountries(): array
     {
@@ -568,7 +566,7 @@ enum Country: int
     /**
      * Get Alpha 2 ISO code of valid shipping countries
      *
-     * @return array<int, string>
+     * @return array
      */
     public static function getValidShippingCountriesIsoAplha2Codes(): array
     {
@@ -578,7 +576,7 @@ enum Country: int
     /**
      * Get Alpha 2 ISO code of valid billing countries
      *
-     * @return array<int, string>
+     * @return array
      */
     public static function getValidBillingCountriesIsoAplha2Codes(): array
     {
@@ -586,258 +584,21 @@ enum Country: int
     }
 
     /**
-     * Custom added ISOCODES definition.
+     * Custom added ISOCODES definition
      */
     private const ISOCODES = [
-        self::afghanistan->name                            => 'AFG',
-        self::alandIslands->name                           => 'ALA',
-        self::albania->name                                => 'ALB',
-        self::algeria->name                                => 'DZA',
-        self::americanSamoa->name                          => 'ASM',
-        self::andorra->name                                => 'AND',
-        self::angola->name                                 => 'AGO',
-        self::anguilla->name                               => 'AIA',
-        self::antarctica->name                             => 'AQ',
-        self::antiguaAndBarbuda->name                      => 'ATG',
-        self::argentina->name                              => 'ARG',
-        self::armenia->name                                => 'ARM',
-        self::aruba->name                                  => 'ABW',
-        self::australia->name                              => 'AUS',
-        self::austria->name                                => 'AUT',
-        self::azerbaijan->name                             => 'AZE',
-        self::bahrain->name                                => 'BHR',
-        self::bahamas->name                                => 'BHS',
-        self::bangladesh->name                             => 'BGD',
-        self::barbados->name                               => 'BRB',
-        self::belarus->name                                => 'BLR',
-        self::belgium->name                                => 'BEL',
-        self::belize->name                                 => 'BLZ',
-        self::benin->name                                  => 'BEN',
-        self::bermuda->name                                => 'BMU',
-        self::bhutan->name                                 => 'BTN',
-        self::boliviaPlurinationalStateOf->name            => 'BOL',
-        self::bonaireSintEustatiusAndSaba->name            => 'BES',
-        self::bosniaAndHerzegovina->name                   => 'BIH',
-        self::botswana->name                               => 'BWA',
-        self::bouvetIsland->name                           => 'BVT',
-        self::brazil->name                                 => 'BRA',
-        self::britishIndianOceanTerritory->name            => 'IOT',
-        self::bruneiDarussalam->name                       => 'BRN',
-        self::bulgaria->name                               => 'BGR',
-        self::burkinaFaso->name                            => 'BFA',
-        self::burundi->name                                => 'BDI',
-        self::cambodia->name                               => 'KHM',
-        self::cameroon->name                               => 'CMR',
-        self::canada->name                                 => 'CAN',
-        self::capeVerde->name                              => 'CPV',
-        self::caymanIslands->name                          => 'CYM',
-        self::centralAfricanRepublic->name                 => 'CAF',
-        self::chad->name                                   => 'TCD',
-        self::chile->name                                  => 'CHL',
-        self::china->name                                  => 'CHN',
-        self::christmasIsland->name                        => 'CXR',
-        self::cocosKeelingIslands->name                    => 'CCK',
-        self::colombia->name                               => 'COL',
-        self::comoros->name                                => 'COM',
-        self::congo->name                                  => 'COG',
-        self::congoTheDemocraticRepublicOfThe->name        => 'COD',
-        self::cookIslands->name                            => 'COK',
-        self::costaRica->name                              => 'CRI',
-        self::coteDivoire->name                            => 'CIV',
-        self::croatia->name                                => 'HRV',
-        self::cuba->name                                   => 'CUB',
-        self::curacao->name                                => 'CUW',
-        self::cyprus->name                                 => 'CYP',
-        self::czechRepublic->name                          => 'CZE',
-        self::denmark->name                                => 'DNK',
-        self::djibouti->name                               => 'DJI',
-        self::dominica->name                               => 'DMA',
-        self::dominicanRepublic->name                      => 'DOM',
-        self::ecuador->name                                => 'ECU',
-        self::egypt->name                                  => 'EGY',
-        self::elSalvador->name                             => 'SLV',
-        self::equatorialGuinea->name                       => 'GNQ',
-        self::eritrea->name                                => 'ERI',
-        self::estonia->name                                => 'EST',
-        self::ethiopia->name                               => 'ETH',
-        self::falklandIslandsMalvinas->name                => 'FLK',
-        self::faroeIslands->name                           => 'FRO',
-        self::fiji->name                                   => 'FJI',
-        self::finland->name                                => 'FIN',
-        self::france->name                                 => 'FRA',
-        self::frenchGuiana->name                           => 'GUF',
-        self::frenchPolynesia->name                        => 'PYF',
-        self::frenchSouthernTerritories->name              => 'ATF',
-        self::gabon->name                                  => 'GAB',
-        self::gambia->name                                 => 'GMB',
-        self::georgia->name                                => 'GEO',
-        self::germany->name                                => 'DEU',
-        self::ghana->name                                  => 'GHA',
-        self::gibraltar->name                              => 'GIB',
-        self::greece->name                                 => 'GRC',
-        self::greenland->name                              => 'GRL',
-        self::grenada->name                                => 'GRD',
-        self::guadeloupe->name                             => 'GLP',
-        self::guam->name                                   => 'GUM',
-        self::guatemala->name                              => 'GTM',
-        self::guernsey->name                               => 'GGY',
-        self::guinea->name                                 => 'GIN',
-        self::guineaBissau->name                           => 'GNB',
-        self::guyana->name                                 => 'GUY',
-        self::haiti->name                                  => 'HTI',
-        self::heardIslandAndMcdonaldIslands->name          => 'HMD',
-        self::holySeeVaticanCityState->name                => 'VAT',
-        self::honduras->name                               => 'HND',
-        self::hongKong->name                               => 'HKG',
-        self::hungary->name                                => 'HUN',
-        self::iceland->name                                => 'ISL',
-        self::india->name                                  => 'IND',
-        self::indonesia->name                              => 'IDN',
-        self::iranIslamicRepublicOf->name                  => 'IRN',
-        self::iraq->name                                   => 'IRQ',
-        self::ireland->name                                => 'IRL',
-        self::isleOfMan->name                              => 'IMN',
-        self::israel->name                                 => 'ISR',
-        self::italy->name                                  => 'ITA',
-        self::jamaica->name                                => 'JAM',
-        self::japan->name                                  => 'JPN',
-        self::jersey->name                                 => 'JEY',
-        self::jordan->name                                 => 'JOR',
-        self::kazakhstan->name                             => 'KAZ',
-        self::kenya->name                                  => 'KEN',
-        self::kiribati->name                               => 'KIR',
-        self::koreaDemocraticPeoplesRepublicOf->name       => 'PRK',
-        self::koreaRepublicOf->name                        => 'KOR',
-        self::kuwait->name                                 => 'KWT',
-        self::kyrgyzstan->name                             => 'KGZ',
-        self::laoPeoplesDemocraticRepublic->name           => 'LAO',
-        self::latvia->name                                 => 'LVA',
-        self::lebanon->name                                => 'LBN',
-        self::lesotho->name                                => 'LSO',
-        self::liberia->name                                => 'LBR',
-        self::libya->name                                  => 'LBY',
-        self::liechtenstein->name                          => 'LIE',
-        self::lithuania->name                              => 'LTU',
-        self::luxembourg->name                             => 'LUX',
-        self::macao->name                                  => 'MAC',
-        self::macedoniaTheFormerYugoslavRepublicOf->name   => 'MKD',
-        self::madagascar->name                             => 'MDG',
-        self::malawi->name                                 => 'MWI',
-        self::malaysia->name                               => 'MYS',
-        self::maldives->name                               => 'MDV',
-        self::mali->name                                   => 'MLI',
-        self::malta->name                                  => 'MLT',
-        self::marshallIslands->name                        => 'MHL',
-        self::martinique->name                             => 'MTQ',
-        self::mauritania->name                             => 'MRT',
-        self::mauritius->name                              => 'MUS',
-        self::mayotte->name                                => 'MYT',
-        self::mexico->name                                 => 'MEX',
-        self::micronesiaFederatedStatesOf->name            => 'FSM',
-        self::moldovaRepublicOf->name                      => 'MDA',
-        self::monaco->name                                 => 'MCO',
-        self::mongolia->name                               => 'MNG',
-        self::montenegro->name                             => 'MNE',
-        self::montserrat->name                             => 'MSR',
-        self::morocco->name                                => 'MAR',
-        self::mozambique->name                             => 'MOZ',
-        self::myanmar->name                                => 'MMR',
-        self::namibia->name                                => 'NAM',
-        self::nauru->name                                  => 'NRU',
-        self::nepal->name                                  => 'NPL',
-        self::netherlands->name                            => 'NLD',
-        self::newCaledonia->name                           => 'NCL',
-        self::newZealand->name                             => 'NZL',
-        self::nicaragua->name                              => 'NIC',
-        self::niger->name                                  => 'NER',
-        self::nigeria->name                                => 'NGA',
-        self::niue->name                                   => 'NIU',
-        self::norfolkIsland->name                          => 'NFK',
-        self::northernMarianaIslands->name                 => 'MNP',
-        self::norway->name                                 => 'NOR',
-        self::oman->name                                   => 'OMN',
-        self::pakistan->name                               => 'PAK',
-        self::palau->name                                  => 'PLW',
-        self::palestineStateOf->name                       => 'PSE',
-        self::panama->name                                 => 'PAN',
-        self::papuaNewGuinea->name                         => 'PNG',
-        self::paraguay->name                               => 'PRY',
-        self::peru->name                                   => 'PER',
-        self::philippines->name                            => 'PHL',
-        self::pitcairn->name                               => 'PCN',
-        self::poland->name                                 => 'POL',
-        self::portugal->name                               => 'PRT',
-        self::puertoRico->name                             => 'PRI',
-        self::qatar->name                                  => 'QAT',
-        self::reunion->name                                => 'REU',
-        self::romania->name                                => 'ROU',
-        self::russianFederation->name                      => 'RUS',
-        self::rwanda->name                                 => 'RWA',
-        self::saintBarthelemy->name                        => 'BLM',
-        self::saintHelenaAscensionAndTristanDaCunha->name  => 'SHN',
-        self::saintKittsAndNevis->name                     => 'KNA',
-        self::saintLucia->name                             => 'LCA',
-        self::saintMartinFrenchPart->name                  => 'MAF',
-        self::saintPierreAndMiquelon->name                 => 'SPM',
-        self::saintVincentAndTheGrenadines->name           => 'VCT',
-        self::samoa->name                                  => 'WSM',
-        self::sanMarino->name                              => 'SMR',
-        self::saoTomeAndPrincipe->name                     => 'STP',
-        self::saudiArabia->name                            => 'SAU',
-        self::senegal->name                                => 'SEN',
-        self::serbia->name                                 => 'SRB',
-        self::seychelles->name                             => 'SYC',
-        self::sierraLeone->name                            => 'SLE',
-        self::singapore->name                              => 'SGP',
-        self::sintMaartenDutchPart->name                   => 'SXM',
-        self::slovakia->name                               => 'SVK',
-        self::slovenia->name                               => 'SVN',
-        self::solomonIslands->name                         => 'SLB',
-        self::somalia->name                                => 'SOM',
-        self::southAfrica->name                            => 'ZAF',
-        self::southGeorgiaAndTheSouthSandwichIslands->name => 'SGS',
-        self::southSudan->name                             => 'SSD',
-        self::spain->name                                  => 'ESP',
-        self::sriLanka->name                               => 'LKA',
-        self::sudan->name                                  => 'SDN',
-        self::suriname->name                               => 'SUR',
-        self::svalbardAndJanMayen->name                    => 'SJM',
-        self::swaziland->name                              => 'SWZ',
-        self::sweden->name                                 => 'SWE',
-        self::switzerland->name                            => 'CHE',
-        self::syrianArabRepublic->name                     => 'SYR',
-        self::taiwanProvinceOfChina->name                  => 'TWN',
-        self::tajikistan->name                             => 'TJK',
-        self::tanzaniaUnitedRepublicOf->name               => 'TZA',
-        self::thailand->name                               => 'THA',
-        self::timorLeste->name                             => 'TLS',
-        self::togo->name                                   => 'TGO',
-        self::tokelau->name                                => 'TKL',
-        self::tonga->name                                  => 'TON',
-        self::trinidadAndTobago->name                      => 'TTO',
-        self::tunisia->name                                => 'TUN',
-        self::turkey->name                                 => 'TUR',
-        self::turkmenistan->name                           => 'TKM',
-        self::turksAndCaicosIslands->name                  => 'TCA',
-        self::tuvalu->name                                 => 'TUV',
-        self::uganda->name                                 => 'UGA',
-        self::ukraine->name                                => 'UKR',
-        self::unitedArabEmirates->name                     => 'ARE',
-        self::unitedKingdom->name                          => 'GBR',
-        self::unitedStates->name                           => 'USA',
-        self::unitedStatesMinorOutlyingIslands->name       => 'UMI',
-        self::uruguay->name                                => 'URY',
-        self::uzbekistan->name                             => 'UZB',
-        self::vanuatu->name                                => 'VUT',
-        self::venezuelaBolivarianRepublicOf->name          => 'VEN',
-        self::vietNam->name                                => 'VNM',
-        self::virginIslandsBritish->name                   => 'VGB',
-        self::virginIslandsUs->name                        => 'VIR',
-        self::wallisAndFutuna->name                        => 'WLF',
-        self::westernSahara->name                          => 'ESH',
-        self::yemen->name                                  => 'YEM',
-        self::zambia->name                                 => 'ZMB',
-        self::zimbabwe->name                               => 'ZWE',
+        self::france->name => 'FR',
+        self::guadeloupe->name => 'GP',
+        self::martinique->name => 'MQ',
+        self::frenchGuiana->name => 'GF',
+        self::reunion->name => 'RE',
+        self::saintPierreAndMiquelon->name => 'PM',
+        self::mayotte->name => 'YT',
+        self::saintBarthelemy->name => 'BL',
+        self::saintMartinFrenchPart->name => 'MF',
+        self::wallisAndFutuna->name => 'WF',
+        self::frenchPolynesia->name => 'PF',
+        self::newCaledonia->name => 'NC',
     ];
 
     /**

app/Enums/Listen/ObjectEnum.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Enums\Listen;
-
-use App\Traits\Enums\BaseEnum;
-
-enum ObjectEnum: int
-{
-    use BaseEnum;
-
-    case remark     = 1;
-    case sponsoring = 2;
-    case service    = 3;
-    case other      = 4;
-
-    /**
-     * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
-     */
-    private const LABELS = [
-        self::remark->name      => 'Contact Commercial ou remarque sur nos produits',
-        self::sponsoring->name  => 'Demande de partenariat ou sponsoring',
-        self::service->name     => 'Proposition de service au fournisseur',
-        self::other->name       => 'Autre demande',
-    ];
-}

app/Enums/Sections/PageSectionEnum.php

@@ -13,70 +13,64 @@ enum PageSectionEnum: int
     case home_team            = 3;
     case home_life            = 4;
     case unveil_pole          = 5;
-    case unveil_missions      = 6;
-    case unveil_local         = 7;
-    case unveil_sites         = 8;
-    case unveil_history       = 9;
-    case unveil_commitments   = 10;
-    case hire_life            = 11;
-    case hire_formation       = 12;
-    case hire_grow            = 13;
-    case hire_parity          = 14;
-    case hire_find            = 15;
-    case commit_ambition      = 16;
-    case commit_breeding      = 17;
-    case commit_living        = 18;
-    case commit_respect_earth = 19;
-    case commit_feed          = 20;
-    case commit_commitments   = 21;
-    case move_life            = 22;
-    case move_commitments     = 23;
-    case produce_local        = 24;
-    case produce_gms          = 25;
-    case produce_rhd          = 26;
-    case produce_export       = 27;
-    case produce_quality      = 28;
-    case produce_linking      = 29;
-    case listening_study      = 30;
-    case produce_networks     = 31;
+    case unveil_local         = 6;
+    case unveil_sites         = 7;
+    case unveil_history       = 8;
+    case unveil_commitments   = 9;
+    case hire_life            = 10;
+    case hire_formation       = 11;
+    case hire_grow            = 12;
+    case hire_parity          = 13;
+    case hire_find            = 14;
+    case commit_ambition      = 15;
+    case commit_breeding      = 16;
+    case commit_living        = 17;
+    case commit_respect_earth = 18;
+    case commit_feed          = 19;
+    case commit_commitments   = 20;
+    case move_life            = 21;
+    case move_commitments     = 22;
+    case produce_local        = 23;
+    case produce_gms          = 24;
+    case produce_rhd          = 25;
+    case produce_export       = 26;
+    case produce_quality      = 27;
+    case produce_linking      = 28;
+    case listening_study      = 29;
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
-        self::home_missions->name        => 'Nos Missions',
-        self::home_ambition->name        => 'Notre Ambition',
-        self::home_team->name            => 'L\'équipe VOLENA',
-        self::home_life->name            => 'La vie chez VOLENA',
-        self::unveil_pole->name          => 'Le Pôle Volena',
-        self::unveil_missions->name      => 'Nos Missions',
-        self::unveil_local->name         => 'Notre Filière Locale',
-        self::unveil_sites->name         => 'Nos Sites',
-        self::unveil_history->name       => 'Histoire',
-        self::unveil_commitments->name   => 'Engagements',
-        self::hire_life->name            => 'Vie de l\'Entreprise',
-        self::hire_formation->name       => 'Alternance et Formation',
-        self::hire_grow->name            => 'Fiers d\'évoluer ensemble',
-        self::hire_parity->name          => 'Parité',
-        self::hire_find->name            => 'On se retrouve',
-        self::commit_ambition->name      => 'Ambition',
-        self::commit_breeding->name      => 'Elever Durablement',
-        self::commit_living->name        => 'Mieux vivre',
+        self::home_missions->name => 'Nos Missions',
+        self::home_ambition->name => 'Notre Ambition',
+        self::home_team->name => 'L\'équipe VOLENA',
+        self::home_life->name => 'La vie chez VOLENA',
+        self::unveil_pole->name => 'Le Pôle Volena',
+        self::unveil_local->name => 'Notre Filière Locale',
+        self::unveil_sites->name => 'Nos Sites',
+        self::unveil_history->name => 'Histoire',
+        self::unveil_commitments->name => 'Engagements',
+        self::hire_life->name => 'Vie de l\'Entreprise',
+        self::hire_formation->name => 'Alternance et Formation',
+        self::hire_grow->name => 'Fiers d\'évoluer ensemble',
+        self::hire_parity->name => 'Parité',
+        self::hire_find->name => 'On se retrouve',
+        self::commit_ambition->name => 'Ambition',
+        self::commit_breeding->name => 'Elever Durablement',
+        self::commit_living->name => 'Mieux vivre',
         self::commit_respect_earth->name => 'Respecter la terre',
-        self::commit_feed->name          => 'Bien nourrir',
-        self::commit_commitments->name   => 'Engagements',
-        self::move_life->name            => 'Vie de l\'Entreprise',
-        self::move_commitments->name     => 'Engagements',
-        self::produce_local->name        => 'Large Gamme Locale',
-        self::produce_gms->name          => 'Retrouvez en GMS',
-        self::produce_rhd->name          => 'RHD',
-        self::produce_export->name       => 'Export',
-        self::produce_quality->name      => 'Qualité',
-        self::produce_linking->name      => 'Liens',
-        self::listening_study->name      => 'On étudie',
-        self::produce_networks->name     => 'Nos réseaux',
+        self::commit_feed->name => 'Bien nourrir',
+        self::commit_commitments->name => 'Engagements',
+        self::move_life->name => 'Vie de l\'Entreprise',
+        self::move_commitments->name => 'Engagements',
+        self::produce_local->name => 'Large Gamme Locale',
+        self::produce_gms->name => 'Retrouvez en GMS',
+        self::produce_rhd->name => 'RHD',
+        self::produce_export->name => 'Export',
+        self::produce_quality->name => 'Qualité',
+        self::produce_linking->name => 'Liens',
+        self::listening_study->name => 'On étudie',
     ];
 
     /**
@@ -100,7 +94,6 @@ enum PageSectionEnum: int
             self::commit_feed,
             self::move_commitments,
             self::produce_linking => true,
-            self::unveil_missions,
             self::unveil_local,
             self::unveil_sites,
             self::unveil_history,
@@ -116,8 +109,7 @@ enum PageSectionEnum: int
             self::produce_rhd,
             self::produce_export,
             self::produce_quality,
-            self::listening_study,
-            self::produce_networks => false,
+            self::listening_study => false,
         }; //end match
     }
 
@@ -135,9 +127,8 @@ enum PageSectionEnum: int
             self::home_life,
             self::unveil_sites,
             self::unveil_history,
-            self::unveil_commitments => \App\Enums\CkEditorConfigName::basic->label(),
+            self::unveil_commitments => \App\Enums\CkEditorConfigName::base->label(),
             self::unveil_pole,
-            self::unveil_missions,
             self::unveil_local,
             self::hire_life,
             self::hire_formation,
@@ -158,8 +149,7 @@ enum PageSectionEnum: int
             self::produce_quality,
             self::listening_study => \App\Enums\CkEditorConfigName::advanced->label(),
             self::produce_linking,
-            self::hire_grow,
-            self::produce_networks => null,
+            self::hire_grow, => null,
         }; //end match
     }
 }

app/Enums/Sites/SpeciesEnum.php

@@ -18,8 +18,6 @@ enum SpeciesEnum: int
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::chicken->name     => 'Poulet',
@@ -30,73 +28,4 @@ enum SpeciesEnum: int
         self::guinea_fowl->name => 'Pintade',
         self::rooster->name     => 'Coq',
     ];
-
-    /**
-     * Pictures paths.
-     */
-    private const PICTURES = [
-        self::chicken->name     => 'resources/assets/images/pictos/chicken.jpg',
-        self::turkey->name      => 'resources/assets/images/pictos/turkey.jpg',
-        self::hen->name         => 'resources/assets/images/pictos/hen_and_rooster.jpg',
-        self::duck->name        => 'resources/assets/images/pictos/duck.jpg',
-        self::rabbit->name      => 'resources/assets/images/pictos/rabbit.jpg',
-        self::guinea_fowl->name => 'resources/assets/images/pictos/guinea_fowl.jpg',
-        self::rooster->name     => 'resources/assets/images/pictos/hen_and_rooster.jpg',
-    ];
-
-    /**
-     * Get picture path
-     *
-     * @return string
-     */
-    public function picture(): string
-    {
-        return self::PICTURES[$this->name];
-    }
-
-    /**
-     * Alt attributes for pictures.
-     */
-    private const ALTS = [
-        self::chicken->name => 'Pictogramme pour la catégorie \'poulet\'',
-        self::turkey->name  => 'Pictogramme pour la catégorie \'dinde\'',
-        self::hen->name     => 'Pictogramme pour la catégorie \'poule\'',
-        self::duck->name    => 'Pictogramme pour la catégorie \'canard\'',
-        self::rabbit->name  => 'Pictogramme pour la catégorie \'lapin\'',
-        self::guinea_fowl->name  => 'Pictogramme pour la catégorie \'pintade\'',
-        self::rooster->name => 'Pictogramme pour la catégorie \'coq\'',
-    ];
-
-    /**
-     * Get picture alt attribute.
-     *
-     * @return string
-     */
-    public function alt(): string
-    {
-        return self::ALTS[$this->name];
-    }
-
-    /**
-     * Alt attributes for pictures.
-     */
-    private const TITLES = [
-        self::chicken->name => 'Pictogramme pour la catégorie \'poulet\'',
-        self::turkey->name  => 'Pictogramme pour la catégorie \'dinde\'',
-        self::hen->name     => 'Pictogramme pour la catégorie \'poule\'',
-        self::duck->name    => 'Pictogramme pour la catégorie \'canard\'',
-        self::rabbit->name  => 'Pictogramme pour la catégorie \'lapin\'',
-        self::guinea_fowl->name  => 'Pictogramme pour la catégorie \'pintade\'',
-        self::rooster->name => 'Pictogramme pour la catégorie \'coq\'',
-    ];
-
-    /**
-     * Get picture alt attribute.
-     *
-     * @return string
-     */
-    public function title(): string
-    {
-        return self::TITLES[$this->name];
-    }
 }

app/Enums/Slides/SliderTypeEnum.php

@@ -11,17 +11,13 @@ enum SliderTypeEnum: int
     case home          = 1;
     case better_life   = 2;
     case respect_earth = 3;
-    case team          = 4;
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::home->name          => 'Accueil',
         self::better_life->name   => 'Mieux vivre',
         self::respect_earth->name => 'Respecter la terre',
-        self::team->name => 'Nous rejoindre',
     ];
 }

app/Enums/StaticPageType.php

@@ -21,8 +21,6 @@ enum StaticPageType: int
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::contact->name         => 'Contact',
@@ -40,7 +38,7 @@ enum StaticPageType: int
     /**
      * Get the enums for the page which contains sections.
      *
-     * @return array<int, self>
+     * @return array
      */
     public static function containsSection(): array
     {
@@ -59,40 +57,20 @@ enum StaticPageType: int
      * Does the static page need to fill its 'content' column ?
      *
      * @return boolean
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
     public function containsContent(): bool
     {
-        // @phpcs:enable
         return match ($this) {
-            self::contact         => false,
-            self::legals          => true,
+            self::contact,
+            self::legals,
             self::confidentiality => true,
-            self::home            => false,
-            self::unveil          => false,
-            self::we_hire         => false,
-            self::we_commit       => false,
-            self::we_move         => false,
-            self::we_produce      => false,
-            self::we_listen       => false,
-        };
-    }
-
-    /**
-     * Does the static page need to fill its 'picture' column ?
-     *
-     * @return boolean
-     */
-    public function containsBanner(): bool
-    {
-        return match ($this) {
+            self::home,
             self::unveil,
             self::we_hire,
             self::we_commit,
             self::we_move,
             self::we_produce,
-            self::we_listen => true,
-            default         => false,
+            self::we_listen => false,
         };
     }
 }

app/Enums/StickiesColorEnum.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use App\Traits\Enums\BaseEnum;
-
-enum StickiesColorEnum: int
-{
-    use BaseEnum;
-
-    case primary   = 1;
-    case secondary = 2;
-    case tertiary  = 3;
-    case quad      = 4;
-    case quint     = 5;
-    case sixt      = 6;
-
-    /**
-     * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
-     */
-    private const LABELS = [
-        self::primary->name   => 'Primary',
-        self::secondary->name => 'Secondary',
-        self::tertiary->name  => 'Tertiary',
-        self::quad->name      => 'Quad',
-        self::quint->name     => 'Quint',
-        self::sixt->name      => 'Sixt',
-    ];
-}

app/Enums/Strips/PictoEnum.php

@@ -17,23 +17,21 @@ enum PictoEnum: int
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
-        self::none->name          => 'Aucun',
         self::danger->name        => 'Danger',
         self::respect_earth->name => 'Respecter la terre',
         self::breeding->name      => 'Elever Durablement',
         self::feed->name          => 'Bien Nourrir',
         self::better_life->name   => 'Mieux vivre en équipe',
+        self::none->name          => 'Aucun',
     ];
 
     /**
      * Pictures paths.
      */
     private const PICTURES = [
-        self::none->name          => 'resources/assets/images/pictos/none.jpg',
+        self::none->name          => '',
         self::danger->name        => 'resources/assets/images/pictos/danger.png',
         self::respect_earth->name => 'resources/assets/images/pictos/respect_earth.png',
         self::breeding->name      => 'resources/assets/images/pictos/breeding.png',
@@ -42,7 +40,7 @@ enum PictoEnum: int
     ];
 
     /**
-     * Get picture path.
+     * Get picture path
      *
      * @return string
      */
@@ -55,7 +53,7 @@ enum PictoEnum: int
      * Alt attributes for pictures.
      */
     private const ALTS = [
-        self::none->name          => 'Logo Volena',
+        self::none->name          => '',
         self::danger->name        => 'Pictogramme pour la catégorie \'Danger\'',
         self::respect_earth->name => 'Pictogramme pour la catégorie \'Respecter la terre\'',
         self::breeding->name      => 'Pictogramme pour la catégorie \'Elever durablement\'',
@@ -64,7 +62,7 @@ enum PictoEnum: int
     ];
 
     /**
-     * Get picture alt attribute.
+     * Get picture alt attribute
      *
      * @return string
      */
@@ -78,7 +76,7 @@ enum PictoEnum: int
      * Alt attributes for pictures.
      */
     private const TITLES = [
-        self::none->name          => 'Logo Volena',
+        self::none->name          => '',
         self::danger->name        => 'Pictogramme pour la catégorie \'Danger\'',
         self::respect_earth->name => 'Pictogramme pour la catégorie \'Respecter la terre\'',
         self::breeding->name      => 'Pictogramme pour la catégorie \'Elever durablement\'',
@@ -87,7 +85,7 @@ enum PictoEnum: int
     ];
 
     /**
-     * Get picture alt attribute.
+     * Get picture alt attribute
      *
      * @return string
      */

app/Enums/Testimonials/TypeEnum.php

@@ -17,8 +17,6 @@ enum TypeEnum: int
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
         self::breeding->name      => 'Elever Durablement',
@@ -28,26 +26,4 @@ enum TypeEnum: int
         self::volena->name        => 'Voléna',
         self::hire->name          => 'On Embauche',
     ];
-
-    /**
-     * Optionnal labels definition.
-     */
-    private const COLORS = [
-        self::breeding->name      => 'tertiary',
-        self::better_life->name   => 'quad',
-        self::respect_earth->name => 'quint',
-        self::feed->name          => 'sixt',
-        self::volena->name        => 'primary',
-        self::hire->name          => 'primary',
-    ];
-
-    /**
-     * Get color name.
-     *
-     * @return string
-     */
-    public function color(): string
-    {
-        return self::COLORS[$this->name];
-    }
 }

app/Enums/Theme/BootstrapThemeEnum.php

@@ -13,11 +13,9 @@ enum BootstrapThemeEnum: int
 
     /**
      * Optionnal labels definition
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
-        self::light->name => 'enums.bootstrap-theme.light',
-        self::dark->name  => 'enums.bootstrap-theme.dark',
+        self::light->name => 'Light',
+        self::dark->name  => 'Dark',
     ];
 }

app/Enums/Users/RoleEnum.php

@@ -14,12 +14,10 @@ enum RoleEnum: int
 
     /**
      * Optionnal labels definition.
-     *
-     * @phpstan-ignore-next-line
      */
     private const LABELS = [
-        self::conceptor->name => 'enums.user-role.conceptor',
-        self::admin->name     => 'enums.user-role.admin',
-        self::visitor->name   => 'enums.user-role.visitor',
+        self::conceptor->name => 'Concepteur',
+        self::admin->name     => 'Administrateur',
+        self::visitor->name   => 'Visiteur',
     ];
 }

app/Http/Controllers/Bo/ActivityLogController.php

@@ -21,7 +21,8 @@ class ActivityLogController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\ActivityLog> $query */
+        $this->authorize('isConceptor');
+        /** @var \Illuminate\Database\Eloquent\Builder $query */
         $query = ActivityLog::query()->with('user');
 
         /** @var string $search Search field */
@@ -50,12 +51,12 @@ class ActivityLogController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\ActivityLog $activity_log
+     * @param App\Models\ActivityLog $activity_log
      * @return \Illuminate\Contracts\View\View
      */
     public function show(ActivityLog $activity_log): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Model $targetModelClass */
+        $this->authorize('isConceptor');
         $targetModelClass = $activity_log->model_class;
         $targetModel      = $activity_log->model_class::where(
             (new $targetModelClass())->getRouteKeyName(),

app/Http/Controllers/Bo/AisleController.php

@@ -1,194 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Aisles\StoreAisleRequest;
-use App\Http\Requests\Bo\Aisles\UpdateAisleRequest;
-use App\Models\Aisle;
-use App\Models\Network;
-use App\Traits\Controllers\UpdateModelOrder;
-use App\Traits\Controllers\UpdateModelPublished;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-
-class AisleController extends Controller
-{
-    use UpdateModelOrder;
-    use UpdateModelPublished;
-
-    /**
-     * Create the controller instance.
-     */
-    public function __construct()
-    {
-        $this->authorizeResource(Aisle::class);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(Request $request): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Aisle> $aisleModels */
-        $aisleModels = Aisle::query()->with('network');
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Network> $networkModels */
-        $networkModels = Network::query()->where('published', true)->get();
-
-        $selectedNetwork = intval($request->network);
-
-        $aisleModels = $aisleModels->when($selectedNetwork, function ($query) use ($selectedNetwork) {
-            $query->where('network_id', $selectedNetwork);
-        });
-
-        /** @var string $search Search field */
-        $search = $request->input('search');
-        if ($search) {
-            $this->searchQuery(
-                $aisleModels,
-                $search,
-                null,
-                'name',
-            );
-        }
-        $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.name')),
-        ]);
-
-        /** Sort columns with a query */
-        $this->sortQuery($aisleModels);
-
-        /** Custom pagination */
-        $aisleModels = $this->paginate($aisleModels);
-
-        return view(
-            'bo.pages.aisles.index',
-            compact(
-                'aisleModels',
-                'networkModels',
-                'selectedNetwork',
-                'search',
-                'searchFields'
-            )
-        );
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @param \App\Models\Aisle $aisle
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create(Aisle $aisle): \Illuminate\Contracts\View\View
-    {
-        $networkModels = Network::all();
-
-        return view('bo.pages.aisles.create', [
-            'aisleModel'    => $aisle,
-            'networkModels' => $networkModels
-        ]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Aisles\StoreAisleRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(StoreAisleRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request) {
-            $aisle = new Aisle();
-            $aisle->fill($request->validated());
-
-            if ($aisle->saveOrFail()) {
-                return redirect()->route('bo.aisles.edit', $aisle)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.aisle'))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.aisle'))
-                ]));
-        });
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param \App\Models\Aisle $aisle
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function edit(Aisle $aisle): \Illuminate\Contracts\View\View
-    {
-        $networkModels = Network::all();
-
-        return view('bo.pages.aisles.edit', [
-            'aisleModel' => $aisle,
-            'networkModels' => $networkModels
-        ]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Aisles\UpdateAisleRequest $request
-     * @param \App\Models\Aisle                               $aisle
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UpdateAisleRequest $request, Aisle $aisle): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request, $aisle) {
-            $aisle->fill($request->validated());
-
-            if ($aisle->saveOrFail()) {
-                return redirect()->route('bo.aisles.edit', $aisle)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.aisle'))
-                    ]));
-            }
-            return redirect()->route('bo.aisles.edit', $aisle)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.aisle'))
-                ]));
-        });
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param \App\Models\Aisle $aisle
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(Aisle $aisle): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($aisle) {
-            if ($aisle->deleteOrFail()) {
-                return redirect()->route('bo.aisles.index')
-                    ->with('success', trans('crud.messages.has_been_deleted', [
-                        'model' => Str::ucfirst(trans('models.classes.aisle'))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.aisle'))
-                ]));
-        });
-    }
-
-    /**
-     * Duplicate the specified resource.
-     *
-     * @param \App\Models\Aisle $aisle
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function duplicate(Aisle $aisle): \Illuminate\Contracts\View\View
-    {
-        return $this->create($aisle->replicate());
-    }
-}

app/Http/Controllers/Bo/Auth/LoginController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Bo\Auth;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -26,7 +28,7 @@ class LoginController extends Controller
      *
      * @return \Illuminate\Contracts\Auth\StatefulGuard
      */
-    protected function guard(): \Illuminate\Contracts\Auth\StatefulGuard
+    protected function guard(): StatefulGuard
     {
         return Auth::guard('backend');
     }
@@ -36,7 +38,7 @@ class LoginController extends Controller
      *
      * @return \Illuminate\Contracts\View\View
      */
-    public function showLoginForm(): \Illuminate\Contracts\View\View
+    public function showLoginForm(): View
     {
         return view('bo.auth.login');
     }
@@ -57,7 +59,7 @@ class LoginController extends Controller
      * @param \Illuminate\Http\Request $request
      * @return boolean
      */
-    protected function attemptLogin(Request $request): bool
+    protected function attemptLogin(Request $request)
     {
         $credentials = $this->credentials($request);
         // * Attempt login only using published users.

app/Http/Controllers/Bo/Auth/ResetPasswordController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bo\Auth;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Support\Facades\Auth;
 
@@ -15,7 +16,7 @@ class ResetPasswordController extends Controller
      *
      * @return \Illuminate\Contracts\Auth\StatefulGuard
      */
-    protected function guard(): \Illuminate\Contracts\Auth\StatefulGuard
+    protected function guard(): StatefulGuard
     {
         return Auth::guard('backend');
     }

app/Http/Controllers/Bo/BrandController.php

@@ -1,176 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Brands\StoreBrandRequest;
-use App\Http\Requests\Bo\Brands\UpdateBrandRequest;
-use App\Models\Aisle;
-use App\Models\Brand;
-use App\Traits\Controllers\UpdateModelPublished;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-
-class BrandController extends Controller
-{
-    use UpdateModelPublished;
-
-    /**
-     * Create the controller instance.
-     */
-    public function __construct()
-    {
-        $this->authorizeResource(Brand::class);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(Request $request): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Brand> $brandModels */
-        $brandModels = Brand::query()->with('aisle');
-
-        /** @var string $search Search field */
-        $search = $request->input('search');
-        if ($search) {
-            $this->searchQuery(
-                $brandModels,
-                $search,
-                null,
-                'name',
-            );
-        }
-        $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.name')),
-        ]);
-
-        /** Sort columns with a query */
-        $this->sortQuery($brandModels);
-
-        /** Custom pagination */
-        $brandModels = $this->paginate($brandModels);
-
-        return view('bo.pages.brands.index', compact('brandModels', 'search', 'searchFields'));
-    }
-
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @param \App\Models\Brand $brand
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create(Brand $brand): \Illuminate\Contracts\View\View
-    {
-        $aisleModels = Aisle::all();
-
-        return view('bo.pages.brands.create', [
-            'brandModel'    => $brand,
-            'aisleModels' => $aisleModels
-        ]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Brands\StoreBrandRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(StoreBrandRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request) {
-            $brand = new Brand();
-            $brand->fill($request->validated());
-
-            if ($brand->saveOrFail()) {
-                return redirect()->route('bo.brands.edit', $brand)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.brand'))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.brand'))
-                ]));
-        });
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param \App\Models\Brand $brand
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function edit(Brand $brand): \Illuminate\Contracts\View\View
-    {
-        $aisleModels = Aisle::all();
-
-        return view('bo.pages.brands.edit', [
-            'brandModel' => $brand,
-            'aisleModels' => $aisleModels
-        ]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Brands\UpdateBrandRequest $request
-     * @param \App\Models\Brand                               $brand
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UpdateBrandRequest $request, Brand $brand): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request, $brand) {
-            $brand->fill($request->validated());
-
-            if ($brand->saveOrFail()) {
-                return redirect()->route('bo.brands.edit', $brand)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.brand'))
-                    ]));
-            }
-            return redirect()->route('bo.brands.edit', $brand)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.brand'))
-                ]));
-        });
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param \App\Models\Brand $brand
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(Brand $brand): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($brand) {
-            if ($brand->deleteOrFail()) {
-                return redirect()->route('bo.brands.index')
-                    ->with('success', trans('crud.messages.has_been_deleted', [
-                        'model' => Str::ucfirst(trans('models.classes.brand'))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.brand'))
-                ]));
-        });
-    }
-
-    /**
-     * Duplicate the specified resource.
-     *
-     * @param \App\Models\Brand $brand
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function duplicate(Brand $brand): \Illuminate\Contracts\View\View
-    {
-        return $this->create($brand->replicate());
-    }
-}

app/Http/Controllers/Bo/CarouselController.php

@@ -1,228 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Carousels\StoreCarouselRequest;
-use App\Http\Requests\Bo\Carousels\UpdateCarouselRequest;
-use App\Lib\Helpers\FileStorageHelper;
-use App\Models\Carousel;
-use App\Models\Section;
-use App\Traits\Controllers\UpdateModelOrder;
-use App\Traits\Controllers\UpdateModelPublished;
-use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-
-class CarouselController extends Controller
-{
-    use UpdateModelOrder;
-    use UpdateModelPublished;
-
-    /**
-     * Create the controller instance.
-     */
-    public function __construct()
-    {
-        $this->authorizeResource(Carousel::class);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(Request $request): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Carousel> $carouselModels */
-        $carouselModels = Carousel::query()->with('section');
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Section> $sectionModels */
-        $sectionModels = Section::query()->whereHas('carousels')->get();
-
-        $selectedSection = intval($request->section);
-
-        $carouselModels = $carouselModels->when($selectedSection, function ($query) use ($selectedSection) {
-            $query->where('section_id', $selectedSection);
-        });
-
-        /** @var string $search Search field */
-        $search = $request->input('search');
-        if ($search) {
-            $this->searchQuery(
-                $carouselModels,
-                $search,
-                null,
-                'title',
-            );
-        }
-        $searchFields = \implode(', ', [
-            Str::ucFirst(trans('validation.attributes.title')),
-        ]);
-
-        /** Sort columns with a query */
-        $this->sortQuery($carouselModels);
-
-        /** Custom pagination */
-        $carouselModels = $this->paginate($carouselModels);
-
-        return view('bo.pages.carousels.index', compact(
-            'carouselModels',
-            'sectionModels',
-            'selectedSection',
-            'search',
-            'searchFields'
-        ));
-    }
-
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @param \App\Models\Carousel $carousel
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create(Carousel $carousel): \Illuminate\Contracts\View\View
-    {
-        $sectionModels = Section::all();
-
-        return view('bo.pages.carousels.create', [
-            'carouselModel' => $carousel,
-            'sectionModels' => $sectionModels
-        ]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Carousels\StoreCarouselRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(StoreCarouselRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request) {
-            $carousel = new Carousel();
-            $carousel->fill($request->validated());
-
-            if (!Arr::exists($request->validated(), 'media')) {
-                $carousel->media = [];
-            }
-
-            // Set the new pictures files in the pictures array.
-            collect($request->only(['media.pictures.*.path']))
-                ->each(
-                    function (mixed $value, string $attribute) use ($carousel) {
-                        foreach ($value['pictures']['*']['path'] as $index => $file) {
-                            if ($file instanceof \Illuminate\Http\UploadedFile) {
-                                $carousel->setAttribute(
-                                    "{$attribute}->pictures->{$index}->path",
-                                    FileStorageHelper::storeFile($carousel, $file, true)
-                                );
-                            }
-                        }
-                    }
-                );
-
-            if ($carousel->saveOrFail()) {
-                return redirect()->route('bo.carousels.edit', $carousel)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-                ]));
-        });
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param \App\Models\Carousel $carousel
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function edit(Carousel $carousel): \Illuminate\Contracts\View\View
-    {
-        $sectionModels = Section::all();
-
-        return view('bo.pages.carousels.edit', [
-            'carouselModel' => $carousel,
-            'sectionModels' => $sectionModels
-        ]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Carousels\UpdateCarouselRequest $request
-     * @param \App\Models\Carousel                                  $carousel
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UpdateCarouselRequest $request, Carousel $carousel): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request, $carousel) {
-            $carousel->fill($request->validated());
-            if (!Arr::exists($request->validated(), 'media')) {
-                $carousel->media = [];
-            }
-
-            // Set the new pictures files in the pictures array.
-            collect($request->only(['media.pictures.*.path']))
-                ->each(
-                    function (mixed $value, string $attribute) use ($carousel) {
-                        foreach ($value['pictures']['*']['path'] as $index => $file) {
-                            if ($file instanceof \Illuminate\Http\UploadedFile) {
-                                $carousel->setAttribute(
-                                    "{$attribute}->pictures->{$index}->path",
-                                    FileStorageHelper::storeFile($carousel, $file, true)
-                                );
-                            }
-                        }
-                    }
-                );
-            if ($carousel->saveOrFail()) {
-                return redirect()->route('bo.carousels.edit', $carousel)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-                    ]));
-            }
-            return redirect()->route('bo.carousels.edit', $carousel)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-                ]));
-        });
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param \App\Models\Carousel $carousel
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(Carousel $carousel): \Illuminate\Http\RedirectResponse
-    {
-        if ($carousel->deleteOrFail()) {
-            return redirect()->route('bo.carousels.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-                ]));
-        }
-        return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans_choice('models.classes.carousel', 1))
-            ]));
-    }
-
-    /**
-     * Duplicate the specified resource.
-     *
-     * @param \App\Models\Carousel $carousel
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function duplicate(Carousel $carousel): \Illuminate\Contracts\View\View
-    {
-        return $this->create($carousel->replicate());
-    }
-}

app/Http/Controllers/Bo/DashboardController.php

@@ -3,15 +3,16 @@
 namespace App\Http\Controllers\Bo;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\View\View;
 
 class DashboardController extends Controller
 {
     /**
-     * Dashboard Page.
+     * Dashboard Page
      *
      * @return \Illuminate\Contracts\View\View
      */
-    public function index(): \Illuminate\Contracts\View\View
+    public function index(): View
     {
         return view('bo.pages.dashboard');
     }

app/Http/Controllers/Bo/HistoricalMilestoneController.php

@@ -28,11 +28,11 @@ class HistoricalMilestoneController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\HistoricalMilestone> $historicalMilestoneModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $historicalMilestoneModels */
         $historicalMilestoneModels = HistoricalMilestone::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $historicalMilestoneModels,
@@ -74,7 +74,7 @@ class HistoricalMilestoneController extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param \App\Http\Requests\Bo\HistoricalMilestones\StoreHistoricalMilestoneRequest $request
+     * @param \App\Http\Requests\Bo\HistoricalMilestone\StoreHistoricalMilestoneRequest $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(StoreHistoricalMilestoneRequest $request): \Illuminate\Http\RedirectResponse
@@ -85,13 +85,13 @@ class HistoricalMilestoneController extends Controller
 
             if ($historicalMilestone->saveOrFail()) {
                 return redirect()->route('bo.historicalmilestones.edit', $historicalMilestone)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
                 ]));
         });
     }
@@ -99,7 +99,7 @@ class HistoricalMilestoneController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\HistoricalMilestone $historicalMilestone
+     * @param App\Models\HistoricalMilestone $historicalMilestone
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(HistoricalMilestone $historicalMilestone): \Illuminate\Contracts\View\View
@@ -110,8 +110,8 @@ class HistoricalMilestoneController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param \App\Http\Requests\Bo\HistoricalMilestones\UpdateHistoricalMilestoneRequest $request
-     * @param \App\Models\HistoricalMilestone                                             $historicalMilestone
+     * @param \App\Http\Requests\Bo\HistoricalMilestone\UpdateHistoricalMilestoneRequest $request
+     * @param \App\Models\HistoricalMilestone                                            $historicalMilestone
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(
@@ -123,13 +123,13 @@ class HistoricalMilestoneController extends Controller
 
             if ($historicalMilestone->saveOrFail()) {
                 return redirect()->route('bo.historicalmilestones.edit', $historicalMilestone)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
                     ]));
             }
             return redirect()->route('bo.historicalmilestones.edit', $historicalMilestone)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
                 ]));
         });
     }
@@ -144,13 +144,13 @@ class HistoricalMilestoneController extends Controller
     {
         if ($historicalMilestone->deleteOrFail()) {
             return redirect()->route('bo.historicalmilestones.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', 1))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(trans_choice('models.classes.historicalMilestone', '1'))
             ]));
     }
 

app/Http/Controllers/Bo/JobVideoController.php

@@ -28,11 +28,11 @@ class JobVideoController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\JobVideo> $jobVideoModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $jobVideoModels */
         $jobVideoModels = JobVideo::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $jobVideoModels,
@@ -85,13 +85,13 @@ class JobVideoController extends Controller
 
             if ($jobVideo->saveOrFail()) {
                 return redirect()->route('bo.jobvideos.edit', $jobVideo)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
                 ]));
         });
     }
@@ -99,7 +99,7 @@ class JobVideoController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\JobVideo $jobVideo
+     * @param App\Models\JobVideo $jobVideo
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(JobVideo $jobVideo): \Illuminate\Contracts\View\View
@@ -123,13 +123,13 @@ class JobVideoController extends Controller
 
             if ($jobVideo->saveOrFail()) {
                 return redirect()->route('bo.jobvideos.edit', $jobVideo)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
                     ]));
             }
             return redirect()->route('bo.jobvideos.edit', $jobVideo)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
                 ]));
         });
     }
@@ -144,13 +144,13 @@ class JobVideoController extends Controller
     {
         if ($jobVideo->deleteOrFail()) {
             return redirect()->route('bo.jobvideos.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans_choice('models.classes.job_video', 1))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(trans_choice('models.classes.job_video', '1'))
             ]));
     }
 

app/Http/Controllers/Bo/LogoController.php

@@ -28,11 +28,11 @@ class LogoController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Logo> $logoModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $logoModels */
         $logoModels = Logo::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $logoModels,
@@ -83,13 +83,13 @@ class LogoController extends Controller
 
             if ($logo->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.logos.edit', $logo)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.logo'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.logo'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.logo'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.logo'))
                 ]));
         });
     }
@@ -97,7 +97,7 @@ class LogoController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Logo $logo
+     * @param App\Models\Logo $logo
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Logo $logo): \Illuminate\Contracts\View\View
@@ -117,13 +117,13 @@ class LogoController extends Controller
         return DB::transaction(function () use ($request, $logo) {
             if ($logo->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.logos.edit', $logo)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.logo'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.logo'))
                     ]));
             }
             return redirect()->route('bo.logos.edit', $logo)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.logo'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.logo'))
                 ]));
         });
     }
@@ -138,13 +138,13 @@ class LogoController extends Controller
     {
         if ($logo->deleteOrFail()) {
             return redirect()->route('bo.logos.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.logo'))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.logo'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans('models.classes.logo'))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(__('models.classes.logo'))
             ]));
     }
 

app/Http/Controllers/Bo/NetworkController.php

@@ -1,171 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Networks\StoreNetworkRequest;
-use App\Http\Requests\Bo\Networks\UpdateNetworkRequest;
-use App\Models\Network;
-use App\Traits\Controllers\ChangesModelOrder;
-use App\Traits\Controllers\UpdateModelPublished;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-
-class NetworkController extends Controller
-{
-    use ChangesModelOrder;
-    use UpdateModelPublished;
-
-    /**
-     * Create the controller instance.
-     */
-    public function __construct()
-    {
-        $this->authorizeResource(Network::class);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(Request $request): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Network> $networkModels */
-        $networkModels = Network::query();
-
-        /** @var string $search Search field */
-        $search = $request->input('search');
-        if ($search) {
-            $this->searchQuery(
-                $networkModels,
-                $search,
-                null,
-                'name',
-            );
-        }
-        $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.name')),
-        ]);
-
-        /** Sort columns with a query */
-        $this->sortQuery($networkModels);
-
-        /** Custom pagination */
-        $networkModels = $this->paginate($networkModels);
-
-        return view('bo.pages.networks.index', compact('networkModels', 'search', 'searchFields'));
-    }
-
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @param \App\Models\Network $network
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create(Network $network): \Illuminate\Contracts\View\View
-    {
-        return view('bo.pages.networks.create', [
-            'networkModel' => $network,
-        ]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Networks\StoreNetworkRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(StoreNetworkRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request) {
-            $network = new Network();
-            $network->fill($request->validated());
-
-            if ($network->saveOrFail()) {
-                return redirect()->route('bo.networks.edit', $network)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                ]));
-        });
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param \App\Models\Network $network
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function edit(Network $network): \Illuminate\Contracts\View\View
-    {
-        return view('bo.pages.networks.edit', [
-            'networkModel' => $network,
-        ]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Networks\UpdateNetworkRequest $request
-     * @param \App\Models\Network                                 $network
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UpdateNetworkRequest $request, Network $network): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request, $network) {
-            $network->fill($request->validated());
-
-            if ($network->saveOrFail()) {
-                return redirect()->route('bo.networks.edit', $network)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                    ]));
-            }
-            return redirect()->route('bo.networks.edit', $network)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                ]));
-        });
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param \App\Models\Network $network
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(Network $network): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($network) {
-            if ($network->deleteOrFail()) {
-                return redirect()->route('bo.networks.index')
-                    ->with('success', trans('crud.messages.has_been_deleted', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_deleted', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.network', 1))
-                ]));
-        });
-    }
-
-    /**
-     * Duplicate the specified resource.
-     *
-     * @param \App\Models\Network $network
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function duplicate(Network $network): \Illuminate\Contracts\View\View
-    {
-        return $this->create($network->replicate());
-    }
-}

app/Http/Controllers/Bo/NewsController.php

@@ -33,11 +33,11 @@ class NewsController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\News> $newsModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $newsModels */
         $newsModels = News::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $newsModels,
@@ -88,13 +88,13 @@ class NewsController extends Controller
 
             if ($news->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.news.edit', $news)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.news'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.news'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.news'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.news'))
                 ]));
         });
     }
@@ -102,7 +102,7 @@ class NewsController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\News $news
+     * @param App\Models\News $news
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(News $news): \Illuminate\Contracts\View\View
@@ -122,13 +122,13 @@ class NewsController extends Controller
         return DB::transaction(function () use ($request, $news) {
             if ($news->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.news.edit', $news)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.news'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.news'))
                     ]));
             }
             return redirect()->route('bo.news.edit', $news)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.news'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.news'))
                 ]));
         });
     }
@@ -143,13 +143,13 @@ class NewsController extends Controller
     {
         if ($news->deleteOrFail()) {
             return redirect()->route('bo.news.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.news'))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.news'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans('models.classes.news'))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(__('models.classes.news'))
             ]));
     }
 

app/Http/Controllers/Bo/SectionController.php

@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Bo\Sections\UpdateSectionRequest;
 use App\Models\Section;
 use App\Models\StaticPage;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -30,7 +29,7 @@ class SectionController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Section> $query */
+        /** @var \Illuminate\Database\Eloquent\Builder $query */
         $query = Section::query()->with('page');
 
         // Filter by related page if requested.
@@ -49,7 +48,7 @@ class SectionController extends Controller
         }
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $query,
@@ -74,7 +73,7 @@ class SectionController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Section $section
+     * @param App\Models\Section $section
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Section $section): \Illuminate\Contracts\View\View
@@ -89,63 +88,25 @@ class SectionController extends Controller
      * @param \App\Models\Section                                 $section
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(UpdateSectionRequest $request, Section $section): RedirectResponse
+    public function update(UpdateSectionRequest $request, Section $section): \Illuminate\Http\RedirectResponse
     {
         return DB::transaction(function () use ($request, $section) {
-            $encoded = json_encode($section->toArray());
-            if ($encoded === false) {
-                return redirect()->back()->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.section'))
-                ]));
-            }
-            /** @var array<string, mixed> $data */
-            $data = json_decode($encoded, true);
-            $section->fill(array_replace_recursive($data, $request->validated()));
+            $section->fill(array_replace_recursive(
+                \json_decode(\json_encode($section->toArray()), true),
+                $request->validated()
+            ));
+
 
             if ($section->saveOrFail()) {
                 return redirect()->route('bo.sections.edit', $section)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.section'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.section'))
                     ]));
             }
             return redirect()->route('bo.sections.edit', $section)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.section'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.section'))
                 ]));
         });
     }
-
-    /**
-     * Section add PartPiece
-     *
-     * @param \App\Models\Section $section
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function addPartPiece(Section $section): RedirectResponse
-    {
-        $section->addPartPiece();
-        $section->saveOrFail();
-        return response()->redirectToRoute('bo.sections.edit', $section)
-            ->with('success', trans('Partie ajouté'));
-    }
-
-    /**
-     * Section remove PartPiece
-     *
-     * @param \App\Models\Section $section
-     * @param integer             $index
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function removePartPiece(Section $section, int $index): RedirectResponse
-    {
-        $count = $section->removePartPiece($index);
-        $section->saveOrFail();
-        $response = response()->redirectToRoute('bo.sections.edit', $section);
-        if ($count) {
-            $response->with('error', trans('Partie enlevé'));
-        } else {
-            $response->with('info', trans('Aucune partie enlevé'));
-        }
-        return $response;
-    }
 }

app/Http/Controllers/Bo/SiteController.php

@@ -32,23 +32,25 @@ class SiteController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Site> $siteModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $siteModels */
         $siteModels = Site::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $siteModels,
                 $search,
                 null,
-                'name',
-                'description',
+                'title',
+                'introduction',
+                'content',
             );
         }
         $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.name')),
-            trans('validation.attributes.description'),
+            Str::ucfirst(trans('validation.attributes.title')),
+            trans('validation.custom.introduction'),
+            trans('validation.attributes.content'),
         ]);
 
         /** Sort columns with a query */
@@ -90,17 +92,15 @@ class SiteController extends Controller
             $site->fill($request->safe()->except(['logos']));
 
             if ($site->saveOrFail()) {
-                /** @var array<int, array<string, mixed>> $logos */
-                $logos = $request->validated('logos') ?? [];
-                $site->logos()->attach(collect($logos)->pluck('id'));
+                $site->logos()->attach(collect($request->validated('logos'))->pluck('id'));
                 return redirect()->route('bo.sites.edit', $site)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.site'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.site'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.site'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.site'))
                 ]));
         });
     }
@@ -108,7 +108,7 @@ class SiteController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Site $site
+     * @param App\Models\Site $site
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Site $site): \Illuminate\Contracts\View\View
@@ -131,20 +131,18 @@ class SiteController extends Controller
     public function update(UpdateSiteRequest $request, Site $site): \Illuminate\Http\RedirectResponse
     {
         return DB::transaction(function () use ($request, $site) {
-            /** @var array<int, array<string, mixed>> $logos */
-            $logos = $request->validated('logos') ?? [];
-            $site->logos()->sync(collect($logos)->pluck('id'));
             $site->fill($request->safe()->except(['logos']));
+            $site->logos()->sync(collect($request->validated('logos'))->pluck('id'));
 
             if ($site->saveOrFail()) {
                 return redirect()->route('bo.sites.edit', $site)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.site'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.site'))
                     ]));
             }
             return redirect()->route('bo.sites.edit', $site)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.site'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.site'))
                 ]));
         });
     }
@@ -162,13 +160,13 @@ class SiteController extends Controller
 
             if ($site->deleteOrFail()) {
                 return redirect()->route('bo.sites.index')
-                    ->with('success', trans('crud.messages.has_been_deleted', [
-                        'model' => Str::ucfirst(trans('models.classes.site'))
+                    ->with('success', __('crud.messages.has_been_deleted', [
+                        'model' => Str::ucfirst(__('models.classes.site'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.site'))
+                ->with('error', __('crud.messages.cannot_be_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.site'))
                 ]));
         });
     }

app/Http/Controllers/Bo/SlideController.php

@@ -28,17 +28,17 @@ class SlideController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Slide> $slideModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $slideModels */
         $slideModels = Slide::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $slideModels,
                 $search,
                 null,
-                'type',
+                'slider',
                 'title',
             );
         }
@@ -81,13 +81,13 @@ class SlideController extends Controller
 
             if ($slide->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.slides.edit', $slide)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.slide'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.slide'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.slide'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.slide'))
                 ]));
         });
     }
@@ -95,7 +95,7 @@ class SlideController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Slide $slide
+     * @param App\Models\Slide $slide
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Slide $slide): \Illuminate\Contracts\View\View
@@ -115,13 +115,13 @@ class SlideController extends Controller
         return DB::transaction(function () use ($request, $slide) {
             if ($slide->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.slides.edit', $slide)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.slide'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.slide'))
                     ]));
             }
             return redirect()->route('bo.slides.edit', $slide)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.slide'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.slide'))
                 ]));
         });
     }
@@ -136,13 +136,13 @@ class SlideController extends Controller
     {
         if ($slide->deleteOrFail()) {
             return redirect()->route('bo.slides.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.slide'))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.slide'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans('models.classes.slide'))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(__('models.classes.slide'))
             ]));
     }
 

app/Http/Controllers/Bo/StaticPageController.php

@@ -27,11 +27,11 @@ class StaticPageController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\StaticPage> $query */
+        /** @var \Illuminate\Database\Eloquent\Builder $query */
         $query = StaticPage::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $query,
@@ -56,7 +56,7 @@ class StaticPageController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\StaticPage $static_page
+     * @param App\Models\StaticPage $static_page
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(StaticPage $static_page): \Illuminate\Contracts\View\View
@@ -78,12 +78,12 @@ class StaticPageController extends Controller
 
             if ($static_page->saveOrFail()) {
                 return redirect()->route('bo.static_pages.edit', $static_page)
-                    ->with('success', trans('crud.messages.has_been_updated', [
+                    ->with('success', __('crud.messages.has_been_updated', [
                         'model' => Str::ucfirst(\trans_choice('models.classes.static_page', 1))
                     ]));
             }
             return redirect()->route('bo.static_pages.edit', $static_page)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
+                ->with('error', __('crud.messages.cannot_be_updated', [
                     'model' => Str::ucfirst(\trans_choice('models.classes.static_page', 1))
                 ]));
         });

app/Http/Controllers/Bo/StickyController.php

@@ -1,157 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Stickies\StoreStickyRequest;
-use App\Http\Requests\Bo\Stickies\UpdateStickyRequest;
-use App\Models\Sticky;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-
-class StickyController extends Controller
-{
-    /**
-     * Create the controller instance.
-     */
-    public function __construct()
-    {
-        $this->authorizeResource(Sticky::class);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(Request $request): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Sticky> $stickyModels */
-        $stickyModels = Sticky::query();
-
-        /** @var string $search Search field */
-        $search = $request->input('search');
-        if ($search) {
-            $this->searchQuery(
-                $stickyModels,
-                $search,
-                null,
-                'title',
-            );
-        }
-        $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.title')),
-        ]);
-
-        /** Sort columns with a query */
-        $this->sortQuery($stickyModels);
-
-        /** Custom pagination */
-        $stickyModels = $this->paginate($stickyModels);
-
-        return view('bo.pages.stickies.index', compact('stickyModels', 'search', 'searchFields'));
-    }
-
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @param \App\Models\Sticky $sticky
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function create(Sticky $sticky): \Illuminate\Contracts\View\View
-    {
-        return view('bo.pages.stickies.create', ['stickyModel' => $sticky]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Stickies\StoreStickyRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(StoreStickyRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request) {
-            $sticky = new Sticky();
-
-            if ($sticky->fill($request->validated())->saveOrFail()) {
-                return redirect()->route('bo.stickies.edit', $sticky)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-                    ]));
-            }
-            return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-                ]));
-        });
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param \App\Models\Sticky $sticky
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function edit(Sticky $sticky): \Illuminate\Contracts\View\View
-    {
-        return view('bo.pages.stickies.edit', ['stickyModel' => $sticky]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param \App\Http\Requests\Bo\Stickies\UpdateStickyRequest $request
-     * @param \App\Models\Sticky                                 $sticky
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UpdateStickyRequest $request, Sticky $sticky): \Illuminate\Http\RedirectResponse
-    {
-        return DB::transaction(function () use ($request, $sticky) {
-            if ($sticky->fill($request->validated())->saveOrFail()) {
-                return redirect()->route('bo.stickies.edit', $sticky)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-                    ]));
-            }
-            return redirect()->route('bo.stickies.edit', $sticky)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-                ]));
-        });
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param \App\Models\Sticky $sticky
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(Sticky $sticky): \Illuminate\Http\RedirectResponse
-    {
-        if ($sticky->deleteOrFail()) {
-            return redirect()->route('bo.stickies.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-                ]));
-        }
-        return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans_choice('models.classes.sticky', 0))
-            ]));
-    }
-
-    /**
-     * Duplicate the specified resource.
-     *
-     * @param \App\Models\Sticky $sticky
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function duplicate(Sticky $sticky): \Illuminate\Contracts\View\View
-    {
-        return $this->create($sticky->replicate());
-    }
-}

app/Http/Controllers/Bo/StripController.php

@@ -9,7 +9,6 @@ use App\Models\News;
 use App\Models\Strip;
 use App\Traits\Controllers\UpdateModelPublished;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
@@ -33,11 +32,11 @@ class StripController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Strip> $stripModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $stripModels */
         $stripModels = Strip::query()->with('news');
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $stripModels,
@@ -47,7 +46,7 @@ class StripController extends Controller
             );
         }
         $searchFields = \implode(', ', [
-            Str::ucfirst(trans('validation.attributes.content')),
+            Str::ucfirst(__('validation.attributes.content')),
         ]);
 
         /** Sort columns with a query */
@@ -92,12 +91,12 @@ class StripController extends Controller
 
             if ($strip->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.strips.edit', $strip)
-                    ->with('success', trans('crud.messages.has_been_created', [
+                    ->with('success', __('crud.messages.has_been_created', [
                         'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
+                ->with('error', __('crud.messages.cannot_be_created', [
                     'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
                 ]));
         });
@@ -106,7 +105,7 @@ class StripController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Strip $strip
+     * @param App\Models\Strip $strip
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Strip $strip): \Illuminate\Contracts\View\View
@@ -132,23 +131,14 @@ class StripController extends Controller
             if ($request->news_id === null) {
                 $strip->news()->dissociate();
             }
-
-            if (!Arr::exists($request->validated(), 'picture')) {
-                $strip->picture       = null;
-                $strip->picture_alt   = null;
-                $strip->picture_title = null;
-            } elseif (!Arr::exists($request->validated(), 'picto')) {
-                $strip->picto = null;
-            }
-
             if ($strip->saveOrFail()) {
                 return redirect()->route('bo.strips.edit', $strip)
-                    ->with('success', trans('crud.messages.has_been_updated', [
+                    ->with('success', __('crud.messages.has_been_updated', [
                         'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
                     ]));
             }
             return redirect()->route('bo.strips.edit', $strip)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
+                ->with('error', __('crud.messages.cannot_be_updated', [
                     'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
                 ]));
         });
@@ -164,12 +154,12 @@ class StripController extends Controller
     {
         if ($strip->deleteOrFail()) {
             return redirect()->route('bo.strips.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
+                ->with('success', __('crud.messages.has_been_deleted', [
                     'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
+            ->with('error', __('crud.messages.cannot_be_deleted', [
                 'model' => Str::ucfirst(trans_choice('models.classes.strip', 1))
             ]));
     }

app/Http/Controllers/Bo/TestimonialController.php

@@ -28,11 +28,11 @@ class TestimonialController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\Testimonial> $testimonialModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $testimonialModels */
         $testimonialModels = Testimonial::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $testimonialModels,
@@ -85,13 +85,13 @@ class TestimonialController extends Controller
 
             if ($testimonial->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.testimonials.edit', $testimonial)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.testimonial'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.testimonial'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.testimonial'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.testimonial'))
                 ]));
         });
     }
@@ -99,7 +99,7 @@ class TestimonialController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\Testimonial $testimonial
+     * @param App\Models\Testimonial $testimonial
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(Testimonial $testimonial): \Illuminate\Contracts\View\View
@@ -121,13 +121,13 @@ class TestimonialController extends Controller
         return DB::transaction(function () use ($request, $testimonial) {
             if ($testimonial->fill($request->validated())->saveOrFail()) {
                 return redirect()->route('bo.testimonials.edit', $testimonial)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.testimonial'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.testimonial'))
                     ]));
             }
             return redirect()->route('bo.testimonials.edit', $testimonial)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.testimonial'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.testimonial'))
                 ]));
         });
     }
@@ -142,13 +142,13 @@ class TestimonialController extends Controller
     {
         if ($testimonial->deleteOrFail()) {
             return redirect()->route('bo.testimonials.index')
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.testimonial'))
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.testimonial'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans('models.classes.testimonial'))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(__('models.classes.testimonial'))
             ]));
     }
 

app/Http/Controllers/Bo/UploadController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bo;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Bo\UploadFileRequest;
 use App\Lib\Helpers\FileStorageHelper;
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Section;
 
 class UploadController extends Controller
 {
@@ -18,19 +18,10 @@ class UploadController extends Controller
      */
     public function uploadFile(UploadFileRequest $request)
     {
-        $modelClass = "App\\Models\\$request->folder";
-
-        if (!class_exists($modelClass) && !is_subclass_of($modelClass, Model::class)) {
-            return response()->json(['error' => 'Invalid model class'], 404);
-        }
-
-        /** @var \Illuminate\Database\Eloquent\Model $model */
-        $model = new $modelClass();
-
         /** @var \Illuminate\Http\UploadedFile $image */
-        $image = $request->file('upload');
+        $image = $request->upload;
 
-        $path = FileStorageHelper::storeFile($model, $image, true);
+        $path = FileStorageHelper::storeFile(new Section(), $image, true);
 
         return response()->json([
             'url' => "/{$path}"

app/Http/Controllers/Bo/UserController.php

@@ -31,11 +31,11 @@ class UserController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\View
     {
-        /** @var \Illuminate\Database\Eloquent\Builder<\App\Models\User> $userModels */
+        /** @var \Illuminate\Database\Eloquent\Builder $userModels */
         $userModels = User::query();
 
         /** @var string $search Search field */
-        $search = $request->input('search');
+        $search = $request->search;
         if ($search) {
             $this->searchQuery(
                 $userModels,
@@ -63,6 +63,7 @@ class UserController extends Controller
         return view('bo.pages.users.index', compact('userModels', 'search', 'searchFields'));
     }
 
+
     /**
      * Show the form for creating a new resource.
      *
@@ -88,13 +89,13 @@ class UserController extends Controller
 
             if ($user->saveOrFail()) {
                 return redirect()->route('bo.users.edit', $user)
-                    ->with('success', trans('crud.messages.has_been_created', [
-                        'model' => Str::ucfirst(trans('models.classes.user'))
+                    ->with('success', __('crud.messages.has_been_created', [
+                        'model' => Str::ucfirst(__('models.classes.user'))
                     ]));
             }
             return redirect()->back()
-                ->with('error', trans('crud.messages.cannot_be_created', [
-                    'model' => Str::ucfirst(trans('models.classes.user'))
+                ->with('error', __('crud.messages.cannot_be_created', [
+                    'model' => Str::ucfirst(__('models.classes.user'))
                 ]));
         });
     }
@@ -102,7 +103,7 @@ class UserController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Models\User $user
+     * @param App\Models\User $user
      * @return \Illuminate\Contracts\View\View
      */
     public function edit(User $user): \Illuminate\Contracts\View\View
@@ -124,13 +125,13 @@ class UserController extends Controller
 
             if ($user->saveOrFail()) {
                 return redirect()->route('bo.users.edit', $user)
-                    ->with('success', trans('crud.messages.has_been_updated', [
-                        'model' => Str::ucfirst(trans('models.classes.user'))
+                    ->with('success', __('crud.messages.has_been_updated', [
+                        'model' => Str::ucfirst(__('models.classes.user'))
                     ]));
             }
             return redirect()->route('bo.users.edit', $user)
-                ->with('error', trans('crud.messages.cannot_be_updated', [
-                    'model' => Str::ucfirst(trans('models.classes.user'))
+                ->with('error', __('crud.messages.cannot_be_updated', [
+                    'model' => Str::ucfirst(__('models.classes.user'))
                 ]));
         });
     }
@@ -143,18 +144,15 @@ class UserController extends Controller
      */
     public function destroy(User $user): \Illuminate\Http\RedirectResponse
     {
-        /** @var array<string,string> */
-        $previousQueries = [];
-        \parse_str((string) \parse_url(url()->previous(), \PHP_URL_QUERY), $previousQueries);
         if ($user->deleteOrFail()) {
-            return redirect()->route('bo.users.index', $previousQueries)
-                ->with('success', trans('crud.messages.has_been_deleted', [
-                    'model' => Str::ucfirst(trans('models.classes.user'))
+            return redirect()->route('bo.users.index')
+                ->with('success', __('crud.messages.has_been_deleted', [
+                    'model' => Str::ucfirst(__('models.classes.user'))
                 ]));
         }
         return redirect()->back()
-            ->with('error', trans('crud.messages.cannot_be_deleted', [
-                'model' => Str::ucfirst(trans('models.classes.user'))
+            ->with('error', __('crud.messages.cannot_be_deleted', [
+                'model' => Str::ucfirst(__('models.classes.user'))
             ]));
     }
 

app/Http/Controllers/Controller.php

@@ -24,19 +24,18 @@ class Controller extends BaseController
      * Build Search query on specified fields
      * splitting search into words or using whole sentence
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Database\Eloquent\Builder<TModel> $query       The eloquent query builder.
-     * @param string                                        $search      The searched string.
-     * @param callable|null                                 $searchQuery The query string.
-     * @param string                                        ...$fields   Either a simple array or a string
-     *                                                                   in case of a string the two fields
-     *                                                                   would be concatenate to make the search.
-     * @return \Illuminate\Database\Eloquent\Builder<TModel>
+     * @param \Illuminate\Database\Eloquent\Builder $query       The eloquent query builder.
+     * @param string                                $search      The query string.
+     * @param callable                              $searchQuery The query string.
+     * @param string                                ...$fields   Either a simple array or a string
+     *                                                           in case of a string the two fields
+     *                                                           would be concatenate to make the search.
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function searchQuery(
         Builder $query,
         string $search,
-        callable|null $searchQuery = null,
+        callable $searchQuery = null,
         string ...$fields
     ): \Illuminate\Database\Eloquent\Builder {
         if (count($fields)) {
@@ -62,16 +61,15 @@ class Controller extends BaseController
     /**
      * Build query search on all fields
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Database\Eloquent\Builder<TModel> $query
-     * @param string                                        $search
-     * @param array<int|string, string|array<int, string>>  $fields
-     * @return \Illuminate\Database\Eloquent\Builder<TModel>
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string                                $search
+     * @param array                                 $fields
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     private function searchOnFields(
         Builder $query,
         string $search,
-        array $fields,
+        array $fields
     ): \Illuminate\Database\Eloquent\Builder {
         $table = $query->getModel()->getTable();
         foreach ($fields as $field) {
@@ -96,7 +94,7 @@ class Controller extends BaseController
                 return $query;
             }
             // Get models with relation's name/label.
-            if (Str::endsWith($field, '_id')) {
+            if (Str::endsWith($field, '_id') && $query->getModel()->has(Str::remove('_id', $field))) {
                 $query->orWhereHas(Str::remove('_id', $field), function ($queryRelation) use ($field, $search) {
                     if (Schema::hasColumn(Str::remove('_id', $field) . 's', 'name')) {
                         $queryRelation->where('name', 'like', '%' . $search . '%');
@@ -117,28 +115,21 @@ class Controller extends BaseController
     /**
      * Get the search value (on string or Enum).
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Database\Eloquent\Builder<TModel> $query
-     * @param string                                        $search
-     * @param string                                        $field
-     * @return string|array<int, mixed>
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string                                $search
+     * @param string                                $field
+     * @return string|array
      */
-    protected function getSearchValue(
-        Builder $query,
-        string $search,
-        string $field,
-    ): string|array {
-        $cast = $query->getModel()->getCasts()[$field] ?? null;
+    protected function getSearchValue(Builder $query, string $search, string $field): string|array
+    {
         if (
             count($query->getModel()->getCasts()) and // Check if the model has casts.
-            $cast and // Check if there is cast about specific field.
-            enum_exists($cast) // Check if the cast is an enum.
+            isset($query->getModel()->getCasts()[$field]) and // Check if there is cast about specific field.
+            enum_exists($query->getModel()->getCasts()[$field]) // Check if the cast is an enum.
         ) {
-            /** @var \App\Traits\Enums $cast */
-            // @phpstan-ignore-next-line
-            $cases = collect($cast::toArray());
-            $enum  = $cases->filter(function ($item) use ($search): bool {
-                return preg_match('/' . Str::lower($search) . '/', Str::lower($item->label)) === 1;
+            $cases = collect($query->getModel()->getCasts()[$field]::toArray());
+            $enum  = $cases->filter(function ($item) use ($search) {
+                return preg_match('/' . Str::lower($search) . '/', Str::lower($item->label));
             });
             return $enum->toArray();
         } else {
@@ -149,23 +140,20 @@ class Controller extends BaseController
     /**
      * Sort columns with a query.
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Database\Eloquent\Builder<TModel> $query
-     * @param array<int, string>                            $ignore
-     * @return \Illuminate\Database\Eloquent\Builder<TModel>
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param array                                 $ignore
+     * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function sortQuery(
-        Builder $query,
-        array $ignore = [],
-    ): \Illuminate\Database\Eloquent\Builder {
+    protected function sortQuery(Builder $query, array $ignore = []): \Illuminate\Database\Eloquent\Builder
+    {
         $rName = request()->route()->getName();
         $table = $query->getModel()->getTable();
-        if (request()->input('sort_col')) {
-            Session::put("$rName.sort_col", request()->input('sort_col'));
+        if (request()->sort_col) {
+            Session::put("$rName.sort_col", request()->sort_col);
             Session::put("$rName.sorted", true);
         }
-        if (request()->input('sort_way')) {
-            Session::put("$rName.sort_way", request()->input('sort_way'));
+        if (request()->sort_way) {
+            Session::put("$rName.sort_way", request()->sort_way);
             Session::put("$rName.sorted", true);
         }
         if (request()->rst) {
@@ -173,16 +161,12 @@ class Controller extends BaseController
             Session::remove("$rName.sort_col");
             Session::remove("$rName.sort_way");
         }
-        if (
-            request()->input('sort_col') and
-            request()->input('sort_way') and
-            Schema::hasColumn($table, request()->input('sort_col'))
-        ) {
-            if (!in_array(request()->input('sort_col'), $ignore)) {
-                $query = $query->orderBy(
-                    \sprintf("$table.%s", request()->input('sort_col')),
-                    request()->input('sort_way')
-                );
+        if (request()->sort_col and request()->sort_way and Schema::hasColumn($table, request()->sort_col)) {
+            if (
+                !isset($ignore) or
+                (isset($ignore) and !in_array(request()->sort_col, $ignore))
+            ) {
+                $query = $query->orderBy(\sprintf("$table.%s", request()->sort_col), request()->sort_way);
             }
         } elseif (Schema::hasColumn($table, 'order')) {
             $query = $query->orderBy('order', 'ASC');
@@ -203,14 +187,13 @@ class Controller extends BaseController
     /**
      * Customize pagination with cache or config (default).
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Database\Eloquent\Builder<TModel>     $query
+     * @param \Illuminate\Database\Eloquent\Builder             $query
      * @param \App\Enums\Pagination\ItemsPerPaginationEnum|null $pagination
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator<TModel>
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
     protected function paginate(
         Builder $query,
-        ItemsPerPaginationEnum|null $pagination = null
+        ItemsPerPaginationEnum $pagination = null
     ): \Illuminate\Contracts\Pagination\LengthAwarePaginator {
         $currentRoutePath = Str::slug(request()->route()->getName());
         $cacheKey         = "pagination.{$currentRoutePath}";
@@ -218,7 +201,7 @@ class Controller extends BaseController
         $pagination       = ToolboxHelper::getValidatedEnum(
             Cache::get($cacheKey, $pagination->value()),
             'pagination',
-            ItemsPerPaginationEnum::class,
+            '\App\Enums\Pagination\ItemsPerPaginationEnum',
         );
         if (Cache::get($cacheKey) !== $pagination) {
             Cache::put($cacheKey, $pagination);
@@ -238,7 +221,7 @@ class Controller extends BaseController
         $theme = ToolboxHelper::getValidatedEnum(
             $request->theme ?: Cache::get('theme', BootstrapThemeEnum::light->value()),
             'theme',
-            BootstrapThemeEnum::class,
+            '\App\Http\Controllers\BootstrapThemeEnum',
         );
         if (Cache::get("theme") !== $theme) {
             Cache::put("theme", $theme);

app/Http/Controllers/Fo/HomeController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Fo;
+
+use App\Http\Controllers\Controller;
+
+class HomeController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function index(): \Illuminate\Contracts\View\View
+    {
+        return view('fo.pages.home');
+    }
+}

app/Http/Controllers/Fo/NetworkController.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Fo;
-
-use App\Http\Controllers\Controller;
-use App\Models\Network;
-
-class NetworkController extends Controller
-{
-    /**
-     * Display the specified resource.
-     *
-     * @param \App\Models\Network $network
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show(Network $network): \Illuminate\Contracts\View\View
-    {
-        $network->load(['aisles', 'aisles.brands']);
-        $networkModels = Network::query()
-            ->whereNot('id', $network->id)
-            ->where('published', true)
-            ->orderBy('order')
-            ->get();
-
-        return view('fo.pages.networks.show', [
-            'networkModel'  => $network,
-            'networkModels' => $networkModels,
-        ]);
-    }
-}

app/Http/Controllers/Fo/NewsController.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Fo;
-
-use App\Enums\Sections\PageSectionEnum;
-use App\Enums\StaticPageType;
-use App\Http\Controllers\Controller;
-use App\Models\News;
-use App\Models\Section;
-use App\Models\StaticPage;
-
-class NewsController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function index(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel   = StaticPage::query()->where('type', StaticPageType::we_move)->first();
-        $sectionModels     = Section::query()->where('page_id', $staticPageModel->id)->get();
-        $newsModels        = News::query()
-            ->where('published', true)
-            ->orderBy('displayed_date', 'DESC')
-            ->simplePaginate(4)
-            ->fragment('corpo');
-        $lifeSection       = $sectionModels->where('section', PageSectionEnum::move_life)->first();
-        $commitmentSection = $sectionModels->where('section', PageSectionEnum::move_commitments)->first();
-        return view('fo.pages.news.index', \compact(
-            'staticPageModel',
-            'sectionModels',
-            'newsModels',
-            'lifeSection',
-            'commitmentSection'
-        ));
-    }
-
-    /**
-     * Display a news articles
-     *
-     * @param \App\Models\News $news
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show(News $news): \Illuminate\Contracts\View\View
-    {
-        // Get only id from published news.
-        $publishedNews = News::query()->where('published', true)->orderBy('publish_at', 'DESC')->get()->pluck('id');
-        // Search the position of the current news id.
-        $positionId = \array_search($news->id, $publishedNews->toArray());
-        // Check if it's the last position.
-        $nextPositionId = ($positionId === count($publishedNews) - 1) ? 0 : intval($positionId) + 1;
-        // Find the next news from the id.
-        $nextNews = News::query()->where('id', $publishedNews[$nextPositionId])->firstOrFail();
-        // Check if it's the first position.
-        $prevPositionId = ($positionId === 0) ? count($publishedNews) - 1 : intval($positionId) - 1;
-        // Find the next news from the id.
-        $prevNews = News::query()->where('id', $publishedNews[$prevPositionId])->firstOrFail();
-
-        return view('fo.pages.news.show', [
-            'news'     => $news,
-            'nextNews' => $nextNews,
-            'prevNews' => $prevNews,
-        ]);
-    }
-}

app/Http/Controllers/Fo/StaticPageController.php

@@ -1,351 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Fo;
-
-use App\Enums\Listen\ObjectEnum;
-use App\Enums\Sections\PageSectionEnum;
-use App\Enums\Slides\SliderTypeEnum;
-use App\Enums\StaticPageType;
-use App\Enums\StickiesColorEnum;
-use App\Enums\Testimonials\TypeEnum;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Fo\ListenFormRequest;
-use App\Mail\SendConfirmationMail;
-use App\Mail\SendContactMail;
-use App\Models\Carousel;
-use App\Models\HistoricalMilestone;
-use App\Models\JobVideo;
-use App\Models\Network;
-use App\Models\News;
-use App\Models\Section;
-use App\Models\Site;
-use App\Models\Slide;
-use App\Models\StaticPage;
-use App\Models\Sticky;
-use App\Models\Strip;
-use App\Models\Testimonial;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Str;
-
-class StaticPageController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel = StaticPage::query()->where('type', StaticPageType::home)->first();
-        $sectionModels   = Section::query()->where('page_id', $staticPageModel->id)->get();
-        $stripModels     = Strip::query()
-            ->where('published', true)
-            ->orderBy('publish_at', 'DESC')
-            ->limit(6)
-            ->with('news')
-            ->whereHas('news', function (Builder $query) {
-                $query->where('published', true);
-            })
-            ->get();
-        $newsModels      = News::query()
-            ->where('published', true)
-            ->orderBy('displayed_date', 'DESC')
-            ->limit(4)
-            ->get();
-        $slideModels     = Slide::query()->where('type', SliderTypeEnum::home)->get();
-        $missionSection  = $sectionModels->where('section', PageSectionEnum::home_missions)->first();
-        $ambitionSection = $sectionModels->where('section', PageSectionEnum::home_ambition)->first();
-        $teamSection     = $sectionModels->where('section', PageSectionEnum::home_team)->first();
-        $lifeSection     = $sectionModels->where('section', PageSectionEnum::home_life)->first();
-        $slideTeams      = Slide::query()->where('type', SliderTypeEnum::team)->get();
-
-        return view('fo.pages.home', compact(
-            'staticPageModel',
-            'sectionModels',
-            'stripModels',
-            'newsModels',
-            'slideModels',
-            'missionSection',
-            'ambitionSection',
-            'teamSection',
-            'lifeSection',
-            'slideTeams',
-        ));
-    }
-
-    /**
-     * Display the 'unveil' page.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function unveil(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel           = StaticPage::query()->where('type', StaticPageType::unveil)->first();
-        $sectionModels             = Section::query()->where('page_id', $staticPageModel->getKey())->get();
-        $historicalMilestoneModels = HistoricalMilestone::query()->orderBy('year', 'ASC')->get();
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\Site> */
-        $siteModelList     = Site::query()->orderBy('order')->get();
-        $keySection        = $sectionModels->where('section', PageSectionEnum::unveil_pole)->first();
-        $missionsSection   = $sectionModels->where('section', PageSectionEnum::unveil_missions)->first();
-        $localSection      = $sectionModels->where('section', PageSectionEnum::unveil_local)->first();
-        $siteSection       = $sectionModels->where('section', PageSectionEnum::unveil_sites)->first();
-        $historySection    = $sectionModels->where('section', PageSectionEnum::unveil_history)->first();
-        $commitmentSection = $sectionModels->where('section', PageSectionEnum::unveil_commitments)->first();
-        $navLinks          = Sticky::query()->where('type', StaticPageType::unveil)->get();
-
-        $viewBox     = null;
-        $initialZoom = null;
-        // * Calcul Viewbox leaflet map ().
-        // Carte page “on se dévoile” : Point central = Laval + rayon = 100 km
-        /** @var \App\Models\Site|null $lavalSite */
-        $lavalSite = $siteModelList->first(fn(Site $site) => Str::contains($site->name, 'Laval'));
-        if ($lavalSite) {
-            $viewBox     = (object) [
-                'lat' => $lavalSite->latitude,
-                'lng' => $lavalSite->longitude
-            ];
-            $initialZoom = 9;
-        }
-
-        return view('fo.pages.unveil', compact(
-            'viewBox',
-            'initialZoom',
-            'staticPageModel',
-            'sectionModels',
-            'historicalMilestoneModels',
-            'siteModelList',
-            'keySection',
-            'missionsSection',
-            'localSection',
-            'siteSection',
-            'historySection',
-            'commitmentSection',
-            'navLinks'
-        ));
-    }
-
-    /**
-     * Display the 'commitments' page.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function commit(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel     = StaticPage::query()->where('type', StaticPageType::we_commit)->first();
-        $sectionModels       = Section::query()->where('page_id', $staticPageModel->id)->get();
-        $slideLifeModels     = Slide::query()->where('type', SliderTypeEnum::better_life)->latest()->get();
-        $slideEarthModels    = Slide::query()->where('type', SliderTypeEnum::respect_earth)->latest()->get();
-        $testimonialModels   = Testimonial::query()
-            ->whereIn('type', [
-                TypeEnum::breeding->value,
-                TypeEnum::better_life->value,
-                TypeEnum::respect_earth->value,
-                TypeEnum::feed->value,
-                TypeEnum::volena->value,
-            ])->get();
-        $ambitionSection     = $sectionModels->where('section', PageSectionEnum::commit_ambition)->first();
-        $breedingSection     = $sectionModels->where('section', PageSectionEnum::commit_breeding)->first();
-        $lifeSection         = $sectionModels->where('section', PageSectionEnum::commit_living)->first();
-        $earthSection        = $sectionModels->where('section', PageSectionEnum::commit_respect_earth)->first();
-        $feedSection         = $sectionModels->where('section', PageSectionEnum::commit_feed)->first();
-        $testimonialsSection = $sectionModels->where('section', PageSectionEnum::commit_commitments)->first();
-
-        $navLinks = Sticky::query()->where('type', StaticPageType::we_commit)->get();
-
-        return view('fo.pages.commitments', compact(
-            'staticPageModel',
-            'sectionModels',
-            'slideLifeModels',
-            'slideEarthModels',
-            'testimonialModels',
-            'ambitionSection',
-            'breedingSection',
-            'lifeSection',
-            'earthSection',
-            'feedSection',
-            'testimonialsSection',
-            'navLinks',
-        ));
-    }
-
-    /**
-     * Display the 'legals' page.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function legals(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel = StaticPage::query()->where('type', StaticPageType::legals)->first();
-
-        return view('fo.pages.legals', compact(
-            'staticPageModel',
-        ));
-    }
-
-    /**
-     * Display the 'confidentiality' page.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function confidentiality(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel = StaticPage::query()->where('type', StaticPageType::confidentiality)->first();
-
-        return view('fo.pages.legals', compact(
-            'staticPageModel',
-        ));
-    }
-
-    /**
-     * Display the 'we_produce' page.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function produce(): \Illuminate\Contracts\View\View
-    {
-        // MODELS.
-        $staticPageModel = StaticPage::query()->where('type', StaticPageType::we_produce)->first();
-        $sectionModels   = Section::query()->where('page_id', $staticPageModel->id)->get();
-        $networkModels   = Network::query()->where('published', true)->orderBy('order')->get();
-
-        // SECTIONS.
-        $localSection   = $sectionModels->where('section', PageSectionEnum::produce_local)->first();
-        $gmsSection     = $sectionModels->where('section', PageSectionEnum::produce_gms)->first();
-        $rhdSection     = $sectionModels->where('section', PageSectionEnum::produce_rhd)->first();
-        $exportSection  = $sectionModels->where('section', PageSectionEnum::produce_export)->first();
-        $qualitySection = $sectionModels->where('section', PageSectionEnum::produce_quality)->first();
-        $networkSection = $sectionModels->where('section', PageSectionEnum::produce_networks)->first();
-
-        return view('fo.pages.produce.show', compact(
-            'staticPageModel',
-            'networkModels',
-            'localSection',
-            'gmsSection',
-            'rhdSection',
-            'exportSection',
-            'qualitySection',
-            'networkSection',
-        ));
-    }
-
-    /**
-     * Display the 'we_listen' page.
-     * This page is used to send a contact form.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function listen(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel = StaticPage::query()->where('type', StaticPageType::we_listen)->first();
-        $sectionModel    = Section::query()->where('page_id', $staticPageModel->id)->first();
-
-        return view('fo.pages.listen', compact(
-            'staticPageModel',
-            'sectionModel',
-        ));
-    }
-
-    /**
-     * Send listen form data.
-     *
-     * @param \App\Http\Requests\Fo\ListenFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function listenForm(ListenFormRequest $request): \Illuminate\Http\RedirectResponse
-    {
-        Mail::to(config('mail.contact.' . ObjectEnum::make(intval($request->validated()['object']))->name()))
-            ->send(new SendContactMail((object) $request->validated()));
-        Mail::to($request->validated()['email'])->send(new SendConfirmationMail((object) $request->validated()));
-
-        return redirect()->route('fo.listen.show')
-            ->with('success', trans(
-                'Bonjour, votre message a bien été transmis, nous vous en remercions. Cordialement, l’équipe :appName.',
-                ['appName' => config('app.name')]
-            ));
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function hire(): \Illuminate\Contracts\View\View
-    {
-        $staticPageModel       = StaticPage::query()->where('type', StaticPageType::we_hire)->first();
-        $sectionModels         = Section::query()->where('page_id', $staticPageModel->id)->get();
-        $videoModels           = JobVideo::query()->inRandomOrder()->simplePaginate(4);
-        $testimonialModels     = Testimonial::query()->where('type', TypeEnum::hire)->get();
-        $compagnyLifeSection   = $sectionModels->where('section', PageSectionEnum::hire_life)->first();
-        $formationSection      = $sectionModels->where('section', PageSectionEnum::hire_formation)->first();
-        $testimonialSection    = $sectionModels->where('section', PageSectionEnum::hire_grow)->first();
-        $paritySection         = $sectionModels->where('section', PageSectionEnum::hire_parity)->first();
-        $findSection           = $sectionModels->where('section', PageSectionEnum::hire_find)->first();
-        $carouselSectionParity = Carousel::query()
-            ->where('section_id', PageSectionEnum::hire_parity)
-            ->where('published', true)
-            ->orderBy('order')
-            ->get();
-        $navLinks              = Sticky::query()->where('type', StaticPageType::we_hire)->get();
-
-        return view('fo.pages.hire', \compact(
-            'staticPageModel',
-            'sectionModels',
-            'videoModels',
-            'testimonialModels',
-            'compagnyLifeSection',
-            'formationSection',
-            'testimonialSection',
-            'paritySection',
-            'findSection',
-            'carouselSectionParity',
-            'navLinks'
-        ));
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \App\Models\Site $site
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function site(Site $site): \Illuminate\Contracts\View\View
-    {
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\Site> */
-        $siteModels    = Site::query()->orderBy('order')->get();
-        $siteModelList = $siteModels->keyBy('order');
-
-        $nextSiteModel = $siteModelList->where(
-            'order',
-            '>',
-            $site->order
-        )->first();
-        if ($siteModelList->last()->is($site)) {
-            $nextSiteModel = $siteModelList->first();
-        }
-
-        $viewBox     = (object) [
-            'lat' => $site->latitude,
-            'lng' => $site->longitude
-        ];
-        $initialZoom = 10;
-
-        // Create datas similar to Sticky model.
-        $navLinks = collect([
-            (object) [
-                'title' => $site->sticky_title,
-                'anchor' => $site->sticky_link,
-                'color' => StickiesColorEnum::quad,
-            ],
-        ]);
-
-        return view('fo.pages.site', [
-            'siteModelList' => $siteModelList,
-            'siteModel' => $site,
-            'nextSiteModel' => $nextSiteModel,
-            'viewBox' => $viewBox,
-            'initialZoom' => $initialZoom,
-            'navLinks' => $navLinks,
-        ]);
-    }
-}

app/Http/Kernel.php

@@ -39,11 +39,7 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\SecureHeaders::class
         ],
-        'saml' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-        ],
+
         'api' => [
             \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
@@ -58,16 +54,16 @@ class Kernel extends HttpKernel
      * @var array<string, class-string|string>
      */
     protected $middlewareAliases = [
-        'auth'             => \App\Http\Middleware\Authenticate::class,
-        'auth.basic'       => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'auth.session'     => \Illuminate\Session\Middleware\AuthenticateSession::class,
-        'cache.headers'    => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can'              => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest'            => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed'           => \App\Http\Middleware\ValidateSignature::class,
-        'throttle'         => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified'         => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'htmlsanitize'     => \App\Http\Middleware\HtmlSanitizer::class,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'htmlsanitize' => \App\Http\Middleware\HtmlSanitizer::class,
     ];
 }

app/Http/Middleware/HtmlSanitizer.php

@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
 
 use App\Lib\Helpers\ToolboxHelper;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class HtmlSanitizer
 {
@@ -12,14 +13,11 @@ class HtmlSanitizer
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $next
-     * @param  string|array<int, mixed> ...$params
+     * @param  string|array             ...$params
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handle(
-        Request $request,
-        \Closure $next,
-        string|array ...$params
-    ): \Symfony\Component\HttpFoundation\Response {
+    public function handle(Request $request, \Closure $next, string|array ...$params): Response
+    {
         $inputs = $request->all();
         /** @var callable|null */
         $cleanInput = null;

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class RedirectIfAuthenticated
 {
@@ -16,7 +17,7 @@ class RedirectIfAuthenticated
      * @throws \RuntimeException If guard is unhandled.
      * @phpcs:disable Squiz.Commenting.FunctionComment.IncorrectTypeHint
      */
-    public function handle(Request $request, \Closure $next, ...$guards): \Symfony\Component\HttpFoundation\Response
+    public function handle(Request $request, \Closure $next, ...$guards): Response
     {
         // phpcs:enable phpcs:disable
         $guards = empty($guards) ? [null] : $guards;
@@ -25,10 +26,10 @@ class RedirectIfAuthenticated
             if (auth($guard)->check()) {
                 switch ($guard) {
                     case 'frontend':
-                        return \redirect()->route('fo.home.show');
+                        return \redirect()->route('fo.homepage');
                     case 'backend':
                         if (!$request->routeIs('bo.*')) {
-                            continue 2;
+                            continue;
                         }
                         return \redirect()->route('bo.dashboard');
                     default:

app/Http/Middleware/SecureHeaders.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Vite;
+use Symfony\Component\HttpFoundation\Response;
 
 class SecureHeaders
 {
@@ -15,7 +16,7 @@ class SecureHeaders
      * Great starting point would be to go check out @Scott_Helme's:
      * https://securityheaders.com/
      *
-     * @var list<string>
+     * @var array
      */
     private $unwantedHeaderList = [
         'X-Powered-By',
@@ -30,7 +31,7 @@ class SecureHeaders
      * @return \Symfony\Component\HttpFoundation\Response
      * @phpcs:disable Squiz.Commenting.FunctionComment.IncorrectTypeHint
      */
-    public function handle(Request $request, Closure $next): \Symfony\Component\HttpFoundation\Response
+    public function handle(Request $request, Closure $next): Response
     {
         // phpcs:enable
         // * For Vite DEV
@@ -52,26 +53,18 @@ class SecureHeaders
             "default-src 'none';",
             "manifest-src 'self';",
             // * CKEDITOR Specific https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/csp.html
-            "connect-src 'self' blob: " . implode(' ', [
+            "connect-src 'self' " . implode(' ', [
                 // * VITE DEV
                 config('app.debug') ? "wss://{$host}:4443" : '',
                 config('app.debug') ? "https://{$host}:4443" : '',
-                'https://yl.s-web.fr'
             ]) . ';',
-            "img-src 'self' data: blob: " . implode(' ', [
-                // * Leaftlet With OpenStreetmaps
-                'https://tile.openstreetmap.org',
-                // * Youtube thumbnails
-                'https://img.youtube.com/vi/',
-                // * VITE DEV
-                config('app.debug') ? "https://{$host}:4443" : '',
-            ]) . ';',
-            "object-src 'self' " . implode(' ', []) . ';',
-            "frame-src 'self' " . implode(' ', [
+            "img-src * data: blob:;",
+            'frame-src ' . implode(' ', [
+                '\'self\'',
                 'https://www.google.com/recaptcha/',
                 'https://recaptcha.google.com/recaptcha/',
+                'https://www.google.com/maps/',
                 'https://www.youtube.com',
-                'https://www.youtube-nocookie.com/embed/',
             ]) . ';',
             "font-src 'self' data: " . \implode(' ', [
                 // * VITE DEV
@@ -112,9 +105,9 @@ class SecureHeaders
     }
 
     /**
-     * Remove unwanted headers.
+     * Remove unwanted headers
      *
-     * @param list<string> $headerList
+     * @param array $headerList
      * @return void
      */
     private function removeUnwantedHeaders(array $headerList): void

app/Http/Middleware/TrustHosts.php

@@ -11,7 +11,7 @@ class TrustHosts extends Middleware
      *
      * @return array<int, string|null>
      */
-    public function hosts(): array
+    public function hosts()
     {
         return [
             $this->allSubdomainsOfApplicationUrl(),

app/Http/Middleware/TrustProxies.php

@@ -10,11 +10,9 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     *  ! Added * as tmp Fix for #13
-     *
      * @var array<int, string>|string|null
      */
-    protected $proxies = '*';
+    protected $proxies;
 
     /**
      * The headers that should be used to detect proxies.
@@ -22,7 +20,7 @@ class TrustProxies extends Middleware
      * @var integer
      */
     protected $headers =
-    Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_FOR |
         Request::HEADER_X_FORWARDED_HOST |
         Request::HEADER_X_FORWARDED_PORT |
         Request::HEADER_X_FORWARDED_PROTO |

app/Http/Requests/Bo/Aisles/StoreAisleRequest.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Aisles;
-
-use App\Rules\WysiwygLength;
-use App\Traits\Requests\HasPicture;
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreAisleRequest extends FormRequest
-{
-    use HasPicture;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->merge([
-            'published' => $this->boolean('published')
-        ]);
-        $this->mergePicture('picture');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'name'          => 'required|string|between:3,255',
-            'title'         => 'required|string|between:3,255',
-            'text'          => [
-                'required',
-                'string',
-                new WysiwygLength(3, 500),
-            ],
-            'picture_alt'   => 'required|string|between:3,255',
-            'picture_title' => 'required|string|between:3,255',
-            'network_id'    => 'required|exists:networks,id',
-            'published'     => 'required|boolean',
-        ];
-        return \array_merge(
-            $rules,
-            $this->pictureRules('picture', 1400, 450, 1400, 450, false),
-        );
-    }
-}

app/Http/Requests/Bo/Aisles/UpdateAisleRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Aisles;
-
-class UpdateAisleRequest extends StoreAisleRequest
-{
-}

app/Http/Requests/Bo/Brands/StoreBrandRequest.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Brands;
-
-use App\Rules\WysiwygLength;
-use App\Traits\Requests\HasPicture;
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreBrandRequest extends FormRequest
-{
-    use HasPicture;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->merge([
-            'published' => $this->boolean('published')
-        ]);
-        $this->mergePicture('picture');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'name'          => 'required|string|between:3,255',
-            'text'          => [
-                'required',
-                'string',
-                new WysiwygLength(3, 500),
-            ],
-            'picture_alt'   => 'required|string|between:3,255',
-            'picture_title' => 'required|string|between:3,255',
-            'link'          => 'nullable|url:https',
-            'aisle_id'      => 'required|exists:aisles,id',
-            'published'     => 'required|boolean',
-        ];
-        return \array_merge(
-            $rules,
-            $this->pictureRules('picture', 250, 250, 250, 250, false),
-        );
-    }
-}

app/Http/Requests/Bo/Brands/UpdateBrandRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Brands;
-
-class UpdateBrandRequest extends StoreBrandRequest
-{
-}

app/Http/Requests/Bo/Carousels/StoreCarouselRequest.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Carousels;
-
-use App\Models\Section;
-use App\Rules\IsMaxChildrenReached;
-use App\Rules\WysiwygLength;
-use App\Traits\Requests\HasPicture;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Arr;
-use Illuminate\Validation\Rule;
-
-class StoreCarouselRequest extends FormRequest
-{
-    use HasPicture;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        if ($this->input('media.pictures')) {
-            foreach ($this->input('media.pictures') as $index => $pictureArray) {
-                $this->mergePicture("media.pictures.$index.path");
-            }
-        }
-
-        $this->merge([
-            'published' => $this->boolean('published'),
-        ]);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'title'            => 'required|string|between:3,255',
-            'section_id' => [
-                'required',
-                Rule::exists('sections', 'id'),
-                new IsMaxChildrenReached(new Section(), 'carousels', 5)
-            ],
-            'media'                   => 'required|array',
-            'media.pictures.*.alt'    => 'sometimes|string|between:3,255',
-            'media.pictures.*.title'  => 'sometimes|string|between:3,255',
-            'media.pictures.*.legend' => [
-                'sometimes',
-                'string',
-                new WysiwygLength(3, 255),
-            ],
-            'published'               => 'required|boolean',
-        ];
-        if ($this->input('media')) {
-            if (Arr::exists($this->input('media'), 'pictures')) {
-                foreach ($this->input('media')['pictures'] as $pictureIndex => $pictureArray) {
-                    $rules = array_merge(
-                        $rules,
-                        [
-                            "media.pictures.$pictureIndex.alt" => 'required|string|between:3,255',
-                            "media.pictures.$pictureIndex.title" => 'required|string|between:3,255',
-                            "media.pictures.$pictureIndex.legend" => [
-                                'sometimes',
-                                'string',
-                                new WysiwygLength(3, 255),
-                            ],
-                        ],
-                        $this->pictureRules("media.pictures.$pictureIndex.path", 500, 500, 500, 500, false),
-                    );
-                }
-            } //end if
-        } //end if
-        return $rules;
-    }
-
-    /**
-     * Get custom attributes for validator errors.
-     *
-     * @return array<string, string>
-     */
-    public function attributes(): array
-    {
-        $attributes = [
-            'title'       => trans('validation.attributes.title'),
-        ];
-        if ($this->input('media') && array_key_exists('pictures', $this->input('media'))) {
-            foreach ($this->input('media.pictures') as $index => $pictureArray) {
-                $attributes = array_merge(
-                    $attributes,
-                    [
-                        "media.pictures.$index.alt" => trans(':field :inter:model', [
-                            'field' => trans('validation.custom.alt_attribute'),
-                            'inter' => trans('validation.custom.of_the.vowel'),
-                            'model' => sprintf('%s n°%d', trans('validation.custom.picture'), $index + 1),
-                        ]),
-                        "media.pictures.$index.title" => trans(':field :inter:model', [
-                            'field' => trans('validation.custom.title_attribute'),
-                            'inter' => trans('validation.custom.of_the.vowel'),
-                            'model' => sprintf('%s n°%d', trans('validation.custom.picture'), $index + 1),
-                        ]),
-                        "media.pictures.$index.legend" => trans(':field :inter:model', [
-                            'field' => trans('validation.custom.legend'),
-                            'inter' => trans('validation.custom.of_the.vowel'),
-                            'model' => sprintf('%s n°%d', trans('validation.custom.picture'), $index + 1),
-                        ]),
-                    ],
-                );
-            } //end foreach
-        } //end if
-        return $attributes;
-    }
-}

app/Http/Requests/Bo/Carousels/UpdateCarouselRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Carousels;
-
-class UpdateCarouselRequest extends StoreCarouselRequest
-{
-}

app/Http/Requests/Bo/HistoricalMilestones/StoreHistoricalMilestoneRequest.php

@@ -24,11 +24,11 @@ class StoreHistoricalMilestoneRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'button_status'  => $this->boolean('button_status'),
-            'button_new_tab' => $this->boolean('button_new_tab')
+            'button_status'  => $this->button_status ? true : false,
+            'button_new_tab' => $this->button_new_tab ? true : false
         ]);
         $this->mergePicture('picture');
     }
@@ -36,12 +36,12 @@ class StoreHistoricalMilestoneRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
         $rules = [
-            'year'           => 'required|integer|min:1900|max:2100',
+            'year'           => 'required|integer|min:1901|max:2155',
             'title'          => 'required|string|between:3,255',
             'text'           => 'required|string|between:3,255',
             'picture_alt'    => 'required|string|between:3,255',
@@ -54,14 +54,15 @@ class StoreHistoricalMilestoneRequest extends FormRequest
 
         return \array_merge(
             $rules,
-            $this->pictureRules('picture', 606, 800, 606, 800, false),
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('picture', 100, 100, 100, 100, null, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
@@ -69,15 +70,15 @@ class StoreHistoricalMilestoneRequest extends FormRequest
             'year'           => trans('validation.attributes.year'),
             'title'          => trans('validation.attributes.title'),
             'text'           => trans('validation.custom.text'),
-            'picture_alt'     => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'picture_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
-            'picture_title'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'picture_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
             'button_label'   => trans('validation.custom.button_label'),
             'button_url'     => trans('validation.custom.button_url'),

app/Http/Requests/Bo/JobVideos/StoreJobVideoRequest.php

@@ -22,7 +22,7 @@ class StoreJobVideoRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
@@ -36,13 +36,13 @@ class StoreJobVideoRequest extends FormRequest
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'title'    => trans('validation.attributes.title'),
-            'place'    => trans('validation.custom.place'),
+            'title' => trans('validation.attributes.title'),
+            'place' => trans('validation.custom.place'),
             'video_id' => trans('validation.custom.video_id'),
         ];
     }

app/Http/Requests/Bo/Logos/StoreLogoRequest.php

@@ -24,7 +24,7 @@ class StoreLogoRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->mergePicture('picture');
     }
@@ -32,7 +32,7 @@ class StoreLogoRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
@@ -44,27 +44,28 @@ class StoreLogoRequest extends FormRequest
         ];
         return \array_merge(
             $rules,
-            $this->pictureRules('picture', 450, 450, 450, 450, false),
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('picture', 100, 100, 100, 100, null, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'picture_alt'     => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'picture_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
-            'picture_title'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'picture_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
         ];
     }

app/Http/Requests/Bo/Networks/StoreNetworkRequest.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Networks;
-
-use App\Traits\Requests\HasPicture;
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreNetworkRequest extends FormRequest
-{
-    use HasPicture;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->merge([
-            'published' => $this->boolean('published')
-        ]);
-        $this->mergePicture('picture');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'seo_title'       => 'required|string|between:45,70',
-            'seo_description' => 'required|string|between:50,160',
-            'name'            => 'required|string|between:3,255',
-            'title'           => 'required|string|between:3,255',
-            'subtitle'        => 'required|string|between:3,255',
-            'picture_alt'     => 'required|string|between:3,255',
-            'picture_title'   => 'required|string|between:3,255',
-            'button_text'     => 'required|string|between:3,255',
-            'published'       => 'required|boolean',
-
-        ];
-        return \array_merge(
-            $rules,
-            $this->pictureRules('picture', 1920, 1080, 1920, 1080, false),
-        );
-    }
-}

app/Http/Requests/Bo/Networks/UpdateNetworkRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Networks;
-
-class UpdateNetworkRequest extends StoreNetworkRequest
-{
-}

app/Http/Requests/Bo/News/StoreNewsRequest.php

@@ -24,10 +24,10 @@ class StoreNewsRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'published' => $this->boolean('published')
+            'published' => $this->published ? true : false
         ]);
         $this->mergePicture('picture');
         $this->mergePicture('thumbnail');
@@ -36,7 +36,7 @@ class StoreNewsRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
@@ -53,21 +53,21 @@ class StoreNewsRequest extends FormRequest
             'linkedin_url'    => 'nullable|url',
             'published'       => 'required|boolean',
             'publish_at'      => 'nullable|date',
-            'displayed_date'  => 'required|date',
             'unpublish_at'    => 'nullable|date|after:publish_at',
 
         ];
         return \array_merge(
             $rules,
-            $this->pictureRules('picture', 500, 390, 500, 390, true),
-            $this->pictureRules('thumbnail', 660, 440, 660, 440, true),
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('picture', 100, 100, 100, 100, false),
+            $this->pictureRules('thumbnail', 100, 100, 100, 100, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
@@ -85,7 +85,6 @@ class StoreNewsRequest extends FormRequest
             'published'       => trans('validation.custom.activated'),
             'publish_at'      => trans('validation.custom.publish_at'),
             'unpublish_at'    => trans('validation.custom.unpublish_at'),
-            'displayed_date'  => trans('validation.custom.displayed_date'),
         ];
     }
 }

app/Http/Requests/Bo/Sections/UpdateSectionRequest.php

@@ -33,37 +33,36 @@ class UpdateSectionRequest extends UpdateMiniCrudRequest
         $rules = [
             'h2_title' => 'required|between:3,255',
         ];
-        /** @var \App\Models\Section|null $section */
-        $section = $this->route('section');
-        if ($section) {
-            if (
-                $section->section !== \App\Enums\Sections\PageSectionEnum::hire_grow
-            ) {
-                $rules = \array_merge($rules, [
-                    'text' => 'present',
-                ]);
-            }
-            if ($section->section->containsData()) {
-                $rules = \array_merge($rules, [
-                    'data' => 'present|array',
-                    'data.*' => 'required|array',
-                ]);
-            }
+        if ($this->route('section')->section !== \app\Enums\Sections\PageSectionEnum::hire_grow) {
+            $rules = \array_merge($rules, [
+                'text' => 'present',
+            ]);
         }
-        return \array_merge(parent::rules(), $rules);
+        if ($this->route('section')->section->containsData()) {
+            $rules = \array_merge($rules, [
+                'data' => 'present|array',
+                'data.*' => 'required|array',
+            ]);
+        }
+
+        return \array_merge(
+            parent::rules(),
+            $rules
+        );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
-    public function attributes(): array
+    public function attributes()
     {
         return [
-            'h2_title'     => trans('validation.custom.h2_title'),
-            'text'         => trans('validation.attributes.content'),
-            'data'         => trans('Valeurs du contenu spécifique'),
+            'h2_title' => __('validation.custom.h2_title'),
+            'text' => __('validation.attributes.content'),
+
+            'data' => trans('Valeurs du contenu spécifique'),
             'data.*.value' => trans('Valeur du contenu spécifique'),
         ];
     }

app/Http/Requests/Bo/Sites/StoreSiteRequest.php

@@ -25,146 +25,152 @@ class StoreSiteRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
-        /** @var array<int, mixed> $pictos */
-        $pictos = $this->input('pictos') ?? [];
         $this->merge([
-            'published'             => $this->boolean('published'),
-            'invert_director_block' => $this->boolean('invert_director_block'),
-            'pictos'                => \collect($pictos)->all(),
+            'published' => $this->published ? true : false,
+            'pictos' => \collect($this->pictos)->all(),
         ]);
         $this->mergePicture('logo');
         $this->mergePicture('picture_1');
         $this->mergePicture('picture_2');
         $this->mergePicture('picture_3');
+        $this->mergePicture('map_picture');
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
         $rules = [
-            'seo_title'             => 'required|between:45,70',
-            'seo_description'       => 'required|between:50,160',
-            'name'                  => 'required|string|between:3,100',
-            'description'           => 'required|string|between:3,255',
-            'description_2'         => 'nullable|string|between:3,255',
-            'employees'             => 'required|numeric|min:0',
-            'pictos'                => 'present|array',
-            'pictos.*'              => 'required|integer',
-            'address'               => 'required|string|between:3,255',
-            'phone_number'          => 'required|string|between:10,20',
-            'access_line'           => 'present|array',
-            'access_line.*'         => 'nullable|string|between:3,255',
-            'director_name'         => 'required|string|between:3,255',
-            'director_function'     => 'required|string|between:3,255',
-            'director_speach'       => 'required|string|min:15',
-            'invert_director_block' => 'required|boolean',
-            'employee_name'         => 'nullable|string|between:3,255',
-            'employee_function'     => 'nullable|string|between:3,255',
-            'employee_speach'       => 'nullable|string|min:15',
-            'highlights'            => 'nullable|string|min:15',
-            'latitude'              => 'required|numeric|between:-90,90',
-            'longitude'             => 'required|numeric|between:-180,180',
-            'sticky_title'          => 'required_with:sticky_link|nullable|string|between:3,255',
-            'sticky_link'           => 'required_with:sticky_title|nullable|string|between:3,255',
-            'logo_alt'              => 'required|string|between:3,255',
-            'logo_title'            => 'required|string|between:3,255',
-            'picture_1_alt'         => 'required|string|between:3,255',
-            'picture_1_title'       => 'required|string|between:3,255',
-            'picture_2_alt'         => 'required_with:picture_2|nullable|string|between:3,255',
-            'picture_2_title'       => 'required_with:picture_2|nullable|string|between:3,255',
-            'picture_3_alt'         => 'required_with:picture_3|nullable|string|between:3,255',
-            'picture_3_title'       => 'required_with:picture_3|nullable|string|between:3,255',
-            'logos'                 => 'nullable|array',
-            'logos.*.id'            => 'required|exists:logos,id',
+            'seo_title'         => 'required|between:45,70',
+            'seo_description'   => 'required|between:50,160',
+            'name'              => 'required|string|between:3,100',
+            'description'       => 'required|string|between:3,255',
+            'description_2'     => 'nullable|string|between:3,255',
+            'employees'         => 'required|numeric|min:0',
+            'pictos'            => 'present|array',
+            'pictos.*'          => 'required|integer',
+            'address'           => 'required|string|between:3,255',
+            'phone_number'      => 'required|string|between:10,20',
+            'access_line'       => 'present|array',
+            'access_line.*'     => 'nullable|string|between:3,255',
+            'director_name'     => 'nullable|string|between:3,255',
+            'director_speach'   => 'required|string|min:15',
+            'employee_name'     => 'nullable|string|between:3,255',
+            'employee_function' => 'nullable|string|between:3,255',
+            'employee_speach'   => 'nullable|string|min:15',
+            'highlights'        => 'nullable|string|min:15',
+            'latitude'          => 'required|numeric|between:-90,90',
+            'longitude'         => 'required|numeric|between:-180,180',
+            'logo_alt'          => 'required|string|between:3,255',
+            'logo_title'        => 'required|string|between:3,255',
+            'picture_1_alt'     => 'required|string|between:3,255',
+            'picture_1_title'   => 'required|string|between:3,255',
+            'picture_2_alt'     => 'required_with:picture_2|nullable|string|between:3,255',
+            'picture_2_title'   => 'required_with:picture_2|nullable|string|between:3,255',
+            'picture_3_alt'     => 'required_with:picture_3|nullable|string|between:3,255',
+            'picture_3_title'   => 'required_with:picture_3|nullable|string|between:3,255',
+            'map_picture_alt'   => 'required|string|between:3,255',
+            'map_picture_title' => 'required|string|between:3,255',
+            'logos'             => 'nullable|array',
+            'logos.*.id'        => 'required|exists:logos,id',
+
+
         ];
         return \array_merge(
             $rules,
-            $this->pictureRules('logo', 1000, 727, 1000, 727, false),
-            $this->pictureRules('picture_1', 1000, 562, 1000, 562, false),
-            $this->pictureRules('picture_2', 1000, 562, 1000, 562, true),
-            $this->pictureRules('picture_3', 1000, 562, 1000, 562, true),
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('logo', 100, 100, 100, 100, null, false),
+            $this->pictureRules('picture_1', 100, 100, 100, 100, null, false),
+            $this->pictureRules('picture_2', 100, 100, 100, 100, null, true),
+            $this->pictureRules('picture_3', 100, 100, 100, 100, null, true),
+            $this->pictureRules('map_picture', 100, 100, 100, 100, null, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'seo_title'             => trans('validation.custom.seo_title'),
-            'seo_description'       => trans('validation.custom.seo_description'),
-            'name'                  => trans('validation.attributes.name'),
-            'description'           => trans('validation.custom.description'),
-            'description_2'         => trans('validation.custom.description_2'),
-            'employees'             => trans('validation.custom.employees_count'),
-            'pictos'                => Str::plural(trans('validation.custom.picto')),
-            'pictos.*'              => trans('validation.custom.picto'),
-            'address'               => trans('validation.attributes.address'),
-            'phone_number'          => trans('validation.attributes.phone'),
-            'access_line'           => trans('validation.custom.access_line'),
-            'access_line.*'         => trans('ligne d\'accès au site'),
-            'director_name'         => trans('validation.custom.director_name'),
-            'director_function'     => trans('validation.custom.director_function'),
-            'director_speach'       => trans('validation.custom.director_speach'),
-            'invert_director_block' => trans('validation.custom.invert_block'),
-            'employee_name'         => trans('validation.custom.employee_name'),
-            'employee_function'     => trans('validation.custom.employee_function'),
-            'employee_speach'       => trans('validation.custom.employee_speach'),
-            'highlights'            => Str::plural(trans('validation.custom.highlight')),
-            'latitude'              => trans('validation.custom.latitude'),
-            'longitude'             => trans('validation.custom.longitude'),
-            'sticky_title'          => trans('validation.custom.sticky_item.title'),
-            'sticky_link'           => trans('validation.custom.sticky_item.link'),
-            'logos'                 => Str::plural(trans('models.classes.logo')),
-            'logos.*'               => trans('models.classes.logo'),
-            'logo_alt'              => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.male'),
-                'model' => trans('validation.custom.logo'),
+            'seo_title'         => __('validation.custom.seo_title'),
+            'seo_description'   => __('validation.custom.seo_description'),
+            'name'              => __('validation.attributes.name'),
+            'description'       => __('validation.custom.description'),
+            'description_2'     => __('validation.custom.description_2'),
+            'employees'         => __('validation.custom.employees_count'),
+            'pictos'            => Str::plural(__('validation.custom.picto')),
+            'pictos.*'          => __('validation.custom.picto'),
+            'address'           => __('validation.attributes.address'),
+            'phone_number'      => __('validation.attributes.phone'),
+            'access_line'       => __('validation.custom.access_line'),
+            'access_line.*'     => __('ligne d\'accès au site'),
+            'director_name'     => __('validation.custom.director_name'),
+            'director_speach'   => __('validation.custom.director_speach'),
+            'employee_name'     => __('validation.custom.employee_name'),
+            'employee_function' => __('validation.custom.employee_function'),
+            'employee_speach'   => __('validation.custom.employee_speach'),
+            'highlights'        => Str::plural(__('validation.custom.highlight')),
+            'latitude'          => __('validation.custom.latitude'),
+            'longitude'         => __('validation.custom.longitude'),
+            'logos'             => Str::plural(__('models.classes.logo')),
+            'logos.*'           => __('models.classes.logo'),
+            'logo_alt'          => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.male'),
+                'model' => __('validation.custom.logo'),
             ]),
-            'logo_title'        => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.male'),
-                'model' => trans('validation.custom.logo'),
+            'logo_title'        => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.male'),
+                'model' => __('validation.custom.logo'),
             ]),
-            'picture_1_alt'     => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_1'),
+            'picture_1_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_1'),
             ]),
-            'picture_1_title'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_1'),
+            'picture_1_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_1'),
             ]),
-            'picture_2_alt'     => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_2'),
+            'picture_2_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_2'),
             ]),
-            'picture_2_title'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_2'),
+            'picture_2_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_2'),
             ]),
-            'picture_3_alt'     => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_3'),
+            'picture_3_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_3'),
             ]),
-            'picture_3_title'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture_3'),
+            'picture_3_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture_3'),
+            ]),
+            'map_picture_alt'     => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.map_picture'),
+            ]),
+            'map_picture_title'   => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.map_picture'),
             ]),
         ];
     }

app/Http/Requests/Bo/Slides/StoreSlideRequest.php

@@ -2,8 +2,6 @@
 
 namespace App\Http\Requests\Bo\Slides;
 
-use App\Enums\Slides\SliderTypeEnum;
-use App\Rules\WysiwygLength;
 use App\Traits\Requests\HasPicture;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rules\Enum;
@@ -27,114 +25,78 @@ class StoreSlideRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'button_status'  => $this->boolean('button_status'),
-            'button_new_tab' => $this->boolean('button_new_tab'),
+            'button_status'  => $this->button_status ? true : false,
+            'button_new_tab' => $this->button_new_tab ? true : false
         ]);
+        if (intval($this->slider) !== \App\Enums\Slides\SliderTypeEnum::home->value()) {
+            $this->merge([
+                'video_id'  => ''
+            ]);
+        };
         $this->mergePicture('picture');
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
         $rules = [
-            'type'           => [
+            'slider'         => [
                 'required',
-                new Enum(SliderTypeEnum::class)
+                new Enum(\App\Enums\Slides\SliderTypeEnum::class)
             ],
             'title'          => [
-                'required_unless:type,' . SliderTypeEnum::home->value(),
+                'required_unless:slider,' . \App\Enums\Slides\SliderTypeEnum::home->value(),
                 'nullable',
                 'string',
                 'between:3,255'
             ],
-            'content'        => [
-                'required_if:type,' . SliderTypeEnum::home->value() . ', ' . SliderTypeEnum::team->value(),
-                'nullable',
-                'string',
-                new WysiwygLength(3, 275),
-                'max:500'
-            ],
+            'content'        => 'required|string|between:3,255',
             'video_id'       => 'nullable|string|regex:%([^"&?\/\s]{11})%i',
-            'picture_alt'    => [
-                'required_unless:type,' . SliderTypeEnum::team->value(),
-                'nullable',
-                'string',
-                'between:3,255'
-            ],
-            'picture_title'  => [
-                'required_unless:type,' . SliderTypeEnum::team->value(),
-                'nullable',
-                'string',
-                'between:3,255'
-            ],
+            'picture_alt'    => 'required|string|between:3,255',
+            'picture_title'  => 'required|string|between:3,255',
             'button_label'   => 'required_if:button_status,true|nullable|string|between:3,35',
             'button_url'     => 'required_if:button_status,true|nullable|string|between:3,255',
-            'button_status'  => [
-                'required_unless:type,' . SliderTypeEnum::home->value() . ', ' . SliderTypeEnum::team->value(),
-                'nullable',
-                'boolean'
-            ],
+            'button_status'  => 'required|boolean',
             'button_new_tab' => 'required|boolean',
         ];
         return \array_merge(
             $rules,
-            $this->pictureRules('picture', 1920, 1080, 1920, 1080, true)
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('picture', 100, 100, 100, 100, null, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'type'           => trans('validation.custom.type'),
-            'title'          => trans('validation.attributes.title'),
-            'content'        => trans('validation.attributes.content'),
-            'video_id'       => trans('validation.custom.video_id'),
-            'picture'        => trans('validation.custom.picture'),
-            'picture_alt'    => trans('validation.custom.picture_alt'),
-            'picture_title'  => trans('validation.custom.picture_title'),
-            'button_label'   => trans('validation.custom.button_label'),
-            'button_url'     => trans('validation.custom.button_url'),
-            'button_status'  => trans('validation.custom.button_status'),
-            'button_new_tab' => trans('validation.custom.button_new_tab'),
+
+            'video_id' => trans('validation.custom.video_id'),
         ];
     }
 
     /**
      * Custom validaton messages.
      *
-     * @return array<string, string>
+     * @return array
      */
-    public function messages(): array
+    public function messages()
     {
         return [
-            'title.required_unless' => __('Le champ :attribute est obligatoire si le slider n\'est pas :name.', [
-                'attribute' => trans('validation.attributes.title'),
-                'name'      => SliderTypeEnum::home->label()
-            ]),
-            'content.required_if' => __('Le champ :attribute est obligatoire si le slider est :name1 ou :name2.', [
-                'attribute' => trans('validation.attributes.content'),
-                'name1'      => SliderTypeEnum::home->label(),
-                'name2'      => SliderTypeEnum::team->label()
-            ]),
-            'content.max' => __(
-                'Le champ :attribute ne peut pas contenir plus de :max caractères (balises incluses).',
-                [
-                    'attribute' => trans('validation.attributes.content'),
-                    'max'       => '500',
-                ]
-            ),
+            'title' => [
+                'required_unless' => __('Le champ titre est obligatoire si le slider n\'est pas home.'),
+            ]
         ];
     }
 }

app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php

@@ -2,15 +2,11 @@
 
 namespace App\Http\Requests\Bo\StaticPages;
 
-use App\Traits\Requests\HasPicture;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Str;
 
 class UpdateStaticPageRequest extends FormRequest
 {
-    use HasPicture;
-
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -18,7 +14,7 @@ class UpdateStaticPageRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return Gate::check('update', $this->route('static_page'));
+        return auth('backend')->check();
     }
 
     /**
@@ -29,11 +25,8 @@ class UpdateStaticPageRequest extends FormRequest
     public function prepareForValidation(): void
     {
         $this->merge([
-            'content' => (empty(Str::of($this->input('content'))->value())) ?
-                null :
-                Str::of($this->input('content'))->value()
+            'content' => (string)Str::of($this->post('content'))
         ]);
-        $this->mergePicture('picture');
     }
 
     /**
@@ -42,44 +35,12 @@ class UpdateStaticPageRequest extends FormRequest
      * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
      */
     public function rules(): array
-    {
-        $rules = [
-            'seo_title'       => 'required|min:45|max:70',
-            'seo_description' => 'required|min:50|max:160',
-            'title'           => 'required|min:3|max:255',
-            'content'         => 'sometimes|nullable',
-        ];
-        if (request()->route()->parameters()['static_page']->type->containsContent()) {
-            $rules = array_merge($rules, ['content' => 'required|string|min:15']);
-        }
-        if (request()->route()->parameters()['static_page']->type->containsBanner()) {
-            $rules = array_merge(
-                $rules,
-                $this->pictureRules('picture', 1920, 1080, 1920, 1080, false),
-                [
-                    'picture_alt'   => 'required|string|between:3,255',
-                    'picture_title' => 'required|string|between:3,255',
-                ]
-            );
-        }
-        return $rules;
-    }
-
-    /**
-     * Get custom attributes for validator errors.
-     *
-     * @return array<string, string>
-     */
-    public function attributes(): array
     {
         return [
-            'seo_title'       => trans('validation.custom.seo_title'),
-            'seo_description' => trans('validation.custom.seo_description'),
-            'title'           => trans('validation.attributes.title'),
-            'content'         => trans('validation.attributes.content'),
-            'picture'         => trans('validation.custom.banner'),
-            'picture_alt'     => trans('validation.custom.attribute_alt'),
-            'picture_title'   => trans('validation.custom.attribute_title'),
+            'seo_title' => 'required|min:45|max:70',
+            'seo_description' => 'required|min:50|max:160',
+            'title' => 'required|min:3|max:255',
+            'content' => 'present',
         ];
     }
 }

app/Http/Requests/Bo/Stickies/StoreStickyRequest.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Stickies;
-
-use App\Enums\StaticPageType;
-use App\Enums\StickiesColorEnum;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\Enum;
-
-class StoreStickyRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'type'   => [
-                Rule::requiredIf($this->user()->can('create', $this->sticky)),
-                new Enum(StaticPageType::class)
-            ],
-            'title'  => 'required|string|between:3,255',
-            'anchor' => [
-                Rule::requiredIf($this->user()->can('create', $this->sticky)),
-                'string',
-                'between:3,255'
-            ],
-            'color'   => [
-                Rule::requiredIf($this->user()->can('create', $this->sticky)),
-                new Enum(StickiesColorEnum::class)
-            ],
-        ];
-    }
-
-    /**
-     * Get custom attributes for validator errors.
-     *
-     * @return array<string, string>
-     */
-    public function attributes(): array
-    {
-        return [
-            'type'   => trans('validation.custom.type'),
-            'title'  => trans('validation.attributes.title'),
-            'anchor' => trans('validation.custom.anchor'),
-            'color'  => trans('validation.custom.color'),
-        ];
-    }
-}

app/Http/Requests/Bo/Stickies/UpdateStickyRequest.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Stickies;
-
-class UpdateStickyRequest extends StoreStickyRequest
-{
-}

app/Http/Requests/Bo/Strips/StoreStripRequest.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Requests\Bo\Strips;
 
-use App\Rules\WysiwygLength;
 use App\Traits\Requests\HasPicture;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Enum;
 
 class StoreStripRequest extends FormRequest
@@ -26,76 +26,61 @@ class StoreStripRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'published' => $this->boolean('published'),
+            'published' => $this->published ? true : false,
         ]);
-        if ($this->input('picture')) {
-            $this->mergePicture('picture');
-        }
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
-        $rules = [
+        return [
+            'picto'        => [
+                'required',
+                new Enum(\App\Enums\Strips\PictoEnum::class)
+            ],
             'text'         => [
                 'required',
                 'string',
-                new WysiwygLength(3, 90),
+                'min:3',
+                // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
+                function (string $attribute, mixed $value, \Closure $fail) {
+                    // phpcs:enable
+                    if (Str::wordCount(\strip_tags($value)) > 255) {
+                        $fail(trans('validation.max_words', [
+                            'attribute' => trans('validation.attributes.text'),
+                            'count' => '255'
+                        ]));
+                    }
+                }
             ],
             'news_id'      => 'nullable|exists:news,id',
             'published'    => 'required|boolean',
             'publish_at'   => 'nullable|date',
             'unpublish_at' => 'nullable|date|after:publish_at',
         ];
-
-        if ($this->input('picture')) {
-            $rules = array_merge(
-                $rules,
-                [
-                    'picture_alt'   => 'required_with|string|between:3,255',
-                    'picture_title' => 'required_with|string|between:3,255',
-                ],
-                $this->pictureRules('picture', 100, 65, 100, 65, true),
-            );
-        } else {
-            $rules = array_merge(
-                $rules,
-                [
-                    'picto' => [
-                        'required',
-                        new Enum(\App\Enums\Strips\PictoEnum::class)
-                    ],
-                ],
-            );
-        }
-
-        return $rules;
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'picto'         => trans('validation.custom.picto'),
-            'picture'       => trans('validation.custom.picture'),
-            'picture_alt'   => trans('validation.custom.alt_attribute'),
-            'picture_title' => trans('validation.custom.title_attribute'),
-            'text'          => trans('validation.attributes.content'),
-            'news_id'       => trans('models.classes.news'),
-            'published'     => trans('validation.custom.activated'),
-            'publish_at'    => trans('validation.custom.publish_at'),
-            'unpublish_at'  => trans('validation.custom.unpublish_at'),
+            'picto'        => __('validation.custom.picto'),
+            'text'         => __('validation.attributes.content'),
+            'news_id'      => __('models.classes.news'),
+            'published'    => __('validation.custom.activated'),
+            'publish_at'   => __('validation.custom.publish_at'),
+            'unpublish_at' => __('validation.custom.unpublish_at'),
         ];
     }
 }

app/Http/Requests/Bo/Testimonials/StoreTestimonialRequest.php

@@ -25,7 +25,7 @@ class StoreTestimonialRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->mergePicture('picture');
     }
@@ -33,7 +33,7 @@ class StoreTestimonialRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
@@ -50,31 +50,32 @@ class StoreTestimonialRequest extends FormRequest
         ];
         return \array_merge(
             $rules,
-            $this->pictureRules('picture', 150, 150, 150, 150, false),
+            // FIXME: Mettre à jour les tailles.
+            $this->pictureRules('picture', 100, 100, 100, 100, null, false),
         );
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
-            'type'          => trans('validation.custom.type'),
-            'name'          => trans('validation.attributes.name'),
-            'job'           => trans('validation.custom.job'),
-            'content'       => trans('validation.attributes.content'),
-            'picture_alt'   => trans(':field :inter:model', [
-                'field' => trans('validation.custom.alt_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'type'          => __('validation.custom.type'),
+            'name'          => __('validation.attributes.name'),
+            'job'           => __('validation.custom.job'),
+            'content'       => __('validation.attributes.content'),
+            'picture_alt'   => __(':field :inter:model', [
+                'field' => __('validation.custom.alt_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
-            'picture_title' => trans(':field :inter:model', [
-                'field' => trans('validation.custom.title_attribute'),
-                'inter' => trans('validation.custom.of_the.vowel'),
-                'model' => trans('validation.custom.picture'),
+            'picture_title' => __(':field :inter:model', [
+                'field' => __('validation.custom.title_attribute'),
+                'inter' => __('validation.custom.of_the.vowel'),
+                'model' => __('validation.custom.picture'),
             ]),
         ];
     }

app/Http/Requests/Bo/UpdateChangeOrderRequest.php

@@ -24,14 +24,14 @@ class UpdateChangeOrderRequest extends FormRequest
     protected function prepareForValidation(): void
     {
         $this->merge([
-            'direction' => $this->route('direction') === 'up' ? true : false
+            'direction' => $this->direction === 'up' ? true : false
         ]);
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {

app/Http/Requests/Bo/UpdateMiniCrudRequest.php

@@ -10,7 +10,7 @@ use Illuminate\Validation\ValidationException;
 abstract class UpdateMiniCrudRequest extends FormRequest
 {
     /**
-     * The model parameter name.
+     * The model parameter name
      *
      * @var string
      */
@@ -21,25 +21,45 @@ abstract class UpdateMiniCrudRequest extends FormRequest
      *
      * @return boolean
      */
-    public function authorize(): bool
+    public function authorize()
     {
         return auth('backend')->check();
     }
 
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation(): void
+    {
+        foreach ($this->{$this->modelName}->data as $iptName => $input) {
+            $input = \json_decode(\json_encode($input), true);
+            switch ($input['inputType']) {
+                case InputType::text->value:
+                    if (is_null($this->data[$iptName]['value']) && !$input['required']) {
+                        $this->merge([
+                            $this->data[$iptName]['value'] => ''
+                        ]);
+                    }
+                    break;
+            }
+        }
+    }
+
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      * @phpcs:disable Generic.Metrics.CyclomaticComplexity.MaxExceeded
      * @phpcs:disable Generic.Metrics.NestingLevel.TooHigh
      */
-    public function rules(): array
+    public function rules()
     {
         // phpcs:enable
         $rules = [];
         foreach ($this->{$this->modelName}->data as $iptName => $input) {
-            $encoded = \json_encode($input);
-            $input   = \json_decode($encoded !== false ? $encoded : '[]', true);
+            $input = \json_decode(\json_encode($input), true);
             switch ($input['inputType']) {
                 case InputType::number->value:
                     $rules = array_merge($rules, [
@@ -69,10 +89,11 @@ abstract class UpdateMiniCrudRequest extends FormRequest
                     ]);
                     break;
                 case InputType::text->value:
-                    $mergeRules = $this->compileValidate('required|string|min:15', $input);
+                    $required   = $input['required'] ? 'required' : 'nullable';
+                    $mergeRules = $this->compileValidate($required . '|string|min:15', $input);
                     $mergeRules = collect($mergeRules)
                         ->map(function ($rule) {
-                            if (\is_string($rule) && \strpos($rule, 'max:') !== false) {
+                            if (\strpos($rule, 'max:') !== false) {
                                 $max = \intval(str_replace('max:', '', $rule));
                                 return function ($attribute, $value, $fail) use ($max) {
                                     if (\strlen(\strip_tags($value)) > $max) {
@@ -81,16 +102,17 @@ abstract class UpdateMiniCrudRequest extends FormRequest
                                 };
                             }
                             return $rule;
-                        })->all();
+                        });
                     $rules      = array_merge($rules, [
                         "data.$iptName.value" => $mergeRules
                     ]);
                     break;
                 case InputType::image->value:
-                    $required = $this->isUpdate() ? 'sometimes' : ($input['required'] ? 'required' : 'nullable');
-                    $ipt      = $this->data[$iptName];
-                    $max      = isset($ipt['dimensionsMax']);
-                    $dim      = \is_string($input['dimensions']) ? collect(explode(
+                    $required = $this->isUpdate() ? 'sometimes' : 'required';
+
+                    $ipt = $this->data[$iptName];
+                    $max = isset($ipt['dimensionsMax']);
+                    $dim = \is_string($input['dimensions']) ? collect(explode(
                         ',',
                         (isset($ipt['dimensionsMax']) and is_string($ipt['dimensionsMax'])) ?
                             $ipt['dimensionsMax'] : $input['dimensions']
@@ -100,16 +122,20 @@ abstract class UpdateMiniCrudRequest extends FormRequest
                     }) : $input['dimensions'];
 
                     // * Adapt dimensions
-                    $sizes = [
+                    $sizes = (object)[
                         'minHeight' => $dim['height'],
                         'maxHeight' => $dim['height'],
-                        'minWidth'  => $dim['width'],
-                        'maxWidth'  => $dim['width'],
+                        'minWith' => $dim['width'],
+                        'maxWith' => $dim['width'],
                     ];
+
                     $rules = array_merge($rules, [
                         "data.$iptName.value" => [
-                            function (string $attribute, $value, callable $fail) use ($sizes) {
-                                ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes);
+                            function (string $attribute, $value, callable $fail) use ($sizes, $input) {
+                                // Picture can be null.
+                                if ($input['required'] || $value !== null) {
+                                    return ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes);
+                                }
                             }
                         ],
                         $this->compileValidate(
@@ -127,17 +153,28 @@ abstract class UpdateMiniCrudRequest extends FormRequest
                             ]),
                             $input
                         ),
-                        "data.$iptName.alt"   => $this->compileValidate("$required|string|min:5", $input),
+                    ]);
+
+                    // Attributes are required if a picture is set.
+                    $required = $this->data['bloc_image']['value'] ? 'required' : 'nullable';
+
+                    $rules = array_merge($rules, [
+                        "data.$iptName.alt" => $this->compileValidate("$required|string|min:5", $input),
                         "data.$iptName.title" => $this->compileValidate("$required|string|min:5", $input)
                     ]);
                     break;
                 case InputType::url->value:
                     $rules = array_merge($rules, [
                         "data.$iptName.value" => [
-                            $this->compileValidate('url', $input),
+                            'required', 'url',
                             // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
                             function ($attribute, $value, $fail) {
-                                $this->validateUrl($attribute, $value, $fail);
+                                try {
+                                    ToolboxHelper::assertNoInternalUrls($attribute, $value);
+                                    ToolboxHelper::assertNoInternalBoUrls($attribute, $value);
+                                } catch (ValidationException $e) {
+                                    $fail(collect($e->errors())->first()[0]);
+                                }
                             }
                         ]
                     ]);
@@ -156,23 +193,22 @@ abstract class UpdateMiniCrudRequest extends FormRequest
                     break;
             } //end switch
         } //end foreach
-        // @phpstan-ignore-next-line
         return $rules;
     }
 
     /**
-     * Undocumented function.
+     * Undocumented function
      *
-     * @param string|array<int, string> $inputTypeValidate
-     * @param array<string, mixed>      $input
-     * @return array<int, mixed>
+     * @param string|array $inputTypeValidate
+     * @param array        $input
+     * @return array
      */
     public function compileValidate(string|array $inputTypeValidate, array $input): array
     {
         if (\is_string($inputTypeValidate)) {
             $inputTypeValidate = explode('|', $inputTypeValidate);
         }
-        /** @var array<int|string, mixed>|string $inputValidate */
+        /** @var array|string */
         $inputValidate = \collect($input)->get('validate', $input);
         $inputValidate = \is_string($inputValidate) ? explode('|', $inputValidate) : $inputValidate;
         foreach ($inputValidate as $validate) {
@@ -181,32 +217,18 @@ abstract class UpdateMiniCrudRequest extends FormRequest
             }
         }
 
+        $test = \collect($inputTypeValidate)->all();
+        $test = \collect($inputTypeValidate)->sort(function ($valueA, $valueB) {
+            $valueA = $this->ruleHasToComeFirst($valueA) ? 0 : 2;
+            $valueB = $this->ruleHasToComeFirst($valueB) ? 1 : 2;
+            return $valueA - $valueB;
+        })->unique()->all();
+
         return \collect($inputTypeValidate)->unique()->sort(function ($valueA, $valueB) {
             $valueA = $this->ruleHasToComeFirst($valueA) ? 0 : 2;
             $valueB = $this->ruleHasToComeFirst($valueB) ? 1 : 2;
             return $valueA - $valueB;
-        })->values()->all();
-    }
-
-    /**
-     * Validate URl
-     *
-     * @param string   $attribute
-     * @param mixed    $url
-     * @param \Closure $fail
-     * @return void
-     */
-    private function validateUrl(string $attribute, mixed $url, \Closure $fail): void
-    {
-        try {
-            if (!is_null($url)) {
-                $url = is_string($url) ? $url : '';
-                ToolboxHelper::assertNoInternalUrls($attribute, $url);
-                ToolboxHelper::assertNoInternalBoUrls($attribute, $url);
-            }
-        } catch (ValidationException $e) {
-            $fail(collect($e->errors())->first()[0]);
-        }
+        })->all();
     }
 
     /**

app/Http/Requests/Bo/UpdateOrderRequest.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdateOrderRequest extends FormRequest
-{
-    /**
-     * Attribute model needed.
-     *
-     * @var Model $orderable
-     */
-    private Model $orderableModel;
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return auth('backend')->check();
-    }
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->orderableModel = collect($this->route()->parameters())
-            ->first(fn($param) => $param instanceof Model);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'order' => [
-                'required',
-                'integer',
-                'min:1',
-                sprintf('max:%s', $this->orderableModel->max('order')),
-                function ($attribute, $value, $fail) {
-                    /** @phpstan-ignore-next-line */
-                    if ($this->orderableModel && intval($value) === $this->orderableModel->order) {
-                        $fail("La valeur de {$attribute} doit être différente de la valeur actuelle.");
-                    }
-                },
-            ],
-        ];
-    }
-}

app/Http/Requests/Bo/UploadFileRequest.php

@@ -11,7 +11,7 @@ class UploadFileRequest extends FormRequest
      *
      * @return boolean
      */
-    public function authorize(): bool
+    public function authorize()
     {
         return auth()->check() and $this->ajax();
     }
@@ -19,9 +19,9 @@ class UploadFileRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
-    public function rules(): array
+    public function rules()
     {
         return [
             'upload' => 'required|image|mimes:jpeg,png,jpg|max:2048'

app/Http/Requests/Bo/Users/StoreUserRequest.php

@@ -3,10 +3,9 @@
 namespace App\Http\Requests\Bo\Users;
 
 use App\Enums\Users\RoleEnum;
-use App\Models\User;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rules\Enum;
+use Illuminate\Validation\Rules\Password;
 
 class StoreUserRequest extends FormRequest
 {
@@ -17,7 +16,7 @@ class StoreUserRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return Gate::check('create', User::class);
+        return auth('backend')->check();
     }
 
     /**
@@ -25,42 +24,51 @@ class StoreUserRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'published' => $this->boolean('published')
+            'published' => $this->published ? true : false
         ]);
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
         return [
             'first_name' => 'required|string|min:3|max:255',
-            'last_name'  => 'required|string|min:3|max:255',
-            'email'      => 'required|email:rfc,strict,dns,spoof,filter|unique:users,email',
-            'role'       => ['required', new Enum(RoleEnum::class)],
-            'published'  => 'required|boolean',
+            'last_name' => 'required|string|min:3|max:255',
+            'email' => 'required|email:rfc,strict,dns,spoof,filter|unique:users,email',
+            'password' => [
+                'required', 'required_with:password_confirmation', 'confirmed', 'max:255', Password::min(8)
+                    ->letters()
+                    ->mixedCase()
+                    ->numbers()
+                    ->symbols()
+                    ->uncompromised()
+            ],
+            'role' => ['required', new Enum(RoleEnum::class)],
+            'published' => 'required|boolean',
         ];
     }
 
     /**
      * Get custom attributes for validator errors.
      *
-     * @return array<string, string>
+     * @return array
      */
     public function attributes(): array
     {
         return [
             'first_name' => trans('validation.attributes.first_name'),
-            'last_name'  => trans('validation.attributes.last_name'),
-            'email'      => trans('validation.attributes.email'),
-            'role'       => trans('validation.attributes.role'),
-            'published'  => trans('validation.custom.publication')
+            'last_name' => trans('validation.attributes.last_name'),
+            'email' => trans('validation.attributes.email'),
+            'password' => trans('validation.attributes.password'),
+            'role' => trans('validation.attributes.role'),
+            'published' => trans('validation.custom.publication')
         ];
     }
 }

app/Http/Requests/Bo/Users/UpdateUserRequest.php

@@ -2,46 +2,47 @@
 
 namespace App\Http\Requests\Bo\Users;
 
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\Password;
 
 class UpdateUserRequest extends StoreUserRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize(): bool
-    {
-        return Gate::check('update', $this->route('user'));
-    }
-
     /**
      * Prepare the data for validation.
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $this->merge([
-            'published' => $this->boolean('published'),
+            'published' => $this->published ? true : false,
+            'password' => $this->password ? $this->password : $this->route('user')->password,
+            'password_confirmation' => $this->password_confirmation ?
+                $this->password_confirmation :
+                $this->route('user')->password
         ]);
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array
      */
     public function rules(): array
     {
         return array_merge(parent::rules(), [
-            'email'    => [
+            'email' => [
                 'required',
                 'email:rfc,strict,dns,spoof,filter',
-                Rule::unique('users', 'email')->ignore(\optional($this->route('user'))->getRouteKey())
-            ]
+                'unique:users,email,' . $this->route('user')->id . ',id',
+            ],
+            'password' => [
+                'required', 'required_with:password_confirmation', 'confirmed', 'max:255', Password::min(8)
+                    ->letters()
+                    ->mixedCase()
+                    ->numbers()
+                    ->symbols()
+                    ->uncompromised()
+            ],
         ]);
     }
 }

app/Http/Requests/Fo/ListenFormRequest.php

@@ -1,125 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Fo;
-
-use App\Enums\Country;
-use App\Enums\Listen\ObjectEnum;
-use App\Lib\Helpers\ToolboxHelper;
-use App\Traits\Requests\HasPicture;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rules\Enum;
-
-class ListenFormRequest extends FormRequest
-{
-    use HasPicture;
-
-    /**
-     * Prepare the data for validation.
-     *
-     * @return void
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->merge([
-            'country'      => $this->post('country') ?? null,
-            'accept_rules' => $this->boolean('accept_rules'),
-            'send_data'    => $this->boolean('send_data'),
-        ]);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        ToolboxHelper::validateRecaptcha($this, \config('services.google.recaptcha.version'));
-        $rules = [
-            'first_name'   => 'present|nullable|string|between:3,100',
-            'last_name'    => 'required|string|between:3,100',
-            'society'      => 'present|nullable|string|between:3,255',
-            'email'        => 'required|email:rfc,strict,dns,spoof,filter|max:255',
-            'phone' => array_merge(
-                ['present', 'nullable'],
-                !is_null(request()->input('country'))
-                    ? (Country::make(request()->input('country'))->value === Country::france->value
-                        ? ['phone:FR', 'max:25']
-                        : ['numeric', 'max:50'])
-                    : ['numeric', 'max:50']
-            ),
-            'postal_code' => array_merge(
-                ['present', 'nullable'],
-                !is_null(request()->input('country'))
-                    ? (Country::make(request()->input('country'))->value === Country::france->value
-                        ? ['postal_code:FR', 'max:25']
-                        : ['numeric', 'max:50'])
-                    : ['numeric', 'max:50']
-            ),
-            'city'         => 'present|nullable|string|between:3,20',
-            'country'      => ['present', 'nullable', new Enum(Country::class)],
-            'address'      => 'present|nullable|string|between:3,255',
-            'object'       => ['required', new Enum(ObjectEnum::class)],
-            'message'      => 'required|min:20|max:35656',
-        ];
-        if (
-            isset(request()->file) and
-            (request()->file->getClientMimeType() === "image/jpeg" ||
-                request()->file->getClientMimeType() === "image/png")
-        ) {
-            $rules = \array_merge($rules, $this->pictureRules(
-                'file',
-                0,
-                0,
-                1920,
-                1080,
-                true,
-                3000,
-            ));
-        } elseif (isset(request()->file) and (request()->file->getClientMimeType() === "application/pdf")) {
-            $rules = \array_merge($rules, [
-                'file' => 'present|nullable|mimes:pdf'
-            ]);
-        } elseif (
-            isset(request()->file) and
-            (request()->file->getClientMimeType() !== "application/pdf") and
-            (request()->file->getClientMimeType() !== "image/jpeg") and
-            (request()->file->getClientMimeType() !== "image/png")
-        ) {
-            $rules = \array_merge($rules, [
-                'file' => [
-                    // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
-                    function ($attribute, $value, $fail) {
-                        $fail(\trans('Le format du fichier doit être .jpg, .png ou .pdf'));
-                    }
-                ],
-            ]);
-        } //end if
-        return $rules;
-    }
-
-    /**
-     * Get custom attributes for validator errors.
-     *
-     * @return array<string, string>
-     */
-    public function attributes(): array
-    {
-        return [
-            'first_name'   => trans('validation.attributes.first_name'),
-            'last_name'    => trans('validation.attributes.last_name'),
-            'society'      => trans('validation.attributes.society'),
-            'email'        => trans('validation.attributes.email'),
-            'phone'        => trans('validation.attributes.phone'),
-            'postal_code'  => trans('validation.attributes.postal_code'),
-            'city'         => trans('validation.attributes.city'),
-            'country'      => trans('validation.attributes.country'),
-            'address'      => trans('validation.attributes.address'),
-            'object'       => trans('validation.attributes.object'),
-            'message'      => trans('validation.attributes.message'),
-            'file'         => trans('validation.attributes.file'),
-            'accept_rules' => trans('validation.attributes.custom.accept_rules'),
-            'send_data'    => trans('validation.attributes.custom.send_data'),
-        ];
-    }
-}

app/Jobs/CleanOldActivities.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\ActivityLog;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Permanently deletes entries that have been stored for more than one year.
- */
-class CleanOldActivities implements ShouldQueue, ShouldBeUnique
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * Create the controller instance.
-     *
-     * @param boolean $force
-     */
-    public function __construct(public readonly bool $force = false)
-    {
-    }
-
-    /**
-     * Delete entries if it has been stored for more than one year.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        $query = ActivityLog::query();
-
-        if (!$this->force) {
-            $query->where('created_at', '<', Carbon::now()->subYear());
-        }
-
-        $query->cursor()->each(fn($model) => $model->delete());
-    }
-}

app/Jobs/UpdatePlanificatedStatus.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\News;
-use App\Models\Strip;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
-
-/**
- * Update published attribute reading its
- * publish_at and unpublish_at attributes.
- */
-class UpdatePlanificatedStatus
-{
-    /**
-     * Called when the job will be executed.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        collect([News::class, Strip::class])
-            ->each(function (string $model) {
-                /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\News|\App\Models\Strip> */
-                $modelListToPublish = $model::query()
-                    ->whereNotNull('publish_at')
-                    ->where('publish_at', '<=', Carbon::now())
-                    ->where(function ($query) {
-                        $query->whereNull('unpublish_at')
-                              ->orWhere('unpublish_at', '>', Carbon::now());
-                    })
-                    ->where('published', false)
-                    ->get();
-                Log::debug(__CLASS__ . " models to publish " . $modelListToPublish->count());
-                $modelListToPublish->each(function ($currentModel) {
-                    $currentModel->published = true;
-                    $currentModel->saveOrFail();
-                });
-
-                /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\News|\App\Models\Strip> */
-                $modelListToUnpublish = $model::query()
-                    ->whereNotNull('unpublish_at')
-                    ->where('unpublish_at', '<=', Carbon::now())
-                    ->where('published', true)
-                    ->get();
-                Log::debug(__CLASS__ . " models to unpublish " . $modelListToUnpublish->count());
-                $modelListToUnpublish->each(function ($currentModel) {
-                    $currentModel->published = false;
-                    $currentModel->saveOrFail();
-                });
-            });
-    }
-}

app/Lib/Helpers/CollectionHelper.php

@@ -10,37 +10,33 @@ use Illuminate\Support\Collection;
 class CollectionHelper
 {
     /**
-     * Paginate a collection.
+     * Paginate a collection
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Support\Collection<int, TModel> $results
-     * @param integer                                     $pageSize
-     * @return \Illuminate\Pagination\LengthAwarePaginator<TModel>
+     * @param \Illuminate\Support\Collection $results
+     * @param integer                        $pageSize
+     * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public static function paginate(Collection $results, int $pageSize): \Illuminate\Pagination\LengthAwarePaginator
+    public static function paginate(Collection $results, int $pageSize): LengthAwarePaginator
     {
         $page = Paginator::resolveCurrentPage('page');
+
         return self::paginateManually($results, $pageSize, $page);
     }
 
     /**
-     * Paginate a collection.
+     * Paginate a collection
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param \Illuminate\Support\Collection<int, TModel> $results
-     * @param integer                                     $pageSize
-     * @param integer                                     $page
-     * @return \Illuminate\Pagination\LengthAwarePaginator<TModel>
+     * @param \Illuminate\Support\Collection $results
+     * @param integer                        $pageSize
+     * @param integer                        $page
+     * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public static function paginateManually(
-        Collection $results,
-        int $pageSize,
-        int $page = 1
-    ): \Illuminate\Pagination\LengthAwarePaginator {
+    public static function paginateManually(Collection $results, int $pageSize, int $page = 1): LengthAwarePaginator
+    {
         $total = $results->count();
 
         return self::paginator($results->forPage($page, $pageSize), $total, $pageSize, $page, [
-            'path'     => Paginator::resolveCurrentPath(),
+            'path' => Paginator::resolveCurrentPath(),
             'pageName' => 'page',
         ]);
     }
@@ -48,27 +44,21 @@ class CollectionHelper
     /**
      * Create a new length-aware paginator instance.
      *
-     * @template TModel of \Illuminate\Database\Eloquent\Model
-     * @param  \Illuminate\Support\Collection<int, TModel> $items
-     * @param  integer                                     $total
-     * @param  integer                                     $perPage
-     * @param  integer                                     $currentPage
-     * @param  array<mixed>                                $options
-     * @return \Illuminate\Pagination\LengthAwarePaginator<TModel>
+     * @param  \Illuminate\Support\Collection $items
+     * @param  integer                        $total
+     * @param  integer                        $perPage
+     * @param  integer                        $currentPage
+     * @param  array                          $options
+     * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    protected static function paginator(
-        Collection $items,
-        int $total,
-        int $perPage,
-        int $currentPage,
-        array $options
-    ): \Illuminate\Pagination\LengthAwarePaginator {
+    protected static function paginator(Collection $items, int $total, int $perPage, int $currentPage, array $options)
+    {
         return Container::getInstance()->makeWith(LengthAwarePaginator::class, [
-            'items'       => $items,
-            'total'       => $total,
-            'perPage'     => $perPage,
+            'items' => $items,
+            'total' => $total,
+            'perPage' => $perPage,
             'currentPage' => $currentPage,
-            'options'     => $options
+            'options' => $options
         ]);
     }
 }

app/Lib/Helpers/ExceptionsHelper.php

@@ -5,7 +5,7 @@ namespace App\Lib\Helpers;
 class ExceptionsHelper
 {
     /**
-     * Handle sentry event.
+     * Handle sentry event
      *
      * @param \Sentry\Event $event
      * @return null|\Sentry\Event
@@ -26,7 +26,7 @@ class ExceptionsHelper
     }
 
     /**
-     * Anonimize Sentry Exception bag.
+     * Anonimize Sentry Exception bag
      *
      * @param \Sentry\ExceptionDataBag $exceptionDataBag
      * @return \Sentry\ExceptionDataBag
@@ -42,7 +42,7 @@ class ExceptionsHelper
     }
 
     /**
-     * Anonymise sentry stacktrace.
+     * Anonymise sentry stacktrace
      *
      * @param \Sentry\Stacktrace $stackTrace
      * @return \Sentry\Stacktrace
@@ -70,7 +70,7 @@ class ExceptionsHelper
     }
 
     /**
-     * Get anonymized sentry params.
+     * Get anonymized sentry params
      *
      * @param mixed[] $params
      * @return string[]
@@ -80,7 +80,7 @@ class ExceptionsHelper
         foreach ($params as &$param) {
             $type = \strtolower(\gettype($param));
             if (\is_string($param)) {
-                $type = \explode(' ', \trim(strtolower($param)))[0];
+                $type = \explode(' ', \trim(strtolower($param)))[0] ?? null;
             }
             switch (true) {
                 case $type === 'lambda':
@@ -103,8 +103,9 @@ class ExceptionsHelper
         return $params;
     }
 
+
     /**
-     * Anonymize at least Sql queries.
+     * Anonymize at least Sql queries
      *
      * @param string $message
      * @return string
@@ -119,14 +120,14 @@ class ExceptionsHelper
     }
 
     /**
-     * Anonymize stack trace.
+     * Anonymize stack trace
      *
      * @param \Throwable $e
      * @return string
      */
     public static function getAnonymizedStackTrace(\Throwable $e): string
     {
-        $projectPath   = \realpath(\sprintf('%s/../', \app_path())) ?: '';
+        $projectPath   = \realpath(\sprintf('%s/../', \app_path()));
         $traceStack    = $e->getTrace();
         $traceStr      = '';
         $maxStackStage = 0;
@@ -144,7 +145,7 @@ class ExceptionsHelper
                     $traceStr .= self::handleArgs($stack);
                 }
                 $traceStr .= ")\n";
-            } else {
+            } elseif (isset($stack['function'])) {
                 $traceStr .= "{$stack['function']}(";
                 if (isset($stack['args'])) {
                     $traceStr .= self::handleArgs($stack);
@@ -158,9 +159,9 @@ class ExceptionsHelper
     }
 
     /**
-     * Handle Args.
+     * Handle Args
      *
-     * @param array<string, mixed> $stack
+     * @param array $stack
      * @return string
      */
     public static function handleArgs(array $stack): string

app/Lib/Helpers/FileStorageHelper.php

@@ -25,23 +25,11 @@ use Illuminate\Support\Str;
  * The final path will be storage/modelfiles/posts/10/04/19/5f/black-cat-under-red-car-286071690833400.png
  *
  * ! No limits of file per folder will be handled.
+ *
+ * @author Munsch Jérémy <jeremy.munsch@ldc.fr>
  */
 class FileStorageHelper
 {
-    /**
-     * Remove all files from string attribute html that are stored in public
-     *
-     * @param string $publicStorageFilePath The file path from public directory.
-     * @return string The local storage path.
-     */
-    public static function getFileFullPath(string $publicStorageFilePath): string
-    {
-        /** @var \Illuminate\Filesystem\FilesystemAdapter */
-        $disk = Storage::disk('uploads');
-        $path = ToolboxHelper::mbReplaceString('storage/', '', \ltrim(\urldecode($publicStorageFilePath), '/'));
-        return $disk->path($path);
-    }
-
     /**
      * Destroy the file associate with the attribute.
      *
@@ -55,7 +43,7 @@ class FileStorageHelper
         if (\strpos($path, 'storage') !== 0) {
             return;
         }
-        $path = ToolboxHelper::mbReplaceString('storage/', '', $path);
+        $path = ToolboxHelper::mbReplace('storage/', '', $path);
         if (Storage::disk('public')->exists($path)) {
             Storage::disk('public')->delete($path);
         }
@@ -79,7 +67,7 @@ class FileStorageHelper
         if (\strpos($originalPath, 'storage') !== 0) {
             return;
         }
-        $originalPath = ToolboxHelper::mbReplaceString('storage/', '', $originalPath);
+        $originalPath = ToolboxHelper::mbReplace('storage/', '', $originalPath);
         if (Storage::disk('public')->exists($originalPath)) {
             Storage::disk('public')->delete($originalPath);
         }
@@ -103,8 +91,8 @@ class FileStorageHelper
         Model $model,
         $file,
         bool $slugify = false,
-        string|null $filename = null,
-        bool $private = false,
+        string $filename = null,
+        bool $private = false
     ): string {
         // phpcs:enable
         $tableName = $model->getTable();
@@ -164,16 +152,16 @@ class FileStorageHelper
     public static function storeModelFilesFromHtml(
         Model $model,
         string $htmlString,
-        string|null $oldHtmlString = null
+        string $oldHtmlString = null
     ): string {
         \collect(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString)))
             ->each(function (string $path) use ($model, &$htmlString) {
                 /** @var \Illuminate\Filesystem\FilesystemAdapter */
                 $disk       = Storage::disk('uploads');
                 $fileInfo   = new \SplFileInfo($disk->path(
-                    ToolboxHelper::mbReplaceString('/uploads/', '', \urldecode($path))
+                    ToolboxHelper::mbReplace('/uploads/', '', \urldecode($path))
                 ));
-                $htmlString = ToolboxHelper::mbReplaceString(
+                $htmlString = ToolboxHelper::mbReplace(
                     $path,
                     '/' . self::storeFile($model, $fileInfo, true),
                     $htmlString
@@ -214,7 +202,7 @@ class FileStorageHelper
         $filesToKeep   = \collect(self::onlyUploadedFilesWithFileStorageHelper($newFiles));
         $filesToRemove = $oldFiles->diff($filesToKeep);
         $filesToRemove->each(function (string $publicStorageFilePath) {
-            $path = ToolboxHelper::mbReplaceString('storage/', '', \ltrim(\urldecode($publicStorageFilePath), '/'));
+            $path = ToolboxHelper::mbReplace('storage/', '', \ltrim(\urldecode($publicStorageFilePath), '/'));
             if (Storage::disk('public')->exists($path)) {
                 Storage::disk('public')->delete($path);
             }
@@ -231,7 +219,7 @@ class FileStorageHelper
     {
         $filesToRemove = \collect(self::onlyUploadedFilesWithFileStorageHelper(self::findFilesInHtml($htmlString)));
         $filesToRemove->each(function (string $publicStorageFilePath) {
-            $path = ToolboxHelper::mbReplaceString('storage/', '', \ltrim(\urldecode($publicStorageFilePath), '/'));
+            $path = ToolboxHelper::mbReplace('storage/', '', \ltrim(\urldecode($publicStorageFilePath), '/'));
             if (Storage::disk('public')->exists($path)) {
                 Storage::disk('public')->delete($path);
             }
@@ -242,7 +230,7 @@ class FileStorageHelper
      * Find all occurence of files in html
      *
      * @param string $html
-     * @return array<mixed>
+     * @return array
      */
     public static function findFilesInHtml(string $html): array
     {
@@ -257,20 +245,20 @@ class FileStorageHelper
      * Filter array to get only uploaded files that exists
      * on disk 'public' (using helper storage strategy)
      *
-     * @param array<int, string> $urls
-     * @return array<mixed>
+     * @param array $urls
+     * @return array
      */
     public static function onlyUploadedFilesWithFileStorageHelper(array $urls): array
     {
         return \collect($urls)->unique()
             // * Filter to get only /uploads and using app url or empty
             ->filter(function (string $url) {
-                $path = (string) \parse_url($url, \PHP_URL_PATH);
+                $path = \parse_url($url, \PHP_URL_PATH);
                 return \strpos(\ltrim($path, '/'), 'storage/modelfiles') === 0;
             })->filter(function (string $url) {
-                $path = (string) \parse_url($url, \PHP_URL_PATH);
+                $path = \parse_url($url, \PHP_URL_PATH);
                 return Storage::disk('public')
-                    ->exists(ToolboxHelper::mbReplaceString('storage/', '', \ltrim(\urldecode($path), '/')));
+                    ->exists(ToolboxHelper::mbReplace('storage/', '', \ltrim(\urldecode($path), '/')));
             })->all();
     }
 
@@ -278,22 +266,22 @@ class FileStorageHelper
      * Filter array to get only uploaded files that exists
      * on disk 'uploads'
      *
-     * @param array<int, string> $urls
-     * @return array<mixed>
+     * @param array $urls
+     * @return array
      */
     private static function onlyUploadedFilesWithFileManager(array $urls): array
     {
         return \collect($urls)->unique()
             // * Filter to get only /uploads and using app url or empty
             ->filter(function (string $url) {
-                $host = (string) \parse_url($url, \PHP_URL_HOST);
-                $path = (string) \parse_url($url, \PHP_URL_PATH);
-                return ($host === (string) \parse_url(config('app.url'), PHP_URL_HOST) or $host === '') and
+                $host = \parse_url($url, \PHP_URL_HOST);
+                $path = \parse_url($url, \PHP_URL_PATH);
+                return ($host === \parse_url(config('app.url'), PHP_URL_HOST) or \is_null($host)) and
                     \strpos(\ltrim($path, '/'), 'uploads') === 0;
             })->filter(function (string $url) {
-                $path = (string) \parse_url($url, \PHP_URL_PATH);
+                $path = \parse_url($url, \PHP_URL_PATH);
                 return Storage::disk('uploads')
-                    ->exists(ToolboxHelper::mbReplaceString('uploads/', '', \ltrim(\urldecode($path), '/')));
+                    ->exists(ToolboxHelper::mbReplace('uploads/', '', \ltrim(\urldecode($path), '/')));
             })->all();
     }
 
@@ -320,7 +308,8 @@ class FileStorageHelper
         $folderPath = self::getStoragePath(
             $private ? 'app/private/modelfiles' : 'app/public/modelfiles',
             $tableName,
-            $filename
+            $filename,
+            $private
         );
         $filename   = self::getFileUniqueName($folderPath, $filename);
         return "{$folderPath}/{$filename}";
@@ -415,7 +404,7 @@ class FileStorageHelper
         $filename = Str::of($filename)->ltrim('.-');
         // * Optional beautification
         if ($beautify) {
-            $filename = self::beautifyFilename($filename);
+            $filename = static::beautifyFilename($filename);
         }
         // * Maximize filename length to 255 bytes http://serverfault.com/a/9548/44086
         /** @var string */
@@ -457,7 +446,7 @@ class FileStorageHelper
             '/\.{2,}/'
         ], '.', $filename);
         // Lowercase for windows/unix interoperability http://support.microsoft.com/kb/100625 .
-        $filename = mb_strtolower($filename, mb_detect_encoding($filename) ?: null);
+        $filename = mb_strtolower($filename, mb_detect_encoding($filename));
         // * ".file-name.-" becomes "file-name"
         $filename = trim($filename, '.-');
         return $filename;
@@ -466,7 +455,7 @@ class FileStorageHelper
     /**
      * Remove all model files for the given Model.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      * @return void
      */
     public static function removeModelFiles(Model $model): void

app/Lib/Helpers/ToolboxHelper.php

@@ -21,39 +21,10 @@ use Symfony\Component\Finder\SplFileInfo;
 
 class ToolboxHelper
 {
-    /**
-     * Run a terminal command and gives the output.
-     *
-     * @param array<string>|string $command The command to execute on terminal.
-     * @param boolean              $throw   Wether to throw en esception on failure or not.
-     * @return string|false Return false on failure only if $throw is false.
-     * @phpcs:disable Squiz.Commenting.FunctionComment.EmptyThrows
-     * @phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
-     * @throws \Illuminate\Process\Exceptions\ProcessTimedOutException
-     * @throws \Symfony\Component\Process\Exception\LogicException
-     * @throws \Symfony\Component\Process\Exception\InvalidArgumentException
-     * @throws \Symfony\Component\Process\Exception\RuntimeException
-     * @throws \LogicException
-     * @throws \RuntimeException If the command fails.
-     */
-    public static function runConsoleCommand(array|string $command, bool $throw = true): string|false
-    {
-        // phpcs:enable
-        $process = \Illuminate\Support\Facades\Process::command($command)->run();
-        if ($process->failed()) {
-            $code  = $process->exitCode();
-            $ouput = $process->errorOutput();
-            if ($throw) {
-                throw new \RuntimeException("Failed to run command exit code {$code} with output \n{$ouput}");
-            }
-            return false;
-        }
-        return $process->output();
-    }
-
     /**
      * @param array<int|string, mixed> $array1
      * @param array<int|string, mixed> $array2
+     *
      * @return array<int|string, mixed>
      */
     public static function arrayMergeRecursiveDistinct(array &$array1, array &$array2): array
@@ -66,17 +37,18 @@ class ToolboxHelper
                 $merged[$key] = $value;
             }
         }
+
         return $merged;
     }
 
     /**
-     * Validate recaptcha.
+     * Validate recaptcha
      *
      * @param \Illuminate\Http\Request $request
      * @param boolean                  $isV3
      * @return void
      */
-    public static function validateRecaptcha(Request $request, bool $isV3 = true): void
+    public static function validateRecaptcha(Request $request, bool $isV3 = true)
     {
         Validator::validate($request->all(), [
             'g-recaptcha-response' => [
@@ -128,7 +100,7 @@ class ToolboxHelper
      * Only embed allowed are for MP4 self hosted videos right now
      *
      * https is force by ckeditor MediaElements which natively supports
-     * only cloud hosted medias (youtube, spotify etc..).
+     * only cloud hosted medias (youtube, spotify etc..)
      *
      * @param string $input
      * @return string
@@ -140,7 +112,7 @@ class ToolboxHelper
     }
 
     /**
-     * Assert That no Back Office url is present on txt.
+     * Assert That no Back Office url is present on txt
      *
      * @param string $field
      * @param string $text
@@ -183,7 +155,7 @@ class ToolboxHelper
     }
 
     /**
-     * Assert That only external url is present on txt.
+     * Assert That only external url is present on txt
      *
      * @param string $field
      * @param string $text
@@ -203,10 +175,11 @@ class ToolboxHelper
                 $url   = $match;
                 try {
                     $request = Request::create($url);
-                    // Assert route matches existing routes.
-                    $routes->match($request);
-                    // ? Is url internal ?
-                    if (\parse_url(config('app.url'), \PHP_URL_HOST) === \parse_url($url, \PHP_URL_HOST)) {
+                    // If a route is match then it do not throws exception.
+                    if (
+                        \parse_url(config('app.url'), \PHP_URL_HOST) === \parse_url($url, \PHP_URL_HOST) &&
+                        $routes->match($request)
+                    ) {
                         // Removes the matched url.
                         throw ValidationException::withMessages([
                             $field => trans(
@@ -226,79 +199,57 @@ class ToolboxHelper
     }
 
     /**
-     * Mutltibyte string replace.
+     * Mutltibyte string replace
      *
-     * @param array<string>|string $search
-     * @param array<string>|string $replace
-     * @param array<string>|string $subject
-     * @param integer              $count
-     * @return array<string>|string|false
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
+     * @param array|string $search
+     * @param array|string $replace
+     * @param array|string $subject
+     * @param integer      $count
+     * @return array|string
      */
     public static function mbReplace(
         array|string $search,
         array|string $replace,
         array|string $subject,
         int &$count = 0
-    ): array|string|false {
+    ): array|string {
         if (!is_array($search) && is_array($replace)) {
             return false;
         }
         if (is_array($subject)) {
             // Call mb_replace for each single string in $subject .
             foreach ($subject as &$string) {
-                $string = &self::mbReplace($search, $replace, $string, $count) ?: '';
+                $string = &self::mbReplace($search, $replace, $string, $count);
             }
-            return $subject;
         } elseif (is_array($search)) {
             if (!is_array($replace)) {
                 foreach ($search as &$string) {
-                    $subject = self::mbReplace($string, $replace, $subject, $count) ?: '';
+                    $subject = self::mbReplace($string, $replace, $subject, $count);
                 }
             } else {
                 $n = max(count($search), count($replace));
                 while ($n--) {
-                    $currentSearch  = current($search);
-                    $currentReplace = current($replace);
-                    if ($currentSearch === false || $currentReplace === false) {
-                        break;
-                    }
-                    $result  = self::mbReplace($currentSearch, $currentReplace, $subject, $count);
-                    $subject = is_string($result) ? $result : '';
+                    $subject = self::mbReplace(current($search), current($replace), $subject, $count);
                     next($search);
                     next($replace);
                 }
             }
         } else {
-            $parts   = mb_split(preg_quote($search), $subject) ?: [];
-            $count   = (int) count($parts) - 1;
-            $subject = implode(is_array($replace) ? '' : $replace, $parts);
+            $parts   = mb_split(preg_quote($search), $subject);
+            $count   = count($parts) - 1;
+            $subject = implode($replace, $parts);
         } //end if
         return $subject;
     }
 
-    /**
-     * Multibyte string replace (string only version).
-     *
-     * @param string $search
-     * @param string $replace
-     * @param string $subject
-     * @return string
-     */
-    public static function mbReplaceString(string $search, string $replace, string $subject): string
-    {
-        $parts = mb_split(preg_quote($search), $subject) ?: [];
-        return implode($replace, $parts);
-    }
-
     /**
      * Asserts that the field is unique
      *
-     * @param string                                         $table
-     * @param string                                         $field
-     * @param string|integer|float|boolean|null|array<mixed> $value
-     * @param integer|null                                   $id
-     * @param callable|null                                  $query
+     * @param string                                  $table
+     * @param string                                  $field
+     * @param string|integer|float|boolean|null|array $value
+     * @param integer|null                            $id
+     * @param callable|null                           $query
      * @return void
      * @throws \Illuminate\Validation\ValidationException If the field is not unique.
      */
@@ -308,32 +259,28 @@ class ToolboxHelper
         string|int|float|bool|null|array $value,
         ?int $id = null,
         ?callable $query = null
-    ): void {
+    ) {
         if (!$query) {
             Validator::make([$field => $value], [
-                /** @phpstan-ignore-next-line */
                 self::mbReplace('.', '\.', $field) => Rule::unique($table, $field)->ignore($id),
             ], [
-                /** @phpstan-ignore-next-line */
-                self::mbReplace('.', '\.', "{$field}.unique") => trans('crud.libs.toolbox.assertFieldIsUnique', [
-                    'attribute' => $field,
-                    'value'     => is_array($value) ? implode(', ', array_map('strval', $value)) : (string) $value,
-                ])
+                self::mbReplace('.', '\.', "{$field}.unique")
+                => trans('crud.libs.toolbox.assertFieldIsUnique', ['attribute' => $field, 'value' => $value])
             ])->validate();
             return;
         }
         Validator::make([$field => $value], [
-            $field => Rule::unique($table)->where(\Closure::fromCallable($query))->ignore($id),
+            $field => Rule::unique($table)->where($query)->ignore($id),
         ], [
-            $field . '.unique' => trans('crud.libs.toolbox.assertFieldIsUnique', [
-                'attribute' => $field,
-                'value'     => is_array($value) ? implode(', ', array_map('strval', $value)) : (string) $value,
-            ])
+            $field . '.unique' => trans(
+                'crud.libs.toolbox.assertFieldIsUnique',
+                ['attribute' => $field, 'value' => $value]
+            )
         ])->validate();
     }
 
     /**
-     * Get original polyfill with autotranslate behavior.
+     * Get original polyfill with autotranslate behavior
      *
      * @param \Illuminate\Database\Eloquent\Model $model
      * @param string                              $attribute
@@ -341,17 +288,10 @@ class ToolboxHelper
      */
     public static function getOriginal(Model $model, string $attribute): mixed
     {
-        if (
-            \in_array('Spatie\Translatable\HasTranslations', \class_uses_recursive($model)) and
-            // @phpstan-ignore-next-line
-            $model->isTranslatableAttribute($attribute)
-        ) {
-            // @phpstan-ignore-next-line
+        if (\in_array('Spatie\Translatable\HasTranslations', \class_uses_recursive($model))) {
             return $model->getTranslation(
                 $attribute,
-                // @phpstan-ignore-next-line
                 $model->getLocale(),
-                // @phpstan-ignore-next-line
                 $model->useFallbackLocale()
             );
         }
@@ -359,7 +299,7 @@ class ToolboxHelper
     }
 
     /**
-     * Dynamic model query.
+     * Dynamic model query
      *
      * @param string                                          $defaultLocale
      * @param \Illuminate\Contracts\Database\Eloquent\Builder $q
@@ -372,9 +312,9 @@ class ToolboxHelper
         Builder $q,
         string $column,
         string $value
-    ): \Illuminate\Contracts\Database\Eloquent\Builder {
+    ): Builder {
         $currentLocale = app()->currentLocale();
-        $locales       = collect((array) config('app.locales', []))
+        $locales       = collect(config('app.locales'))
             ->mapWithKeys(fn (string $locale) => [$locale => $locale]);
         if (!$locales->has($defaultLocale)) {
             // * Remove default locale.
@@ -400,18 +340,17 @@ class ToolboxHelper
     }
 
     /**
-     * Generates an array from a dot separated string.
+     * Generates an array from a dot separated string
      *
-     * @param string      $path
-     * @param mixed       $value
-     * @param string|null $separator
-     * @return array<mixed>
+     * @param string $path
+     * @param mixed  $value
+     * @param string $separator
+     * @return array
      */
-    public static function dotStringToNestedArray(string $path, mixed $value, string|null $separator = null): array
+    public static function dotStringToNestedArray(string $path, mixed $value, string $separator = '.'): array
     {
-        $arr       = $value;
-        $separator = $separator ?: '.';
-        $keys      = array_reverse(explode($separator, $path));
+        $arr  = $value;
+        $keys = array_reverse(explode($separator, $path));
 
         foreach ($keys as $key) {
             $arr = [$key => $arr];
@@ -420,59 +359,61 @@ class ToolboxHelper
     }
 
     /**
-     * Convert deeply an object to array.
+     * Convert deeply an object to array
      *
-     * @param mixed $input
-     * @return array<mixed>
+     * @param array|object $input
+     * @return array
      * @throws \RuntimeException If $input var is a scalar value.
      */
-    public static function objectToArray(mixed $input): array
+    public static function objectToArray($input): array
     {
         // Only process if it's an object or array being passed to the function.
-        if (!(is_object($input) or is_array($input))) {
+        if (is_object($input) or is_array($input)) {
+            $ret = (array)$input;
+            foreach ($ret as &$item) {
+                // Recursively process EACH element only if not scalar.
+                $item = (is_object($item) or is_array($item)) ?
+                    self::objectToArray($item) : $item;
+            }
+            return $ret;
+        } else {
             throw new \RuntimeException('Cannot handle $input of type ' . \gettype($input));
         }
-        $ret = (array) $input;
-        foreach ($ret as &$item) {
-            // Recursively process EACH element only if not scalar.
-            $item = (is_object($item) or is_array($item)) ?
-                self::objectToArray($item) : $item;
-        }
-        return $ret;
     }
 
     /**
-     * Convert deeply an array to object.
+     * Convert deeply an array to object
      *
-     * @param mixed $input
+     * @param array|object $input
      * @return object
      * @throws \RuntimeException If $input var is a scalar value.
      */
-    public static function arrayToObject(mixed $input): object
+    public static function arrayToObject($input): object
     {
         // Only process if it's an object or array being passed to the function.
-        if (!(is_object($input) or is_array($input))) {
+        if (is_object($input) or is_array($input)) {
+            $ret = (object)$input;
+            foreach ($ret as &$item) {
+                // Recursively process EACH element only if not scalar.
+                $item = (is_object($item) or is_array($item)) ?
+                    self::arrayToObject($item) : $item;
+            }
+            return $ret;
+        } else {
             throw new \RuntimeException('Cannot handle $input of type ' . \gettype($input));
         }
-        $ret = (array) $input;
-        foreach ($ret as &$item) {
-            // Recursively process EACH element only if not scalar.
-            $item = (is_object($item) or is_array($item)) ?
-                self::arrayToObject($item) : $item;
-        }
-        return (object) $ret;
     }
 
     /**
-     * Validate picture.
+     * Validate picture
      *
-     * @param string                                                              $attribute
-     * @param string|null                                                         $value
-     * @param callable                                                            $fail
-     * @param array{minWidth: int, maxWidth: int, minHeight: int, maxHeight: int} $sizes
+     * @param string      $attribute
+     * @param string|null $value
+     * @param callback    $fail
+     * @param object      $sizes
      * @return void
      */
-    public static function validatePicture(string $attribute, string|null $value, callable $fail, array $sizes): void
+    public static function validatePicture(string $attribute, string|null $value, callable $fail, object $sizes)
     {
         if (!($useStorage = Storage::exists($value)) and !File::exists($value)) {
             $fail(trans(':attribute n\'existe pas dans le système de fichier', [
@@ -480,6 +421,7 @@ class ToolboxHelper
             ]));
             return;
         }
+        /** @var string */
         $fileFullPath = self::getUploadedFileFullPath($value, $useStorage);
         if (
             !\in_array(self::getUploadedFileMimeType($value, $useStorage), [
@@ -490,7 +432,7 @@ class ToolboxHelper
                 'attribute' => $attribute
             ]));
         }
-        if (!($dimensions = \getimagesize($fileFullPath))) {
+        if (!($dimensions = \getimagesize($fileFullPath)) or !isset($dimensions[0]) or !isset($dimensions[1])) {
             $fail(trans(':attribute impossible de valider les dimensions', [
                 'attribute' => $attribute
             ]));
@@ -499,29 +441,29 @@ class ToolboxHelper
             $height = intval($dimensions[1]);
 
             $xMessage = trans(
-                ":attribute la largeur doit être comprise entre {$sizes['minWidth']}px et {$sizes['maxWidth']}px"
+                ":attribute la largeur doit être comprise entre {$sizes->minWith}px et {$sizes->maxWith}px"
             );
-            if ($sizes['minWidth'] === $sizes['maxWidth']) {
-                $xMessage = trans(":attribute la largeur doit être de {$sizes['minWidth']}px");
+            if ($sizes->minWith === $sizes->maxWith) {
+                $xMessage = trans(":attribute la largeur doit être de {$sizes->minWith}px");
             }
             $yMessage = trans(
-                ":attribute la hauteur doit être comprise entre {$sizes['minHeight']}px et {$sizes['maxHeight']}px"
+                ":attribute la hauteur doit être comprise entre {$sizes->minWith}px et {$sizes->maxWith}px"
             );
-            if ($sizes['minHeight'] === $sizes['maxHeight']) {
-                $yMessage = trans(":attribute la hauteur doit être de {$sizes['minHeight']}px");
+            if ($sizes->minHeight === $sizes->maxHeight) {
+                $yMessage = trans(":attribute la hauteur doit être de {$sizes->minWith}px");
             }
 
-            if (($width < $sizes['minWidth']) or ($width > $sizes['maxWidth'])) {
+            if (($width < $sizes->minWith) or ($width > $sizes->maxWith)) {
                 $fail($xMessage);
             }
-            if (($height < $sizes['minHeight']) or ($height > $sizes['maxHeight'])) {
+            if (($height < $sizes->minHeight) or ($height > $sizes->maxHeight)) {
                 $fail($yMessage);
             }
         } //end if
     }
 
     /**
-     * Get the file full path.
+     * Get the file full path
      *
      * @param string  $value
      * @param boolean $useStorage
@@ -535,19 +477,19 @@ class ToolboxHelper
     }
 
     /**
-     * Get the file mimetype.
+     * Get the file mimetype
      *
      * @param string  $value
      * @param boolean $useStorage
      * @return string|false
      */
-    private static function getUploadedFileMimeType(string $value, bool $useStorage): string|false
+    private static function getUploadedFileMimeType(string $value, bool $useStorage)
     {
         return !$useStorage ? File::mimeType($value) : Storage::mimeType($value);
     }
 
     /**
-     * Fetch class list from a specific namespace.
+     * Fetch class list from a specific namespace
      *
      * @param string $namespace
      * @return array<string> An array of classe namespaces
@@ -561,7 +503,7 @@ class ToolboxHelper
     }
 
     /**
-     * Get all classes from a specific namespace that implement a specific interface.
+     * Get all classes from a specific namespace that implement a specific interface
      *
      * @param string $namespace
      * @param string $interface
@@ -571,7 +513,7 @@ class ToolboxHelper
     {
         return Arr::where(
             static::getClassesUsingNamespace($namespace),
-            fn (string $class_namespace) => \collect(class_implements($class_namespace, true) ?: [])->filter()
+            fn (string $class_namespace) => \collect(class_implements($class_namespace, true))->filter()
                 ->contains(fn (string $class_interface) => $class_interface === $interface)
         );
     }
@@ -579,9 +521,9 @@ class ToolboxHelper
     /**
      * Get validated pagination from request.
      *
-     * @param integer                 $default
-     * @param string                  $field
-     * @param class-string<\UnitEnum> $enumPath
+     * @param integer $default
+     * @param string  $field
+     * @param string  $enumPath
      * @return integer
      */
     public static function getValidatedEnum(int $default, string $field, string $enumPath): int

app/Mail/SendConfirmationMail.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Mail\Markdown;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Str;
-
-class SendConfirmationMail extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * @var \stdClass
-     */
-    private \stdClass $data;
-
-    /**
-     * Create a new message instance.
-     *
-     * @param \stdClass $data
-     * @return void
-     */
-    public function __construct(\stdClass $data)
-    {
-        $this->data = clone $data;
-        $this->sanitizeStringInputs();
-    }
-
-    /**
-     * Sanitizes user message
-     *
-     * ! This is not recursive !
-     * * Prevent xss injection via markdown interpretation.
-     *
-     * La solution devrai etre de filtrer en sortie, mais il n'est pas possible de
-     *
-     * @return void
-     */
-    private function sanitizeStringInputs(): void
-    {
-        $this->data = (object) Arr::map((array) $this->data, function ($el) {
-            if (is_string($el)) {
-                $el = \htmlspecialchars(\strip_tags(Blade::render(
-                    (string) Markdown::parse($el)
-                )));
-                $el = Str::of($el)->replaceMatches(
-                    '/[^\p{L}0-9\n\s\@\.\:\-\_\?\!\;\(\)\+\-\/\\\=]+/us',
-                    ''
-                )->trim()->wordWrap(75, "\n", true)->toString();
-            }
-            return $el;
-        });
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope(): \Illuminate\Mail\Mailables\Envelope
-    {
-        return new Envelope(
-            subject: sprintf(
-                '%s - %s',
-                trans('Confirmation d\'envoi'),
-                config('app.name')
-            ),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content(): \Illuminate\Mail\Mailables\Content
-    {
-        return new Content(
-            markdown: 'emails.send-confirmation-form',
-            with: ['data' => $this->data],
-        );
-    }
-}

app/Mail/SendContactMail.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Enums\Listen\ObjectEnum;
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Attachment;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Mail\Markdown;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Str;
-
-class SendContactMail extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * @var \stdClass
-     */
-    private \stdClass $data;
-
-    /**
-     * Create a new message instance.
-     *
-     * @param \stdClass $data
-     * @return void
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
-     */
-    public function __construct(\stdClass $data)
-    {
-        $this->data = clone $data;
-        $this->sanitizeStringInputs();
-    }
-
-    /**
-     * Sanitizes user message.
-     *
-     * ! This is not recursive !
-     * * Prevent xss injection via markdown interpretation.
-     *
-     * La solution devrai etre de filtrer en sortie, mais il n'est pas possible de
-     *
-     * @return void
-     */
-    private function sanitizeStringInputs(): void
-    {
-        $this->data = (object) Arr::map((array) $this->data, function ($el) {
-            if (is_string($el)) {
-                $el = \htmlspecialchars(\strip_tags(Blade::render(
-                    (string) Markdown::parse($el)
-                )));
-                $el = Str::of($el)->replaceMatches(
-                    '/[^\p{L}0-9\n\s\@\.\:\-\_\?\!\;\(\)\+\-\/\\\=]+/us',
-                    ''
-                )->trim()->wordWrap(75, "\n", true)->toString();
-            }
-            return $el;
-        });
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope(): \Illuminate\Mail\Mailables\Envelope
-    {
-        return new Envelope(
-            subject: sprintf(
-                '%s - %s',
-                ObjectEnum::make($this->data->object)->label(),
-                config('app.name')
-            ),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content(): \Illuminate\Mail\Mailables\Content
-    {
-        return new Content(
-            markdown: 'emails.send-contact-form',
-            with: ['data' => $this->data],
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        $attachments = [];
-        if (isset($this->data->file)) {
-            $attachments[] = Attachment::fromPath($this->data->file->getRealPath())
-                ->as($this->data->file->getClientOriginalName())
-                ->withMime($this->data->file->getClientMimeType());
-        }
-        return $attachments;
-    }
-}

app/Models/ActivityLog.php

@@ -3,20 +3,26 @@
 namespace App\Models;
 
 use App\Enums\ActivityLogs\ActivityLogsEventEnum;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Schema;
 
 /**
- * @property string                                        $model      Target model.
- * @property string                                        $model_id   Id of the target model.
- * @property \App\Enums\ActivityLogs\ActivityLogsEventEnum $event      Event of this activity (ActivityLogsEventEnum).
- * @property array<string, mixed>                          $data       Changes.
- * @property-read \Illuminate\Support\Carbon               $created_at Created date.
+ * @property string                          $model      Target model.
+ * @property string                          $model_id   Id of the target model.
+ * @property string                          $event      Event of this activity (ActivityLogsEventEnum).
+ * @property string                          $data       Changes.
+ * @property-read \Carbon\Carbon $created_at Created date.
  *
  * @property-read \App\Models\User $user User BelongsTo relation.
  */
 class ActivityLog extends Model
 {
+    use HasFactory;
+    use Notifiable;
+
     /**
      * Indicates if the model should be timestamped.
      *
@@ -27,7 +33,7 @@ class ActivityLog extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var list<string>
+     * @var array<int, string>
      */
     protected $fillable = [
         'is_anonymous',
@@ -76,100 +82,47 @@ class ActivityLog extends Model
         $activity->model_id     = $model->getKey();
         $activity->event        = $eventEnum;
         $activity->data         = static::getChangedColumns($activity, $model, $eventEnum);
-        // @phpstan-ignore-next-line
-        $activity->created_at = now();
+        $activity->created_at   = Carbon::now();
         $activity->saveOrFail();
     }
 
     /**
      * Get old, new columns that has changed.
      *
-     * @param self                                          $activity
+     * @param \self                                         $activity
      * @param \Illuminate\Database\Eloquent\Model           $model
      * @param \App\Enums\ActivityLogs\ActivityLogsEventEnum $eventEnum
-     * @return array<string, string>
+     * @return array|null
      */
-    public static function getChangedColumns(self $activity, Model $model, ActivityLogsEventEnum $eventEnum): array
+    public static function getChangedColumns(self $activity, Model $model, ActivityLogsEventEnum $eventEnum): array|null
     {
         $modelClassName = $activity->model_class;
-        $modelTarget    = new $modelClassName();
-
         /** Get type of each fields of the target model */
-        /** @var \Illuminate\Database\Eloquent\Model|null $targetModel */
-        $targetModel = ($modelTarget instanceof \Illuminate\Database\Eloquent\Model) ? $activity->model_class::where(
-            $modelTarget->getRouteKeyName(),
+        $targetModel = $activity->model_class::where(
+            (new $modelClassName())->getRouteKeyName(),
             $activity->model_id
-        )->first() : null;
-
-        if (\is_null($targetModel)) {
-            return [];
+        )->first();
+        if ($targetModel != null) {
+            // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
+            $targetModelTypes = collect($targetModel->toArray())
+                ->map(function ($field, $fieldIndex) use ($targetModel) {
+                    return Schema::getColumnType($targetModel->getTable(), $fieldIndex);
+                })->toArray();
+            // phpcs:enable
         }
-        $targetModelTypes = collect($targetModel->toArray())
-            ->map(fn ($value) => self::getValueType($value))
-            ->toArray();
         /** Return old, new and type of values changed */
-        return match ($eventEnum) {
-            ActivityLogsEventEnum::created => array_intersect_key($targetModelTypes, $model->toArray()),
-            ActivityLogsEventEnum::duplicated => array_intersect_key($targetModelTypes, $model->toArray()),
-            ActivityLogsEventEnum::updated => array_intersect_key($targetModelTypes, $model->getChanges()),
-            default => []
-        };
+        return ($eventEnum === ActivityLogsEventEnum::updated) ?
+            array_intersect_key($targetModelTypes, $model->getChanges()) : null;
     }
 
-
-    /**
-     * Get a value type as a string
-     * ! Use this for display purpose only.
-     *
-     * @param mixed $value
-     * @return string
-     * @throws \RuntimeException If type is unhlanded.
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.MaxExceeded
-     */
-    private static function getValueType(mixed $value): string
-    {
-        // phpcs:enable
-        $type = \gettype($value);
-        switch ($type) {
-                // phpcs:ignore PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
-            case 'string':
-                return match (true) {
-                    Str::length(\strip_tags($value)) !== Str::length($value)           => 'html',
-                    Str::startsWith($value, 'storage/modelfiles')                      => 'file',
-                    Str::isUuid($value)                                                => 'uuid',
-                    Str::isUlid($value)                                                => 'ulid',
-                    Str::isUrl($value)                                                 => 'url',
-                    Str::isMatch('/^[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]$/', $value)    => 'youtube_video_id',
-                    \is_numeric($value)                                                => 'numeric',
-                    Str::isJson($value) and
-                        (Str::startsWith($value, '[') or Str::startsWith($value, '{')) => 'json',
-                    default => 'string'
-                };
-            case 'NULL':
-            case 'object':
-            case 'array':
-            case 'integer':
-            case 'boolean':
-                return $type;
-            case 'double':
-                return is_float($value) ? 'float' : 'double';
-            case 'resource (closed)':
-            case 'resource':
-                throw new \RuntimeException('Laravel model properties should not contain resources !');
-            case 'unknown type':
-            default:
-                throw new \RuntimeException('Unhandled Type ' . \gettype($value));
-        } //end switch
-    }
-
-    // * RELATIONS.
+    // * RELATIONS
 
     /**
      * User BelongsTo relation.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\User,$this>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    public function user()
     {
         return $this->belongsTo(User::class);
     }

app/Models/Aisle.php

@@ -1,142 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Lib\Helpers\FileStorageHelper;
-use App\Traits\Models\ActivityLog;
-use App\Traits\Models\Orderable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Validation\ValidationException;
-
-class Aisle extends Model
-{
-    use ActivityLog;
-    use Orderable;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var list<string>
-     */
-    protected $fillable = [
-        'name',
-        'title',
-        'text',
-        'picture',
-        'picture_alt',
-        'picture_title',
-        'published',
-        'network_id',
-        'order',
-    ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'published' => 'boolean',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model) {
-            self::setOrder($model);
-            self::manageFields($model);
-        });
-        static::updating(function (self $model) {
-            self::manageFields($model);
-        });
-        static::updated(function (self $model) {
-            FileStorageHelper::removeOldFile($model, 'picture');
-        });
-        static::deleting(function (self $model) {
-            self::assertLimitPublishedModels($model, true);
-        });
-        static::deleted(function (self $model) {
-            FileStorageHelper::removeFile($model, 'picture');
-            self::setOrder($model, true);
-        });
-    }
-
-    // * METHODS.
-
-    /**
-     * Manage model fields.
-     *
-     * @param self $model
-     * @return void
-     */
-    private static function manageFields(self $model): void
-    {
-        // * ASSERTIONS
-        self::assertLimitPublishedModels($model);
-
-        $model->picture = FileStorageHelper::storeFile($model, $model->picture, true);
-    }
-
-    /**
-     * Check if the limit of published models is reached.
-     *
-     * @param self    $model
-     * @param boolean $isDeletion
-     * @throws \Illuminate\Validation\ValidationException If the limit of published models is reached.
-     * @return void
-     */
-    private static function assertLimitPublishedModels(self $model, bool $isDeletion = false)
-    {
-        $count           = self::query()
-            ->where('published', true)
-            ->where('network_id', $model->network_id)
-            ->count();
-        $updatePublished = !$isDeletion && $model->published && !$model->getOriginal('published');
-
-        if (
-            (!$model->published && $count <= 1) ||
-            ($updatePublished && $count >= 4) ||
-            ($isDeletion && $count === 1)
-        ) {
-            throw ValidationException::withMessages([
-                'Il doit y avoir entre 1 et 4 éléments attachés à chaque réseau.'
-            ]);
-        }
-    }
-
-    /**
-     * Group ordering by network_id.
-     *
-     * @return string
-     */
-    public function getOrderGroupField(): string
-    {
-        return 'network_id';
-    }
-
-    // * RELATIONS.
-
-    /**
-     * The network that belongs to the logo.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\Network,$this>
-     */
-    public function network(): \Illuminate\Database\Eloquent\Relations\BelongsTo
-    {
-        return $this->belongsTo(Network::class);
-    }
-
-    /**
-     * Associated brands.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<\App\Models\Brand,$this>
-     */
-    public function brands(): \Illuminate\Database\Eloquent\Relations\HasMany
-    {
-        return $this->hasMany(Brand::class);
-    }
-}

app/Models/Brand.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Lib\Helpers\FileStorageHelper;
-use App\Traits\Models\ActivityLog;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Validation\ValidationException;
-
-class Brand extends Model
-{
-    use ActivityLog;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var list<string>
-     */
-    protected $fillable = [
-        'name',
-        'text',
-        'picture',
-        'picture_alt',
-        'picture_title',
-        'link',
-        'published',
-        'aisle_id'
-    ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'published' => 'bool',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model) {
-            self::manageFields($model);
-        });
-        static::updating(function (self $model) {
-            self::manageFields($model);
-        });
-        static::updated(function (self $model) {
-            FileStorageHelper::removeOldFile($model, 'picture');
-        });
-        static::deleting(function (self $model) {
-            self::assertLimitPublishedModels($model, true);
-        });
-        static::deleted(function (self $model) {
-            FileStorageHelper::removeFile($model, 'picture');
-        });
-    }
-
-    // * METHODS.
-
-    /**
-     * Manage model fields.
-     *
-     * @param self $model
-     * @return void
-     */
-    private static function manageFields(self $model): void
-    {
-        // * ASSERTIONS.
-        self::assertLimitPublishedModels($model);
-
-        // * TRANSFORMATIONS.
-        $model->picture = FileStorageHelper::storeFile($model, $model->picture, true);
-    }
-
-    /**
-     * Check if the limit of published models is reached.
-     *
-     * @param self    $model
-     * @param boolean $isDeletion
-     * @throws \Illuminate\Validation\ValidationException If the limit of published models is reached.
-     * @return void
-     */
-    private static function assertLimitPublishedModels(self $model, bool $isDeletion = false)
-    {
-        $count           = self::query()
-            ->where('published', true)
-            ->where('aisle_id', $model->aisle_id)
-            ->count();
-        $updatePublished = !$isDeletion && $model->published && !$model->getOriginal('published');
-
-        if (
-            $count !== 0 &&
-            ((!$model->published && $count <= 1) ||
-            ($updatePublished && $count >= 5) ||
-            ($isDeletion && $count === 1))
-        ) {
-            throw ValidationException::withMessages([
-                'Il doit y avoir entre 1 et 5 éléments publiés simultanément.'
-            ]);
-        }
-    }
-
-    // * RELATIONS.
-
-    /**
-     * Associated aisle.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\Aisle,$this>
-     */
-    public function aisle(): \Illuminate\Database\Eloquent\Relations\BelongsTo
-    {
-        return $this->belongsTo(Aisle::class);
-    }
-}

app/Models/Carousel.php

@@ -1,102 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Lib\Helpers\FileStorageHelper;
-use App\Lib\Helpers\ToolboxHelper;
-use App\Traits\Models\ActivityLog;
-use App\Traits\Models\Orderable;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property-read int            $id         Id.
- * @property string              $title      Title.
- * @property array               $media      Medias of the carousel.
- * @property-read \Carbon\Carbon $created_at Created date.
- * @property-read \Carbon\Carbon $updated_at Updated date.
- *
- * @property-read \App\Models\ActivityLog $activityLogs Activities logs One-to-many relationship.
- */
-class Carousel extends Model
-{
-    use ActivityLog;
-    use Orderable;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var list<string>
-     */
-    protected $fillable = [
-        'section_id',
-        'title',
-        'media',
-        'order',
-        'published',
-    ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'media'     => 'array',
-        'published' => 'boolean',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model) {
-            $otherCarousels = self::query()
-                ->whereRelation('section', 'id', $model->section->id)
-                ->count();
-            if ($otherCarousels > 4) {
-                throw new \RuntimeException('Creating more than 5 carousels is not allowed');
-            }
-            self::setOrder($model);
-        });
-        static::updated(function (self $model) {
-            FileStorageHelper::removeOldFiles(
-                data_get(ToolboxHelper::getOriginal($model, 'media'), 'pictures.*.path', ['']),
-                data_get($model->media, 'pictures.*.path', [''])
-            );
-        });
-        static::deleted(function (self $model) {
-            FileStorageHelper::removeOldFiles(
-                data_get($model->media, 'pictures.*.path', ['']),
-                ['']
-            );
-            self::setOrder($model, true);
-        });
-    }
-
-    // * METHODS.
-
-    /**
-     * Group ordering by section_id.
-     *
-     * @return string
-     */
-    public function getOrderGroupField(): string
-    {
-        return 'section_id';
-    }
-
-    // * RELATIONSHIPS.
-
-    /**
-     * Get the sections that owns the Carousel
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\Section,$this>
-     */
-    public function section(): \Illuminate\Database\Eloquent\Relations\BelongsTo
-    {
-        return $this->belongsTo(Section::class);
-    }
-}

app/Models/HistoricalMilestone.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Lib\Helpers\FileStorageHelper;
-use App\Traits\Models\ActivityLog;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -20,19 +19,15 @@ use Illuminate\Database\Eloquent\Model;
  * @property integer             $year           Year of the historical milestone.
  * @property-read \Carbon\Carbon $created_at     Created date.
  * @property-read \Carbon\Carbon $updated_at     Updated date.
- *
- * @property-read \App\Models\ActivityLog $activityLogs Activities logs One-to-many relationship.
  */
 class HistoricalMilestone extends Model
 {
-    use ActivityLog;
-    /** @use HasFactory<\Database\Factories\HistoricalMilestoneFactory> */
     use HasFactory;
 
     /**
      * The attributes that are mass assignable.
      *
-     * @var list<string>
+     * @var array<int, string>
      */
     protected $fillable = [
         'title',
@@ -79,7 +74,7 @@ class HistoricalMilestone extends Model
         });
     }
 
-    // * METHODS.
+    // * METHODS
 
     /**
      * Manage model fields.