Merge branch 'release/2.1.0'

galette · Jun 7, 2024 · 81b6c92 · 81b6c92
2 parents 5ccb3f3 + 046532b
commit 81b6c92
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 162 deletions.
diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
@@ -15,6 +15,12 @@
     "static", "self", "parent",
     "array", "bool", "callable", "float", "int", "iterable", "object", "string", "void",
 
+    "// random native PHP functions",
+    "// these are moved in random native extension in PHP 8.2, but this extension does not exists in previous PHP versions",
+    "mt_rand",
+    "rand",
+    "random_int",
+
     "// Galette constants (not detected as they are dynamically declared)",
     "GALETTE_ATTACHMENTS_PATH",
     "GALETTE_BASE_PATH",
@@ -24,14 +30,18 @@
     "GALETTE_CARD_ROWS",
     "GALETTE_CARD_WIDTH",
     "GALETTE_COMPAT_VERSION",
+    "GALETTE_SYSCONFIG_PATH",
     "GALETTE_CONFIG_PATH",
     "GALETTE_DATA_PATH",
     "GALETTE_DB_VERSION",
+    "GALETTE_DOCUMENTS_PATH",
+    "GALETTE_DOWNLOADS_URI",
     "GALETTE_EXPORTS_PATH",
     "GALETTE_FILES_PATH",
     "GALETTE_IMPORTS_PATH",
     "GALETTE_LOGS_PATH",
     "GALETTE_MODE",
+    "GALETTE_DEBUG",
     "GALETTE_NIGHTLY",
     "GALETTE_PHOTOS_PATH",
     "GALETTE_PLUGINS_PATH",
@@ -49,11 +59,6 @@
     "GALETTE_PGSQL_MIN",
     "GALETTE_DISPLAY_VERSION",
     "GALETTE_PHP_MIN",
-    "_T",
-    "__",
-    "_Tn",
-    "_Tx",
-    "_Tnx",
 
     "// Galette db constants (not detected as they are dynamically declared)",
     "HOST_DB",
@@ -71,12 +76,14 @@
 
     "//know but not detected Galette function,",
     "remove_remarks",
-    "custom_html_entity_decode",
-    "get_form_value",
-    "get_numeric_form_value",
     "isValidWebUrl",
     "remove_remarks",
     "split_sql_file",
+    "_T",
+    "__",
+    "_Tn",
+    "_Tx",
+    "_Tnx",
 
     "// XHProf PECL extension",
     "XHProfRuns_Default",
@@ -95,12 +102,7 @@
     "DI\\Container",
     "DI\\ContainerBuilder",
     "DI\\Bridge\\Slim\\App",
-
-    "// Should not error (not used) but...",
-    "mt_rand",
-    "rand",
-    "random_int",
-
+    "DI\\Attribute\\Inject",
 
     "// Not detected, do not know why.",
     "Psr\\Http\\Server\\RequestHandlerInterface"

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -63,7 +63,7 @@ jobs:
       - name: CS
         run: |
           cd galette-core/galette/plugins/plugin-fullcard
-          ../../vendor/bin/phpcs -n -p --standard=../../../phpcs-rules.xml lib/ ./*.php
+          ../../vendor/bin/phpcs lib/ ./*.php
 
       - name: Check missing symbols
         run: |
@@ -76,3 +76,8 @@ jobs:
           cd galette-core/galette/plugins/plugin-fullcard
           ../../vendor/bin/phpstan analyze --ansi --memory-limit=2G --no-interaction --no-progress
         if: matrix.php-versions == '8.1'
+
+      - name: Headers checks
+        run: |
+          cd galette-core/galette/plugins/plugin-fullcard
+          ../../vendor/bin/docheader --docheader=../../../.docheader check lib ./*.php
diff --git a/_config.inc.php b/_config.inc.php
@@ -1,15 +1,9 @@
 <?php
 
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
- * Configuration file for FullCard plugin
- *
- * PHP version 5
- *
- * Copyright © 2011-2014 The Galette Team
+ * Copyright © 2003-2024 The Galette Team
  *
- * This file is part of Galette (http://galette.tuxfamily.org).
+ * This file is part of Galette (https://galette.eu).
  *
  * Galette is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,16 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugins
- * @package   GaletteFullcard
- *
- * @author    Johan Cwiklinski <[email protected]>
- * @copyright 2011-2014 The Galette Team
- * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @version   SVN: $Id$
- * @link      http://galette.tuxfamily.org
- * @since     Available since 0.7dev - 2011-06-01
  */
 
+declare(strict_types=1);
+
 define('FULLCARD_SMARTY_PREFIX', 'plugins_fullcard');
diff --git a/_define.php b/_define.php
@@ -1,13 +1,7 @@
 <?php
 
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
- * Configuration file for FullCard plugin
- *
- * PHP version 5
- *
- * Copyright © 2011-2023 The Galette Team
+ * Copyright © 2003-2024 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *
@@ -23,24 +17,17 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugins
- * @package   GaletteFullcard
- *
- * @author    Johan Cwiklinski <[email protected]>
- * @copyright 2011-2023 The Galette Team
- * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @version   SVN: $Id$
- * @link      https://galette.eu
  */
 
+declare(strict_types=1);
+
 $this->register(
     'Galette Fullcard',         //Name
     'Full member card as PDF',  //Short description
     'Johan Cwiklinski',         //Author
-    '2.0.0',                    //Version
-    '1.0.0',                    //Galette compatible version
+    '2.1.0',                    //Version
+    '1.1.0',                    //Galette compatible version
     'fullcard',                 //routing name
-    '2023-12-07',               //Release date
+    '2024-06-08',               //Release date
     []                          //Permissions needed
 );
diff --git a/_preferences.php b/_preferences.php
@@ -1,15 +1,9 @@
 <?php
 
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
- * Preferences override file for FullCard plugin
- *
- * PHP version 5
- *
- * Copyright © 2016 The Galette Team
+ * Copyright © 2003-2024 The Galette Team
  *
- * This file is part of Galette (http://galette.tuxfamily.org).
+ * This file is part of Galette (https://galette.eu).
  *
  * Galette is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,18 +17,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugins
- * @package   GaletteFullcard
- *
- * @author    Johan Cwiklinski <[email protected]>
- * @copyright 2016 The Galette Team
- * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @version   SVN: $Id$
- * @link      http://galette.tuxfamily.org
- * @since     Available since 0.8.3 - 2016-10-15
  */
 
+declare(strict_types=1);
+
 $_preferences = array(
     'pref_adhesion_form' => '\GaletteFullcard\PdfFullcard'
 );
diff --git a/_routes.php b/_routes.php
@@ -1,15 +1,9 @@
 <?php
 
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
- * Fullcard routes
- *
- * PHP version 5
- *
- * Copyright © 2016 The Galette Team
+ * Copyright © 2003-2024 The Galette Team
  *
- * This file is part of Galette (http://galette.tuxfamily.org).
+ * This file is part of Galette (https://galette.eu).
  *
  * Galette is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,18 +17,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugins
- * @package   GaletteMaps
- *
- * @author    Johan Cwiklinski <[email protected]>
- * @copyright 2016 The Galette Team
- * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @version   SVN: $Id$
- * @link      http://galette.tuxfamily.org
- * @since     0.9dev 2016-03-02
  */
 
+declare(strict_types=1);
+
 use GaletteFullcard\PdfFullcard;
 use Galette\Entity\Adherent;
 use Analog\Analog;