From b154d2c5384e1e26cebffbde8b6600e3f4239640 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 4 May 2026 19:22:51 +0200 Subject: [PATCH 1/2] No longer rely on global --- _routes.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_routes.php b/_routes.php index e674337..aeff46d 100644 --- a/_routes.php +++ b/_routes.php @@ -21,6 +21,7 @@ declare(strict_types=1); +use Galette\Middleware\Authenticate; use GaletteHelloasso\Controllers\HelloassoController; //Constants and classes from plugin @@ -29,12 +30,12 @@ $app->get( '/preferences', [HelloassoController::class, 'preferences'] -)->setName('helloasso_preferences')->add($authenticate); +)->setName('helloasso_preferences')->add(Authenticate::class); $app->post( '/preferences', [HelloassoController::class, 'storePreferences'] -)->setName('store_helloasso_preferences')->add($authenticate); +)->setName('store_helloasso_preferences')->add(Authenticate::class); $app->get( '/form', @@ -49,13 +50,13 @@ $app->get( '/logs[/{option:order|reset|page}/{value}]', [HelloassoController::class, 'logs'] -)->setName('helloasso_history')->add($authenticate); +)->setName('helloasso_history')->add(Authenticate::class); //history filtering $app->post( '/history/filter', [HelloassoController::class, 'filter'] -)->setName('filter_helloasso_history')->add($authenticate); +)->setName('filter_helloasso_history')->add(Authenticate::class); $app->post( '/webhook', From 9b33c59da7275758818130893fe630aa455b1ad4 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 4 May 2026 19:47:05 +0200 Subject: [PATCH 2/2] Fix headers check --- .github/workflows/ci-linux.yml | 8 +++++-- _config.inc.php | 17 ++----------- _define.php | 17 ++----------- _routes.php | 17 ++----------- bin/release | 6 +++++ .../Controllers/HelloassoController.php | 17 ++----------- lib/GaletteHelloasso/Helloasso.php | 17 ++----------- lib/GaletteHelloasso/HelloassoHistory.php | 17 ++----------- .../PluginGaletteHelloasso.php | 17 ++----------- scripts/mysql.sql | 5 +++- scripts/pgsql.sql | 5 +++- templates/default/headers.html.twig | 24 ++++--------------- templates/default/helloasso_error.html.twig | 24 ++++--------------- templates/default/helloasso_form.html.twig | 24 ++++--------------- templates/default/helloasso_history.html.twig | 24 ++++--------------- .../default/helloasso_preferences.html.twig | 24 ++++--------------- templates/default/helloasso_success.html.twig | 24 ++++--------------- .../tests/units/Helloasso.php | 17 ++----------- tests/TestsBootstrap.php | 17 ++----------- webroot/galette_helloasso.css | 6 +++++ 20 files changed, 74 insertions(+), 253 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index b8ea013..e71eb7e 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -87,8 +87,12 @@ jobs: - name: Headers checks run: | - cd galette-core/galette/plugins/plugin-helloasso - ../../vendor/bin/docheader --docheader=.docheader check lib ./*.php + cd galette-core + ./bin/console galette:headers:check \ + --project-name="Galette Helloasso plugin" \ + --project-url="https://galette-community.github.io/plugin-helloasso" \ + --start-year="2025" \ + --directory="galette/plugins/plugin-helloasso" unit-tests: runs-on: ubuntu-latest diff --git a/_config.inc.php b/_config.inc.php index f567b4a..16580ed 100644 --- a/_config.inc.php +++ b/_config.inc.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/_define.php b/_define.php index b8d9d4a..2308c6b 100644 --- a/_define.php +++ b/_define.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/_routes.php b/_routes.php index aeff46d..3b89421 100644 --- a/_routes.php +++ b/_routes.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/bin/release b/bin/release index 87e5e56..e46cb23 100755 --- a/bin/release +++ b/bin/release @@ -1,5 +1,11 @@ #!/usr/bin/python +/** + * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later + */ + import os, sys, argparse, re, git, http.client, subprocess, glob import urlgrabber.progress, tarfile, shutil, gitdb, time, fnmatch from datetime import datetime diff --git a/lib/GaletteHelloasso/Controllers/HelloassoController.php b/lib/GaletteHelloasso/Controllers/HelloassoController.php index c7335cf..d51ad43 100644 --- a/lib/GaletteHelloasso/Controllers/HelloassoController.php +++ b/lib/GaletteHelloasso/Controllers/HelloassoController.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/lib/GaletteHelloasso/Helloasso.php b/lib/GaletteHelloasso/Helloasso.php index 0001ed1..be6a670 100644 --- a/lib/GaletteHelloasso/Helloasso.php +++ b/lib/GaletteHelloasso/Helloasso.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/lib/GaletteHelloasso/HelloassoHistory.php b/lib/GaletteHelloasso/HelloassoHistory.php index 4c0f8b8..8eb7035 100644 --- a/lib/GaletteHelloasso/HelloassoHistory.php +++ b/lib/GaletteHelloasso/HelloassoHistory.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/lib/GaletteHelloasso/PluginGaletteHelloasso.php b/lib/GaletteHelloasso/PluginGaletteHelloasso.php index 0d26a8d..8ce7715 100644 --- a/lib/GaletteHelloasso/PluginGaletteHelloasso.php +++ b/lib/GaletteHelloasso/PluginGaletteHelloasso.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ declare(strict_types=1); diff --git a/scripts/mysql.sql b/scripts/mysql.sql index f8c95c1..ddabf3c 100644 --- a/scripts/mysql.sql +++ b/scripts/mysql.sql @@ -1,6 +1,9 @@ -- --- Table structure for table `galette_helloasso_history` +-- This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). +-- SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team +-- SPDX-License-Identifier: GPL-3.0-or-later -- + DROP TABLE IF EXISTS galette_helloasso_history; CREATE TABLE galette_helloasso_history ( id_helloasso int(11) NOT NULL auto_increment, diff --git a/scripts/pgsql.sql b/scripts/pgsql.sql index b8d898a..c6a0b2e 100644 --- a/scripts/pgsql.sql +++ b/scripts/pgsql.sql @@ -1,6 +1,9 @@ -- --- Table structure for table galette_helloasso_history +-- This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). +-- SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team +-- SPDX-License-Identifier: GPL-3.0-or-later -- + DROP SEQUENCE IF EXISTS galette_helloasso_history_id_seq; CREATE SEQUENCE galette_helloasso_history_id_seq START 1 diff --git a/templates/default/headers.html.twig b/templates/default/headers.html.twig index b8e85df..47e11e6 100644 --- a/templates/default/headers.html.twig +++ b/templates/default/headers.html.twig @@ -1,21 +1,7 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + diff --git a/templates/default/helloasso_error.html.twig b/templates/default/helloasso_error.html.twig index 19cee1b..e2a0566 100644 --- a/templates/default/helloasso_error.html.twig +++ b/templates/default/helloasso_error.html.twig @@ -1,23 +1,9 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + {% extends not login.isLogged() ? "public_page.html.twig" : "page.html.twig" %} {% block content %} diff --git a/templates/default/helloasso_form.html.twig b/templates/default/helloasso_form.html.twig index ef14262..9c2c735 100644 --- a/templates/default/helloasso_form.html.twig +++ b/templates/default/helloasso_form.html.twig @@ -1,23 +1,9 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + {% extends not login.isLogged() ? "public_page.html.twig" : "page.html.twig" %} {% block content %} diff --git a/templates/default/helloasso_history.html.twig b/templates/default/helloasso_history.html.twig index a2ae603..58f7d04 100644 --- a/templates/default/helloasso_history.html.twig +++ b/templates/default/helloasso_history.html.twig @@ -1,23 +1,9 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + {% extends 'elements/list.html.twig' %} {% set filters = helloasso_history.filters %} diff --git a/templates/default/helloasso_preferences.html.twig b/templates/default/helloasso_preferences.html.twig index 5dd218b..8596008 100644 --- a/templates/default/helloasso_preferences.html.twig +++ b/templates/default/helloasso_preferences.html.twig @@ -1,23 +1,9 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + {% extends 'page.html.twig' %} {% block content %} diff --git a/templates/default/helloasso_success.html.twig b/templates/default/helloasso_success.html.twig index bfa75fa..900342b 100644 --- a/templates/default/helloasso_success.html.twig +++ b/templates/default/helloasso_success.html.twig @@ -1,23 +1,9 @@ {# -/** - * Copyright © 2003-2025 The Galette Team - * - * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). - * - * Galette is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Galette is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Galette. If not, see . - */ -#} + # This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + # SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + {% extends not login.isLogged() ? "public_page.html.twig" : "page.html.twig" %} {% block content %} diff --git a/tests/GaletteHelloasso/tests/units/Helloasso.php b/tests/GaletteHelloasso/tests/units/Helloasso.php index 35803a8..f5b0ee3 100644 --- a/tests/GaletteHelloasso/tests/units/Helloasso.php +++ b/tests/GaletteHelloasso/tests/units/Helloasso.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ namespace GaletteHelloasso\tests\units; diff --git a/tests/TestsBootstrap.php b/tests/TestsBootstrap.php index f9af496..2c582b5 100644 --- a/tests/TestsBootstrap.php +++ b/tests/TestsBootstrap.php @@ -1,22 +1,9 @@ . + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later */ /** diff --git a/webroot/galette_helloasso.css b/webroot/galette_helloasso.css index 0dbec82..63c57a0 100644 --- a/webroot/galette_helloasso.css +++ b/webroot/galette_helloasso.css @@ -1,3 +1,9 @@ +/*! + * This file is part of Galette Helloasso plugin (https://galette-community.github.io/plugin-helloasso). + * SPDX-FileCopyrightText: Copyright © 2025-2026 The Galette Team + * SPDX-License-Identifier: GPL-3.0-or-later + */ + @font-face { font-family: "Helloasso"; src: