From 16f73bcee1c21fd7fcf289b5101e9e79c4b32b5d Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sat, 18 Mar 2023 23:30:48 +0100 Subject: [PATCH] cosmetic code review --- src/Config.php | 1 + src/Manage.php | 2 +- src/My.php | 2 +- src/module/cssheader.php | 1 - src/module/dcdeprecated.php | 9 +++------ 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Config.php b/src/Config.php index ef1c003..da7df86 100644 --- a/src/Config.php +++ b/src/Config.php @@ -49,6 +49,7 @@ class Config extends dcNsProcess dcCore::app()->error->add(sprintf(__('%s required php >= %s'), My::id(), My::PHP_MIN)); } } + return self::$init; } diff --git a/src/Manage.php b/src/Manage.php index f3fa2a2..b5e2db8 100644 --- a/src/Manage.php +++ b/src/Manage.php @@ -230,7 +230,7 @@ class Manage extends dcNsProcess echo dcPage::breadcrumb([ __('Plugins') => '', - My::name() => '', + My::name() => '', empty($_REQUEST['config']) ? (self::$type == 'theme' ? __('Themes actions') : __('Plugins actions')) : __('Configure module') => '', ]) . dcPage::notices(); diff --git a/src/My.php b/src/My.php index 998e364..51cfdb3 100644 --- a/src/My.php +++ b/src/My.php @@ -22,7 +22,7 @@ use dcCore; class My { /** @var string Required php version */ - public const PHP_MIN = '8.1'; + public const PHP_MIN = '8.0'; /** * This module id diff --git a/src/module/cssheader.php b/src/module/cssheader.php index b045466..7fcc438 100644 --- a/src/module/cssheader.php +++ b/src/module/cssheader.php @@ -32,7 +32,6 @@ use Dotclear\Helper\Html\Form\{ use Dotclear\Plugin\improve\Action; /* clearbricks */ -use form; use html; /* php */ diff --git a/src/module/dcdeprecated.php b/src/module/dcdeprecated.php index 2c0e21d..ecdde4f 100644 --- a/src/module/dcdeprecated.php +++ b/src/module/dcdeprecated.php @@ -43,14 +43,11 @@ class dcdeprecated extends Action return true; } - private function loadDeprecatedDefinition() + private function loadDeprecatedDefinition(): void { $path = path::real(__DIR__ . '/dcdeprecated'); - if (!$path) { - return []; - } - if (!is_dir($path) || !is_readable($path)) { - return []; + if (!$path || !is_dir($path) || !is_readable($path)) { + return; } $files = files::scandir($path);