From 0772a607154d0a5b8ebbee9a4f7d9cbabc6e63cf Mon Sep 17 00:00:00 2001
From: Nathan Boiron <github@mopolo.net>
Date: Mon, 13 Apr 2026 13:54:01 +0200
Subject: [PATCH] Refactor de la gestion des feuilles avec Doctrine

---
 app/config/packages/backoffice_menu.yaml      |  6 +-
 app/config/packages/doctrine.yaml             |  5 ++
 app/config/routing/admin_site.yml             | 16 ++--
 composer.json                                 |  1 +
 composer.lock                                 | 64 +++++++++++++++-
 sources/Afup/Corporate/Page.php               | 75 +++++++++----------
 .../AddFeuilleAction.php}                     | 28 +++----
 .../DeleteFeuilleAction.php}                  | 22 +++---
 .../EditFeuilleAction.php}                    | 30 ++++----
 .../ListFeuillesAction.php}                   | 16 ++--
 .../Controller/Website/Global/HomeAction.php  |  6 +-
 .../Website/Global/HtmlSitemapAction.php      | 24 +++---
 .../Website/SecondaryMenuController.php       | 32 ++++----
 .../Doctrine/Type/UnixTimestampType.php       | 49 ++++++++++++
 sources/AppBundle/Site/Entity/Feuille.php     | 53 +++++++++++++
 .../Entity/Repository/FeuilleRepository.php   | 60 +++++++++++++++
 .../Form/{SheetType.php => FeuilleType.php}   | 34 ++++-----
 sources/AppBundle/Site/Form/RubriqueType.php  | 10 +--
 .../Subscriber/SitemapXmlSubscriber.php       | 22 +++---
 ..._form.html.twig => feuille_form.html.twig} | 12 +--
 ..._list.html.twig => feuille_list.html.twig} | 40 +++++-----
 templates/site/home.html.twig                 |  2 +-
 .../Admin/Site/AdminSiteFeuilles.feature      | 24 +++---
 23 files changed, 428 insertions(+), 203 deletions(-)
 rename sources/AppBundle/Controller/Admin/Site/{Sheet/AddSheetAction.php => Feuille/AddFeuilleAction.php} (57%)
 rename sources/AppBundle/Controller/Admin/Site/{Sheet/DeleteSheetAction.php => Feuille/DeleteFeuilleAction.php} (54%)
 rename sources/AppBundle/Controller/Admin/Site/{Sheet/EditSheetAction.php => Feuille/EditFeuilleAction.php} (51%)
 rename sources/AppBundle/Controller/Admin/Site/{Sheet/ListSheetsAction.php => Feuille/ListFeuillesAction.php} (60%)
 create mode 100644 sources/AppBundle/Doctrine/Type/UnixTimestampType.php
 create mode 100644 sources/AppBundle/Site/Entity/Feuille.php
 create mode 100644 sources/AppBundle/Site/Entity/Repository/FeuilleRepository.php
 rename sources/AppBundle/Site/Form/{SheetType.php => FeuilleType.php} (84%)
 rename templates/admin/site/{sheet_form.html.twig => feuille_form.html.twig} (87%)
 rename templates/admin/site/{sheet_list.html.twig => feuille_list.html.twig} (69%)

diff --git a/app/config/packages/backoffice_menu.yaml b/app/config/packages/backoffice_menu.yaml
index e12d71d71..18d44567e 100644
--- a/app/config/packages/backoffice_menu.yaml
+++ b/app/config/packages/backoffice_menu.yaml
@@ -81,9 +81,9 @@ parameters:
                     niveau: 'ROLE_SITE'
                     url : '/admin/site/feuilles'
                     extra_routes:
-                        - admin_site_sheets_list
-                        - admin_site_sheets_add
-                        - admin_site_sheets_edit
+                        - admin_site_feuilles_list
+                        - admin_site_feuilles_add
+                        - admin_site_feuilles_edit
                 site_rubriques:
                     nom: 'Rubriques'
                     niveau: 'ROLE_SITE'
diff --git a/app/config/packages/doctrine.yaml b/app/config/packages/doctrine.yaml
index 29b1215fe..652e639e1 100644
--- a/app/config/packages/doctrine.yaml
+++ b/app/config/packages/doctrine.yaml
@@ -9,6 +9,8 @@ doctrine:
 
     profiling_collect_backtrace: '%kernel.debug%'
     use_savepoints: true
+    types:
+      unix_timestamp: AppBundle\Doctrine\Type\UnixTimestampType
   orm:
     auto_generate_proxy_classes: true
     enable_lazy_ghost_objects: true
@@ -18,6 +20,9 @@ doctrine:
     auto_mapping: true
     controller_resolver:
       auto_mapping: false
+    dql:
+      datetime_functions:
+        UNIX_TIMESTAMP: DoctrineExtensions\Query\Mysql\UnixTimestamp
     mappings:
       Accounting:
         type: attribute
diff --git a/app/config/routing/admin_site.yml b/app/config/routing/admin_site.yml
index 2f4c03a77..5568085cb 100644
--- a/app/config/routing/admin_site.yml
+++ b/app/config/routing/admin_site.yml
@@ -38,22 +38,22 @@ admin_site_articles_delete:
   requirements:
     id: '\d+'
 
-admin_site_sheets_list:
+admin_site_feuilles_list:
   path: /feuilles
-  defaults: {_controller: AppBundle\Controller\Admin\Site\Sheet\ListSheetsAction}
+  defaults: {_controller: AppBundle\Controller\Admin\Site\Feuille\ListFeuillesAction}
 
-admin_site_sheets_add:
+admin_site_feuilles_add:
   path: /feuilles/add
-  defaults: {_controller: AppBundle\Controller\Admin\Site\Sheet\AddSheetAction}
+  defaults: {_controller: AppBundle\Controller\Admin\Site\Feuille\AddFeuilleAction}
 
-admin_site_sheets_edit:
+admin_site_feuilles_edit:
   path: /feuilles/edit/{id}
-  defaults: {_controller: AppBundle\Controller\Admin\Site\Sheet\EditSheetAction}
+  defaults: {_controller: AppBundle\Controller\Admin\Site\Feuille\EditFeuilleAction}
   requirements:
     id: '\d+'
 
-admin_site_sheets_delete:
+admin_site_feuilles_delete:
   path: /feuilles/delete/{id}/{token}
-  defaults: {_controller: AppBundle\Controller\Admin\Site\Sheet\DeleteSheetAction}
+  defaults: {_controller: AppBundle\Controller\Admin\Site\Feuille\DeleteFeuilleAction}
   requirements:
     id: '\d+'
diff --git a/composer.json b/composer.json
index a8291d476..dc7ec63a2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
     "ext-pdo": "*",
     "ext-zip": "*",
     "algolia/algoliasearch-client-php": "^3.4",
+    "beberlei/doctrineextensions": "^1.5",
     "captioning/captioning": "^2.6",
     "ccmbenchmark/ting_bundle": "^3.8",
     "cocur/slugify": "^2.3",
diff --git a/composer.lock b/composer.lock
index e556507a6..dd9517217 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24faf7187ee126fe6d33a5a04c296ac2",
+    "content-hash": "6f95cfdb5c3f4fc801ed23ffcdd47e67",
     "packages": [
         {
             "name": "algolia/algoliasearch-client-php",
@@ -147,6 +147,68 @@
             },
             "time": "2023-04-25T13:21:16+00:00"
         },
+        {
+            "name": "beberlei/doctrineextensions",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beberlei/DoctrineExtensions.git",
+                "reference": "281f1650641c2f438b0a54d8eaa7ba50ac7e3eb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/281f1650641c2f438b0a54d8eaa7ba50ac7e3eb6",
+                "reference": "281f1650641c2f438b0a54d8eaa7ba50ac7e3eb6",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/orm": "^2.19 || ^3.0",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.14 || ^2",
+                "doctrine/coding-standard": "^9.0.2 || ^12.0",
+                "nesbot/carbon": "^2.72 || ^3",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5 || ^9.6",
+                "squizlabs/php_codesniffer": "^3.8",
+                "symfony/cache": "^5.4 || ^6.4 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.4 || ^7.0",
+                "vimeo/psalm": "^3.18 || ^5.22",
+                "zf1/zend-date": "^1.12",
+                "zf1/zend-registry": "^1.12"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DoctrineExtensions\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Steve Lacey",
+                    "email": "steve@steve.ly"
+                }
+            ],
+            "description": "A set of extensions to Doctrine 2 that add support for additional query functions available in MySQL, Oracle, PostgreSQL and SQLite.",
+            "keywords": [
+                "database",
+                "doctrine",
+                "orm"
+            ],
+            "support": {
+                "source": "https://github.com/beberlei/DoctrineExtensions/tree/v1.5.0"
+            },
+            "time": "2024-03-03T17:55:15+00:00"
+        },
         {
             "name": "cakephp/chronos",
             "version": "3.1.0",
diff --git a/sources/Afup/Corporate/Page.php b/sources/Afup/Corporate/Page.php
index 7500e01de..183b656d1 100644
--- a/sources/Afup/Corporate/Page.php
+++ b/sources/Afup/Corporate/Page.php
@@ -4,13 +4,14 @@
 
 namespace Afup\Site\Corporate;
 
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Feuille as FeuilleEntity;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 final readonly class Page
 {
     public function __construct(
-        private SheetRepository $sheetRepository,
+        private FeuilleRepository $feuilleRepository,
     ) {}
 
     public function header($url = null, UserInterface $user = null): string
@@ -18,41 +19,33 @@ public function header($url = null, UserInterface $user = null): string
         $url = urldecode((string) $url);
         $str = '<ul>';
 
-        $feuillesEnfants = iterator_to_array($this->sheetRepository->getActiveChildrenByParentId(Feuille::ID_FEUILLE_HEADER));
+        $feuillesEnfants = $this->feuilleRepository->getFeuillesEnfant(Feuille::ID_FEUILLE_HEADER);
+
+        $cssClasses = [];
+        $feuilleLogin = new FeuilleEntity();
+        $feuilleLogin->idParent = Feuille::ID_FEUILLE_HEADER;
+        $feuilleLogin->lien = '/member';
+        $feuilleLogin->alt = '';
+        $feuilleLogin->position = 999;
+        $feuilleLogin->etat = 1;
 
         if ($user instanceof UserInterface) {
-            $feuillesEnfants[] = [
-                'id' => PHP_INT_MAX,
-                'id_parent' => Feuille::ID_FEUILLE_HEADER,
-                'nom' => 'Espace membre',
-                'lien' => '/member',
-                'alt' => '',
-                'position' => '999',
-                'date' => null,
-                'etat' => '1',
-                'image' => null,
-                'patterns' => "#/admin/company#",
-            ];
+            $feuilleLogin->id = PHP_INT_MAX;
+            $feuilleLogin->nom = 'Espace membre';
+            $feuilleLogin->patterns = "#/admin/company#";
         } else {
-            $feuillesEnfants[] = [
-                'id' => PHP_INT_MAX - 1,
-                'id_parent' => Feuille::ID_FEUILLE_HEADER,
-                'nom' => 'Se connecter',
-                'lien' => '/member',
-                'alt' => '',
-                'position' => '999',
-                'date' => null,
-                'etat' => '1',
-                'image' => null,
-                'patterns' => null,
-                'class' => 'desktop-hidden',
-            ];
+            $feuilleLogin = new FeuilleEntity();
+            $feuilleLogin->id = PHP_INT_MAX - 1;
+            $feuilleLogin->nom = 'Se connecter';
+            $cssClasses[PHP_INT_MAX - 1] = 'desktop-hidden';
         }
 
+        $feuillesEnfants[] = $feuilleLogin;
+
         foreach ($feuillesEnfants as $feuille) {
             $isCurrent = false;
-            if ($feuille['patterns']) {
-                foreach (explode(PHP_EOL, (string) $feuille['patterns']) as $pattern) {
+            if ($feuille->patterns) {
+                foreach (explode(PHP_EOL, (string) $feuille->patterns) as $pattern) {
                     $pattern = trim($pattern);
                     if ($pattern === '') {
                         continue;
@@ -64,15 +57,15 @@ public function header($url = null, UserInterface $user = null): string
                 }
             }
 
-            if (str_contains($url, (string) $feuille['lien'])) {
+            if (str_contains($url, (string) $feuille->lien)) {
                 $isCurrent = true;
             }
 
             if (false === $isCurrent) {
-                $enfants = $this->sheetRepository->getActiveChildrenByParentId($feuille['id']);
+                $enfants = $this->feuilleRepository->getFeuillesEnfant($feuille->id);
                 foreach ($enfants as $feuilleEnfant) {
-                    foreach ($this->sheetRepository->getActiveChildrenByParentId($feuilleEnfant['id']) as $feuillesEnfant2) {
-                        if (str_contains($url, (string) $feuillesEnfant2['lien'])) {
+                    foreach ($this->feuilleRepository->getFeuillesEnfant($feuilleEnfant->id) as $feuilleEnfant2) {
+                        if (str_contains($url, (string) $feuilleEnfant2->lien)) {
                             $isCurrent = true;
                         }
                     }
@@ -81,26 +74,26 @@ public function header($url = null, UserInterface $user = null): string
 
             $class = $isCurrent ? " subheader-current " : "";
 
-            if (isset($feuille['class'])) {
-                $class .= ' ' . $feuille['class'];
+            if (isset($cssClasses[$feuille->id])) {
+                $class .= ' ' . $cssClasses[$feuille->id];
             }
 
-            $str .= sprintf("<li class='%s'><a href='%s'>%s</a></li>", $class, $feuille['lien'], $feuille['nom']);
+            $str .= sprintf("<li class='%s'><a href='%s'>%s</a></li>", $class, $feuille->lien, $feuille->nom);
         }
 
         return $str . '<ul>';
     }
 
     /**
-     * @return array{nom: mixed, items: mixed}[]
+     * @return array{nom: mixed, items: FeuilleEntity[]}[]
      */
     public function footer(): array
     {
         $footerColumns = [];
-        foreach ($this->sheetRepository->getActiveChildrenByParentId(Feuille::ID_FEUILLE_FOOTER) as $feuilleColonne) {
+        foreach ($this->feuilleRepository->getFeuillesEnfant(Feuille::ID_FEUILLE_FOOTER) as $feuilleColonne) {
             $footerColumns[] = [
-                'nom' => $feuilleColonne['nom'],
-                'items' => $this->sheetRepository->getActiveChildrenByParentId($feuilleColonne['id']),
+                'nom' => $feuilleColonne->nom,
+                'items' => $this->feuilleRepository->getFeuillesEnfant($feuilleColonne->id),
             ];
         }
 
diff --git a/sources/AppBundle/Controller/Admin/Site/Sheet/AddSheetAction.php b/sources/AppBundle/Controller/Admin/Site/Feuille/AddFeuilleAction.php
similarity index 57%
rename from sources/AppBundle/Controller/Admin/Site/Sheet/AddSheetAction.php
rename to sources/AppBundle/Controller/Admin/Site/Feuille/AddFeuilleAction.php
index edb9f5b69..0e73422d6 100644
--- a/sources/AppBundle/Controller/Admin/Site/Sheet/AddSheetAction.php
+++ b/sources/AppBundle/Controller/Admin/Site/Feuille/AddFeuilleAction.php
@@ -2,22 +2,22 @@
 
 declare(strict_types=1);
 
-namespace AppBundle\Controller\Admin\Site\Sheet;
+namespace AppBundle\Controller\Admin\Site\Feuille;
 
 use AppBundle\AuditLog\Audit;
-use AppBundle\Site\Form\SheetType;
-use AppBundle\Site\Model\Repository\SheetRepository;
-use AppBundle\Site\Model\Sheet;
+use AppBundle\Site\Entity\Feuille;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
+use AppBundle\Site\Form\FeuilleType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-final class AddSheetAction extends AbstractController
+final class AddFeuilleAction extends AbstractController
 {
     public function __construct(
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
         private readonly Audit $audit,
         #[Autowire('%kernel.project_dir%/../htdocs/templates/site/images')]
         private readonly string $storageDir,
@@ -25,8 +25,8 @@ public function __construct(
 
     public function __invoke(Request $request): Response
     {
-        $sheet = new Sheet();
-        $form = $this->createForm(SheetType::class, $sheet);
+        $feuille = new Feuille();
+        $form = $this->createForm(FeuilleType::class, $feuille);
 
         $form->handleRequest($request);
 
@@ -34,15 +34,15 @@ public function __invoke(Request $request): Response
             $file = $form->get('image')->getData();
             if ($file instanceof UploadedFile) {
                 $file->move($this->storageDir, $file->getClientOriginalName());
-                $sheet->setImage($file->getClientOriginalName());
+                $feuille->image = $file->getClientOriginalName();
             }
-            $this->sheetRepository->save($sheet);
-            $this->audit->log('Ajout de la feuille ' . $sheet->getName());
-            $this->addFlash('notice', 'La feuille ' . $sheet->getName() . ' a été ajoutée');
-            return $this->redirectToRoute('admin_site_sheets_list');
+            $this->feuilleRepository->save($feuille);
+            $this->audit->log('Ajout de la feuille ' . $feuille->nom);
+            $this->addFlash('notice', 'La feuille ' . $feuille->nom . ' a été ajoutée');
+            return $this->redirectToRoute('admin_site_feuilles_list');
         }
 
-        return $this->render('admin/site/sheet_form.html.twig', [
+        return $this->render('admin/site/feuille_form.html.twig', [
             'form' => $form->createView(),
             'formTitle' => 'Ajouter une feuille',
             'image' => false,
diff --git a/sources/AppBundle/Controller/Admin/Site/Sheet/DeleteSheetAction.php b/sources/AppBundle/Controller/Admin/Site/Feuille/DeleteFeuilleAction.php
similarity index 54%
rename from sources/AppBundle/Controller/Admin/Site/Sheet/DeleteSheetAction.php
rename to sources/AppBundle/Controller/Admin/Site/Feuille/DeleteFeuilleAction.php
index 28111e993..fd43ae1b7 100644
--- a/sources/AppBundle/Controller/Admin/Site/Sheet/DeleteSheetAction.php
+++ b/sources/AppBundle/Controller/Admin/Site/Feuille/DeleteFeuilleAction.php
@@ -2,34 +2,34 @@
 
 declare(strict_types=1);
 
-namespace AppBundle\Controller\Admin\Site\Sheet;
+namespace AppBundle\Controller\Admin\Site\Feuille;
 
 use AppBundle\AuditLog\Audit;
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
-class DeleteSheetAction extends AbstractController
+final class DeleteFeuilleAction extends AbstractController
 {
     public function __construct(
-        private SheetRepository $sheetRepository,
-        private CsrfTokenManagerInterface $csrfTokenManager,
+        private readonly FeuilleRepository $feuilleRepository,
+        private readonly CsrfTokenManagerInterface $csrfTokenManager,
         private readonly Audit $audit,
     ) {}
 
     public function __invoke(int $id, string $token): RedirectResponse
     {
-        if (false === $this->csrfTokenManager->isTokenValid(new CsrfToken('sheet_delete', $token))) {
+        if (false === $this->csrfTokenManager->isTokenValid(new CsrfToken('feuille_delete', $token))) {
             $this->addFlash('error', 'Token invalide');
-            return $this->redirectToRoute('admin_site_sheets_list');
+            return $this->redirectToRoute('admin_site_feuilles_list');
         }
-        $sheet = $this->sheetRepository->get($id);
-        $name = $sheet->getName();
-        $this->sheetRepository->delete($sheet);
+        $feuille = $this->feuilleRepository->find($id);
+        $name = $feuille->nom;
+        $this->feuilleRepository->delete($feuille);
         $this->audit->log('Suppression de la feuille ' . $name);
         $this->addFlash('notice', 'La feuille ' . $name . ' a été supprimée');
-        return $this->redirectToRoute('admin_site_sheets_list');
+        return $this->redirectToRoute('admin_site_feuilles_list');
     }
 }
diff --git a/sources/AppBundle/Controller/Admin/Site/Sheet/EditSheetAction.php b/sources/AppBundle/Controller/Admin/Site/Feuille/EditFeuilleAction.php
similarity index 51%
rename from sources/AppBundle/Controller/Admin/Site/Sheet/EditSheetAction.php
rename to sources/AppBundle/Controller/Admin/Site/Feuille/EditFeuilleAction.php
index ff3e09e05..7a32fbb4c 100644
--- a/sources/AppBundle/Controller/Admin/Site/Sheet/EditSheetAction.php
+++ b/sources/AppBundle/Controller/Admin/Site/Feuille/EditFeuilleAction.php
@@ -2,45 +2,45 @@
 
 declare(strict_types=1);
 
-namespace AppBundle\Controller\Admin\Site\Sheet;
+namespace AppBundle\Controller\Admin\Site\Feuille;
 
 use AppBundle\AuditLog\Audit;
-use AppBundle\Site\Form\SheetType;
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
+use AppBundle\Site\Form\FeuilleType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-final class EditSheetAction extends AbstractController
+final class EditFeuilleAction extends AbstractController
 {
     public function __construct(
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
         private readonly Audit $audit,
         #[Autowire('%kernel.project_dir%/../htdocs/templates/site/images')]
         private readonly string $storageDir,
     ) {}
 
-    public function __invoke(int $id,Request $request): Response
+    public function __invoke(int $id, Request $request): Response
     {
-        $sheet = $this->sheetRepository->get($id);
-        $form = $this->createForm(SheetType::class, $sheet);
+        $feuille = $this->feuilleRepository->find($id);
+        $form = $this->createForm(FeuilleType::class, $feuille);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $file = $form->get('image')->getData();
             if ($file instanceof UploadedFile) {
                 $file->move($this->storageDir, $file->getClientOriginalName());
-                $sheet->setImage($file->getClientOriginalName());
+                $feuille->image = $file->getClientOriginalName();
             }
-            $this->sheetRepository->save($sheet);
-            $this->audit->log('Modification de la feuille ' . $sheet->getName());
-            $this->addFlash('notice', 'La feuille ' . $sheet->getName() . ' a été modifiée');
-            return $this->redirectToRoute('admin_site_sheets_list');
+            $this->feuilleRepository->save($feuille);
+            $this->audit->log('Modification de la feuille ' . $feuille->nom);
+            $this->addFlash('notice', 'La feuille ' . $feuille->nom . ' a été modifiée');
+            return $this->redirectToRoute('admin_site_feuilles_list');
         }
-        $image = $sheet->getImage() !== null ? '/templates/site/images/' . $sheet->getImage() : false;
+        $image = $feuille->image !== null ? '/templates/site/images/' . $feuille->image : false;
 
-        return $this->render('admin/site/sheet_form.html.twig', [
+        return $this->render('admin/site/feuille_form.html.twig', [
             'form' => $form->createView(),
             'image' => $image,
             'formTitle' => 'Modifier une feuille',
diff --git a/sources/AppBundle/Controller/Admin/Site/Sheet/ListSheetsAction.php b/sources/AppBundle/Controller/Admin/Site/Feuille/ListFeuillesAction.php
similarity index 60%
rename from sources/AppBundle/Controller/Admin/Site/Sheet/ListSheetsAction.php
rename to sources/AppBundle/Controller/Admin/Site/Feuille/ListFeuillesAction.php
index 77450c6f5..bc2f3de3d 100644
--- a/sources/AppBundle/Controller/Admin/Site/Sheet/ListSheetsAction.php
+++ b/sources/AppBundle/Controller/Admin/Site/Feuille/ListFeuillesAction.php
@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace AppBundle\Controller\Admin\Site\Sheet;
+namespace AppBundle\Controller\Admin\Site\Feuille;
 
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Twig\Environment;
 
-class ListSheetsAction
+final readonly class ListFeuillesAction
 {
     public function __construct(
-        private readonly SheetRepository $sheetRepository,
-        private readonly Environment $twig,
+        private FeuilleRepository $feuilleRepository,
+        private Environment $twig,
     ) {}
 
     public function __invoke(Request $request): Response
@@ -26,10 +26,10 @@ public function __invoke(Request $request): Response
         }
         $direction = $request->query->get('direction', 'desc');
         $filter = $request->query->get('filter', '');
-        $sheets = $this->sheetRepository->getAllSheets($sort, $direction, $filter);
+        $feuilles = $this->feuilleRepository->getAllFeuilles($sort, $direction, $filter);
 
-        return new Response($this->twig->render('admin/site/sheet_list.html.twig', [
-            'sheets' => $sheets,
+        return new Response($this->twig->render('admin/site/feuille_list.html.twig', [
+            'feuilles' => $feuilles,
             'filter' => $filter,
             'sort' => $sort,
             'direction' => $direction,
diff --git a/sources/AppBundle/Controller/Website/Global/HomeAction.php b/sources/AppBundle/Controller/Website/Global/HomeAction.php
index c141b7e71..3e9c7408c 100644
--- a/sources/AppBundle/Controller/Website/Global/HomeAction.php
+++ b/sources/AppBundle/Controller/Website/Global/HomeAction.php
@@ -11,7 +11,7 @@
 use AppBundle\Event\Model\Repository\TalkRepository;
 use AppBundle\Event\Model\Talk;
 use AppBundle\Site\Model\Repository\ArticleRepository;
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use AppBundle\Twig\ViewRenderer;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Cache\InvalidArgumentException;
@@ -33,14 +33,14 @@ public function __construct(
         #[Autowire('%home_algolia_enabled%')]
         private readonly bool $homeAlgoliaEnabled,
         private readonly ArticleRepository $articleRepository,
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public function __invoke(): Response
     {
         $derniers_articles = $this->articleRepository->findListForHome();
 
-        $enfants = iterator_to_array($this->sheetRepository->getActiveChildrenByParentId(Feuille::ID_FEUILLE_COLONNE_DROITE));
+        $enfants = $this->feuilleRepository->getFeuillesEnfant(Feuille::ID_FEUILLE_COLONNE_DROITE);
 
         $premiereFeuille = array_shift($enfants);
         $deuxiemeFeuille = array_shift($enfants);
diff --git a/sources/AppBundle/Controller/Website/Global/HtmlSitemapAction.php b/sources/AppBundle/Controller/Website/Global/HtmlSitemapAction.php
index 7c17d605f..31abf67ac 100644
--- a/sources/AppBundle/Controller/Website/Global/HtmlSitemapAction.php
+++ b/sources/AppBundle/Controller/Website/Global/HtmlSitemapAction.php
@@ -9,7 +9,7 @@
 use AppBundle\Event\Model\Repository\TalkRepository;
 use AppBundle\Event\Model\Talk;
 use AppBundle\Site\Model\Repository\ArticleRepository;
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use AppBundle\Twig\ViewRenderer;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -21,32 +21,32 @@ public function __construct(
         private readonly CompanyMemberRepository $companyMemberRepository,
         private readonly ArticleRepository $articleRepository,
         private readonly TalkRepository $talkRepository,
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public function __invoke(): Response
     {
         return $this->view->render('site/sitemap.html.twig', [
-            'pages' => $this->buildLeafs(Feuille::ID_FEUILLE_HEADER),
-            'association' => $this->buildLeafs(Feuille::ID_FEUILLE_ANTENNES),
+            'pages' => $this->buildPages(Feuille::ID_FEUILLE_HEADER),
+            'association' => $this->buildPages(Feuille::ID_FEUILLE_ANTENNES),
             'members' => $this->members(),
             'news' => $this->news(),
             'talks' => $this->talks(),
         ]);
     }
 
-    private function buildLeafs(int $id): array
+    private function buildPages(int $id): array
     {
-        $leafs = $this->sheetRepository->getActiveChildrenByParentId($id);
+        $feuilles = $this->feuilleRepository->getFeuillesEnfant($id);
 
         $pages = [];
-        foreach ($leafs as $leaf) {
-            if (!$leaf['lien'] || str_starts_with((string) $leaf['lien'], 'http')) {
+        foreach ($feuilles as $feuille) {
+            if (!$feuille->lien || str_starts_with((string) $feuille->lien, 'http')) {
                 continue;
             }
             $pages[] = [
-                'name' => $leaf['nom'],
-                'url' => $leaf['lien'],
+                'name' => $feuille->nom,
+                'url' => $feuille->lien,
             ];
         }
 
@@ -82,7 +82,7 @@ private function news(): array
             ]);
 
             $news[] = [
-                'name' => $newsItem->getTitle(),
+                'name' => $newsItem->titre,
                 'url' => $url,
             ];
         }
@@ -93,7 +93,7 @@ private function news(): array
     private function talks(): array
     {
         $talks = [];
-        $talkList = $this->talkRepository->getAllPastTalks((new \DateTime())->setTime(29,59,59));
+        $talkList = $this->talkRepository->getAllPastTalks((new \DateTime())->setTime(29, 59, 59));
 
         /** @var Talk $talk */
         foreach ($talkList as $talk) {
diff --git a/sources/AppBundle/Controller/Website/SecondaryMenuController.php b/sources/AppBundle/Controller/Website/SecondaryMenuController.php
index aaa8aa35b..e2a81cdc5 100644
--- a/sources/AppBundle/Controller/Website/SecondaryMenuController.php
+++ b/sources/AppBundle/Controller/Website/SecondaryMenuController.php
@@ -4,8 +4,8 @@
 
 namespace AppBundle\Controller\Website;
 
-use AppBundle\Site\Model\Repository\SheetRepository;
-use CCMBenchmark\Ting\Repository\CollectionInterface;
+use AppBundle\Site\Entity\Feuille;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -15,12 +15,12 @@ class SecondaryMenuController extends AbstractController
 {
     public function __construct(
         private readonly RequestStack $requestStack,
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public function display(Request $request): Response
     {
-        $menu = $this->sheetRepository->getActiveChildrenByParentId($request->get('feuille_id'));
+        $menu = $this->feuilleRepository->getFeuillesEnfant($request->get('feuille_id'));
 
         return $this->render(
             'site/secondary_menu.html.twig',
@@ -31,44 +31,48 @@ public function display(Request $request): Response
     }
 
     /**
+     * @param Feuille[] $menu
      * @return mixed[]
      */
-    protected function prepareMenu(Request $masterRequest, CollectionInterface $menu): array
+    protected function prepareMenu(Request $masterRequest, array $menu): array
     {
         $preparedMenu = [];
 
         foreach ($menu as $feuille) {
-            $feuille['is_active'] = $this->isActive($masterRequest, $feuille);
-            $preparedMenu[] = $feuille;
+            $preparedMenu[] = [
+                'lien' => $feuille->lien,
+                'nom' => $feuille->nom,
+                'patterns' => $feuille->patterns,
+                'is_active' => $this->isActive($masterRequest, $feuille),
+            ];
         }
 
         return $preparedMenu;
     }
 
-    private function isActive(Request $masterRequest, array $feuille)
+    private function isActive(Request $masterRequest, Feuille $feuille): bool
     {
         $url = $masterRequest->getUri();
 
-        $pattern = '/' . preg_quote((string) $feuille['lien'], '/') . '/';
+        $pattern = '/' . preg_quote((string) $feuille->lien, '/') . '/';
 
         if (preg_match($pattern, $url)) {
             return true;
         }
 
-        $isCurrent = false;
-        if ($feuille['patterns']) {
-            foreach (explode(PHP_EOL, (string) $feuille['patterns']) as $pattern) {
+        if ($feuille->patterns) {
+            foreach (explode(PHP_EOL, (string) $feuille->patterns) as $pattern) {
                 $pattern = trim($pattern);
                 if ($pattern === '') {
                     continue;
                 }
 
                 if (preg_match($pattern, $url)) {
-                    $isCurrent = true;
+                    return true;
                 }
             }
         }
 
-        return $isCurrent;
+        return false;
     }
 }
diff --git a/sources/AppBundle/Doctrine/Type/UnixTimestampType.php b/sources/AppBundle/Doctrine/Type/UnixTimestampType.php
new file mode 100644
index 000000000..8e4b4184e
--- /dev/null
+++ b/sources/AppBundle/Doctrine/Type/UnixTimestampType.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Doctrine\Type;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Exception\InvalidType;
+use Doctrine\DBAL\Types\Type;
+
+class UnixTimestampType extends Type
+{
+    public const NAME = 'unix_timestamp';
+
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return $platform->getIntegerTypeDeclarationSQL($column);
+    }
+
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?\DateTime
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        $date = new \DateTime();
+        $date->setTimestamp((int) $value);
+
+        return $date;
+    }
+
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        if ($value instanceof \DateTimeInterface) {
+            return $value->getTimestamp();
+        }
+
+        throw InvalidType::new($value, static::class, ['null', \DateTimeInterface::class]);
+    }
+
+    public function getName(): string
+    {
+        return self::NAME;
+    }
+}
diff --git a/sources/AppBundle/Site/Entity/Feuille.php b/sources/AppBundle/Site/Entity/Feuille.php
new file mode 100644
index 000000000..035403ff2
--- /dev/null
+++ b/sources/AppBundle/Site/Entity/Feuille.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Site\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'afup_site_feuille')]
+class Feuille
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    public ?int $id = null;
+
+    #[ORM\Column(nullable: true)]
+    public ?int $idParent = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    public ?string $nom = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    public ?string $lien = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    public ?string $alt = null;
+
+    #[ORM\Column(nullable: true)]
+    public ?int $position = null;
+
+    #[ORM\Column(name: 'date', type: 'unix_timestamp', nullable: true)]
+    public ?\DateTime $dateCreation = null;
+
+    #[ORM\Column(type: 'unix_timestamp', nullable: true)]
+    public ?\DateTime $dateDebutPublication = null;
+
+    #[ORM\Column(type: 'unix_timestamp', nullable: true)]
+    public ?\DateTime $dateFinPublication = null;
+
+    #[ORM\Column(nullable: true)]
+    public ?int $etat = null; // todo enum
+
+    #[ORM\Column(length: 255, nullable: true)]
+    public ?string $image = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    public ?string $imageAlt = null;
+
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $patterns = null;
+}
diff --git a/sources/AppBundle/Site/Entity/Repository/FeuilleRepository.php b/sources/AppBundle/Site/Entity/Repository/FeuilleRepository.php
new file mode 100644
index 000000000..0c697832d
--- /dev/null
+++ b/sources/AppBundle/Site/Entity/Repository/FeuilleRepository.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Site\Entity\Repository;
+
+use AppBundle\Doctrine\EntityRepository;
+use AppBundle\Site\Entity\Feuille;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends EntityRepository<Feuille>
+ */
+final class FeuilleRepository extends EntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Feuille::class);
+    }
+
+    /**
+     * @return Feuille[]
+     */
+    public function getAllFeuilles(string $ordre = 'date', string $direction = 'desc', string $filtre = ''): array
+    {
+        if ($direction !== 'desc' && $direction !== 'asc') {
+            $direction = 'asc';
+        }
+
+        if (!in_array($ordre, ['nom', 'date', 'etat', 'id', 'position'], true)) {
+            $ordre = 'nom';
+        }
+
+        if ($ordre === 'date') {
+            $ordre = 'dateCreation';
+        }
+
+        return $this->createQueryBuilder('f')
+            ->where('f.nom LIKE :filtre')
+            ->setParameter('filtre', '%' . $filtre . '%')
+            ->orderBy('f.' . $ordre, $direction)
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * @return Feuille[]
+     */
+    public function getFeuillesEnfant(int $parentId): array
+    {
+        return $this->createQueryBuilder('f')
+            ->where('f.idParent = :parentId')
+            ->andWhere('f.etat = 1')
+            ->andWhere('(f.dateDebutPublication IS NULL OR f.dateDebutPublication <= UNIX_TIMESTAMP())')
+            ->andWhere('(f.dateFinPublication IS NULL OR f.dateFinPublication >= UNIX_TIMESTAMP())')
+            ->setParameter('parentId', $parentId)
+            ->getQuery()
+            ->getResult();
+    }
+}
diff --git a/sources/AppBundle/Site/Form/SheetType.php b/sources/AppBundle/Site/Form/FeuilleType.php
similarity index 84%
rename from sources/AppBundle/Site/Form/SheetType.php
rename to sources/AppBundle/Site/Form/FeuilleType.php
index 6fc3589fc..3dfd78781 100644
--- a/sources/AppBundle/Site/Form/SheetType.php
+++ b/sources/AppBundle/Site/Form/FeuilleType.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Site\Form;
 
-use AppBundle\Site\Model\Repository\SheetRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
@@ -14,37 +14,37 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 
-class SheetType extends AbstractType
+class FeuilleType extends AbstractType
 {
     public const POSITIONS_RUBRIQUES = 9;
 
     public function __construct(
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $sheets = [];
-        foreach ($this->sheetRepository->getAll() as $sheet) {
-            $sheets[$sheet->getName()] = $sheet->getId();
+        $feuilles = [];
+        foreach ($this->feuilleRepository->findAll() as $feuille) {
+            $feuilles[$feuille->nom] = $feuille->id;
         }
-        ksort($sheets, SORT_NATURAL);
+        ksort($feuilles, SORT_NATURAL);
 
         $positions = [];
-        for ($i = self::POSITIONS_RUBRIQUES ; $i >= -(self::POSITIONS_RUBRIQUES); $i--) {
+        for ($i = self::POSITIONS_RUBRIQUES; $i >= -(self::POSITIONS_RUBRIQUES); $i--) {
             $positions[$i] = $i;
         }
 
         $builder
             ->add('idParent', ChoiceType::class, [
                 'label' => 'Parent',
-                'choices' => $sheets,
+                'choices' => $feuilles,
                 'required' => false,
                 'constraints' => [
                     new Assert\Type("integer"),
                 ],
             ])
-            ->add('name', TextType::class, [
+            ->add('nom', TextType::class, [
                 'label' => 'Nom',
                 'required' => true,
                 'attr' => [
@@ -57,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type('string'),
                 ],
             ])
-            ->add('link', TextType::class, [
+            ->add('lien', TextType::class, [
                 'required' => true,
                 'label' => 'Lien',
                 'attr' => [
@@ -88,7 +88,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'data_class' => null,
                 'mapped' => false,
                 'constraints' => [
-                    new Assert\Image(mimeTypes: ['image/jpg','image/jpeg','image/gif','image/png']),
+                    new Assert\Image(mimeTypes: ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']),
                 ],
             ])
             ->add('imageAlt', TextType::class, [
@@ -103,7 +103,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type('string'),
                 ],
             ])
-            ->add('creationDate', DateType::class, [
+            ->add('dateCreation', DateType::class, [
                 'required' => false,
                 'label' => 'Date',
                 'input' => 'datetime',
@@ -112,8 +112,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type("datetime"),
                 ],
             ])
-
-            ->add('publicationStart', DateType::class, [
+            ->add('dateDebutPublication', DateType::class, [
                 'required' => false,
                 'label' => 'Date de début de publication',
                 'input' => 'datetime',
@@ -122,7 +121,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type("datetime"),
                 ],
             ])
-            ->add('publicationEnd', DateType::class, [
+            ->add('dateFinPublication', DateType::class, [
                 'required' => false,
                 'label' => 'Date de fin de publication',
                 'input' => 'datetime',
@@ -131,7 +130,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type("datetime"),
                 ],
             ])
-
             ->add('position', ChoiceType::class, [
                 'required' => false,
                 'label' => 'Position',
@@ -140,7 +138,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     new Assert\Type("integer"),
                 ],
             ])
-            ->add('state', ChoiceType::class, [
+            ->add('etat', ChoiceType::class, [
                 'label' => 'Etat',
                 'required' => false,
                 'choices' => [
diff --git a/sources/AppBundle/Site/Form/RubriqueType.php b/sources/AppBundle/Site/Form/RubriqueType.php
index e6d88daa1..b2084462e 100644
--- a/sources/AppBundle/Site/Form/RubriqueType.php
+++ b/sources/AppBundle/Site/Form/RubriqueType.php
@@ -5,8 +5,8 @@
 namespace AppBundle\Site\Form;
 
 use AppBundle\Association\Model\Repository\UserRepository;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use AppBundle\Site\Model\Repository\RubriqueRepository;
-use AppBundle\Site\Model\Repository\SheetRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
@@ -24,7 +24,7 @@ class RubriqueType extends AbstractType
     public function __construct(
         private readonly RubriqueRepository $rubriqueRepository,
         private readonly UserRepository $userRepository,
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -34,12 +34,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             $users[$user->getLastName() . ' ' . $user->getFirstName()] = $user->getId();
         }
         $sheets = [];
-        foreach ($this->sheetRepository->getAll() as $sheet) {
-            $sheets[$sheet->getName()] = $sheet->getId();
+        foreach ($this->feuilleRepository->findAll() as $feuille) {
+            $sheets[$feuille->nom] = $feuille->id;
         }
         ksort($sheets, SORT_NATURAL);
         $positions = [];
-        for ($i = self::POSITIONS_RUBRIQUES ; $i >= -(self::POSITIONS_RUBRIQUES); $i--) {
+        for ($i = self::POSITIONS_RUBRIQUES; $i >= -(self::POSITIONS_RUBRIQUES); $i--) {
             $positions[$i] = $i;
         }
         $rubriques = [];
diff --git a/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php b/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php
index b6603bc94..8276671e0 100644
--- a/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php
+++ b/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php
@@ -14,9 +14,9 @@
 use AppBundle\Event\Model\Repository\TalkRepository;
 use AppBundle\Event\Model\Speaker;
 use AppBundle\Event\Model\Talk;
+use AppBundle\Site\Entity\Repository\FeuilleRepository;
 use AppBundle\Site\Model\Article;
 use AppBundle\Site\Model\Repository\ArticleRepository;
-use AppBundle\Site\Model\Repository\SheetRepository;
 use Presta\SitemapBundle\Event\SitemapPopulateEvent;
 use Presta\SitemapBundle\Service\UrlContainerInterface;
 use Presta\SitemapBundle\Sitemap\Url\GoogleVideo;
@@ -34,7 +34,7 @@ public function __construct(
         private readonly EventRepository $eventRepository,
         private readonly ArticleRepository $articleRepository,
         private readonly CompanyMemberRepository $companyMemberRepository,
-        private readonly SheetRepository $sheetRepository,
+        private readonly FeuilleRepository $feuilleRepository,
     ) {}
 
     public static function getSubscribedEvents(): array
@@ -72,7 +72,7 @@ public function registerTalksUrls(UrlContainerInterface $urls): void
                 ),
                 $talk->getSubmittedOn(),
             );
-            $urls->addUrl($url,'talks');
+            $urls->addUrl($url, 'talks');
 
             if ($talk->hasYoutubeId()) {
                 $video = new GoogleVideo(
@@ -83,7 +83,7 @@ public function registerTalksUrls(UrlContainerInterface $urls): void
                 );
                 $decoratedUrl = new GoogleVideoUrlDecorator($url);
                 $decoratedUrl->addVideo($video);
-                $urls->addUrl($decoratedUrl,'video');
+                $urls->addUrl($decoratedUrl, 'video');
             }
         }
     }
@@ -100,7 +100,7 @@ public function registerSpeakersTalksUrls(UrlContainerInterface $urls): void
                     UrlGeneratorInterface::ABSOLUTE_URL,
                 ),
             );
-            $urls->addUrl($url,'talks');
+            $urls->addUrl($url, 'talks');
         }
     }
 
@@ -119,7 +119,7 @@ public function registerEventsTalksUrls(UrlContainerInterface $urls): void
                 UrlConcrete::CHANGEFREQ_DAILY,
                 1,
             );
-            $urls->addUrl($url,'talks');
+            $urls->addUrl($url, 'talks');
         }
     }
 
@@ -133,7 +133,7 @@ public function registerNewsUrls(UrlContainerInterface $urls): void
                 new UrlConcrete(
                     $this->urlGenerator->generate(
                         'news_display',
-                        ['code' => $article->getSlug(),],
+                        ['code' => $article->getSlug()],
                         UrlGeneratorInterface::ABSOLUTE_URL,
                     ),
                     $article->getPublishedAt(),
@@ -195,14 +195,14 @@ private function registerDefaultPages(UrlContainerInterface $urls): void
 
     private function fromFeuilleId(int $id, UrlContainerInterface $urls): void
     {
-        $leafs = $this->sheetRepository->getActiveChildrenByParentId($id);
-        foreach ($leafs as $leaf) {
-            if (!$leaf['lien'] || !str_starts_with((string) $leaf['lien'], 'http')) {
+        $feuilles = $this->feuilleRepository->getFeuillesEnfant($id);
+        foreach ($feuilles as $feuille) {
+            if (!$feuille->lien || !str_starts_with((string) $feuille->lien, 'http')) {
                 continue;
             }
 
             $urls->addUrl(
-                new UrlConcrete($leaf['lien']),
+                new UrlConcrete($feuille->lien),
                 'default',
             );
         }
diff --git a/templates/admin/site/sheet_form.html.twig b/templates/admin/site/feuille_form.html.twig
similarity index 87%
rename from templates/admin/site/sheet_form.html.twig
rename to templates/admin/site/feuille_form.html.twig
index 599074c7a..eb050c5d4 100644
--- a/templates/admin/site/sheet_form.html.twig
+++ b/templates/admin/site/feuille_form.html.twig
@@ -13,8 +13,8 @@
             <div>
                 <div class="ui form">
                     {{ form_row(form.idParent) }}
-                    {{ form_row(form.name) }}
-                    {{ form_row(form.link) }}
+                    {{ form_row(form.nom) }}
+                    {{ form_row(form.lien) }}
                     {{ form_row(form.alt) }}
                     {{ form_row(form.image) }}
                     {% if image  %}
@@ -32,11 +32,11 @@
                     </div>
                     {% endif %}
                     {{ form_row(form.imageAlt) }}
-                    {{ form_row(form.creationDate) }}
-                    {{ form_row(form.publicationStart) }}
-                    {{ form_row(form.publicationEnd) }}
+                    {{ form_row(form.dateCreation) }}
+                    {{ form_row(form.dateDebutPublication) }}
+                    {{ form_row(form.dateFinPublication) }}
                     {{ form_row(form.position) }}
-                    {{ form_row(form.state) }}
+                    {{ form_row(form.etat) }}
                     {{ form_row(form.patterns) }}
 
                 </div>
diff --git a/templates/admin/site/sheet_list.html.twig b/templates/admin/site/feuille_list.html.twig
similarity index 69%
rename from templates/admin/site/sheet_list.html.twig
rename to templates/admin/site/feuille_list.html.twig
index e31db94ed..5c7fc6edc 100644
--- a/templates/admin/site/sheet_list.html.twig
+++ b/templates/admin/site/feuille_list.html.twig
@@ -1,7 +1,7 @@
 {% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
-    {% set token_delete=csrf_token('sheet_delete') %}
+    {% set token_delete=csrf_token('feuille_delete') %}
 
     <h2>Liste des feuilles</h2>
 
@@ -12,7 +12,7 @@
         <p>Cela correspond au menu de gauche sur le site web.</p>
     </div>
     <div class="ui menu">
-        <a href="{{ path('admin_site_sheets_add') }}" class="item">
+        <a href="{{ path('admin_site_feuilles_add') }}" class="item">
             <div data-tooltip="Ajouter une feuille" data-position="bottom left">
                 <i class="icon plus square"></i>
                 Ajouter
@@ -50,44 +50,44 @@
             </tr>
         </thead>
         <tbody>
-        {% if sheets|length > 0 %}
-            {% for sheet in sheets %}
+        {% if feuilles|length > 0 %}
+            {% for feuille in feuilles %}
             <tr>
-                <td>{% if sheet.date != null %}{{ sheet.date|date('d-m-Y') }}{% endif %}</td>
+                <td>{% if feuille.dateCreation != null %}{{ feuille.dateCreation|date('d-m-Y') }}{% endif %}</td>
                 <td style="white-space : normal;">
-                    {{ sheet.nom }}
-                    {% if sheet.image is not empty %}
-                        <br/><img src="../../templates/site/images/{{ sheet.image }}" alt="{{ sheet.image_alt|default('') }}" width="125" />
+                    {{ feuille.nom }}
+                    {% if feuille.image is not empty %}
+                        <br/><img src="../../templates/site/images/{{ feuille.image }}" alt="{{ feuille.imageAlt|default('') }}" width="125" />
                     {% endif %}
                 </td>
-                <td>{% if sheet.date_debut_publication is not null %}{{ sheet.date_debut_publication|date('d-m-Y') }}{% endif %}</td>
-                <td>{% if sheet.date_fin_publication is not null %}{{ sheet.date_fin_publication|date('d-m-Y') }}{% endif %}</td>
+                <td>{% if feuille.dateDebutPublication is not null %}{{ feuille.dateDebutPublication|date('d-m-Y') }}{% endif %}</td>
+                <td>{% if feuille.dateFinPublication is not null %}{{ feuille.dateFinPublication|date('d-m-Y') }}{% endif %}</td>
                 <td class="center aligned">
-                    {% if sheet.etat == 1 %}
+                    {% if feuille.etat == 1 %}
                         <a class="ui orange label">En ligne</a>
-                    {% elseif sheet.etat == -1 %}
+                    {% elseif feuille.etat == -1 %}
                         <a class="ui grey label">Hors ligne</a>
                     {% else %}
                         <a class="ui violet label">En attente</a>
                     {% endif %}
                 </td>
-                <td class="right aligned" >{{ sheet.position }}</td>
+                <td class="right aligned" >{{ feuille.position }}</td>
                 <td class="single line right aligned">
-                    <a id="modifier_{{ sheet.id }}"
-                        href="{{ path('admin_site_sheets_edit', {'id': sheet.id }) }}"
+                    <a id="modifier_{{ feuille.id }}"
+                        href="{{ path('admin_site_feuilles_edit', {'id': feuille.id }) }}"
                         data-position="left center"
-                        data-tooltip="Modifier la feuille {{ sheet.nom }}"
+                        data-tooltip="Modifier la feuille {{ feuille.nom }}"
                         class="compact ui icon button"
                     >
                         <i class="pencil alernate icon"></i>
                     </a>
 
-                    <a id="supprimer_{{ sheet.id }}"
-                    href="{{path('admin_site_sheets_delete', {'id': sheet.id, 'token': token_delete }) }}"
+                    <a id="supprimer_{{ feuille.id }}"
+                    href="{{path('admin_site_feuilles_delete', {'id': feuille.id, 'token': token_delete }) }}"
                     data-position="left center"
-                    data-tooltip="Supprimer la feuille {{ sheet.nom }}"
+                    data-tooltip="Supprimer la feuille {{ feuille.nom }}"
                     class="compact ui red icon button confirmable"
-                    data-confirmable-label="Etes-vous sûr de vouloir supprimer la feuille {{ sheet.nom }} ?"
+                    data-confirmable-label="Etes-vous sûr de vouloir supprimer la feuille {{ feuille.nom }} ?"
                     >
                         <i class="trash icon"></i>
                     </a>
diff --git a/templates/site/home.html.twig b/templates/site/home.html.twig
index de7207d7b..4b29276b7 100644
--- a/templates/site/home.html.twig
+++ b/templates/site/home.html.twig
@@ -28,7 +28,7 @@
 {% macro home_feuille(feuille) %}
     <h2>{{ feuille.nom }}</h2>
     {% if feuille.image %}
-        <a href="{{ feuille.lien }}"><img alt="{{ feuille.image_alt }}" src="/templates/site/images/{{ feuille.image }}" /></a>
+        <a href="{{ feuille.lien }}"><img alt="{{ feuille.imageAlt }}" src="/templates/site/images/{{ feuille.image }}" /></a>
     {% endif %}
     {% if feuille.alt %}
         <p>{{ feuille.alt }}</p>
diff --git a/tests/behat/features/Admin/Site/AdminSiteFeuilles.feature b/tests/behat/features/Admin/Site/AdminSiteFeuilles.feature
index eb1b9ae30..3c66638f9 100644
--- a/tests/behat/features/Admin/Site/AdminSiteFeuilles.feature
+++ b/tests/behat/features/Admin/Site/AdminSiteFeuilles.feature
@@ -21,10 +21,10 @@ Feature: Administration - Partie Site
     Then I should see "Ajouter une feuille"
     And I should see "Date de début de publication"
     And I should see "Date de fin de publication"
-    And I fill in "sheet[name]" with "Feuille avec dates"
-    And I fill in "sheet[link]" with "http://lien"
-    And I fill in "sheet[publicationStart]" with "2026-03-01"
-    And I fill in "sheet[publicationEnd]" with "2027-12-31"
+    And I fill in "feuille[nom]" with "Feuille avec dates"
+    And I fill in "feuille[lien]" with "http://lien"
+    And I fill in "feuille[dateDebutPublication]" with "2026-03-01"
+    And I fill in "feuille[dateFinPublication]" with "2027-12-31"
     And I press "Ajouter"
     Then I should see "Liste des feuilles"
     And the ".content table" element should contain "01-03-2026"
@@ -39,9 +39,9 @@ Feature: Administration - Partie Site
     # ajout d'une feuille
     When I follow "Ajouter"
     Then I should see "Ajouter une feuille"
-    When I fill in "sheet[name]" with "Feuille test"
-    And I fill in "sheet[link]" with "http://lien"
-    And I fill in "sheet[imageAlt]" with "Texte image alt"
+    When I fill in "feuille[nom]" with "Feuille test"
+    And I fill in "feuille[lien]" with "http://lien"
+    And I fill in "feuille[imageAlt]" with "Texte image alt"
     And I press "Ajouter"
     Then I should see "Liste des feuilles"
     And the ".content table" element should contain "Feuille test"
@@ -49,9 +49,9 @@ Feature: Administration - Partie Site
     When I follow "modifier_1013"
     Then I should see "Modifier une feuille"
     And I should see "Feuille test"
-    And the "sheet[link]" field should contain "http://lien"
-    And the "sheet[imageAlt]" field should contain "Texte image alt"
-    When I fill in "sheet[name]" with "Feuille modifiée"
+    And the "feuille[lien]" field should contain "http://lien"
+    And the "feuille[imageAlt]" field should contain "Texte image alt"
+    When I fill in "feuille[nom]" with "Feuille modifiée"
     And I press "Modifier"
     Then I should see "Liste des feuilles"
     And the ".content table" element should contain "Feuille modifiée"
@@ -65,9 +65,9 @@ Feature: Administration - Partie Site
     Then I should see "Liste des feuilles"
     When I follow the button of tooltip "Modifier la feuille La VEILLE de l'AFUP"
     Then I should see "Modifier une feuille"
-    And the "sheet[name]" field should contain "la VEILLE de l'AFUP"
+    And the "feuille[nom]" field should contain "la VEILLE de l'AFUP"
     And I should see "Actuellement : /templates/site/images/tech-letter.png"
-    When I attach the file "tech-letter2.png" to "sheet[image]"
+    When I attach the file "tech-letter2.png" to "feuille[image]"
     And I press "Modifier"
     Then I should see "La feuille La VEILLE de l'AFUP a été modifiée"
     # Modification d'une feuille sans changement pour vérifier que l'image n'est pas surchargée