code style: line breaks

This commit is contained in:
Andreas Gohr 2023-08-31 22:44:40 +02:00
parent fe15e2c063
commit d4f83172d9
245 changed files with 153 additions and 205 deletions

View File

@ -6,16 +6,6 @@
<rule ref="./phpcs.xml">
<!-- Rules with automatic fixes that we want to adhere to, but currently don't -->
<exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine"/>
<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore"/>
<exclude name="PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose"/>
<exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
<exclude name="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse"/>
<exclude name="PSR12.Classes.OpeningBraceSpace.Found"/>
<exclude name="PSR12.Files.FileHeader.SpacingAfterBlock"/>
</rule>
<!-- for now we mix declarations and execution here (mostly for defines) -->

View File

@ -14,7 +14,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class PageCLI extends CLI
{
protected $force = false;
protected $username = '';

View File

@ -15,7 +15,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class GitToolCLI extends CLI
{
/**
* Register options and arguments on the given $options object
*

View File

@ -13,7 +13,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class IndexerCLI extends CLI
{
private $quiet = false;
private $clear = false;

View File

@ -14,7 +14,6 @@ require_once(DOKU_INC . 'inc/init.php');
class PluginCLI extends CLI
{
/**
* Register options and arguments on the given $options object
*

View File

@ -21,7 +21,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class RenderCLI extends CLI
{
/**
* Register options and arguments on the given $options object
*

View File

@ -13,7 +13,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class StripLangsCLI extends CLI
{
/**
* Register options and arguments on the given $options object
*

View File

@ -15,7 +15,6 @@ require_once(DOKU_INC . 'inc/init.php');
*/
class WantedPagesCLI extends CLI
{
protected const DIR_CONTINUE = 1;
protected const DIR_NS = 2;
protected const DIR_PAGE = 3;

View File

@ -1,4 +1,5 @@
<?php
/**
* DokuWiki mainscript
*

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionAclRequiredException;
*/
abstract class AbstractAclAction extends AbstractAction
{
/** @inheritdoc */
public function checkPreconditions()
{

View File

@ -14,7 +14,6 @@ use dokuwiki\Action\Exception\FatalException;
*/
abstract class AbstractAction
{
/** @var string holds the name of the action (lowercase class name, no namespace) */
protected $actionname;

View File

@ -16,7 +16,6 @@ use dokuwiki\Action\Exception\FatalException;
*/
abstract class AbstractAliasAction extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionUserRequiredException;
*/
abstract class AbstractUserAction extends AbstractAclAction
{
/** @inheritdoc */
public function checkPreconditions()
{

View File

@ -14,7 +14,6 @@ use dokuwiki\Extension\AdminPlugin;
*/
class Admin extends AbstractUserAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionAbort;
*/
class Cancel extends AbstractAliasAction
{
/**
* @inheritdoc
* @throws ActionAbort

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionAbort;
*/
class Check extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -14,7 +14,6 @@ use dokuwiki\Action\Exception\ActionAbort;
*/
class Draftdel extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -17,5 +17,4 @@ namespace dokuwiki\Action\Exception;
*/
class ActionAbort extends ActionException
{
}

View File

@ -14,5 +14,4 @@ namespace dokuwiki\Action\Exception;
*/
class ActionAclRequiredException extends ActionException
{
}

View File

@ -14,5 +14,4 @@ namespace dokuwiki\Action\Exception;
*/
class ActionDisabledException extends ActionException
{
}

View File

@ -15,7 +15,6 @@ namespace dokuwiki\Action\Exception;
*/
class ActionException extends \Exception
{
/** @var string the new action */
protected $newaction;

View File

@ -14,5 +14,4 @@ namespace dokuwiki\Action\Exception;
*/
class ActionUserRequiredException extends ActionException
{
}

View File

@ -12,5 +12,4 @@ namespace dokuwiki\Action\Exception;
*/
class NoActionException extends \Exception
{
}

View File

@ -14,7 +14,6 @@ use dokuwiki\Extension\Event;
*/
class Export extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -15,7 +15,6 @@ use dokuwiki\Extension\AuthPlugin;
*/
class Logout extends AbstractUserAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -11,7 +11,6 @@ namespace dokuwiki\Action;
*/
class Media extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -13,7 +13,6 @@ use dokuwiki\Extension\Event;
*/
class Plugin extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -15,7 +15,6 @@ use dokuwiki\Extension\AuthPlugin;
*/
class ProfileDelete extends AbstractUserAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionAbort;
*/
class Recover extends AbstractAliasAction
{
/**
* @inheritdoc
* @throws ActionAbort

View File

@ -14,7 +14,6 @@ use dokuwiki\Extension\Event;
*/
class Redirect extends AbstractAliasAction
{
/**
* Redirect to the show action, trying to jump to the previously edited section
*

View File

@ -14,7 +14,6 @@ use dokuwiki\Action\Exception\ActionException;
*/
class Revert extends AbstractUserAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -14,7 +14,6 @@ use dokuwiki\Action\Exception\ActionException;
*/
class Save extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -13,7 +13,6 @@ use dokuwiki\Action\Exception\ActionAbort;
*/
class Search extends AbstractAction
{
protected $pageLookupResults = [];
protected $fullTextResults = [];
protected $highlight = [];
@ -128,7 +127,6 @@ class Search extends AbstractAction
}
return '*' . $part . '*';
}, $queryParts);
$QUERY = implode(' ', $queryParts);
}

View File

@ -1,4 +1,5 @@
<?php
/**
* Created by IntelliJ IDEA.
* User: andi

View File

@ -15,7 +15,6 @@ use dokuwiki\Utf8\PhpString;
*/
class Sitemap extends AbstractAction
{
/** @inheritdoc */
public function minimumPermission()
{

View File

@ -16,7 +16,6 @@ use dokuwiki\Action\Plugin;
*/
class ActionRouter
{
/** @var AbstractAction */
protected $action;

View File

@ -16,7 +16,6 @@ use dokuwiki\Utf8\Sort;
*/
class Ajax
{
/**
* Execute the given call
*
@ -444,6 +443,5 @@ class Ajax
}
echo '</div>';
}
}
}

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Cache;
*/
class CacheImageMod extends Cache
{
/** @var string source file */
protected $file;

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Cache;
*/
class CacheInstructions extends CacheParser
{
/**
* @param string $id page id
* @param string $file source file for cache

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Cache;
*/
class CacheParser extends Cache
{
public $file = ''; // source file for cache
public $mode = ''; // input mode (represents the processing the input file will undergo)
public $page = '';

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Cache;
*/
class CacheRenderer extends CacheParser
{
/**
* method contains cache use decision logic
*

View File

@ -7,7 +7,6 @@ namespace dokuwiki\ChangeLog;
*/
class MediaChangeLog extends ChangeLog
{
/**
* Returns path to changelog
*

View File

@ -7,7 +7,6 @@ namespace dokuwiki\ChangeLog;
*/
class PageChangeLog extends ChangeLog
{
/**
* Returns path to changelog
*

View File

@ -1,6 +1,5 @@
<?php
namespace dokuwiki\Debug;
use dokuwiki\Extension\Event;
@ -139,7 +138,6 @@ class DebugHelper
$file,
$line
);
}
/**

View File

@ -1,4 +1,5 @@
<?php
/**
* Trait for issuing warnings on deprecated access.
*
@ -6,7 +7,6 @@
*
*/
namespace dokuwiki\Debug;
/**
@ -32,7 +32,6 @@ namespace dokuwiki\Debug;
*/
trait PropertyDeprecationHelper
{
/**
* List of deprecated properties, in <property name> => <class> format
* where <class> is the the name of the class defining the property

View File

@ -3,6 +3,7 @@
namespace dokuwiki;
use dokuwiki\Extension\Event;
/**
* Class Draft
*
@ -10,7 +11,6 @@ use dokuwiki\Extension\Event;
*/
class Draft
{
protected $errors = [];
protected $cname;
protected $id;

View File

@ -7,5 +7,4 @@ namespace dokuwiki\Exception;
*/
class FatalException extends \ErrorException
{
}

View File

@ -12,7 +12,6 @@ namespace dokuwiki\Extension;
*/
abstract class ActionPlugin extends Plugin
{
/**
* Registers a callback function for a given event
*

View File

@ -12,7 +12,6 @@ namespace dokuwiki\Extension;
*/
abstract class AdminPlugin extends Plugin
{
/**
* Return the text that is displayed at the main admin menu
* (Default localized language string 'menu' is returned, override this function for setting another name)

View File

@ -3,6 +3,7 @@
namespace dokuwiki\Extension;
use splitbrain\phpcli\CLI;
/**
* CLI plugin prototype
*

View File

@ -1,4 +1,5 @@
<?php
// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
namespace dokuwiki\Extension;

View File

@ -1,4 +1,5 @@
<?php
// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
namespace dokuwiki\Extension;
@ -8,7 +9,6 @@ namespace dokuwiki\Extension;
*/
class EventHandler
{
// public properties: none
// private properties

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Extension;
*/
trait PluginTrait
{
protected $localised = false; // set to true by setupLocale() after loading language dependent strings
protected $lang = []; // array to hold language dependent strings, best accessed via ->getLang()
protected $configloaded = false; // set to true by loadConfig() after loading plugin configuration variables

View File

@ -13,7 +13,6 @@ use ReflectionMethod;
*/
abstract class RemotePlugin extends Plugin
{
private Api $api;
/**

View File

@ -9,7 +9,6 @@ use SimplePie\File;
*/
class FeedParser extends SimplePie
{
/**
* Constructor. Set some defaults
*/

View File

@ -7,7 +7,6 @@ namespace dokuwiki\File;
*/
class MediaResolver extends Resolver
{
/** @inheritDoc */
public function resolveId($id, $rev = '', $isDateAt = false)
{

View File

@ -7,7 +7,6 @@ namespace dokuwiki\File;
*/
class PageResolver extends Resolver
{
/**
* Resolves a given ID to be absolute
*

View File

@ -7,7 +7,6 @@ namespace dokuwiki\File;
*/
abstract class Resolver
{
/** @var string context page ID */
protected $contextID;
/** @var string namespace of context page ID */

View File

@ -11,7 +11,6 @@ namespace dokuwiki\Form;
*/
class FieldsetOpenElement extends TagOpenElement
{
/**
* @param string $legend
* @param array $attributes

View File

@ -102,7 +102,6 @@ class LegacyForm extends Form
$this->addHTML($element);
}
}
}
/**

View File

@ -1,9 +1,9 @@
<?php
namespace dokuwiki\HTTP;
use dokuwiki\Extension\Event;
/**
* Adds DokuWiki specific configs to the HTTP client
*
@ -12,7 +12,6 @@ use dokuwiki\Extension\Event;
*/
class DokuHTTPClient extends HTTPClient
{
/**
* Constructor.
*

View File

@ -6,5 +6,4 @@ use Exception;
class HTTPClientException extends Exception
{
}

View File

@ -9,7 +9,6 @@ namespace dokuwiki;
*/
class Info
{
/**
* Parse the given version string into its parts
*

View File

@ -13,7 +13,6 @@ namespace dokuwiki\Input;
*/
class Input
{
/** @var Post Access $_POST parameters */
public $post;
/** @var Get Access $_GET parameters */

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Input;
*/
class Post extends Input
{
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/

View File

@ -7,7 +7,6 @@ namespace dokuwiki\Input;
*/
class Server extends Input
{
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/

View File

@ -1,4 +1,5 @@
<?php
/**
* A class to build and send multi part mails (with HTML content and embedded
* attachments). All mails are assumed to be in UTF-8 encoding.
@ -8,6 +9,7 @@
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
use dokuwiki\Utf8\PhpString;
use dokuwiki\Utf8\Clean;
use dokuwiki\Extension\Event;
@ -17,7 +19,6 @@ use dokuwiki\Extension\Event;
*/
class Mailer
{
protected $headers = [];
protected $attach = [];
protected $html = '';
@ -596,7 +597,6 @@ class Mailer
$this->headers['Subject'] = '=?UTF-8?B?' . base64_encode($this->headers['Subject']) . '?=';
}
}
}
/**

View File

@ -14,7 +14,6 @@ use dokuwiki\Menu\Item\AbstractItem;
*/
abstract class AbstractMenu implements MenuInterface
{
/** @var string[] list of Item classes to load */
protected $types = [];

View File

@ -10,7 +10,6 @@ namespace dokuwiki\Menu;
*/
class DetailMenu extends AbstractMenu
{
protected $view = 'detail';
protected $types = ['MediaManager', 'ImgBackto', 'Top'];

View File

@ -19,7 +19,6 @@ namespace dokuwiki\Menu\Item;
*/
abstract class AbstractItem
{
/** menu item is to be shown on desktop screens only */
public const CTX_DESKTOP = 1;
/** menu item is to be shown on mobile screens only */

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Admin extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -10,7 +10,6 @@ namespace dokuwiki\Menu\Item;
*/
class Back extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Backlink extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -10,7 +10,6 @@ namespace dokuwiki\Menu\Item;
*/
class Edit extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class ImgBackto extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Index extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Login extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Media extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class MediaManager extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Profile extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Recent extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Register extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Resendpwd extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Revert extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Revisions extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu\Item;
*/
class Subscribe extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -10,7 +10,6 @@ namespace dokuwiki\Menu\Item;
*/
class Top extends AbstractItem
{
/** @inheritdoc */
public function __construct()
{

View File

@ -11,7 +11,6 @@ use dokuwiki\Menu\Item\AbstractItem;
*/
interface MenuInterface
{
/**
* Get the list of action items in this menu
*

View File

@ -13,7 +13,6 @@ use dokuwiki\Menu\Item\AbstractItem;
*/
class MobileMenu implements MenuInterface
{
/**
* Returns all items grouped by view
*

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu;
*/
class PageMenu extends AbstractMenu
{
protected $view = 'page';
protected $types = ['Edit', 'Revert', 'Revisions', 'Backlink', 'Subscribe', 'Top'];

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu;
*/
class SiteMenu extends AbstractMenu
{
protected $view = 'site';
protected $types = ['Recent', 'Media', 'Index'];

View File

@ -9,7 +9,6 @@ namespace dokuwiki\Menu;
*/
class UserMenu extends AbstractMenu
{
protected $view = 'user';
protected $types = ['Profile', 'Admin', 'Register', 'Login'];

View File

@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\Handler;
class CallWriter implements CallWriterInterface
{
/** @var \Doku_Handler $Handler */
protected $Handler;

View File

@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\Handler;
class Preformatted extends AbstractRewriter
{
protected $pos;
protected $text = '';

View File

@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\Handler;
class Table extends AbstractRewriter
{
protected $tableCalls = [];
protected $maxCols = 0;
protected $maxRows = 1;

View File

@ -1,4 +1,5 @@
<?php
/**
* Lexer adapted from Simple Test: http://sourceforge.net/projects/simpletest/
* For an intro to the Lexer see:

View File

@ -1,4 +1,5 @@
<?php
/**
* Lexer adapted from Simple Test: http://sourceforge.net/projects/simpletest/
* For an intro to the Lexer see:

View File

@ -1,4 +1,5 @@
<?php
/**
* Lexer adapted from Simple Test: http://sourceforge.net/projects/simpletest/
* For an intro to the Lexer see:

View File

@ -14,7 +14,6 @@ use dokuwiki\Parsing\ParserMode\ModeInterface;
*/
class Parser
{
/** @var Doku_Handler */
protected $handler;

View File

@ -3,6 +3,7 @@
namespace dokuwiki\Parsing\ParserMode;
use dokuwiki\Parsing\Lexer\Lexer;
/**
* This class and all the subclasses below are used to reduce the effort required to register
* modes with the Lexer.

Some files were not shown because too many files have changed in this diff Show More