From 5d5ccaf9b005a2f261ef554e960bc752ccae6e9e Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sat, 7 Oct 2023 22:18:57 +0200 Subject: [PATCH] release 1.6 --- CHANGELOG.md | 6 ++++++ README.md | 33 +++++++++++++++------------------ _define.php | 12 +++++++----- dcstore.xml | 6 +++--- src/CleanURLs.php | 6 +++--- src/Prepend.php | 4 ++-- 6 files changed, 36 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 335ed36..af839c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +cleanURLs 1.6 - 2023.10.07 +=========================================================== +* Require Dotclear 2.28 +* Require PHP 8.1+ +* Upgrade to Dotclear 2.28 + cleanURLs 1.5 - 2023.08.06 =========================================================== * Require Dotclear 2.27 diff --git a/README.md b/README.md index eecb953..48cebbf 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,20 @@ # README -[![Release](https://img.shields.io/badge/release-1.5-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/cleanURLs/releases) -[![Date](https://img.shields.io/badge/date-2023.08.06-c44d58.svg)](https://git.dotclear.watch/JcDenis/cleanURLs/releases) -[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-137bbb.svg)](https://fr.dotclear.org/download) +[![Release](https://img.shields.io/badge/release-1.6-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/cleanURLs/releases) +![Date](https://img.shields.io/badge/date-2023.10.07-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/cleanURLs) -[![License](https://img.shields.io/github/license/JcDenis/cleanURLs)](https://git.dotclear.watch/JcDenis/cleanURLs/blob/master/LICENSE) +[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/cleanURLs/src/branch/master/LICENSE) -## WHAT IS ENHANCEPOSTCONTENT ? +## ABOUT -"Clean URLs" is a plugin for the open-source -web publishing software called Dotclear. +_cleanUrls_ is a plugin for the open-source web publishing software called [Dotclear](https://www.dotclear.org). -It removes diacritics and punctuation from URLs... +> It removes diacritics and punctuation from URLs... ## REQUIREMENTS - _cleanURLs_ requires: - - * Dotclear 2.27 +* Dotclear 2.28 ## USAGE @@ -28,14 +25,14 @@ Then when a post is created, it's URL is cleaned automagically. ## LINKS - * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) - * Source & contribution : [Gitea Page](https://git.dotclear.watch/JcDenis/cleanURLs) or [GitHub Page](https://github.com/JcDenis/cleanURLs) - * Packages & details: [Gitea Page](https://git.dotclear.watch/JcDenis/cleanURLs/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/cleanURLs) - * Discuss and help : [Dotclear Forum](http://forum.dotclear.org/viewtopic.php?id=40876) +* [License](https://git.dotclear.watch/JcDenis/cleanURLs/src/branch/master/LICENSE) +* [Packages & details](https://git.dotclear.watch/JcDenis/cleanURLs/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/cleanURLs)) +* [Sources & contributions](https://git.dotclear.watch/JcDenis/cleanURLs) (or on [GitHub](https://github.com/JcDenis/cleanURLs)) +* [Issues & security](https://git.dotclear.watch/JcDenis/cleanURLs/issues) (or on [GitHub](https://github.com/JcDenis/cleanURLs/issues)) ## CONTRIBUTORS - * Pierre Rudloff (author) - * Jean-Christian Denis +* Pierre Rudloff (author) +* Jean-Christian Denis - You are welcome to contribute to this code. \ No newline at end of file +You are welcome to contribute to this code. diff --git a/_define.php b/_define.php index 8bc1dca..54c5ca3 100644 --- a/_define.php +++ b/_define.php @@ -14,16 +14,18 @@ if (!defined('DC_RC_PATH')) { return; } +use Dotclear\App; + $this->registerModule( 'Clean URLs', 'Removes diacritics and punctuation from URLs', 'Pierre Rudloff and contributors', - '1.5', + '1.6', [ - 'requires' => [['core', '2.27']], - 'permissions' => dcCore::app()->auth->makePermissions([ - dcCore::app()->auth::PERMISSION_USAGE, - dcCore::app()->auth::PERMISSION_CONTENT_ADMIN, + 'requires' => [['core', '2.28']], + 'permissions' => App::auth()->makePermissions([ + App::auth()::PERMISSION_USAGE, + App::auth()::PERMISSION_CONTENT_ADMIN, ]), 'type' => 'plugin', 'support' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues', diff --git a/dcstore.xml b/dcstore.xml index 8d4849d..fbd0b10 100644 --- a/dcstore.xml +++ b/dcstore.xml @@ -2,11 +2,11 @@ Clean URLs - 1.5 + 1.6 Pierre Rudloff and contributors Removes diacritics and punctuation from URLs - https://git.dotclear.watch/JcDenis/cleanURLs/releases/download/v1.5/plugin-cleanURLs.zip - 2.27 + https://git.dotclear.watch/JcDenis/cleanURLs/releases/download/v1.6/plugin-cleanURLs.zip + 2.28 https://git.dotclear.watch/JcDenis/cleanURLs/src/branch/master/README.md https://git.dotclear.watch/JcDenis/cleanURLs/issues diff --git a/src/CleanURLs.php b/src/CleanURLs.php index 20a9b0d..a13befb 100644 --- a/src/CleanURLs.php +++ b/src/CleanURLs.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Dotclear\Plugin\cleanURLs; -use dcBlog; +use Dotclear\Core\Blog; use Dotclear\Database\Cursor; /** @@ -269,10 +269,10 @@ class CleanURLs /** * Clean post URLs from diacritics and punctuation. * - * @param dcBlog $blog The blog instance + * @param Blog $blog The blog instance * @param Cursor $cur The post Cursor * */ - public static function cleanPost(dcBlog $blog, Cursor $cur): void + public static function cleanPost(Blog $blog, Cursor $cur): void { $cur->setField('post_url', self::cleanStr($cur->getField('post_url'))); } diff --git a/src/Prepend.php b/src/Prepend.php index 9eb3d25..4ac6684 100644 --- a/src/Prepend.php +++ b/src/Prepend.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Dotclear\Plugin\cleanURLs; -use dcCore; +use Dotclear\App; use Dotclear\Core\Process; class Prepend extends Process @@ -30,7 +30,7 @@ class Prepend extends Process return false; } - dcCore::app()->addBehavior('coreBeforePostCreate', [CleanURLs::class, 'cleanPost']); + App::behavior()->addBehavior('coreBeforePostCreate', CleanURLs::cleanPost(...)); return true; }