galette · trasher · Jan 3, 2026 · Jan 3, 2026 · Jan 3, 2026 · Jan 3, 2026
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          cd galette-core/galette
+          cd galette-core
           composer install --ignore-platform-reqs
 
       - name: CS

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -13,11 +13,60 @@
     ->setRules([
         '@PSR12' => true,
         '@PER-CS' => true,
-        '@PHP82Migration' => true,
+        '@PHP8x2Migration' => true,
         'trailing_comma_in_multiline' => false,
-        'cast_spaces' => false,
+        'cast_spaces' => ['space' => 'none'],
         'single_line_empty_body' => false,
-        'no_unused_imports' => true
+        'no_unused_imports' => true,
+        // rules for phpdoc
+        // Removes @param, @return and @var tags that don't provide any useful information - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:no_superfluous_phpdoc_tags
+        'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+            'remove_inheritdoc' => true,
+        ],
+        // require phpdoc for non typed arguments - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_add_missing_param_annotation
+        'phpdoc_add_missing_param_annotation' => true,
+        // no @access - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_no_access
+        'phpdoc_no_access' => true,
+        // no @package - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_no_package
+        'phpdoc_no_package' => true,
+        // order phpdoc tags - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_order
+        'phpdoc_order' => ['order' => ['since', 'var', 'see', 'param', 'return', 'throw', 'todo', 'deprecated']],
+        // phpdoc param in same order as signature - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_param_order
+        'phpdoc_param_order' => true,
+        // align tags - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_align
+        'phpdoc_align' => [
+            'align' => 'vertical',
+            'tags' => [
+                'param',
+                'property',
+                'property-read',
+                'property-write',
+                'phpstan-param',
+                'phpstan-property',
+                'phpstan-property-read',
+                'phpstan-property-write',
+                'phpstan-assert',
+                'phpstan-assert-if-true',
+                'phpstan-assert-if-false',
+                'psalm-param',
+                'psalm-param-out',
+                'psalm-property',
+                'psalm-property-read',
+                'psalm-property-write',
+                'psalm-assert',
+                'psalm-assert-if-true',
+                'psalm-assert-if-false'
+            ],
+        ],
+        // Check types case - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_types
+        'phpdoc_types' => true,
+        // Use native scalar types - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_scalar
+        'phpdoc_scalar' => true,
+        // remove extra empty lines - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_trim
+        'phpdoc_trim' => true,
+        // remove empty lines inside phpdoc block - https://mlocati.github.io/php-cs-fixer-configurator/#version:3.90|fixer:phpdoc_trim_consecutive_blank_line_separation
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
     ])
     ->setFinder($finder)
 ;
diff --git a/_config.inc.php b/_config.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2025 The Galette Team
+ * Copyright © 2003-2026 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *

diff --git a/_define.php b/_define.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2025 The Galette Team
+ * Copyright © 2003-2026 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *

diff --git a/_routes.php b/_routes.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2025 The Galette Team
+ * Copyright © 2003-2026 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *
@@ -21,24 +21,9 @@
 
 declare(strict_types=1);
 
-use Analog\Analog;
-use Galette\Entity\ContributionsTypes;
-use Galette\Entity\Adherent;
-use Galette\Entity\Contribution;
-use Galette\Repository\Members;
-use GaletteObjectsLend\Entity\Preferences;
-use GaletteObjectsLend\Entity\ObjectPicture;
-use GaletteObjectsLend\Entity\CategoryPicture;
-use GaletteObjectsLend\Entity\LendCategory;
-use GaletteObjectsLend\Entity\LendStatus;
-use GaletteObjectsLend\Entity\LendObject;
-use GaletteObjectsLend\Entity\LendRent;
 use GaletteObjectsLend\Repository\Categories;
 use GaletteObjectsLend\Repository\Objects;
 use GaletteObjectsLend\Repository\Status;
-use GaletteObjectsLend\Filters\StatusList;
-use GaletteObjectsLend\Filters\ObjectsList;
-use GaletteObjectsLend\Filters\CategoriesList;
 use GaletteObjectsLend\Controllers\Crud\CategoriesController;
 use GaletteObjectsLend\Controllers\ImagesController;
 use GaletteObjectsLend\Controllers\Crud\StatusController;

diff --git a/lib/GaletteObjectsLend/Controllers/Crud/CategoriesController.php b/lib/GaletteObjectsLend/Controllers/Crud/CategoriesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2025 The Galette Team
+ * Copyright © 2003-2026 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *
@@ -55,8 +55,6 @@ class CategoriesController extends AbstractPluginController
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function add(Request $request, Response $response): Response
     {
@@ -68,8 +66,6 @@ public function add(Request $request, Response $response): Response
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function doAdd(Request $request, Response $response): Response
     {
@@ -86,8 +82,6 @@ public function doAdd(Request $request, Response $response): Response
      * @param Response        $response PSR Response
      * @param string|null     $option   One of 'page' or 'order'
      * @param int|string|null $value    Value of the option
-     *
-     * @return Response
      */
     public function list(Request $request, Response $response, ?string $option = null, int|string|null $value = null): Response
     {
@@ -139,8 +133,6 @@ public function list(Request $request, Response $response, ?string $option = nul
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function filter(Request $request, Response $response): Response
     {
@@ -190,8 +182,6 @@ public function filter(Request $request, Response $response): Response
      * @param Response $response PSR Response
      * @param int|null $id       Model id
      * @param string   $action   Action
-     *
-     * @return Response
      */
     public function edit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
     {
@@ -235,8 +225,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
      * @param Response $response PSR Response
      * @param null|int $id       Model id for edit
      * @param string   $action   Either add or edit
-     *
-     * @return Response
      */
     public function doEdit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
     {
@@ -305,8 +293,6 @@ public function doEdit(Request $request, Response $response, ?int $id = null, st
      * Get redirection URI
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function redirectUri(array $args): string
     {
@@ -317,8 +303,6 @@ public function redirectUri(array $args): string
      * Get form URI
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function formUri(array $args): string
     {
@@ -332,8 +316,6 @@ public function formUri(array $args): string
      * Get confirmation removal page title
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function confirmRemoveTitle(array $args): string
     {
@@ -349,8 +331,6 @@ public function confirmRemoveTitle(array $args): string
      *
      * @param array<string,mixed> $args Route arguments
      * @param array<string,mixed> $post POST values
-     *
-     * @return bool
      */
     protected function doDelete(array $args, array $post): bool
     {

diff --git a/lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php b/lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2025 The Galette Team
+ * Copyright © 2003-2026 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *
@@ -65,8 +65,6 @@ class ObjectsController extends AbstractPluginController
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function add(Request $request, Response $response): Response
     {
@@ -78,8 +76,6 @@ public function add(Request $request, Response $response): Response
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function doAdd(Request $request, Response $response): Response
     {
@@ -96,8 +92,6 @@ public function doAdd(Request $request, Response $response): Response
      * @param Response        $response PSR Response
      * @param string|null     $option   One of 'page' or 'order'
      * @param int|string|null $value    Value of the option
-     *
-     * @return Response
      */
     public function list(Request $request, Response $response, ?string $option = null, int|string|null $value = null): Response
     {
@@ -166,8 +160,6 @@ public function list(Request $request, Response $response, ?string $option = nul
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function filter(Request $request, Response $response): Response
     {
@@ -211,8 +203,6 @@ public function filter(Request $request, Response $response): Response
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
      * @param int      $id       Object id
-     *
-     * @return Response
      */
     public function show(Request $request, Response $response, int $id): Response
     {
@@ -253,8 +243,6 @@ public function show(Request $request, Response $response, int $id): Response
      *
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
-     *
-     * @return Response
      */
     public function handleBatch(Request $request, Response $response): Response
     {
@@ -305,8 +293,6 @@ public function handleBatch(Request $request, Response $response): Response
      * @param Response $response PSR Response
      * @param int|null $id       Object id
      * @param string   $action   Action
-     *
-     * @return Response
      */
     public function edit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
     {
@@ -379,8 +365,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
      * @param Response $response PSR Response
      * @param null|int $id       Object id for edit
      * @param string   $action   Either add or edit
-     *
-     * @return Response
      */
     public function doEdit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
     {
@@ -478,8 +462,6 @@ public function doEdit(Request $request, Response $response, ?int $id = null, st
      * @param Response $response PSR Response
      * @param null|int $id       Object id for edit
      * @param string   $action   Either add or edit
-     *
-     * @return Response
      */
     public function doUpdateStatus(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
     {
@@ -517,8 +499,6 @@ public function doUpdateStatus(Request $request, Response $response, ?int $id =
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
      * @param int      $id       Object id for edit
-     *
-     * @return Response
      */
     public function doClone(Request $request, Response $response, int $id): Response
     {
@@ -558,8 +538,6 @@ public function doClone(Request $request, Response $response, int $id): Response
      * @param Response $response PSR Response
      * @param string   $action   Action (either 'take' or 'return')
      * @param int      $id       Objects ID
-     *
-     * @return Response
      */
     public function lend(Request $request, Response $response, string $action, int $id): Response
     {
@@ -705,8 +683,6 @@ public function lend(Request $request, Response $response, string $action, int $
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
      * @param int      $id       Objects ID
-     *
-     * @return Response
      */
     public function doTake(Request $request, Response $response, int $id): Response
     {
@@ -860,8 +836,6 @@ public function doTake(Request $request, Response $response, int $id): Response
      * @param Request  $request  PSR Request
      * @param Response $response PSR Response
      * @param int      $id       Objects ID
-     *
-     * @return Response
      */
     public function doReturn(Request $request, Response $response, int $id): Response
     {
@@ -950,8 +924,6 @@ public function doReturn(Request $request, Response $response, int $id): Respons
      * Get redirection URI
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function redirectUri(array $args): string
     {
@@ -962,8 +934,6 @@ public function redirectUri(array $args): string
      * Get form URI
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function formUri(array $args): string
     {
@@ -999,8 +969,6 @@ protected function getIdsToRemove(array &$args, ?array $post): array|int|null
      * Get confirmation removal page title
      *
      * @param array<string,mixed> $args Route arguments
-     *
-     * @return string
      */
     public function confirmRemoveTitle(array $args): string
     {
@@ -1027,8 +995,6 @@ public function confirmRemoveTitle(array $args): string
      *
      * @param array<string,mixed> $args Route arguments
      * @param array<string,mixed> $post POST values
-     *
-     * @return bool
      */
     protected function doDelete(array $args, array $post): bool
     {