From d3349f55b329301bdf7b4b126dfffeb71d68d625 Mon Sep 17 00:00:00 2001 From: vgreb Date: Thu, 15 Oct 2026 23:27:07 +0200 Subject: [PATCH] Suppression de la route void et de l'ancien layout site/base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La route /association/void-route servait à habiller les pages du front legacy (htdocs/pages/site/index.php) avec le header et le footer Symfony via l'attribut legacyContent. Ce point d'entrée a été supprimé en 2020 (bdaf7fd19) : plus rien ne remplit legacyContent et la route n'affichait qu'une page vide à l'ancien habillage. Supprimés avec elle : - templates/site/base.html.twig, dont VoidAction était le dernier utilisateur - templates/admin/association/membership/_base.html.twig, orphelin - htdocs/js/site/layout.js et styles-without-compass.css, chargés uniquement par site/base - l'entrée VoidAction de la baseline phpstan --- config/routing/site.yml | 4 - htdocs/js/site/layout.js | 16 --- .../site/css/styles-without-compass.css | 2 - phpstan-baseline.php | 6 - .../Controller/Website/Static/VoidAction.php | 24 ---- .../association/membership/_base.html.twig | 35 ----- templates/site/base.html.twig | 130 ------------------ 7 files changed, 217 deletions(-) delete mode 100644 htdocs/js/site/layout.js delete mode 100644 htdocs/templates/site/css/styles-without-compass.css delete mode 100644 sources/AppBundle/Controller/Website/Static/VoidAction.php delete mode 100644 templates/admin/association/membership/_base.html.twig delete mode 100644 templates/site/base.html.twig diff --git a/config/routing/site.yml b/config/routing/site.yml index f2578b865..3f1a60aed 100644 --- a/config/routing/site.yml +++ b/config/routing/site.yml @@ -49,10 +49,6 @@ superapero: options: sitemap: true -void: - path: /void-route - defaults: { _controller: AppBundle\Controller\Website\Static\VoidAction } - newsletter_subscribe: path: /newsletter-subscribe defaults: { _controller: AppBundle\Controller\Website\NewsletterController::subscribe } diff --git a/htdocs/js/site/layout.js b/htdocs/js/site/layout.js deleted file mode 100644 index 2167af03c..000000000 --- a/htdocs/js/site/layout.js +++ /dev/null @@ -1,16 +0,0 @@ -$(document).ready(function() { - var $secondaryMenu = $('.secondary-menu__current-item'); - - if (!$secondaryMenu) { - return; - } - - var $list = $secondaryMenu.next(); - $list.addClass('hidden'); - - $secondaryMenu.on('click', function(event) { - event.preventDefault(); - - $list.toggleClass('hidden'); - }); -}); diff --git a/htdocs/templates/site/css/styles-without-compass.css b/htdocs/templates/site/css/styles-without-compass.css deleted file mode 100644 index 0779fed4a..000000000 --- a/htdocs/templates/site/css/styles-without-compass.css +++ /dev/null @@ -1,2 +0,0 @@ -#logo a { color: inherit; text-decoration: none; } -header #espace-membre {z-index:1000;} diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 58076ad0d..708a4224f 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -4892,12 +4892,6 @@ 'count' => 1, 'path' => __DIR__ . '/sources/AppBundle/Controller/Website/SecondaryMenuController.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Parameter \\#2 \\$parameters of method AppBundle\\\\Twig\\\\ViewRenderer\\:\\:render\\(\\) expects array, mixed given\\.$#', - 'identifier' => 'argument.type', - 'count' => 1, - 'path' => __DIR__ . '/sources/AppBundle/Controller/Website/Static/VoidAction.php', -]; $ignoreErrors[] = [ 'message' => '#^Binary operation "\\." between \'https\\://joind\\.in…\' and mixed results in an error\\.$#', 'identifier' => 'binaryOp.invalid', diff --git a/sources/AppBundle/Controller/Website/Static/VoidAction.php b/sources/AppBundle/Controller/Website/Static/VoidAction.php deleted file mode 100644 index a2519028c..000000000 --- a/sources/AppBundle/Controller/Website/Static/VoidAction.php +++ /dev/null @@ -1,24 +0,0 @@ -attributes->has('legacyContent')) { - $params = $request->attributes->get('legacyContent'); - } - - return $this->view->render('site/base.html.twig', $params); - } -} diff --git a/templates/admin/association/membership/_base.html.twig b/templates/admin/association/membership/_base.html.twig deleted file mode 100644 index 3f32000da..000000000 --- a/templates/admin/association/membership/_base.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends 'site/base.html.twig' %} - -{% block stylesheets %} - {{ parent() }} - -{% endblock %} - -{% block content %} - - {% block submenu %} - {% endblock %} - -
-
-

{% block page_title %}{% endblock %}

- - {% for bag in ['notice', 'success', 'error'] %} - {% for flash_message in app.session.flashBag.get(bag) %} -
- {{ flash_message }} -
- {% endfor %} - {% endfor %} - - {% block page_content %} - {% endblock %} -
-
-{% endblock %} - -{% block container_wrapper %} -
- {{ block("content") }} -
-{% endblock%} diff --git a/templates/site/base.html.twig b/templates/site/base.html.twig deleted file mode 100644 index 9f96d3b73..000000000 --- a/templates/site/base.html.twig +++ /dev/null @@ -1,130 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Afup - Association française des utilisateurs de PHP{% endblock %} - -{% block stylesheets %} - - - - - - - - -{% endblock %} - -{% block javascripts %} - - -{% endblock %} - -{% block header %} - {% autoescape false %} - -
- L'écosystème est en difficulté, - consultez la lettre ouverte. -
- -
-
-
- {% if app.user %} - {% if app.user.canAccessAdmin %} - Administration - {% endif %} - Se déconnecter - {% else %} - Se connecter - Adhérer - {% endif %} -
- - - -
 
-
-
- - {% endautoescape %} -{% endblock %} - -{% block content %} - {% autoescape false %} -
-
-
- {% block inner_content %} - {{ content }} - {% endblock %} -
-
-
- {% endautoescape %} -{% endblock %} - -{% block footer %} - {% autoescape false %} - - {% endautoescape %} -{% endblock %}