Merge pull request #4045 from dokuwiki/autofix

Use Rector to autofix code smell

32 files changed, 49 insertions, 76 deletions

diff --git a/inc/Parsing/ParserMode/AbstractMode.php b/inc/Parsing/ParserMode/AbstractMode.php
index 15fc9fe04..44dfe0103 100644
--- a/inc/Parsing/ParserMode/AbstractMode.php
+++ b/inc/Parsing/ParserMode/AbstractMode.php
@@ -2,6 +2,8 @@
 
 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.
@@ -10,9 +12,9 @@ namespace dokuwiki\Parsing\ParserMode;
  */
 abstract class AbstractMode implements ModeInterface
 {
-    /** @var \dokuwiki\Parsing\Lexer\Lexer $Lexer will be injected on loading FIXME this should be done by setter */
+    /** @var Lexer $Lexer will be injected on loading FIXME this should be done by setter */
     public $Lexer;
-    protected $allowedModes = array();
+    protected $allowedModes = [];
 
     /** @inheritdoc */
     abstract public function getSort();
diff --git a/inc/Parsing/ParserMode/Acronym.php b/inc/Parsing/ParserMode/Acronym.php
index b42a7b573..b80df488c 100644
--- a/inc/Parsing/ParserMode/Acronym.php
+++ b/inc/Parsing/ParserMode/Acronym.php
@@ -5,7 +5,7 @@ namespace dokuwiki\Parsing\ParserMode;
 class Acronym extends AbstractMode
 {
     // A list
-    protected $acronyms = array();
+    protected $acronyms = [];
     protected $pattern = '';
 
     /**
@@ -15,7 +15,7 @@ class Acronym extends AbstractMode
      */
     public function __construct($acronyms)
     {
-        usort($acronyms, array($this,'compare'));
+        usort($acronyms, [$this, 'compare']);
         $this->acronyms = $acronyms;
     }
 
@@ -26,7 +26,7 @@ class Acronym extends AbstractMode
 
         $bound = '[\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]';
         $acronyms = array_map(['\\dokuwiki\\Parsing\\Lexer\\Lexer', 'escape'], $this->acronyms);
-        $this->pattern = '(?<=^|'.$bound.')(?:'.join('|', $acronyms).')(?='.$bound.')';
+        $this->pattern = '(?<=^|' . $bound . ')(?:' . implode('|', $acronyms) . ')(?=' . $bound . ')';
     }
 
     /** @inheritdoc */
diff --git a/inc/Parsing/ParserMode/Base.php b/inc/Parsing/ParserMode/Base.php
index 562275600..85049cefd 100644
--- a/inc/Parsing/ParserMode/Base.php
+++ b/inc/Parsing/ParserMode/Base.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Base extends AbstractMode
 {
-
     /**
      * Base constructor.
      */
diff --git a/inc/Parsing/ParserMode/Camelcaselink.php b/inc/Parsing/ParserMode/Camelcaselink.php
index ef0b32531..31fd81230 100644
--- a/inc/Parsing/ParserMode/Camelcaselink.php
+++ b/inc/Parsing/ParserMode/Camelcaselink.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Camelcaselink extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Code.php b/inc/Parsing/ParserMode/Code.php
index aa494377d..6efba0cb7 100644
--- a/inc/Parsing/ParserMode/Code.php
+++ b/inc/Parsing/ParserMode/Code.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Code extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Emaillink.php b/inc/Parsing/ParserMode/Emaillink.php
index f9af28c66..c4b7e355a 100644
--- a/inc/Parsing/ParserMode/Emaillink.php
+++ b/inc/Parsing/ParserMode/Emaillink.php
@@ -4,12 +4,11 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Emaillink extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
         // pattern below is defined in inc/mail.php
-        $this->Lexer->addSpecialPattern('<'.PREG_PATTERN_VALID_EMAIL.'>', $mode, 'emaillink');
+        $this->Lexer->addSpecialPattern('<' . PREG_PATTERN_VALID_EMAIL . '>', $mode, 'emaillink');
     }
 
     /** @inheritdoc */
diff --git a/inc/Parsing/ParserMode/Entity.php b/inc/Parsing/ParserMode/Entity.php
index b670124b2..043511144 100644
--- a/inc/Parsing/ParserMode/Entity.php
+++ b/inc/Parsing/ParserMode/Entity.php
@@ -6,8 +6,7 @@ use dokuwiki\Parsing\Lexer\Lexer;
 
 class Entity extends AbstractMode
 {
-
-    protected $entities = array();
+    protected $entities = [];
     protected $pattern = '';
 
     /**
@@ -27,7 +26,7 @@ class Entity extends AbstractMode
 
         $sep = '';
         foreach ($this->entities as $entity) {
-            $this->pattern .= $sep. Lexer::escape($entity);
+            $this->pattern .= $sep . Lexer::escape($entity);
             $sep = '|';
         }
     }
diff --git a/inc/Parsing/ParserMode/Eol.php b/inc/Parsing/ParserMode/Eol.php
index a5886b51f..61900653f 100644
--- a/inc/Parsing/ParserMode/Eol.php
+++ b/inc/Parsing/ParserMode/Eol.php
@@ -4,11 +4,10 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Eol extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
-        $badModes = array('listblock','table');
+        $badModes = ['listblock', 'table'];
         if (in_array($mode, $badModes)) {
             return;
         }
diff --git a/inc/Parsing/ParserMode/Externallink.php b/inc/Parsing/ParserMode/Externallink.php
index 530d5dbba..354254b64 100644
--- a/inc/Parsing/ParserMode/Externallink.php
+++ b/inc/Parsing/ParserMode/Externallink.php
@@ -4,8 +4,8 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Externallink extends AbstractMode
 {
-    protected $schemes = array();
-    protected $patterns = array();
+    protected $schemes = [];
+    protected $patterns = [];
 
     /** @inheritdoc */
     public function preConnect()
@@ -15,18 +15,18 @@ class Externallink extends AbstractMode
         $ltrs = '\w';
         $gunk = '/\#~:.?+=&%@!\-\[\]';
         $punc = '.:?\-;,';
-        $host = $ltrs.$punc;
-        $any  = $ltrs.$gunk.$punc;
+        $host = $ltrs . $punc;
+        $any  = $ltrs . $gunk . $punc;
 
         $this->schemes = getSchemes();
         foreach ($this->schemes as $scheme) {
-            $this->patterns[] = '\b(?i)'.$scheme.'(?-i)://['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+            $this->patterns[] = '\b(?i)' . $scheme . '(?-i)://[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . '])';
         }
 
-        $this->patterns[] = '(?<![/\\\\])\b(?i)www?(?-i)\.['.$host.']+?\.'.
-                            '['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
-        $this->patterns[] = '(?<![/\\\\])\b(?i)ftp?(?-i)\.['.$host.']+?\.'.
-                            '['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        $this->patterns[] = '(?<![/\\\\])\b(?i)www?(?-i)\.[' . $host . ']+?\.' .
+                            '[' . $host . ']+?[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . '])';
+        $this->patterns[] = '(?<![/\\\\])\b(?i)ftp?(?-i)\.[' . $host . ']+?\.' .
+                            '[' . $host . ']+?[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . '])';
     }
 
     /** @inheritdoc */
diff --git a/inc/Parsing/ParserMode/File.php b/inc/Parsing/ParserMode/File.php
index 149134135..a49b1c135 100644
--- a/inc/Parsing/ParserMode/File.php
+++ b/inc/Parsing/ParserMode/File.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class File extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Filelink.php b/inc/Parsing/ParserMode/Filelink.php
index 3cd86cb8b..3e57af32f 100644
--- a/inc/Parsing/ParserMode/Filelink.php
+++ b/inc/Parsing/ParserMode/Filelink.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Filelink extends AbstractMode
 {
-
     protected $pattern;
 
     /** @inheritdoc */
@@ -14,11 +13,10 @@ class Filelink extends AbstractMode
         $ltrs = '\w';
         $gunk = '/\#~:.?+=&%@!\-';
         $punc = '.:?\-;,';
-        $host = $ltrs.$punc;
-        $any  = $ltrs.$gunk.$punc;
+        $any  = $ltrs . $gunk . $punc;
 
-        $this->pattern = '\b(?i)file(?-i)://['.$any.']+?['.
-            $punc.']*[^'.$any.']';
+        $this->pattern = '\b(?i)file(?-i)://[' . $any . ']+?[' .
+            $punc . ']*[^' . $any . ']';
     }
 
     /** @inheritdoc */
diff --git a/inc/Parsing/ParserMode/Footnote.php b/inc/Parsing/ParserMode/Footnote.php
index c399f9849..5bd282740 100644
--- a/inc/Parsing/ParserMode/Footnote.php
+++ b/inc/Parsing/ParserMode/Footnote.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Footnote extends AbstractMode
 {
-
     /**
      * Footnote constructor.
      */
diff --git a/inc/Parsing/ParserMode/Formatting.php b/inc/Parsing/ParserMode/Formatting.php
index a3c465cc0..7949698b1 100644
--- a/inc/Parsing/ParserMode/Formatting.php
+++ b/inc/Parsing/ParserMode/Formatting.php
@@ -10,49 +10,44 @@ class Formatting extends AbstractMode
 {
     protected $type;
 
-    protected $formatting = array(
-        'strong' => array(
+    protected $formatting = [
+        'strong' => [
             'entry' => '\*\*(?=.*\*\*)',
             'exit' => '\*\*',
             'sort' => 70
-        ),
-
-        'emphasis' => array(
-            'entry' => '//(?=[^\x00]*[^:])', //hack for bugs #384 #763 #1468
+        ],
+        'emphasis' => [
+            'entry' => '//(?=[^\x00]*[^:])',
+            //hack for bugs #384 #763 #1468
             'exit' => '//',
-            'sort' => 80
-        ),
-
-        'underline' => array(
+            'sort' => 80,
+        ],
+        'underline' => [
             'entry' => '__(?=.*__)',
             'exit' => '__',
             'sort' => 90
-        ),
-
-        'monospace' => array(
+        ],
+        'monospace' => [
             'entry' => '\x27\x27(?=.*\x27\x27)',
             'exit' => '\x27\x27',
             'sort' => 100
-        ),
-
-        'subscript' => array(
+        ],
+        'subscript' => [
             'entry' => '<sub>(?=.*</sub>)',
             'exit' => '</sub>',
             'sort' => 110
-        ),
-
-        'superscript' => array(
+        ],
+        'superscript' => [
             'entry' => '<sup>(?=.*</sup>)',
             'exit' => '</sup>',
             'sort' => 120
-        ),
-
-        'deleted' => array(
+        ],
+        'deleted' => [
             'entry' => '<del>(?=.*</del>)',
             'exit' => '</del>',
             'sort' => 130
-        ),
-    );
+        ]
+    ];
 
     /**
      * @param string $type
diff --git a/inc/Parsing/ParserMode/Header.php b/inc/Parsing/ParserMode/Header.php
index 854b3178c..8dc8937ec 100644
--- a/inc/Parsing/ParserMode/Header.php
+++ b/inc/Parsing/ParserMode/Header.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Header extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Hr.php b/inc/Parsing/ParserMode/Hr.php
index e4f0b444b..a64137b18 100644
--- a/inc/Parsing/ParserMode/Hr.php
+++ b/inc/Parsing/ParserMode/Hr.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Hr extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Internallink.php b/inc/Parsing/ParserMode/Internallink.php
index 6def0d9a3..c3ed4589f 100644
--- a/inc/Parsing/ParserMode/Internallink.php
+++ b/inc/Parsing/ParserMode/Internallink.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Internallink extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Linebreak.php b/inc/Parsing/ParserMode/Linebreak.php
index dd95cc383..9b5246768 100644
--- a/inc/Parsing/ParserMode/Linebreak.php
+++ b/inc/Parsing/ParserMode/Linebreak.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Linebreak extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Listblock.php b/inc/Parsing/ParserMode/Listblock.php
index eef762777..a9adbe6b6 100644
--- a/inc/Parsing/ParserMode/Listblock.php
+++ b/inc/Parsing/ParserMode/Listblock.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Listblock extends AbstractMode
 {
-
     /**
      * Listblock constructor.
      */
diff --git a/inc/Parsing/ParserMode/Media.php b/inc/Parsing/ParserMode/Media.php
index f93f94773..ec6b32217 100644
--- a/inc/Parsing/ParserMode/Media.php
+++ b/inc/Parsing/ParserMode/Media.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Media extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Multiplyentity.php b/inc/Parsing/ParserMode/Multiplyentity.php
index 89df136df..8ae21134a 100644
--- a/inc/Parsing/ParserMode/Multiplyentity.php
+++ b/inc/Parsing/ParserMode/Multiplyentity.php
@@ -7,7 +7,6 @@ namespace dokuwiki\Parsing\ParserMode;
  */
 class Multiplyentity extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Nocache.php b/inc/Parsing/ParserMode/Nocache.php
index fa6db8305..93ffb3957 100644
--- a/inc/Parsing/ParserMode/Nocache.php
+++ b/inc/Parsing/ParserMode/Nocache.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Nocache extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Notoc.php b/inc/Parsing/ParserMode/Notoc.php
index 5956207c1..5747050c0 100644
--- a/inc/Parsing/ParserMode/Notoc.php
+++ b/inc/Parsing/ParserMode/Notoc.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Notoc extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
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/Parsing/ParserMode/Preformatted.php b/inc/Parsing/ParserMode/Preformatted.php
index 7dfc47489..e7228367a 100644
--- a/inc/Parsing/ParserMode/Preformatted.php
+++ b/inc/Parsing/ParserMode/Preformatted.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Preformatted extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Quote.php b/inc/Parsing/ParserMode/Quote.php
index 65525b241..c6c2d2807 100644
--- a/inc/Parsing/ParserMode/Quote.php
+++ b/inc/Parsing/ParserMode/Quote.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Quote extends AbstractMode
 {
-
     /**
      * Quote constructor.
      */
diff --git a/inc/Parsing/ParserMode/Quotes.php b/inc/Parsing/ParserMode/Quotes.php
index 13db2e679..f83964ab0 100644
--- a/inc/Parsing/ParserMode/Quotes.php
+++ b/inc/Parsing/ParserMode/Quotes.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Quotes extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Rss.php b/inc/Parsing/ParserMode/Rss.php
index a62d9b807..757a5b16f 100644
--- a/inc/Parsing/ParserMode/Rss.php
+++ b/inc/Parsing/ParserMode/Rss.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Rss extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Smiley.php b/inc/Parsing/ParserMode/Smiley.php
index 084ccc9ed..8523c9f8c 100644
--- a/inc/Parsing/ParserMode/Smiley.php
+++ b/inc/Parsing/ParserMode/Smiley.php
@@ -6,7 +6,7 @@ use dokuwiki\Parsing\Lexer\Lexer;
 
 class Smiley extends AbstractMode
 {
-    protected $smileys = array();
+    protected $smileys = [];
     protected $pattern = '';
 
     /**
@@ -25,7 +25,7 @@ class Smiley extends AbstractMode
 
         $sep = '';
         foreach ($this->smileys as $smiley) {
-            $this->pattern .= $sep.'(?<=\W|^)'. Lexer::escape($smiley).'(?=\W|$)';
+            $this->pattern .= $sep . '(?<=\W|^)' . Lexer::escape($smiley) . '(?=\W|$)';
             $sep = '|';
         }
     }
diff --git a/inc/Parsing/ParserMode/Table.php b/inc/Parsing/ParserMode/Table.php
index b4b512380..4fb558560 100644
--- a/inc/Parsing/ParserMode/Table.php
+++ b/inc/Parsing/ParserMode/Table.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Table extends AbstractMode
 {
-
     /**
      * Table constructor.
      */
diff --git a/inc/Parsing/ParserMode/Unformatted.php b/inc/Parsing/ParserMode/Unformatted.php
index 1bc2826e6..58f1435e1 100644
--- a/inc/Parsing/ParserMode/Unformatted.php
+++ b/inc/Parsing/ParserMode/Unformatted.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Unformatted extends AbstractMode
 {
-
     /** @inheritdoc */
     public function connectTo($mode)
     {
diff --git a/inc/Parsing/ParserMode/Windowssharelink.php b/inc/Parsing/ParserMode/Windowssharelink.php
index 747d4d8a9..a6517d63f 100644
--- a/inc/Parsing/ParserMode/Windowssharelink.php
+++ b/inc/Parsing/ParserMode/Windowssharelink.php
@@ -4,7 +4,6 @@ namespace dokuwiki\Parsing\ParserMode;
 
 class Windowssharelink extends AbstractMode
 {
-
     protected $pattern;
 
     /** @inheritdoc */
diff --git a/inc/Parsing/ParserMode/Wordblock.php b/inc/Parsing/ParserMode/Wordblock.php
index 50b24b2db..64d377fe0 100644
--- a/inc/Parsing/ParserMode/Wordblock.php
+++ b/inc/Parsing/ParserMode/Wordblock.php
@@ -9,7 +9,7 @@ use dokuwiki\Parsing\Lexer\Lexer;
  */
 class Wordblock extends AbstractMode
 {
-    protected $badwords = array();
+    protected $badwords = [];
     protected $pattern = '';
 
     /**
@@ -31,7 +31,7 @@ class Wordblock extends AbstractMode
 
         $sep = '';
         foreach ($this->badwords as $badword) {
-            $this->pattern .= $sep.'(?<=\b)(?i)'. Lexer::escape($badword).'(?-i)(?=\b)';
+            $this->pattern .= $sep . '(?<=\b)(?i)' . Lexer::escape($badword) . '(?-i)(?=\b)';
             $sep = '|';
         }
     }