some code style cleanups

Author: splitbrain

admin.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DokuWiki Plugin upgrade (Admin Component)
  *
@@ -81,8 +82,22 @@ public function html()
         echo '<input type="hidden" name="do" value="admin" />';
         echo '<input type="hidden" name="page" value="upgrade" />';
         echo '<input type="hidden" name="sectok" value="' . getSecurityToken() . '" />';
-        if ($next) echo '<button type="submit" name="step[' . $next . ']" value="1" class="button continue ' . $careful . '">' . $this->getLang('btn_continue') . ' ➡</button>';
-        if ($abrt) echo '<button type="submit" name="step[cancel]" value="1" class="button abort">✖ ' . $this->getLang('btn_abort') . '</button>';
+        if ($next) {
+            echo '<button type="submit"
+                          name="step[' . $next . ']"
+                          value="1"
+                          class="button continue ' . $careful . '">' .
+                $this->getLang('btn_continue') .
+                ' ➡</button>';
+        }
+        if ($abrt) {
+            echo '<button type="submit"
+                          name="step[cancel]"
+                          value="1"
+                          class="button abort">✖ ' .
+                $this->getLang('btn_abort') .
+                '</button>';
+        }
         echo '</form>';
 
         $this->displayProgressBar($next);
@@ -180,7 +195,8 @@ private function nextStep(&$abrt, &$next, &$ok)
      * @param string $level
      * @param string $message
      */
-    public function log($level, $message) {
+    public function log($level, $message)
+    {
         echo '<div class="log-' . $level . '">' . $message . '</div>';
         flush();
         ob_flush();

cli.php

@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
+
 use splitbrain\phpcli\Options;
 
 require_once __DIR__ . '/vendor/autoload.php';
@@ -29,7 +31,7 @@ public function __construct()
     protected function setup(Options $options)
     {
         $options->setHelp(
-            'This tool will upgrade your wiki to the newest release. It will automatically check file permissions '.
+            'This tool will upgrade your wiki to the newest release. It will automatically check file permissions ' .
             'and download the required tarball. Internet access is required.'
         );
         $options->registerArgument('check|run', 'Either only check if an update can be done or do it', 'true');
@@ -73,7 +75,7 @@ public function log($level, $message, array $context = array())
 }
 
 // run the script ourselves if called directly
-if(basename($_SERVER['SCRIPT_NAME']) == 'cli.php') {
+if (basename($_SERVER['SCRIPT_NAME']) == 'cli.php') {
     $cli = new cli_plugin_upgrade();
     $cli->run();
 }

helper.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DokuWiki Plugin upgrade (Helper Component)
  *
@@ -93,7 +94,7 @@ public function checkVersions()
         if (!$versionnum) {
             $this->log('warning', $this->getLang('vs_localno'));
             $ok = false;
-        } else if ($tgzversionnum) {
+        } elseif ($tgzversionnum) {
             if ($tgzversionnum < $versionnum) {
                 $this->log('warning', $this->getLang('vs_newer'));
                 $ok = false;
@@ -250,7 +251,8 @@ public function deleteObsoleteFiles()
                 continue;
             }
 
-            if ((is_dir($file) && $this->recursiveDelete($file)) ||
+            if (
+                (is_dir($file) && $this->recursiveDelete($file)) ||
                 @unlink($file)
             ) {
                 $this->log('info', $this->getLang('rm_done'), hsc($line));
@@ -330,10 +332,10 @@ private function traverseCheckAndCopy($dir, $dryrun)
                 if ($fmd5 != $tmd5 || !file_exists($to)) {
                     if ($dryrun) {
                         // just check for writability
-                        if ((file_exists($to) && !is_writable($to)) ||
+                        if (
+                            (file_exists($to) && !is_writable($to)) ||
                             (!file_exists($to) && is_dir(dirname($to)) && !is_writable(dirname($to)))
                         ) {
-
                             $this->log('error', '<b>' . $this->getLang('tv_noperm') . '</b>', hsc("$dir/$file"));
                             $ok = false;
                         } else {

legacy.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Legacy command line upgrade script
  *
@@ -16,6 +17,7 @@
  * Only use this if you can't run the normal upgrade script.
  */
 
+// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
 
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -28,7 +30,8 @@
 $conf['proxy'] = ['host' => '', 'port' => '', 'user' => '', 'pass' => '', 'ssl' => '', 'except' => ''];
 $conf['allowdebug'] = false;
 
-function linesToHash($lines) {
+function linesToHash($lines)
+{
     $lines = array_map('trim', $lines);
     $lines = array_filter($lines);
     $lines = array_map(function ($item) {
@@ -44,7 +47,7 @@ function conf_decodeString($string)
 
 function filesize_h($size)
 {
-    return $size.'b';
+    return $size . 'b';
 }
 
 function hsc($string)
@@ -54,7 +57,7 @@ function hsc($string)
 
 function io_mkdir_p($dir)
 {
-    if(file_exists($dir)) return true;
+    if (file_exists($dir)) return true;
     return mkdir($dir, 0777, true);
 }
 
@@ -72,7 +75,7 @@ function getVersionData()
 function getVersion()
 {
     $version = getVersionData();
-    return $version['type'].' '.$version['date'];
+    return $version['type'] . ' ' . $version['date'];
 }
 
 class Doku_Event
@@ -124,7 +127,7 @@ abstract class DokuWiki_CLI_Plugin extends splitbrain\phpcli\CLI
     use UpgradePluginTrait;
 }
 
-class  DokuWiki_Plugin
+class DokuWiki_Plugin
 {
     use UpgradePluginTrait;
 }