19 changed files with 115 additions and 83 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,3 @@
-enhancePostContent 2023.10.24
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1
-* Fix widgets
-
-enhancePostContent 2023.10.16
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1
-* Code review
-
 enhancePostContent 2023.10.13
 ===========================================================
 * Require Dotclear 2.28
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # README

-[![Release](https://img.shields.io/badge/release-2023.10.24-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/releases)
-![Date](https://img.shields.io/badge/date-2023.10.24-c44d58.svg)
+[![Release](https://img.shields.io/badge/release-2023.10.13-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/releases)
+![Date](https://img.shields.io/badge/date-2023.10.13-c44d58.svg)
 [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/enhancePostContent)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/src/branch/master/LICENSE)
@ -14,10 +14,10 @@ _enhancePostContent_ is a plugin for the open-source web publishing software cal

 ## REQUIREMENTS

+* admin permissions to set up plugin
+* content admin permissions to manage fitlers
 * Dotclear 2.28
 * PHP 8.1+
-* Dotclear admin permissions to set up plugin
-* Dotclear content admin permissions to manage fitlers

 ## USAGE

@ -40,6 +40,6 @@ you should also add widgets.

 ## CONTRIBUTORS

-* Jean-Christian Denis (author)
+* Jean-Christian Denis

 You are welcome to contribute to this code.
--- a/_define.php
+++ b/_define.php
@ -9,13 +9,14 @@
 * Add features to words in post content.
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 $this->registerModule(
    'Enhance post content',
    'Add features to words in post content',
    'Jean-Christian Denis and Contributors',
-    '2023.10.24',
+    '2023.10.13',
    [
        'type'        => 'plugin',
        'requires'    => [['core', '2.28']],
--- a/dcstore.xml
+++ b/dcstore.xml
@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
  <module id="enhancePostContent">
    <name>Enhance post content</name>
-    <version>2023.10.24</version>
+    <version>2023.10.13</version>
    <author>Jean-Christian Denis and Contributors</author>
    <desc>Add features to words in post content</desc>
-    <file>https://git.dotclear.watch/JcDenis/enhancePostContent/releases/download/v2023.10.24/plugin-enhancePostContent.zip</file>
+    <file>https://git.dotclear.watch/JcDenis/enhancePostContent/releases/download/v2023.10.13/plugin-enhancePostContent.zip</file>
    <da:dcmin>2.28</da:dcmin>
    <da:details>https://git.dotclear.watch/JcDenis/enhancePostContent/src/branch/master/README.md</da:details>
    <da:support>https://git.dotclear.watch/JcDenis/enhancePostContent/issues</da:support>
--- a/locales/en/resources.php
+++ b/locales/en/resources.php
@ -1,10 +1,17 @@
 <?php
 /**
- * @file
- * @brief       The plugin enhancePostContent resources
- * @ingroup     enhancePostContent
+ * @brief enhancePostContent, a plugin for Dotclear 2
 *
- * @author      Jean-Christian Denis
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
-\Dotclear\App::backend()->resources()->set('help', 'enhancePostContent', __DIR__ . '/help/help.html');
+if (!defined('DC_RC_PATH')) {
+    return;
+}
+
+dcCore::app()->resources['help']['enhancePostContent'] = __DIR__ . '/help/help.html';
--- a/locales/fr/resources.php
+++ b/locales/fr/resources.php
@ -1,10 +1,17 @@
 <?php
 /**
- * @file
- * @brief       The plugin enhancePostContent resources
- * @ingroup     enhancePostContent
+ * @brief enhancePostContent, a plugin for Dotclear 2
 *
- * @author      Jean-Christian Denis
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
-\Dotclear\App::backend()->resources()->set('help', 'enhancePostContent', __DIR__ . '/help/help.html');
+if (!defined('DC_RC_PATH')) {
+    return;
+}
+
+dcCore::app()->resources['help']['enhancePostContent'] = __DIR__ . '/help/help.html';
--- a/src/Backend.php
+++ b/src/Backend.php
@ -7,6 +7,7 @@ namespace Dotclear\Plugin\enhancePostContent;
 use ArrayObject;
 use Dotclear\App;
 use Dotclear\Core\Backend\Favorites;
+use Dotclear\Core\BlogSettings;
 use Dotclear\Core\Process;
 use Dotclear\Helper\Html\Form\{
    Checkbox,
@ -18,13 +19,13 @@ use Dotclear\Helper\Html\Form\{
    Para,
    Text
 };
-use Dotclear\Interface\Core\BlogSettingsInterface;

 /**
- * @brief       enhancePostContent backend class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent backend class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Backend extends Process
@ -54,7 +55,7 @@ class Backend extends Process
                ]);
            },
            // backend user preference form
-            'adminBlogPreferencesFormV2' => function (BlogSettingsInterface $blog_settings): void {
+            'adminBlogPreferencesFormV2' => function (BlogSettings $blog_settings): void {
                $active           = (bool) $blog_settings->get(My::id())->get('active');
                $allowedtplvalues = Epc::blogAllowedTemplateValue();
                $allowedpubpages  = Epc::blogAllowedTemplatePage();
@ -99,7 +100,7 @@ class Backend extends Process
                                        // allowedtplvalues
                                        (new Para())->items([
                                            (new Label(__('Allowed DC template values:'), Label::OUTSIDE_LABEL_BEFORE))->for('epc_allowedtplvalues'),
-                                            (new Input('epc_allowedtplvalues'))->size(100)->maxlength(0)->value(Epc::encodeMulti($allowedtplvalues)),
+                                            (new Input('epc_allowedtplvalues'))->size(100)->maxlenght(0)->value(Epc::encodeMulti($allowedtplvalues)),
                                        ]),
                                        (new Note())
                                            ->class('form-note')
@ -107,7 +108,7 @@ class Backend extends Process
                                        // allowedpubpages
                                        (new Para())->items([
                                            (new Label(__('Allowed public pages:'), Label::OUTSIDE_LABEL_BEFORE))->for('epc_allowedpubpages'),
-                                            (new Input('epc_allowedpubpages'))->size(100)->maxlength(0)->value(Epc::encodeMulti($allowedpubpages)),
+                                            (new Input('epc_allowedpubpages'))->size(100)->maxlenght(0)->value(Epc::encodeMulti($allowedpubpages)),
                                        ]),
                                        (new Note())
                                            ->class('form-note')
@ -120,7 +121,7 @@ class Backend extends Process
                    ->render();
            },
            // backend user preference save
-            'adminBeforeBlogSettingsUpdate' => function (BlogSettingsInterface $blog_settings): void {
+            'adminBeforeBlogSettingsUpdate' => function (BlogSettings $blog_settings): void {
                $active           = !empty($_POST['epc_active']);
                $allowedtplvalues = Epc::decodeMulti($_POST['epc_allowedtplvalues']);
                $allowedpubpages  = Epc::decodeMulti($_POST['epc_allowedpubpages']);
@ -145,7 +146,7 @@ class Backend extends Process
                ];
            },
            // widgets registration
-            'initWidgets' => Widgets::initWidgets(...),
+            'initWidgets' => [Widgets::class, 'initWidgets'],
        ]);

        return true;
--- a/src/BackendList.php
+++ b/src/BackendList.php
@ -14,10 +14,11 @@ use Dotclear\Helper\Html\Form\Checkbox;
 use Dotclear\Helper\Html\Html;

 /**
- * @brief       enhancePostContent filters list class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent filters list class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class BackendList extends Listing
--- a/src/Epc.php
+++ b/src/Epc.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief enhancePostContent, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);

 namespace Dotclear\Plugin\enhancePostContent;
@ -22,10 +32,11 @@ __('atom feeds');
 __('RSS feeds');

 /**
- * @brief       enhancePostContent main class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent main class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Epc
@ -110,22 +121,22 @@ class Epc
    /**
     * Get list of allowed templates name->[tag,callback] to list on epc widgets.
     *
-     * @return  array<string, array<string, mixed>>     The templates name->[id,cb] values
+     * @return  array   The templates name->[id,cb] values
     */
    public static function widgetAllowedTemplateValue(): array
    {
        $list = new ArrayObject([
            'entry excerpt' => [
                'id' => 'entryexcerpt',
-                'cb' => self::widgetContentEntryExcerpt(...),
+                'cb' => [self::class, 'widgetContentEntryExcerpt'],
            ],
            'entry content' => [
                'id' => 'entrycontent',
-                'cb' => self::widgetContentEntryContent(...),
+                'cb' => [self::class, 'widgetContentEntryContent'],
            ],
            'comment content' => [
                'id' => 'commentcontent',
-                'cb' => self::widgetContentCommentContent(...),
+                'cb' => [self::class, 'widgetContentCommentContent'],
            ],
        ]);

@ -415,7 +426,7 @@ class Epc

        $content = '';
        while (App::frontend()->context()->__get('posts')?->fetch()) {
-            $content .= App::frontend()->context()->__get('posts')->f('post_excerpt');
+            $content .= App::frontend()->__get('posts')->f('post_excerpt');
        }

        return $content;
--- a/src/EpcFilter.php
+++ b/src/EpcFilter.php
@ -10,12 +10,13 @@ use Dotclear\Plugin\widgets\WidgetsElement;
 use Exception;

 /**
- * @brief       enhancePostContent abstract filter class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent abstract filter class.
+ * @ingroup enhancePostContent
 *
 * All filter must extends this class.
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 abstract class EpcFilter
--- a/src/EpcFilters.php
+++ b/src/EpcFilters.php
@ -5,21 +5,18 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\enhancePostContent;

 /**
- * @brief       enhancePostContent filters stack.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent filters stack.
+ * @ingroup enhancePostContent
 *
 * Use Epc::getFilters() to get loaded stack
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class EpcFilters
 {
-    /**
-     * The filters stack.
-     *
-     * @var     array<int, EpcFilter>    $stack
-     */
+    /** @var 	array<int,EpcFilter> 	$satck 	The filters stack */
    private array $stack = [];

    /**
--- a/src/EpcRecord.php
+++ b/src/EpcRecord.php
@ -12,10 +12,11 @@ use Dotclear\Database\{
 use Exception;

 /**
- * @brief       enhancePostContent filters records.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent filters records.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class EpcRecord
--- a/src/Frontend.php
+++ b/src/Frontend.php
@ -8,10 +8,11 @@ use Dotclear\App;
 use Dotclear\Core\Process;

 /**
- * @brief       enhancePostContent frontend class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent frontend class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Frontend extends Process
@ -49,7 +50,7 @@ class Frontend extends Process
                }
            },
            // Widgets
-            'initWidgets' => Widgets::initWidgets(...),
+            'initWidgets' => [Widgets::class, 'initWidgets'],
        ]);

        return true;
--- a/src/Install.php
+++ b/src/Install.php
@ -10,10 +10,11 @@ use Dotclear\Database\Structure;
 use Exception;

 /**
- * @brief       enhancePostContent installation class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent installation class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Install extends Process
--- a/src/Manage.php
+++ b/src/Manage.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief enhancePostContent, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);

 namespace Dotclear\Plugin\enhancePostContent;
@ -33,10 +43,11 @@ use Dotclear\Helper\Network\Http;
 use Exception;

 /**
- * @brief       enhancePostContent manage class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent manage class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Manage extends Process
@ -265,7 +276,7 @@ class Manage extends Process
                        ->for('filter_style' . $k),
                    (new Input(['filter_style[]', 'filter_style' . $k]))
                        ->size(60)
-                        ->maxlength(255)
+                        ->maxlenght(255)
                        ->value(Html::escapeHTML($filter->style[$k])),
                ]);
        }
@ -337,7 +348,7 @@ class Manage extends Process
                                                    ->for('filter_notag'),
                                                (new Input('filter_notag'))
                                                    ->size(60)
-                                                    ->maxlength(255)
+                                                    ->maxlenght(255)
                                                    ->value(Epc::encodeSingle($filter->notag)),
                                            ]),
                                        (new Note())
@ -406,7 +417,7 @@ class Manage extends Process
                                        ->for('new_key'),
                                    (new Input('new_key'))
                                        ->size(60)
-                                        ->maxlength(255)
+                                        ->maxlenght(255)
                                        ->required(true),
                                ]),
                            (new Para())
@ -415,7 +426,7 @@ class Manage extends Process
                                        ->for('new_value'),
                                    (new Input('new_value'))
                                        ->size(60)
-                                        ->maxlength(255)
+                                        ->maxlenght(255)
                                        ->required(true),
                                ]),
                            (new Para())
--- a/src/My.php
+++ b/src/My.php
@ -8,10 +8,11 @@ use Dotclear\App;
 use Dotclear\Module\MyPlugin;

 /**
- * @brief       enhancePostContent My helper.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent My helper.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class My extends MyPlugin
--- a/src/Prepend.php
+++ b/src/Prepend.php
@ -9,10 +9,11 @@ use Dotclear\Core\Process;
 use Dotclear\Helper\Html\Html;

 /**
- * @brief       enhancePostContent prepend class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent prepend class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Prepend extends Process
@ -29,7 +30,7 @@ class Prepend extends Process
        }

        // register epc filters
-        App::behavior()->addBehavior('enhancePostContentFilters', function (EpcFilters $stack): void {
+        app::behavior()->addBehavior('enhancePostContentFilters', function (EpcFilters $stack): void {
            foreach (Epc::DEFAULT_FILTERS as $class) {
                $stack->add(new $class());
            }
--- a/src/Uninstall.php
+++ b/src/Uninstall.php
@ -8,10 +8,11 @@ use Dotclear\Core\Process;
 use Dotclear\Plugin\Uninstaller\Uninstaller;

 /**
- * @brief       enhancePostContent uninstall class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent uninstall class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Uninstall extends Process
--- a/src/Widgets.php
+++ b/src/Widgets.php
@ -11,10 +11,11 @@ use Dotclear\Plugin\widgets\WidgetsStack;
 use Dotclear\Plugin\widgets\WidgetsElement;

 /**
- * @brief       enhancePostContent widgets class.
- * @ingroup     enhancePostContent
+ * @brief   enhancePostContent widgets class.
+ * @ingroup enhancePostContent
 *
 * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
 * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
 class Widgets
@ -29,7 +30,7 @@ class Widgets
        $w->create(
            'epclist',
            My::name(),
-            self::parseWidget(...),
+            [self::class, 'parseWidget'],
            null,
            __('List filtered contents.')
        );