diff options
author | Andreas Gohr <andi@splitbrain.org> | 2023-08-30 17:05:28 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2023-08-30 17:05:28 +0200 |
commit | 8c7c53b0321a3cd3116b8d3b2ad27863a38dece7 (patch) | |
tree | 7962575f2b88ded7d3252558f8791d10ce0e3df0 | |
parent | c1482d1c08360e6401534a1391da2b650c37d34d (diff) | |
download | dokuwiki-8c7c53b0321a3cd3116b8d3b2ad27863a38dece7.tar.gz dokuwiki-8c7c53b0321a3cd3116b8d3b2ad27863a38dece7.zip |
codestyle adjustments: class declaration braces
163 files changed, 155 insertions, 189 deletions
diff --git a/_test/phpcs_MigrationAdjustments.xml b/_test/phpcs_MigrationAdjustments.xml index b1f226faf..bc85aad09 100644 --- a/_test/phpcs_MigrationAdjustments.xml +++ b/_test/phpcs_MigrationAdjustments.xml @@ -37,8 +37,6 @@ <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/> <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EndLine"/> - <exclude name="PSR2.Classes.ClassDeclaration.CloseBraceAfterBody"/> - <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/> <exclude name="PSR2.Classes.PropertyDeclaration.StaticBeforeVisibility"/> <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/> <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpaceBeforeCloseBrace"/> diff --git a/bin/dwpage.php b/bin/dwpage.php index d4b56b3cf..eef71728c 100755 --- a/bin/dwpage.php +++ b/bin/dwpage.php @@ -12,7 +12,8 @@ require_once(DOKU_INC . 'inc/init.php'); /** * Checkout and commit pages from the command line while maintaining the history */ -class PageCLI extends CLI { +class PageCLI extends CLI +{ protected $force = false; protected $username = ''; diff --git a/bin/gittool.php b/bin/gittool.php index a621f6dee..df14e5825 100755 --- a/bin/gittool.php +++ b/bin/gittool.php @@ -13,7 +13,8 @@ require_once(DOKU_INC . 'inc/init.php'); * * @author Andreas Gohr <andi@splitbrain.org> */ -class GitToolCLI extends CLI { +class GitToolCLI extends CLI +{ /** * Register options and arguments on the given $options object diff --git a/bin/indexer.php b/bin/indexer.php index 2780dd0b8..f533c723b 100755 --- a/bin/indexer.php +++ b/bin/indexer.php @@ -11,7 +11,8 @@ require_once(DOKU_INC . 'inc/init.php'); /** * Update the Search Index from command line */ -class IndexerCLI extends CLI { +class IndexerCLI extends CLI +{ private $quiet = false; private $clear = false; diff --git a/bin/plugin.php b/bin/plugin.php index 479980bf1..2bfa3858e 100755 --- a/bin/plugin.php +++ b/bin/plugin.php @@ -12,7 +12,8 @@ if(!defined('DOKU_INC')) define('DOKU_INC', realpath(__DIR__ . '/../') . '/'); define('NOSESSION', 1); require_once(DOKU_INC . 'inc/init.php'); -class PluginCLI extends CLI { +class PluginCLI extends CLI +{ /** * Register options and arguments on the given $options object diff --git a/bin/render.php b/bin/render.php index 909dd2604..b74da2d21 100755 --- a/bin/render.php +++ b/bin/render.php @@ -19,7 +19,8 @@ require_once(DOKU_INC . 'inc/init.php'); * @license GPL2 * @author Andreas Gohr <andi@splitbrain.org> */ -class RenderCLI extends CLI { +class RenderCLI extends CLI +{ /** * Register options and arguments on the given $options object diff --git a/bin/striplangs.php b/bin/striplangs.php index 3ec1c6339..a00bdefcc 100755 --- a/bin/striplangs.php +++ b/bin/striplangs.php @@ -11,7 +11,8 @@ require_once(DOKU_INC . 'inc/init.php'); /** * Remove unwanted languages from a DokuWiki install */ -class StripLangsCLI extends CLI { +class StripLangsCLI extends CLI +{ /** * Register options and arguments on the given $options object diff --git a/bin/wantedpages.php b/bin/wantedpages.php index 6ad2441de..d4eefee72 100755 --- a/bin/wantedpages.php +++ b/bin/wantedpages.php @@ -13,7 +13,8 @@ require_once(DOKU_INC . 'inc/init.php'); /** * Find wanted pages */ -class WantedPagesCLI extends CLI { +class WantedPagesCLI extends CLI +{ protected const DIR_CONTINUE = 1; protected const DIR_NS = 2; diff --git a/inc/Action/AbstractAclAction.php b/inc/Action/AbstractAclAction.php index 871edb0ae..01fc6c829 100644 --- a/inc/Action/AbstractAclAction.php +++ b/inc/Action/AbstractAclAction.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionAclRequiredException; * * @package dokuwiki\Action */ -abstract class AbstractAclAction extends AbstractAction { +abstract class AbstractAclAction extends AbstractAction +{ /** @inheritdoc */ public function checkPreconditions() { @@ -21,5 +22,4 @@ abstract class AbstractAclAction extends AbstractAction { if(!$conf['useacl']) throw new ActionAclRequiredException(); if(!$auth) throw new ActionAclRequiredException(); } - } diff --git a/inc/Action/AbstractAction.php b/inc/Action/AbstractAction.php index 37eab3a8e..21616cfcb 100644 --- a/inc/Action/AbstractAction.php +++ b/inc/Action/AbstractAction.php @@ -12,7 +12,8 @@ use dokuwiki\Action\Exception\FatalException; * * @package dokuwiki\Action */ -abstract class AbstractAction { +abstract class AbstractAction +{ /** @var string holds the name of the action (lowercase class name, no namespace) */ protected $actionname; diff --git a/inc/Action/AbstractAliasAction.php b/inc/Action/AbstractAliasAction.php index 771664a37..61d62841a 100644 --- a/inc/Action/AbstractAliasAction.php +++ b/inc/Action/AbstractAliasAction.php @@ -14,7 +14,8 @@ use dokuwiki\Action\Exception\FatalException; * * @package dokuwiki\Action */ -abstract class AbstractAliasAction extends AbstractAction { +abstract class AbstractAliasAction extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -27,5 +28,4 @@ abstract class AbstractAliasAction extends AbstractAction { public function preProcess() { throw new FatalException('Alias Actions need to implement preProcess to load the aliased action'); } - } diff --git a/inc/Action/AbstractUserAction.php b/inc/Action/AbstractUserAction.php index 233f52edb..8f710ab77 100644 --- a/inc/Action/AbstractUserAction.php +++ b/inc/Action/AbstractUserAction.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionUserRequiredException; * * @package dokuwiki\Action */ -abstract class AbstractUserAction extends AbstractAclAction { +abstract class AbstractUserAction extends AbstractAclAction +{ /** @inheritdoc */ public function checkPreconditions() { @@ -21,5 +22,4 @@ abstract class AbstractUserAction extends AbstractAclAction { throw new ActionUserRequiredException(); } } - } diff --git a/inc/Action/Admin.php b/inc/Action/Admin.php index 7a884b5b5..8791c681a 100644 --- a/inc/Action/Admin.php +++ b/inc/Action/Admin.php @@ -12,7 +12,8 @@ use dokuwiki\Extension\AdminPlugin; * * @package dokuwiki\Action */ -class Admin extends AbstractUserAction { +class Admin extends AbstractUserAction +{ /** @inheritdoc */ public function minimumPermission() { diff --git a/inc/Action/Backlink.php b/inc/Action/Backlink.php index 392ee468f..04e028005 100644 --- a/inc/Action/Backlink.php +++ b/inc/Action/Backlink.php @@ -25,5 +25,4 @@ class Backlink extends AbstractAction { (new Backlinks)->show(); } - } diff --git a/inc/Action/Cancel.php b/inc/Action/Cancel.php index d7505e4cc..cd7b4692b 100644 --- a/inc/Action/Cancel.php +++ b/inc/Action/Cancel.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionAbort; * * @package dokuwiki\Action */ -class Cancel extends AbstractAliasAction { +class Cancel extends AbstractAliasAction +{ /** * @inheritdoc @@ -24,5 +25,4 @@ class Cancel extends AbstractAliasAction { // continue with draftdel -> redirect -> show throw new ActionAbort('draftdel'); } - } diff --git a/inc/Action/Check.php b/inc/Action/Check.php index 36ae8e8bd..46a311d2d 100644 --- a/inc/Action/Check.php +++ b/inc/Action/Check.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionAbort; * * @package dokuwiki\Action */ -class Check extends AbstractAction { +class Check extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -22,5 +23,4 @@ class Check extends AbstractAction { check(); throw new ActionAbort(); } - } diff --git a/inc/Action/Conflict.php b/inc/Action/Conflict.php index 83061b0ff..020d60532 100644 --- a/inc/Action/Conflict.php +++ b/inc/Action/Conflict.php @@ -36,5 +36,4 @@ class Conflict extends AbstractAction $text = con($PRE, $TEXT, $SUF); (new PageConflict($text, $SUM))->show(); } - } diff --git a/inc/Action/Denied.php b/inc/Action/Denied.php index 00da1941f..012b1e7e3 100644 --- a/inc/Action/Denied.php +++ b/inc/Action/Denied.php @@ -49,5 +49,4 @@ class Denied extends AbstractAction // print intro print p_locale_xhtml('denied'); } - } diff --git a/inc/Action/Diff.php b/inc/Action/Diff.php index 4daad5bd1..c12de9cab 100644 --- a/inc/Action/Diff.php +++ b/inc/Action/Diff.php @@ -38,5 +38,4 @@ class Diff extends AbstractAction global $INFO; (new PageDiff($INFO['id']))->preference('showIntro', true)->show(); } - } diff --git a/inc/Action/Draft.php b/inc/Action/Draft.php index c2664bc80..1e5fa87ec 100644 --- a/inc/Action/Draft.php +++ b/inc/Action/Draft.php @@ -40,5 +40,4 @@ class Draft extends AbstractAction { (new PageDraft)->show(); } - } diff --git a/inc/Action/Draftdel.php b/inc/Action/Draftdel.php index 75bc94715..0fbae6bc3 100644 --- a/inc/Action/Draftdel.php +++ b/inc/Action/Draftdel.php @@ -12,7 +12,8 @@ use dokuwiki\Action\Exception\ActionAbort; * * @package dokuwiki\Action */ -class Draftdel extends AbstractAction { +class Draftdel extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -35,5 +36,4 @@ class Draftdel extends AbstractAction { throw new ActionAbort('redirect'); } - } diff --git a/inc/Action/Edit.php b/inc/Action/Edit.php index e653da4d6..eb863ddbf 100644 --- a/inc/Action/Edit.php +++ b/inc/Action/Edit.php @@ -93,5 +93,4 @@ class Edit extends AbstractAction { (new Editor)->show(); } - } diff --git a/inc/Action/Exception/ActionAbort.php b/inc/Action/Exception/ActionAbort.php index 9c188bb4b..a808f951a 100644 --- a/inc/Action/Exception/ActionAbort.php +++ b/inc/Action/Exception/ActionAbort.php @@ -15,6 +15,7 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class ActionAbort extends ActionException { +class ActionAbort extends ActionException +{ } diff --git a/inc/Action/Exception/ActionAclRequiredException.php b/inc/Action/Exception/ActionAclRequiredException.php index 64a2c61e3..d81cfec61 100644 --- a/inc/Action/Exception/ActionAclRequiredException.php +++ b/inc/Action/Exception/ActionAclRequiredException.php @@ -12,6 +12,7 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class ActionAclRequiredException extends ActionException { +class ActionAclRequiredException extends ActionException +{ } diff --git a/inc/Action/Exception/ActionDisabledException.php b/inc/Action/Exception/ActionDisabledException.php index 40a0c7dd7..f052d2c0a 100644 --- a/inc/Action/Exception/ActionDisabledException.php +++ b/inc/Action/Exception/ActionDisabledException.php @@ -12,6 +12,7 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class ActionDisabledException extends ActionException { +class ActionDisabledException extends ActionException +{ } diff --git a/inc/Action/Exception/ActionException.php b/inc/Action/Exception/ActionException.php index 381584c15..433e92e11 100644 --- a/inc/Action/Exception/ActionException.php +++ b/inc/Action/Exception/ActionException.php @@ -13,7 +13,8 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class ActionException extends \Exception { +class ActionException extends \Exception +{ /** @var string the new action */ protected $newaction; diff --git a/inc/Action/Exception/ActionUserRequiredException.php b/inc/Action/Exception/ActionUserRequiredException.php index aab06cca1..7f6611378 100644 --- a/inc/Action/Exception/ActionUserRequiredException.php +++ b/inc/Action/Exception/ActionUserRequiredException.php @@ -12,6 +12,7 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class ActionUserRequiredException extends ActionException { +class ActionUserRequiredException extends ActionException +{ } diff --git a/inc/Action/Exception/FatalException.php b/inc/Action/Exception/FatalException.php index 42e30ccae..331564322 100644 --- a/inc/Action/Exception/FatalException.php +++ b/inc/Action/Exception/FatalException.php @@ -12,7 +12,8 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class FatalException extends \Exception { +class FatalException extends \Exception +{ /** * FatalException constructor. * diff --git a/inc/Action/Exception/NoActionException.php b/inc/Action/Exception/NoActionException.php index 1c4e4d094..3f7e06183 100644 --- a/inc/Action/Exception/NoActionException.php +++ b/inc/Action/Exception/NoActionException.php @@ -10,6 +10,7 @@ namespace dokuwiki\Action\Exception; * * @package dokuwiki\Action\Exception */ -class NoActionException extends \Exception { +class NoActionException extends \Exception +{ } diff --git a/inc/Action/Export.php b/inc/Action/Export.php index 397bcc5a0..a18290128 100644 --- a/inc/Action/Export.php +++ b/inc/Action/Export.php @@ -12,7 +12,8 @@ use dokuwiki\Extension\Event; * * @package dokuwiki\Action */ -class Export extends AbstractAction { +class Export extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -109,5 +110,4 @@ class Export extends AbstractAction { throw new ActionAbort(); } - } diff --git a/inc/Action/Index.php b/inc/Action/Index.php index 17ef6b7fd..5a2120d76 100644 --- a/inc/Action/Index.php +++ b/inc/Action/Index.php @@ -25,5 +25,4 @@ class Index extends AbstractAction global $IDX; (new Ui\Index($IDX))->show(); } - } diff --git a/inc/Action/Locked.php b/inc/Action/Locked.php index f244c5d47..adcb68f74 100644 --- a/inc/Action/Locked.php +++ b/inc/Action/Locked.php @@ -53,5 +53,4 @@ class Locked extends AbstractAction print '<li><div class="li"><strong>'.$lang['lockexpire'].'</strong> '.$expire.' ('.$min.' min)</div></li>'; print '</ul>'.DOKU_LF; } - } diff --git a/inc/Action/Login.php b/inc/Action/Login.php index 6b553f384..7d7cfdf1a 100644 --- a/inc/Action/Login.php +++ b/inc/Action/Login.php @@ -36,5 +36,4 @@ class Login extends AbstractAclAction { (new Ui\Login)->show(); } - } diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php index e5bef6052..2a4a6db95 100644 --- a/inc/Action/Logout.php +++ b/inc/Action/Logout.php @@ -13,7 +13,8 @@ use dokuwiki\Extension\AuthPlugin; * * @package dokuwiki\Action */ -class Logout extends AbstractUserAction { +class Logout extends AbstractUserAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -49,5 +50,4 @@ class Logout extends AbstractUserAction { // should never be reached throw new ActionException('login'); } - } diff --git a/inc/Action/Media.php b/inc/Action/Media.php index 77a2a6f0d..0384ce4db 100644 --- a/inc/Action/Media.php +++ b/inc/Action/Media.php @@ -9,7 +9,8 @@ namespace dokuwiki\Action; * * @package dokuwiki\Action */ -class Media extends AbstractAction { +class Media extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -20,5 +21,4 @@ class Media extends AbstractAction { public function tplContent() { tpl_media(); } - } diff --git a/inc/Action/Plugin.php b/inc/Action/Plugin.php index cbc407839..b841676d0 100644 --- a/inc/Action/Plugin.php +++ b/inc/Action/Plugin.php @@ -11,7 +11,8 @@ use dokuwiki\Extension\Event; * * @package dokuwiki\Action */ -class Plugin extends AbstractAction { +class Plugin extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { diff --git a/inc/Action/Preview.php b/inc/Action/Preview.php index 04d3be5dd..d753c6ea8 100644 --- a/inc/Action/Preview.php +++ b/inc/Action/Preview.php @@ -46,5 +46,4 @@ class Preview extends Edit } } } - } diff --git a/inc/Action/Profile.php b/inc/Action/Profile.php index 2b6fb4b2a..21426a187 100644 --- a/inc/Action/Profile.php +++ b/inc/Action/Profile.php @@ -48,5 +48,4 @@ class Profile extends AbstractUserAction { (new UserProfile)->show(); } - } diff --git a/inc/Action/ProfileDelete.php b/inc/Action/ProfileDelete.php index d8e434011..febfd79ef 100644 --- a/inc/Action/ProfileDelete.php +++ b/inc/Action/ProfileDelete.php @@ -13,7 +13,8 @@ use dokuwiki\Extension\AuthPlugin; * * @package dokuwiki\Action */ -class ProfileDelete extends AbstractUserAction { +class ProfileDelete extends AbstractUserAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -39,5 +40,4 @@ class ProfileDelete extends AbstractUserAction { throw new ActionAbort('profile'); } } - } diff --git a/inc/Action/Recent.php b/inc/Action/Recent.php index 203c91d81..f5b45a1ac 100644 --- a/inc/Action/Recent.php +++ b/inc/Action/Recent.php @@ -41,5 +41,4 @@ class Recent extends AbstractAction global $INPUT; (new Ui\Recent($INPUT->extract('first')->int('first'), $this->showType))->show(); } - } diff --git a/inc/Action/Recover.php b/inc/Action/Recover.php index c0e744663..010d185f7 100644 --- a/inc/Action/Recover.php +++ b/inc/Action/Recover.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionAbort; * * @package dokuwiki\Action */ -class Recover extends AbstractAliasAction { +class Recover extends AbstractAliasAction +{ /** * @inheritdoc @@ -20,5 +21,4 @@ class Recover extends AbstractAliasAction { public function preProcess() { throw new ActionAbort('edit'); } - } diff --git a/inc/Action/Redirect.php b/inc/Action/Redirect.php index c7fc772d9..61c214822 100644 --- a/inc/Action/Redirect.php +++ b/inc/Action/Redirect.php @@ -12,7 +12,8 @@ use dokuwiki\Extension\Event; * * @package dokuwiki\Action */ -class Redirect extends AbstractAliasAction { +class Redirect extends AbstractAliasAction +{ /** * Redirect to the show action, trying to jump to the previously edited section diff --git a/inc/Action/Register.php b/inc/Action/Register.php index a407ccb21..77aa05b83 100644 --- a/inc/Action/Register.php +++ b/inc/Action/Register.php @@ -48,5 +48,4 @@ class Register extends AbstractAclAction { (new UserRegister)->show(); } - } diff --git a/inc/Action/Resendpwd.php b/inc/Action/Resendpwd.php index bdfbd8ff8..d42f4f667 100644 --- a/inc/Action/Resendpwd.php +++ b/inc/Action/Resendpwd.php @@ -182,5 +182,4 @@ class Resendpwd extends AbstractAclAction } // never reached } - } diff --git a/inc/Action/Revert.php b/inc/Action/Revert.php index b7ee75313..28123a548 100644 --- a/inc/Action/Revert.php +++ b/inc/Action/Revert.php @@ -59,5 +59,4 @@ class Revert extends AbstractUserAction // continue with draftdel -> redirect -> show throw new ActionAbort('draftdel'); } - } diff --git a/inc/Action/Save.php b/inc/Action/Save.php index a577e379f..243a9b303 100644 --- a/inc/Action/Save.php +++ b/inc/Action/Save.php @@ -12,7 +12,8 @@ use dokuwiki\Action\Exception\ActionException; * * @package dokuwiki\Action */ -class Save extends AbstractAction { +class Save extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -59,5 +60,4 @@ class Save extends AbstractAction { // continue with draftdel -> redirect -> show throw new ActionAbort('draftdel'); } - } diff --git a/inc/Action/Search.php b/inc/Action/Search.php index b30f354f3..dfa144da8 100644 --- a/inc/Action/Search.php +++ b/inc/Action/Search.php @@ -11,7 +11,8 @@ use dokuwiki\Action\Exception\ActionAbort; * * @package dokuwiki\Action */ -class Search extends AbstractAction { +class Search extends AbstractAction +{ protected $pageLookupResults = []; protected $fullTextResults = []; diff --git a/inc/Action/Show.php b/inc/Action/Show.php index 773358b5e..e45a26cc9 100644 --- a/inc/Action/Show.php +++ b/inc/Action/Show.php @@ -37,5 +37,4 @@ class Show extends AbstractAction { (new PageView())->show(); } - } diff --git a/inc/Action/Sitemap.php b/inc/Action/Sitemap.php index eba9c2813..1fdeee011 100644 --- a/inc/Action/Sitemap.php +++ b/inc/Action/Sitemap.php @@ -13,7 +13,8 @@ use dokuwiki\Utf8\PhpString; * * @package dokuwiki\Action */ -class Sitemap extends AbstractAction { +class Sitemap extends AbstractAction +{ /** @inheritdoc */ public function minimumPermission() { @@ -63,5 +64,4 @@ class Sitemap extends AbstractAction { throw new FatalException('Could not read the sitemap file - bad permissions?'); } - } diff --git a/inc/Action/Source.php b/inc/Action/Source.php index 08ccb6072..6c69a12fb 100644 --- a/inc/Action/Source.php +++ b/inc/Action/Source.php @@ -38,5 +38,4 @@ class Source extends AbstractAction { (new Editor)->show(); } - } diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php index 47880e8dc..4a05af872 100644 --- a/inc/Action/Subscribe.php +++ b/inc/Action/Subscribe.php @@ -172,5 +172,4 @@ class Subscribe extends AbstractUserAction $params = ['target' => $target, 'style' => $style, 'action' => $action]; } - } diff --git a/inc/ActionRouter.php b/inc/ActionRouter.php index 8af8250fa..3d0a15721 100644 --- a/inc/ActionRouter.php +++ b/inc/ActionRouter.php @@ -14,7 +14,8 @@ use dokuwiki\Action\Plugin; * Class ActionRouter * @package dokuwiki */ -class ActionRouter { +class ActionRouter +{ /** @var AbstractAction */ protected $action; diff --git a/inc/Ajax.php b/inc/Ajax.php index 244e95b99..c80a2eee7 100644 --- a/inc/Ajax.php +++ b/inc/Ajax.php @@ -14,7 +14,8 @@ use dokuwiki\Utf8\Sort; * @todo The calls should be refactored out to their own proper classes * @package dokuwiki */ -class Ajax { +class Ajax +{ /** * Execute the given call @@ -435,5 +436,4 @@ class Ajax { } } - } diff --git a/inc/Cache/CacheImageMod.php b/inc/Cache/CacheImageMod.php index 5883f7842..d8365f159 100644 --- a/inc/Cache/CacheImageMod.php +++ b/inc/Cache/CacheImageMod.php @@ -52,5 +52,4 @@ class CacheImageMod extends Cache getConfigFiles('main') ); } - } diff --git a/inc/Cache/CacheParser.php b/inc/Cache/CacheParser.php index 1273eab31..5f69d3d84 100644 --- a/inc/Cache/CacheParser.php +++ b/inc/Cache/CacheParser.php @@ -61,5 +61,4 @@ class CacheParser extends Cache array_merge($files, $this->depends['files']); parent::addDependencies(); } - } diff --git a/inc/ChangeLog/ChangeLogTrait.php b/inc/ChangeLog/ChangeLogTrait.php index 8ce12f019..f10c53d8b 100644 --- a/inc/ChangeLog/ChangeLogTrait.php +++ b/inc/ChangeLog/ChangeLogTrait.php @@ -259,5 +259,4 @@ trait ChangeLogTrait $lines = $this->readChunk($fp, $head, $tail); return [$lines, $head, $tail]; } - } diff --git a/inc/ChangeLog/MediaChangeLog.php b/inc/ChangeLog/MediaChangeLog.php index 4c4d420f8..0c4ca8f98 100644 --- a/inc/ChangeLog/MediaChangeLog.php +++ b/inc/ChangeLog/MediaChangeLog.php @@ -56,5 +56,4 @@ class MediaChangeLog extends ChangeLog $this->cache[$this->id][$this->currentRevision] = $info; return $info; } - } diff --git a/inc/ChangeLog/PageChangeLog.php b/inc/ChangeLog/PageChangeLog.php index 2230dc172..7d537c7af 100644 --- a/inc/ChangeLog/PageChangeLog.php +++ b/inc/ChangeLog/PageChangeLog.php @@ -56,5 +56,4 @@ class PageChangeLog extends ChangeLog $this->cache[$this->id][$this->currentRevision] = $info; return $info; } - } diff --git a/inc/ChangeLog/RevisionInfo.php b/inc/ChangeLog/RevisionInfo.php index edbc2d7ad..08c34ff9c 100644 --- a/inc/ChangeLog/RevisionInfo.php +++ b/inc/ChangeLog/RevisionInfo.php @@ -388,6 +388,4 @@ class RevisionInfo global $lang; return $this->isCurrent() ? '('.$lang['current'].')' : ''; } - - } diff --git a/inc/Extension/AdminPlugin.php b/inc/Extension/AdminPlugin.php index 86ed56c62..3925ff2ec 100644 --- a/inc/Extension/AdminPlugin.php +++ b/inc/Extension/AdminPlugin.php @@ -118,6 +118,5 @@ abstract class AdminPlugin extends Plugin { return []; } - } diff --git a/inc/Extension/RemotePlugin.php b/inc/Extension/RemotePlugin.php index fd6711044..7b9810f10 100644 --- a/inc/Extension/RemotePlugin.php +++ b/inc/Extension/RemotePlugin.php @@ -118,5 +118,4 @@ abstract class RemotePlugin extends Plugin { return $this->api; } - } diff --git a/inc/FeedParser.php b/inc/FeedParser.php index 94c9d4257..e124175a7 100644 --- a/inc/FeedParser.php +++ b/inc/FeedParser.php @@ -7,7 +7,8 @@ use SimplePie\File; /** * We override some methods of the original SimplePie class here */ -class FeedParser extends SimplePie { +class FeedParser extends SimplePie +{ /** * Constructor. Set some defaults diff --git a/inc/File/MediaResolver.php b/inc/File/MediaResolver.php index 098584e72..02c4a5374 100644 --- a/inc/File/MediaResolver.php +++ b/inc/File/MediaResolver.php @@ -5,7 +5,8 @@ namespace dokuwiki\File; /** * Creates an absolute media ID from a relative one */ -class MediaResolver extends Resolver { +class MediaResolver extends Resolver +{ /** @inheritDoc */ public function resolveId($id, $rev = '', $isDateAt = false) diff --git a/inc/File/PageFile.php b/inc/File/PageFile.php index 8fc95e55d..1757109dd 100644 --- a/inc/File/PageFile.php +++ b/inc/File/PageFile.php @@ -326,5 +326,4 @@ class PageFile $meta['last_change'] = $logEntry; p_set_metadata($this->id, $meta); } - } diff --git a/inc/File/PageResolver.php b/inc/File/PageResolver.php index e800b7d18..e3b8357a5 100644 --- a/inc/File/PageResolver.php +++ b/inc/File/PageResolver.php @@ -95,5 +95,4 @@ class PageResolver extends Resolver } return $id; } - } diff --git a/inc/File/Resolver.php b/inc/File/Resolver.php index b7dd61ec3..f39812626 100644 --- a/inc/File/Resolver.php +++ b/inc/File/Resolver.php @@ -102,5 +102,4 @@ abstract class Resolver return $id; } - } diff --git a/inc/Form/ButtonElement.php b/inc/Form/ButtonElement.php index f13a98fb8..79b8022f9 100644 --- a/inc/Form/ButtonElement.php +++ b/inc/Form/ButtonElement.php @@ -33,5 +33,4 @@ class ButtonElement extends Element { return '<button ' . buildAttributes($this->attrs(), true) . '>'.$this->content.'</button>'; } - } diff --git a/inc/Form/CheckableElement.php b/inc/Form/CheckableElement.php index 982598e04..0b38e66d9 100644 --- a/inc/Form/CheckableElement.php +++ b/inc/Form/CheckableElement.php @@ -79,5 +79,4 @@ class CheckableElement extends InputElement return $this->mainElementHTML(); } } - } diff --git a/inc/Form/DropdownElement.php b/inc/Form/DropdownElement.php index d1c4466b4..898af5ee9 100644 --- a/inc/Form/DropdownElement.php +++ b/inc/Form/DropdownElement.php @@ -196,5 +196,4 @@ class DropdownElement extends InputElement return $html; } - } diff --git a/inc/Form/TagCloseElement.php b/inc/Form/TagCloseElement.php index 6078882d3..2c4e9d945 100644 --- a/inc/Form/TagCloseElement.php +++ b/inc/Form/TagCloseElement.php @@ -91,5 +91,4 @@ class TagCloseElement extends ValueElement { return '</'.$this->val().'>'; } - } diff --git a/inc/Form/TextareaElement.php b/inc/Form/TextareaElement.php index f1d9796ff..7f515bbdb 100644 --- a/inc/Form/TextareaElement.php +++ b/inc/Form/TextareaElement.php @@ -51,5 +51,4 @@ class TextareaElement extends InputElement return '<textarea ' . buildAttributes($this->attrs()) . '>' . formText($this->val()) . '</textarea>'; } - } diff --git a/inc/Form/ValueElement.php b/inc/Form/ValueElement.php index 798593020..fab0b4091 100644 --- a/inc/Form/ValueElement.php +++ b/inc/Form/ValueElement.php @@ -43,5 +43,4 @@ abstract class ValueElement extends Element } return $this->value; } - } diff --git a/inc/HTTP/DokuHTTPClient.php b/inc/HTTP/DokuHTTPClient.php index d9a69db0a..63b4f9dfc 100644 --- a/inc/HTTP/DokuHTTPClient.php +++ b/inc/HTTP/DokuHTTPClient.php @@ -77,5 +77,4 @@ class DokuHTTPClient extends HTTPClient unset($evt); return parent::sendRequest($url, $data, $method); } - } diff --git a/inc/Info.php b/inc/Info.php index 9208b2471..32dff654f 100644 --- a/inc/Info.php +++ b/inc/Info.php @@ -50,5 +50,4 @@ class Info return $return; } - } diff --git a/inc/Input/Server.php b/inc/Input/Server.php index 60964fd8f..ab8f13726 100644 --- a/inc/Input/Server.php +++ b/inc/Input/Server.php @@ -15,5 +15,4 @@ class Server extends Input { $this->access = &$_SERVER; } - } diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php index 49aa77d04..f97ca0f42 100644 --- a/inc/Mailer.class.php +++ b/inc/Mailer.class.php @@ -15,7 +15,8 @@ use dokuwiki\Extension\Event; /** * Mail Handling */ -class Mailer { +class Mailer +{ protected $headers = []; protected $attach = []; diff --git a/inc/Menu/AbstractMenu.php b/inc/Menu/AbstractMenu.php index d97b584ee..825c8fcca 100644 --- a/inc/Menu/AbstractMenu.php +++ b/inc/Menu/AbstractMenu.php @@ -94,5 +94,4 @@ abstract class AbstractMenu implements MenuInterface } return $html; } - } diff --git a/inc/Menu/DetailMenu.php b/inc/Menu/DetailMenu.php index 472ec08ed..16ab57c3a 100644 --- a/inc/Menu/DetailMenu.php +++ b/inc/Menu/DetailMenu.php @@ -14,5 +14,4 @@ class DetailMenu extends AbstractMenu protected $view = 'detail'; protected $types = ['MediaManager', 'ImgBackto', 'Top']; - } diff --git a/inc/Menu/Item/Admin.php b/inc/Menu/Item/Admin.php index c8abfad2e..56cd31b9d 100644 --- a/inc/Menu/Item/Admin.php +++ b/inc/Menu/Item/Admin.php @@ -26,5 +26,4 @@ class Admin extends AbstractItem return parent::visibleInContext($ctx); } - } diff --git a/inc/Menu/Item/Back.php b/inc/Menu/Item/Back.php index 520eb9fbb..822a5042d 100644 --- a/inc/Menu/Item/Back.php +++ b/inc/Menu/Item/Back.php @@ -27,5 +27,4 @@ class Back extends AbstractItem $this->accesskey = 'b'; $this->svg = DOKU_INC . 'lib/images/menu/12-back_arrow-left.svg'; } - } diff --git a/inc/Menu/Item/Backlink.php b/inc/Menu/Item/Backlink.php index 5006fac04..7bc895512 100644 --- a/inc/Menu/Item/Backlink.php +++ b/inc/Menu/Item/Backlink.php @@ -16,5 +16,4 @@ class Backlink extends AbstractItem parent::__construct(); $this->svg = DOKU_INC . 'lib/images/menu/08-backlink_link-variant.svg'; } - } diff --git a/inc/Menu/Item/Edit.php b/inc/Menu/Item/Edit.php index e955002f2..a2b852af6 100644 --- a/inc/Menu/Item/Edit.php +++ b/inc/Menu/Item/Edit.php @@ -65,5 +65,4 @@ class Edit extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/' . $icons[$this->type]; } } - } diff --git a/inc/Menu/Item/ImgBackto.php b/inc/Menu/Item/ImgBackto.php index 5f71eccf0..7d850c5df 100644 --- a/inc/Menu/Item/ImgBackto.php +++ b/inc/Menu/Item/ImgBackto.php @@ -22,5 +22,4 @@ class ImgBackto extends AbstractItem $this->accesskey = 'b'; $this->replacement = $ID; } - } diff --git a/inc/Menu/Item/Index.php b/inc/Menu/Item/Index.php index ac846f74e..b82987c8d 100644 --- a/inc/Menu/Item/Index.php +++ b/inc/Menu/Item/Index.php @@ -25,5 +25,4 @@ class Index extends AbstractItem $this->nofollow = false; } } - } diff --git a/inc/Menu/Item/Login.php b/inc/Menu/Item/Login.php index 29211e3e8..14ab577be 100644 --- a/inc/Menu/Item/Login.php +++ b/inc/Menu/Item/Login.php @@ -27,5 +27,4 @@ class Login extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/logout.svg'; } } - } diff --git a/inc/Menu/Item/Media.php b/inc/Menu/Item/Media.php index b819d024a..e4bb003aa 100644 --- a/inc/Menu/Item/Media.php +++ b/inc/Menu/Item/Media.php @@ -19,5 +19,4 @@ class Media extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/folder-multiple-image.svg'; $this->params['ns'] = getNS($ID); } - } diff --git a/inc/Menu/Item/MediaManager.php b/inc/Menu/Item/MediaManager.php index 1b4570af4..d7347b543 100644 --- a/inc/Menu/Item/MediaManager.php +++ b/inc/Menu/Item/MediaManager.php @@ -26,5 +26,4 @@ class MediaManager extends AbstractItem $this->type = 'mediaManager'; $this->params = ['ns' => $imgNS, 'image' => $IMG, 'do' => 'media']; } - } diff --git a/inc/Menu/Item/Profile.php b/inc/Menu/Item/Profile.php index 156549077..bfae21a94 100644 --- a/inc/Menu/Item/Profile.php +++ b/inc/Menu/Item/Profile.php @@ -22,5 +22,4 @@ class Profile extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/account-card-details.svg'; } - } diff --git a/inc/Menu/Item/Recent.php b/inc/Menu/Item/Recent.php index 3487b5e41..1cb9d081f 100644 --- a/inc/Menu/Item/Recent.php +++ b/inc/Menu/Item/Recent.php @@ -18,5 +18,4 @@ class Recent extends AbstractItem $this->accesskey = 'r'; $this->svg = DOKU_INC . 'lib/images/menu/calendar-clock.svg'; } - } diff --git a/inc/Menu/Item/Register.php b/inc/Menu/Item/Register.php index 03bf62ecc..ffe3ced23 100644 --- a/inc/Menu/Item/Register.php +++ b/inc/Menu/Item/Register.php @@ -22,5 +22,4 @@ class Register extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/account-plus.svg'; } - } diff --git a/inc/Menu/Item/Resendpwd.php b/inc/Menu/Item/Resendpwd.php index 721f61bd2..a07bfee62 100644 --- a/inc/Menu/Item/Resendpwd.php +++ b/inc/Menu/Item/Resendpwd.php @@ -22,5 +22,4 @@ class Resendpwd extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/lock-reset.svg'; } - } diff --git a/inc/Menu/Item/Revert.php b/inc/Menu/Item/Revert.php index f4ae1b36d..caadf81c3 100644 --- a/inc/Menu/Item/Revert.php +++ b/inc/Menu/Item/Revert.php @@ -25,5 +25,4 @@ class Revert extends AbstractItem $this->params['sectok'] = getSecurityToken(); $this->svg = DOKU_INC . 'lib/images/menu/06-revert_replay.svg'; } - } diff --git a/inc/Menu/Item/Revisions.php b/inc/Menu/Item/Revisions.php index 11854daeb..0aefb99ae 100644 --- a/inc/Menu/Item/Revisions.php +++ b/inc/Menu/Item/Revisions.php @@ -19,5 +19,4 @@ class Revisions extends AbstractItem $this->type = 'revs'; $this->svg = DOKU_INC . 'lib/images/menu/07-revisions_history.svg'; } - } diff --git a/inc/Menu/Item/Subscribe.php b/inc/Menu/Item/Subscribe.php index d9d5bb949..c5d3fa306 100644 --- a/inc/Menu/Item/Subscribe.php +++ b/inc/Menu/Item/Subscribe.php @@ -22,5 +22,4 @@ class Subscribe extends AbstractItem $this->svg = DOKU_INC . 'lib/images/menu/09-subscribe_email-outline.svg'; } - } diff --git a/inc/Menu/Item/Top.php b/inc/Menu/Item/Top.php index 1068c7280..22e2e61ca 100644 --- a/inc/Menu/Item/Top.php +++ b/inc/Menu/Item/Top.php @@ -35,5 +35,4 @@ class Top extends AbstractItem { return html_topbtn(); } - } diff --git a/inc/Menu/MobileMenu.php b/inc/Menu/MobileMenu.php index 09d0717f1..ff6d4b386 100644 --- a/inc/Menu/MobileMenu.php +++ b/inc/Menu/MobileMenu.php @@ -93,5 +93,4 @@ class MobileMenu implements MenuInterface return $html; } - } diff --git a/inc/Menu/PageMenu.php b/inc/Menu/PageMenu.php index dd04432a9..626de21cf 100644 --- a/inc/Menu/PageMenu.php +++ b/inc/Menu/PageMenu.php @@ -13,5 +13,4 @@ class PageMenu extends AbstractMenu protected $view = 'page'; protected $types = ['Edit', 'Revert', 'Revisions', 'Backlink', 'Subscribe', 'Top']; - } diff --git a/inc/Menu/SiteMenu.php b/inc/Menu/SiteMenu.php index deba0a135..83d7a8155 100644 --- a/inc/Menu/SiteMenu.php +++ b/inc/Menu/SiteMenu.php @@ -13,5 +13,4 @@ class SiteMenu extends AbstractMenu protected $view = 'site'; protected $types = ['Recent', 'Media', 'Index']; - } diff --git a/inc/Menu/UserMenu.php b/inc/Menu/UserMenu.php index ef02a7770..09217e1cf 100644 --- a/inc/Menu/UserMenu.php +++ b/inc/Menu/UserMenu.php @@ -13,5 +13,4 @@ class UserMenu extends AbstractMenu protected $view = 'user'; protected $types = ['Profile', 'Admin', 'Register', 'Login']; - } diff --git a/inc/Parsing/Handler/Nest.php b/inc/Parsing/Handler/Nest.php index 7cd667a5e..3eed9c29b 100644 --- a/inc/Parsing/Handler/Nest.php +++ b/inc/Parsing/Handler/Nest.php @@ -77,6 +77,4 @@ class Nest extends AbstractRewriter $this->calls[] = $call; } } - - } diff --git a/inc/Parsing/Parser.php b/inc/Parsing/Parser.php index 2e495f588..7e03c43ef 100644 --- a/inc/Parsing/Parser.php +++ b/inc/Parsing/Parser.php @@ -12,7 +12,8 @@ use dokuwiki\Parsing\ParserMode\ModeInterface; * Sets up the Lexer with modes and points it to the Handler * For an intro to the Lexer see: wiki:parser */ -class Parser { +class Parser +{ /** @var Doku_Handler */ protected $handler; @@ -125,5 +126,4 @@ class Parser { } return $this->handler->calls; } - } diff --git a/inc/Parsing/ParserMode/Plugin.php b/inc/Parsing/ParserMode/Plugin.php index c885c6037..581a854d1 100644 --- a/inc/Parsing/ParserMode/Plugin.php +++ b/inc/Parsing/ParserMode/Plugin.php @@ -5,4 +5,6 @@ namespace dokuwiki\Parsing\ParserMode; /** * @fixme do we need this anymore or could the syntax plugin inherit directly from abstract mode? */ -abstract class Plugin extends AbstractMode {} +abstract class Plugin extends AbstractMode +{ +} diff --git a/inc/PassHash.php b/inc/PassHash.php index f8896f6ff..d54a1ae7c 100644 --- a/inc/PassHash.php +++ b/inc/PassHash.php @@ -12,7 +12,8 @@ namespace dokuwiki; * @author Schplurtz le Déboulonné <Schplurtz@laposte.net> * @license LGPL2 */ -class PassHash { +class PassHash +{ /** * Verifies a cleartext password against a crypted hash * diff --git a/inc/SafeFN.class.php b/inc/SafeFN.class.php index 82e67874a..93088d51e 100644 --- a/inc/SafeFN.class.php +++ b/inc/SafeFN.class.php @@ -14,7 +14,8 @@ use dokuwiki\Utf8\Unicode; * @author Christopher Smith <chris@jalakai.co.uk> * @date 2010-04-02 */ -class SafeFN { +class SafeFN +{ // 'safe' characters are a superset of $plain, $pre_indicator and $post_indicator private static $plain = '-./[_0123456789abcdefghijklmnopqrstuvwxyz'; // these characters aren't converted @@ -154,5 +155,4 @@ class SafeFN { return $unicode; } - } diff --git a/inc/Search/Indexer.php b/inc/Search/Indexer.php index 87f4831ba..46261f1ce 100644 --- a/inc/Search/Indexer.php +++ b/inc/Search/Indexer.php @@ -12,7 +12,8 @@ use dokuwiki\Extension\Event; * * @author Tom N Harris <tnharris@whoopdedo.org> */ -class Indexer { +class Indexer +{ /** * @var array $pidCache Cache for getPID() */ diff --git a/inc/Sitemap/Item.php b/inc/Sitemap/Item.php index d11bfc135..a5e0f08bb 100644 --- a/inc/Sitemap/Item.php +++ b/inc/Sitemap/Item.php @@ -7,7 +7,8 @@ namespace dokuwiki\Sitemap; * * @author Michael Hamann */ -class Item { +class Item +{ public $url; public $lastmod; public $changefreq; diff --git a/inc/Sitemap/Mapper.php b/inc/Sitemap/Mapper.php index 9db028eee..93ccf7d1c 100644 --- a/inc/Sitemap/Mapper.php +++ b/inc/Sitemap/Mapper.php @@ -17,7 +17,8 @@ use dokuwiki\Logger; * * @author Michael Hamann */ -class Mapper { +class Mapper +{ /** * Builds a Google Sitemap of all public pages known to the indexer * diff --git a/inc/Subscriptions/PageSubscriptionSender.php b/inc/Subscriptions/PageSubscriptionSender.php index e5577c1af..f7b081408 100644 --- a/inc/Subscriptions/PageSubscriptionSender.php +++ b/inc/Subscriptions/PageSubscriptionSender.php @@ -84,5 +84,4 @@ class PageSubscriptionSender extends SubscriptionSender $headers ); } - } diff --git a/inc/Ui/Backlinks.php b/inc/Ui/Backlinks.php index cd2c55f99..074c67ac8 100644 --- a/inc/Ui/Backlinks.php +++ b/inc/Ui/Backlinks.php @@ -39,5 +39,4 @@ class Backlinks extends Ui print '<div class="level1"><p>' . $lang['nothingfound'] . '</p></div>'; } } - } diff --git a/inc/Ui/Editor.php b/inc/Ui/Editor.php index 56053f5ae..154c1dfc9 100644 --- a/inc/Ui/Editor.php +++ b/inc/Ui/Editor.php @@ -208,5 +208,4 @@ class Editor extends Ui $data['form']->addTextarea('wikitext', '')->attrs($attr)->val($TEXT) ->id('wiki__text')->addClass('edit'); } - } diff --git a/inc/Ui/Index.php b/inc/Ui/Index.php index d3bee6c6b..6638fd607 100644 --- a/inc/Ui/Index.php +++ b/inc/Ui/Index.php @@ -127,5 +127,4 @@ class Index extends Ui return '<li class="closed">'; } } - } diff --git a/inc/Ui/Login.php b/inc/Ui/Login.php index 523189527..01ebbf6f8 100644 --- a/inc/Ui/Login.php +++ b/inc/Ui/Login.php @@ -80,5 +80,4 @@ class Login extends Ui print '</div>'; } - } diff --git a/inc/Ui/Media/DisplayRow.php b/inc/Ui/Media/DisplayRow.php index 013dfc443..a9d1f3d49 100644 --- a/inc/Ui/Media/DisplayRow.php +++ b/inc/Ui/Media/DisplayRow.php @@ -89,5 +89,4 @@ class DisplayRow extends DisplayTile } echo '</div>'; } - } diff --git a/inc/Ui/MediaDiff.php b/inc/Ui/MediaDiff.php index 67c74455c..6a60e2e1e 100644 --- a/inc/Ui/MediaDiff.php +++ b/inc/Ui/MediaDiff.php @@ -324,5 +324,4 @@ class MediaDiff extends Diff echo '</table>'; echo '</div>'; } - } diff --git a/inc/Ui/MediaRevisions.php b/inc/Ui/MediaRevisions.php index fc0866f79..2bdddb40e 100644 --- a/inc/Ui/MediaRevisions.php +++ b/inc/Ui/MediaRevisions.php @@ -119,5 +119,4 @@ class MediaRevisions extends Revisions static fn($n) => media_managerURL(['first' => $n], '&', false, true) ); } - } diff --git a/inc/Ui/PageConflict.php b/inc/Ui/PageConflict.php index 29b9caf30..7ab7dc1b4 100644 --- a/inc/Ui/PageConflict.php +++ b/inc/Ui/PageConflict.php @@ -59,5 +59,4 @@ class PageConflict extends Ui // print difference (new PageDiff($INFO['id']))->compareWith($this->text)->preference('showIntro', false)->show(); } - } diff --git a/inc/Ui/PageDiff.php b/inc/Ui/PageDiff.php index 6e772dc1a..d2f0e9089 100644 --- a/inc/Ui/PageDiff.php +++ b/inc/Ui/PageDiff.php @@ -545,5 +545,4 @@ REGEX; return preg_replace('<' . $regex . '>xu', '\0<wbr>', $match[0]); }, $diffhtml); } - } diff --git a/inc/Ui/PageDraft.php b/inc/Ui/PageDraft.php index c71fdbc35..a4dcb3806 100644 --- a/inc/Ui/PageDraft.php +++ b/inc/Ui/PageDraft.php @@ -51,5 +51,4 @@ class PageDraft extends Ui print $form->toHTML('Draft'); } - } diff --git a/inc/Ui/PageView.php b/inc/Ui/PageView.php index b353d983f..60261ce77 100644 --- a/inc/Ui/PageView.php +++ b/inc/Ui/PageView.php @@ -82,6 +82,4 @@ class PageView extends Ui { print p_locale_xhtml('showrev'); } - - } diff --git a/inc/Ui/Recent.php b/inc/Ui/Recent.php index f61b45a90..891721a99 100644 --- a/inc/Ui/Recent.php +++ b/inc/Ui/Recent.php @@ -227,5 +227,4 @@ class Recent extends Ui $form->addButton('do[recent]', $lang['btn_apply'])->attr('type', 'submit'); $form->addTagClose('div'); } - } diff --git a/inc/Ui/Revisions.php b/inc/Ui/Revisions.php index e47a609b9..d231be207 100644 --- a/inc/Ui/Revisions.php +++ b/inc/Ui/Revisions.php @@ -110,5 +110,4 @@ abstract class Revisions extends Ui $html .= '</div>'; return $html; } - } diff --git a/inc/Ui/Subscribe.php b/inc/Ui/Subscribe.php index 53022b931..44b37d604 100644 --- a/inc/Ui/Subscribe.php +++ b/inc/Ui/Subscribe.php @@ -113,5 +113,4 @@ class Subscribe extends Ui echo '</div>'; } - } diff --git a/inc/Ui/Ui.php b/inc/Ui/Ui.php index 57d0c2998..703e8e88d 100644 --- a/inc/Ui/Ui.php +++ b/inc/Ui/Ui.php @@ -17,5 +17,4 @@ abstract class Ui * @return void */ abstract public function show(); - } diff --git a/inc/Ui/UserProfile.php b/inc/Ui/UserProfile.php index c3d998c73..b99e7bcd7 100644 --- a/inc/Ui/UserProfile.php +++ b/inc/Ui/UserProfile.php @@ -122,5 +122,4 @@ class UserProfile extends Ui print '</div>'; } - } diff --git a/inc/Ui/UserRegister.php b/inc/Ui/UserRegister.php index 14bd1eeee..034e40974 100644 --- a/inc/Ui/UserRegister.php +++ b/inc/Ui/UserRegister.php @@ -70,5 +70,4 @@ class UserRegister extends Ui print '</div>'; } - } diff --git a/inc/Ui/UserResendPwd.php b/inc/Ui/UserResendPwd.php index 9ee4c7807..39bcb6fa3 100644 --- a/inc/Ui/UserResendPwd.php +++ b/inc/Ui/UserResendPwd.php @@ -96,5 +96,4 @@ class UserResendPwd extends Ui $form->addTagClose('div'); return $form; } - } diff --git a/inc/Utf8/Clean.php b/inc/Utf8/Clean.php index 0975ff559..434da7043 100644 --- a/inc/Utf8/Clean.php +++ b/inc/Utf8/Clean.php @@ -200,5 +200,4 @@ class Clean return $i; } - } diff --git a/inc/Utf8/Conversion.php b/inc/Utf8/Conversion.php index a3bc250c9..6b013d3b3 100644 --- a/inc/Utf8/Conversion.php +++ b/inc/Utf8/Conversion.php @@ -156,5 +156,4 @@ class Conversion $uni = unpack('n*', $str); return Unicode::toUtf8($uni); } - } diff --git a/inc/Utf8/PhpString.php b/inc/Utf8/PhpString.php index 4b157fd04..d4bef428f 100644 --- a/inc/Utf8/PhpString.php +++ b/inc/Utf8/PhpString.php @@ -372,6 +372,4 @@ class PhpString return $length; } - - } diff --git a/inc/form.php b/inc/form.php index 9202bd230..57479b02b 100644 --- a/inc/form.php +++ b/inc/form.php @@ -332,7 +332,6 @@ class Doku_Form $this->addElement(form_makeRadioField($name, $val, $cap, '', '', $data)); } } - } /** diff --git a/lib/exe/css.php b/lib/exe/css.php index 3501746dc..b63e4ff86 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -401,7 +401,8 @@ function css_loadfile($file,$location=''){ * * @author Chris Smith <chris@jalakai.co.uk> */ -class DokuCssFile { +class DokuCssFile +{ protected $filepath; // file system path to the CSS/Less file protected $location; // base url location of the CSS/Less file diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index beef981e1..0c47a4b70 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -16,7 +16,8 @@ use dokuwiki\plugin\config\core\Setting\SettingHidden; * All DokuWiki plugins to extend the admin function * need to inherit from this class */ -class admin_plugin_config extends AdminPlugin { +class admin_plugin_config extends AdminPlugin +{ protected const IMGDIR = DOKU_BASE . 'lib/plugins/config/images/'; diff --git a/lib/plugins/config/core/ConfigParser.php b/lib/plugins/config/core/ConfigParser.php index a1c7c4a74..05c3e3c28 100644 --- a/lib/plugins/config/core/ConfigParser.php +++ b/lib/plugins/config/core/ConfigParser.php @@ -10,7 +10,8 @@ namespace dokuwiki\plugin\config\core; * * @author Chris Smith <chris@jalakai.co.uk> */ -class ConfigParser { +class ConfigParser +{ /** @var string variable to parse from the file */ protected $varname = 'conf'; /** @var string the key to mark sub arrays */ @@ -95,5 +96,4 @@ class ConfigParser { } return $value; } - } diff --git a/lib/plugins/config/core/Configuration.php b/lib/plugins/config/core/Configuration.php index b711ad369..af640a68e 100644 --- a/lib/plugins/config/core/Configuration.php +++ b/lib/plugins/config/core/Configuration.php @@ -15,7 +15,8 @@ use dokuwiki\plugin\config\core\Setting\SettingUndefined; * @author Ben Coburn <btcoburn@silicodon.net> * @author Andreas Gohr <andi@splitbrain.org> */ -class Configuration { +class Configuration +{ public const KEYMARKER = '____'; @@ -215,5 +216,4 @@ class Configuration { } return '\\dokuwiki\\plugin\\config\\core\\Setting\\Setting'; } - } diff --git a/lib/plugins/config/core/Loader.php b/lib/plugins/config/core/Loader.php index 8d0ff821e..465f68a91 100644 --- a/lib/plugins/config/core/Loader.php +++ b/lib/plugins/config/core/Loader.php @@ -10,7 +10,8 @@ use dokuwiki\Extension\Event; * Loads configuration meta data and settings from the various files. Honors the * configuration cascade and installed plugins. */ -class Loader { +class Loader +{ /** @var ConfigParser */ protected $parser; diff --git a/lib/plugins/config/core/Setting/Setting.php b/lib/plugins/config/core/Setting/Setting.php index 0410d0205..cfa06bf8f 100644 --- a/lib/plugins/config/core/Setting/Setting.php +++ b/lib/plugins/config/core/Setting/Setting.php @@ -7,7 +7,8 @@ use dokuwiki\plugin\config\core\Configuration; /** * Class Setting */ -class Setting { +class Setting +{ /** @var string unique identifier of this setting */ protected $key = ''; @@ -304,5 +305,4 @@ class Setting { } return $this->caution; } - } diff --git a/lib/plugins/config/core/Setting/SettingArray.php b/lib/plugins/config/core/Setting/SettingArray.php index 517d785db..d2a7c4442 100644 --- a/lib/plugins/config/core/Setting/SettingArray.php +++ b/lib/plugins/config/core/Setting/SettingArray.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_array */ -class SettingArray extends Setting { +class SettingArray extends Setting +{ /** * Create an array from a string diff --git a/lib/plugins/config/core/Setting/SettingAuthtype.php b/lib/plugins/config/core/Setting/SettingAuthtype.php index 3a6df6fe5..11efeb3e2 100644 --- a/lib/plugins/config/core/Setting/SettingAuthtype.php +++ b/lib/plugins/config/core/Setting/SettingAuthtype.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_authtype */ -class SettingAuthtype extends SettingMultichoice { +class SettingAuthtype extends SettingMultichoice +{ /** @inheritdoc */ public function initialize($default = null, $local = null, $protected = null) { diff --git a/lib/plugins/config/core/Setting/SettingCompression.php b/lib/plugins/config/core/Setting/SettingCompression.php index 4450f5279..09ab8686a 100644 --- a/lib/plugins/config/core/Setting/SettingCompression.php +++ b/lib/plugins/config/core/Setting/SettingCompression.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_compression */ -class SettingCompression extends SettingMultichoice { +class SettingCompression extends SettingMultichoice +{ protected $choices = ['0']; // 0 = no compression, always supported diff --git a/lib/plugins/config/core/Setting/SettingDirchoice.php b/lib/plugins/config/core/Setting/SettingDirchoice.php index f48733ab6..e6f157e75 100644 --- a/lib/plugins/config/core/Setting/SettingDirchoice.php +++ b/lib/plugins/config/core/Setting/SettingDirchoice.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_dirchoice */ -class SettingDirchoice extends SettingMultichoice { +class SettingDirchoice extends SettingMultichoice +{ protected $dir = ''; diff --git a/lib/plugins/config/core/Setting/SettingDisableactions.php b/lib/plugins/config/core/Setting/SettingDisableactions.php index 2553175bd..ec4974318 100644 --- a/lib/plugins/config/core/Setting/SettingDisableactions.php +++ b/lib/plugins/config/core/Setting/SettingDisableactions.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_disableactions */ -class SettingDisableactions extends SettingMulticheckbox { +class SettingDisableactions extends SettingMulticheckbox +{ /** @inheritdoc */ public function html(\admin_plugin_config $plugin, $echo = false) { diff --git a/lib/plugins/config/core/Setting/SettingEmail.php b/lib/plugins/config/core/Setting/SettingEmail.php index d4c505cc1..9a0304ba4 100644 --- a/lib/plugins/config/core/Setting/SettingEmail.php +++ b/lib/plugins/config/core/Setting/SettingEmail.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_email */ -class SettingEmail extends SettingString { +class SettingEmail extends SettingString +{ protected $multiple = false; protected $placeholders = false; diff --git a/lib/plugins/config/core/Setting/SettingFieldset.php b/lib/plugins/config/core/Setting/SettingFieldset.php index 4e8618967..733d74cc5 100644 --- a/lib/plugins/config/core/Setting/SettingFieldset.php +++ b/lib/plugins/config/core/Setting/SettingFieldset.php @@ -7,11 +7,11 @@ namespace dokuwiki\plugin\config\core\Setting; * * Used to start a new settings "display-group". */ -class SettingFieldset extends Setting { +class SettingFieldset extends Setting +{ /** @inheritdoc */ public function shouldHaveDefault() { return false; } - } diff --git a/lib/plugins/config/core/Setting/SettingHidden.php b/lib/plugins/config/core/Setting/SettingHidden.php index ca8a03eb9..11b800f84 100644 --- a/lib/plugins/config/core/Setting/SettingHidden.php +++ b/lib/plugins/config/core/Setting/SettingHidden.php @@ -5,6 +5,7 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_hidden */ -class SettingHidden extends Setting { +class SettingHidden extends Setting +{ // Used to explicitly ignore a setting in the configuration manager. } diff --git a/lib/plugins/config/core/Setting/SettingImConvert.php b/lib/plugins/config/core/Setting/SettingImConvert.php index 8740d94c8..38691f679 100644 --- a/lib/plugins/config/core/Setting/SettingImConvert.php +++ b/lib/plugins/config/core/Setting/SettingImConvert.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_im_convert */ -class SettingImConvert extends SettingString { +class SettingImConvert extends SettingString +{ /** @inheritdoc */ public function update($input) { diff --git a/lib/plugins/config/core/Setting/SettingLicense.php b/lib/plugins/config/core/Setting/SettingLicense.php index f33275b1f..33fbbdac9 100644 --- a/lib/plugins/config/core/Setting/SettingLicense.php +++ b/lib/plugins/config/core/Setting/SettingLicense.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_license */ -class SettingLicense extends SettingMultichoice { +class SettingLicense extends SettingMultichoice +{ protected $choices = ['']; // none choosen diff --git a/lib/plugins/config/core/Setting/SettingMulticheckbox.php b/lib/plugins/config/core/Setting/SettingMulticheckbox.php index ad23eb6d0..e4b0031be 100644 --- a/lib/plugins/config/core/Setting/SettingMulticheckbox.php +++ b/lib/plugins/config/core/Setting/SettingMulticheckbox.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_multicheckbox */ -class SettingMulticheckbox extends SettingString { +class SettingMulticheckbox extends SettingString +{ protected $choices = []; protected $combine = []; diff --git a/lib/plugins/config/core/Setting/SettingMultichoice.php b/lib/plugins/config/core/Setting/SettingMultichoice.php index eee3b59b4..81dcf1154 100644 --- a/lib/plugins/config/core/Setting/SettingMultichoice.php +++ b/lib/plugins/config/core/Setting/SettingMultichoice.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_multichoice */ -class SettingMultichoice extends SettingString { +class SettingMultichoice extends SettingString +{ protected $choices = []; public $lang; //some custom language strings are stored in setting diff --git a/lib/plugins/config/core/Setting/SettingNoClass.php b/lib/plugins/config/core/Setting/SettingNoClass.php index 8efff216a..805ab11c9 100644 --- a/lib/plugins/config/core/Setting/SettingNoClass.php +++ b/lib/plugins/config/core/Setting/SettingNoClass.php @@ -7,6 +7,7 @@ namespace dokuwiki\plugin\config\core\Setting; * A do-nothing class used to detect settings with a missing setting class. * Used internaly to hide undefined settings, and generate the undefined settings list. */ -class SettingNoClass extends SettingUndefined { +class SettingNoClass extends SettingUndefined +{ protected $errorMessage = '_msg_setting_no_class'; } diff --git a/lib/plugins/config/core/Setting/SettingNoDefault.php b/lib/plugins/config/core/Setting/SettingNoDefault.php index 07b8412dd..2780be095 100644 --- a/lib/plugins/config/core/Setting/SettingNoDefault.php +++ b/lib/plugins/config/core/Setting/SettingNoDefault.php @@ -8,6 +8,7 @@ namespace dokuwiki\plugin\config\core\Setting; * A do-nothing class used to detect settings with no default value. * Used internaly to hide undefined settings, and generate the undefined settings list. */ -class SettingNoDefault extends SettingUndefined { +class SettingNoDefault extends SettingUndefined +{ protected $errorMessage = '_msg_setting_no_default'; } diff --git a/lib/plugins/config/core/Setting/SettingNoKnownClass.php b/lib/plugins/config/core/Setting/SettingNoKnownClass.php index 3c527e1ee..0d5c1c734 100644 --- a/lib/plugins/config/core/Setting/SettingNoKnownClass.php +++ b/lib/plugins/config/core/Setting/SettingNoKnownClass.php @@ -6,6 +6,7 @@ namespace dokuwiki\plugin\config\core\Setting; * A do-nothing class used to detect settings with a missing setting class. * Used internaly to hide undefined settings, and generate the undefined settings list. */ -class SettingNoKnownClass extends SettingUndefined { +class SettingNoKnownClass extends SettingUndefined +{ protected $errorMessage = '_msg_setting_no_known_class'; } diff --git a/lib/plugins/config/core/Setting/SettingNumeric.php b/lib/plugins/config/core/Setting/SettingNumeric.php index 288bc5662..7f40bc87c 100644 --- a/lib/plugins/config/core/Setting/SettingNumeric.php +++ b/lib/plugins/config/core/Setting/SettingNumeric.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_numeric */ -class SettingNumeric extends SettingString { +class SettingNumeric extends SettingString +{ // This allows for many PHP syntax errors... // var $_pattern = '/^[-+\/*0-9 ]*$/'; // much more restrictive, but should eliminate syntax errors. diff --git a/lib/plugins/config/core/Setting/SettingNumericopt.php b/lib/plugins/config/core/Setting/SettingNumericopt.php index a79767448..90eb235eb 100644 --- a/lib/plugins/config/core/Setting/SettingNumericopt.php +++ b/lib/plugins/config/core/Setting/SettingNumericopt.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_numericopt */ -class SettingNumericopt extends SettingNumeric { +class SettingNumericopt extends SettingNumeric +{ // just allow an empty config protected $pattern = '/^(|[-]?\d+(?:[-+*]\d+)*)$/'; diff --git a/lib/plugins/config/core/Setting/SettingOnoff.php b/lib/plugins/config/core/Setting/SettingOnoff.php index 786000621..2cc8f32c0 100644 --- a/lib/plugins/config/core/Setting/SettingOnoff.php +++ b/lib/plugins/config/core/Setting/SettingOnoff.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_onoff */ -class SettingOnoff extends SettingNumeric { +class SettingOnoff extends SettingNumeric +{ /** * We treat the strings 'false' and 'off' as false diff --git a/lib/plugins/config/core/Setting/SettingPassword.php b/lib/plugins/config/core/Setting/SettingPassword.php index 7c6ce289c..c1fc0f42b 100644 --- a/lib/plugins/config/core/Setting/SettingPassword.php +++ b/lib/plugins/config/core/Setting/SettingPassword.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_password */ -class SettingPassword extends SettingString { +class SettingPassword extends SettingString +{ protected $code = 'plain'; // mechanism to be used to obscure passwords diff --git a/lib/plugins/config/core/Setting/SettingRegex.php b/lib/plugins/config/core/Setting/SettingRegex.php index d966cb2c0..a3d235b2f 100644 --- a/lib/plugins/config/core/Setting/SettingRegex.php +++ b/lib/plugins/config/core/Setting/SettingRegex.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_regex */ -class SettingRegex extends SettingString { +class SettingRegex extends SettingString +{ protected $delimiter = '/'; // regex delimiter to be used in testing input protected $pregflags = 'ui'; // regex pattern modifiers to be used in testing input diff --git a/lib/plugins/config/core/Setting/SettingRenderer.php b/lib/plugins/config/core/Setting/SettingRenderer.php index 776905e85..e46255d03 100644 --- a/lib/plugins/config/core/Setting/SettingRenderer.php +++ b/lib/plugins/config/core/Setting/SettingRenderer.php @@ -10,7 +10,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_renderer */ -class SettingRenderer extends SettingMultichoice { +class SettingRenderer extends SettingMultichoice +{ protected $prompts = []; protected $format; diff --git a/lib/plugins/config/core/Setting/SettingSavedir.php b/lib/plugins/config/core/Setting/SettingSavedir.php index 43e428dd3..87afdfd60 100644 --- a/lib/plugins/config/core/Setting/SettingSavedir.php +++ b/lib/plugins/config/core/Setting/SettingSavedir.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_savedir */ -class SettingSavedir extends SettingString { +class SettingSavedir extends SettingString +{ /** @inheritdoc */ public function update($input) { diff --git a/lib/plugins/config/core/Setting/SettingSepchar.php b/lib/plugins/config/core/Setting/SettingSepchar.php index 57cd0ae92..bb30362e5 100644 --- a/lib/plugins/config/core/Setting/SettingSepchar.php +++ b/lib/plugins/config/core/Setting/SettingSepchar.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_sepchar */ -class SettingSepchar extends SettingMultichoice { +class SettingSepchar extends SettingMultichoice +{ /** @inheritdoc */ public function __construct($key, $param = null) { diff --git a/lib/plugins/config/core/Setting/SettingString.php b/lib/plugins/config/core/Setting/SettingString.php index f4039ddf7..ff6a07ff1 100644 --- a/lib/plugins/config/core/Setting/SettingString.php +++ b/lib/plugins/config/core/Setting/SettingString.php @@ -5,7 +5,8 @@ namespace dokuwiki\plugin\config\core\Setting; /** * Class setting_string */ -class SettingString extends Setting { +class SettingString extends Setting +{ /** @inheritdoc */ public function html(\admin_plugin_config $plugin, $echo = false) { $disable = ''; diff --git a/lib/plugins/config/core/Setting/SettingUndefined.php b/lib/plugins/config/core/Setting/SettingUndefined.php index 722c44784..29a0f662e 100644 --- a/lib/plugins/config/core/Setting/SettingUndefined.php +++ b/lib/plugins/config/core/Setting/SettingUndefined.php @@ -8,7 +8,8 @@ use dokuwiki\plugin\config\core\Configuration; * A do-nothing class used to detect settings with no metadata entry. * Used internaly to hide undefined settings, and generate the undefined settings list. */ -class SettingUndefined extends SettingHidden { +class SettingUndefined extends SettingHidden +{ protected $errorMessage = '_msg_setting_undefined'; @@ -36,5 +37,4 @@ class SettingUndefined extends SettingHidden { return [$label, $input]; } - } diff --git a/lib/plugins/config/core/Writer.php b/lib/plugins/config/core/Writer.php index 5eca71029..8857ca76f 100644 --- a/lib/plugins/config/core/Writer.php +++ b/lib/plugins/config/core/Writer.php @@ -7,7 +7,8 @@ use dokuwiki\Logger; /** * Writes the settings to the correct local file */ -class Writer { +class Writer +{ /** @var string header info */ protected $header = 'Dokuwiki\'s Main Configuration File - Local Settings'; diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php index 7f374b5e9..3f829f724 100644 --- a/lib/plugins/testing/action.php +++ b/lib/plugins/testing/action.php @@ -11,7 +11,8 @@ use dokuwiki\Extension\Event; * * @author Tobias Sarnowski <tobias@trustedco.de> */ -class action_plugin_testing extends ActionPlugin { +class action_plugin_testing extends ActionPlugin +{ /** @inheritdoc */ public function register(EventHandler $controller) { |