Merge branch 'issue-61' into 'develop'

chore: ⬆️ bump php to 8.5 #61

See merge request ldc-web/projets/lionor!56

Dockerfile

@@ -30,7 +30,8 @@ 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 ci && npm run prod
 
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047
+ARG PHP_8_5_TAG=latest
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
 
 ARG USER=www-data
 

app/Http/Controllers/Controller.php

@@ -33,7 +33,7 @@ class Controller extends BaseController
     protected function searchQuery(
         Builder $query,
         string $search,
-        callable $searchQuery = null,
+        ?callable $searchQuery = null,
         string ...$fields
     ): Builder {
         if (count($fields)) {
@@ -131,7 +131,7 @@ class Controller extends BaseController
      */
     protected function paginate(
         Builder $query,
-        ItemsPerPaginationEnum $pagination = null
+        ?ItemsPerPaginationEnum $pagination = null
     ): \Illuminate\Contracts\Pagination\LengthAwarePaginator {
         $currentRoutePath = Str::slug(request()->route()->getName());
         $cacheKey         = "pagination.{$currentRoutePath}";

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

@@ -46,10 +46,9 @@ class UpdateStaticPageRequest extends FormRequest
             'data.*'          => 'required|array',
         ];
 
+        /** @var \App\Models\StaticPage $staticPageModel */
         $staticPageModel = request()->route()->parameter('static_page');
-        if (
-            !$staticPageModel->type->equals(StaticPageType::banner_section)
-        ) {
+        if (!$staticPageModel->type->equals(StaticPageType::banner_section)) {
             $rules = \array_merge(
                 $rules,
                 [

app/Lib/Helpers/FileStorageHelper.php

@@ -91,7 +91,7 @@ class FileStorageHelper
         Model $model,
         $file,
         bool $slugify = false,
-        string $filename = null,
+        ?string $filename = null,
         bool $private = false
     ): string {
         // phpcs:enable
@@ -152,7 +152,7 @@ class FileStorageHelper
     public static function storeModelFilesFromHtml(
         Model $model,
         string $htmlString,
-        string $oldHtmlString = null
+        ?string $oldHtmlString = null
     ): string {
         \collect(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString)))
             ->each(function (string $path) use ($model, &$htmlString) {

app/Traits/Models/MiniCrudModel.php

@@ -11,18 +11,20 @@ trait MiniCrudModel
     /**
      * Fill the model with an array of attributes.
      *
-     * @param  array $attributes
-     * @return void
+     * @param  array<string, mixed> $attributes
+     * @return $this
      * @throws \Illuminate\Database\Eloquent\MassAssignmentException If fill prop is not allowed.
      * @phpcs:disable Squiz.Commenting.FunctionComment.EmptyThrows
      */
-    public function fill(array $attributes)
+    public function fill(array $attributes): static
     {
         // phpcs:enable
         parent::fill($attributes);
         if (isset($attributes['data'])) {
             $this->setData($attributes['data']);
         }
+
+        return $this;
     }
 
     /**
@@ -62,7 +64,6 @@ trait MiniCrudModel
      */
     public function minicrudUpdated()
     {
-        /** @var array */
         foreach ($this->data as $index => $input) {
             switch ($input['inputType']) {
                 case InputType::text->value:

app/View/Components/LocalBlockComponent.php

@@ -10,7 +10,7 @@ use Illuminate\View\Component;
 
 class LocalBlockComponent extends Component
 {
-    /** @var $staticPageModel \App\Models\StaticPage */
+    /** @var \App\Models\StaticPage $staticPageModel */
     private $staticPageModel;
 
     /**

composer.json

@@ -3,8 +3,8 @@
     "type": "project",
     "description": "Site de la marque Lionor",
     "require": {
-        "php": "^8.3",
-        "24slides/laravel-saml2": "^2.4",
+        "php": "^8.5",
+        "scaler-tech/laravel-saml2": "^2.5",
         "axlon/laravel-postal-code-validation": "^3.3",
         "carlos-meneses/laravel-mpdf": "^2.1",
         "diglactic/laravel-breadcrumbs": "^9.0",
@@ -17,7 +17,7 @@
         "mews/purifier": "^3.4",
         "propaganistas/laravel-phone": "^5.0.3",
         "sentry/sentry-laravel": "*",
-        "uwil/admin-secure-laravel": "^5.0",
+        "uwil/laravel-admin-secure": "^6.0",
         "uwil/k8s-laravel": "^1.4",
         "uwil/sitemap-generator": "^3.0"
     },