diff options
author | Mario <mario@mariovavti.com> | 2024-05-07 09:04:45 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2024-05-07 09:04:45 +0000 |
commit | 11d7a4c9f744e2b9389191073cabe6d2be4a8145 (patch) | |
tree | 31bf9a1e0139f4222d06efa13bf4f3401de6181e | |
parent | 9dd63db736819ba15fd75821a8ea520f68a54ee3 (diff) | |
parent | bfa81490c1085978f6431e06025e2794f7232768 (diff) | |
download | volse-hubzilla-11d7a4c9f744e2b9389191073cabe6d2be4a8145.tar.gz volse-hubzilla-11d7a4c9f744e2b9389191073cabe6d2be4a8145.tar.bz2 volse-hubzilla-11d7a4c9f744e2b9389191073cabe6d2be4a8145.zip |
Merge branch 'rename-help-helper-trait' into 'dev'
Rename HelpHelper to HelpHelperTrait.
See merge request hubzilla/core!2124
-rw-r--r-- | Zotlabs/Lib/Traits/HelpHelperTrait.php (renamed from Zotlabs/Lib/Traits/HelpHelper.php) | 2 | ||||
-rw-r--r-- | Zotlabs/Module/Help.php | 2 | ||||
-rw-r--r-- | Zotlabs/Widget/Helpindex.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Traits/HelpHelper.php b/Zotlabs/Lib/Traits/HelpHelperTrait.php index f0dca35d0..b7711bbd5 100644 --- a/Zotlabs/Lib/Traits/HelpHelper.php +++ b/Zotlabs/Lib/Traits/HelpHelperTrait.php @@ -4,7 +4,7 @@ namespace Zotlabs\Lib\Traits; use CommerceGuys\Intl\Language\LanguageRepository; -trait HelpHelper { +trait HelpHelperTrait { // PHP versions before 8.2 does not support trait constants, // Leave this commented out until we drop support for PHP 8.1. diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index 00946368f..5d52440a5 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -14,7 +14,7 @@ use Michelf\MarkdownExtra; */ class Help extends \Zotlabs\Web\Controller { - use \Zotlabs\Lib\Traits\HelpHelper; + use \Zotlabs\Lib\Traits\HelpHelperTrait; private string $heading_slug = ''; diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 23261ca6f..5264e1947 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -12,7 +12,7 @@ namespace Zotlabs\Widget; class Helpindex { - use \Zotlabs\Lib\Traits\HelpHelper; + use \Zotlabs\Lib\Traits\HelpHelperTrait; private string $contents = ''; |