Upgrade core to Hogfather

https://www.dokuwiki.org/changes#release_2020-07-29_hogfather

Author: saundefined

dokuwiki/README

@@ -1,10 +1,10 @@
 All documentation for DokuWiki is available online
-at http://www.dokuwiki.org/
+at https://www.dokuwiki.org/
 
 For Installation Instructions see
-http://www.dokuwiki.org/install
+https://www.dokuwiki.org/install
 
-DokuWiki - 2004-2018 (c) Andreas Gohr <andi@splitbrain.org>
+DokuWiki - 2004-2020 (c) Andreas Gohr <andi@splitbrain.org>
                          and the DokuWiki Community
 See COPYING and file headers for license info
 

dokuwiki/VERSION

@@ -1 +1 @@
-2018-04-22b "Greebo"
+2020-07-29 "Hogfather"

dokuwiki/bin/dwpage.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;
@@ -182,7 +182,7 @@ protected function commandCheckout($wiki_id, $localfile) {
         }
 
         if(empty($localfile)) {
-            $localfile = getcwd() . '/' . utf8_basename($wiki_fn);
+            $localfile = getcwd() . '/' . \dokuwiki\Utf8\PhpString::basename($wiki_fn);
         }
 
         if(!file_exists(dirname($localfile))) {

dokuwiki/bin/gittool.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;
@@ -89,17 +89,17 @@ protected function main(Options $options) {
                 echo $options->help();
                 break;
             case 'clone':
-                $this->cmd_clone($args);
+                $this->cmdClone($args);
                 break;
             case 'install':
-                $this->cmd_install($args);
+                $this->cmdInstall($args);
                 break;
             case 'repo':
             case 'repos':
-                $this->cmd_repos();
+                $this->cmdRepos();
                 break;
             default:
-                $this->cmd_git($command, $args);
+                $this->cmdGit($command, $args);
         }
     }
 
@@ -108,7 +108,7 @@ protected function main(Options $options) {
      *
      * @param array $extensions
      */
-    public function cmd_clone($extensions) {
+    public function cmdClone($extensions) {
         $errors = array();
         $succeeded = array();
 
@@ -137,7 +137,7 @@ public function cmd_clone($extensions) {
      *
      * @param array $extensions
      */
-    public function cmd_install($extensions) {
+    public function cmdInstall($extensions) {
         $errors = array();
         $succeeded = array();
 
@@ -171,7 +171,7 @@ public function cmd_install($extensions) {
      * @param $cmd
      * @param $arg
      */
-    public function cmd_git($cmd, $arg) {
+    public function cmdGit($cmd, $arg) {
         $repos = $this->findRepos();
 
         $shell = array_merge(array('git', $cmd), $arg);
@@ -199,7 +199,7 @@ public function cmd_git($cmd, $arg) {
     /**
      * Simply lists the repositories
      */
-    public function cmd_repos() {
+    public function cmdRepos() {
         $repos = $this->findRepos();
         foreach($repos as $repo) {
             echo "$repo\n";

dokuwiki/bin/indexer.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;
@@ -60,7 +60,7 @@ protected function main(Options $options) {
     /**
      * Update the index
      */
-    function update() {
+    protected function update() {
         global $conf;
         $data = array();
         $this->quietecho("Searching pages... ");
@@ -77,7 +77,7 @@ function update() {
      *
      * @param string $id
      */
-    function index($id) {
+    protected function index($id) {
         $this->quietecho("$id... ");
         idx_addPage($id, !$this->quiet, $this->clear);
         $this->quietecho("done.\n");
@@ -86,7 +86,7 @@ function index($id) {
     /**
      * Clear all index files
      */
-    function clearindex() {
+    protected function clearindex() {
         $this->quietecho("Clearing index... ");
         idx_get_indexer()->clear();
         $this->quietecho("done.\n");
@@ -97,7 +97,7 @@ function clearindex() {
      *
      * @param string $msg
      */
-    function quietecho($msg) {
+    protected function quietecho($msg) {
         if(!$this->quiet) echo $msg;
     }
 }

dokuwiki/bin/plugin.php

@@ -1,6 +1,7 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
+use dokuwiki\Extension\PluginController;
 use splitbrain\phpcli\CLI;
 use splitbrain\phpcli\Colors;
 use splitbrain\phpcli\Options;
@@ -51,7 +52,7 @@ protected function main(Options $options) {
      * List available plugins
      */
     protected function listPlugins() {
-        /** @var Doku_Plugin_Controller $plugin_controller */
+        /** @var PluginController $plugin_controller */
         global $plugin_controller;
 
         echo "\n";
@@ -85,10 +86,9 @@ protected function listPlugins() {
      * Instantiate a CLI plugin
      *
      * @param string $name
-     * @return DokuWiki_CLI_Plugin|null
+     * @return \dokuwiki\Extension\CLIPlugin|null
      */
-    protected
-    function loadPlugin($name) {
+    protected function loadPlugin($name) {
         // execute the plugin CLI
         $class = "cli_plugin_$name";
         if(class_exists($class)) {

dokuwiki/bin/render.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;

dokuwiki/bin/striplangs.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;

dokuwiki/bin/wantedpages.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 use splitbrain\phpcli\CLI;
@@ -74,8 +74,8 @@ protected function main(Options $options) {
 
         $this->info("searching $startdir");
 
-        foreach($this->get_pages($startdir) as $page) {
-            $this->internal_links($page);
+        foreach($this->getPages($startdir) as $page) {
+            $this->internalLinks($page);
         }
         ksort($this->result);
         foreach($this->result as $main => $subs) {
@@ -98,7 +98,7 @@ protected function main(Options $options) {
      * @param string $basepath
      * @return int
      */
-    protected function dir_filter($entry, $basepath) {
+    protected function dirFilter($entry, $basepath) {
         if($entry == '.' || $entry == '..') {
             return WantedPagesCLI::DIR_CONTINUE;
         }
@@ -121,7 +121,7 @@ protected function dir_filter($entry, $basepath) {
      * @return array
      * @throws DokuCLI_Exception
      */
-    protected function get_pages($dir) {
+    protected function getPages($dir) {
         static $trunclen = null;
         if(!$trunclen) {
             global $conf;
@@ -135,11 +135,11 @@ protected function get_pages($dir) {
         $pages = array();
         $dh = opendir($dir);
         while(false !== ($entry = readdir($dh))) {
-            $status = $this->dir_filter($entry, $dir);
+            $status = $this->dirFilter($entry, $dir);
             if($status == WantedPagesCLI::DIR_CONTINUE) {
                 continue;
             } else if($status == WantedPagesCLI::DIR_NS) {
-                $pages = array_merge($pages, $this->get_pages($dir . '/' . $entry));
+                $pages = array_merge($pages, $this->getPages($dir . '/' . $entry));
             } else {
                 $page = array(
                     'id' => pathID(substr($dir . '/' . $entry, $trunclen)),
@@ -157,7 +157,7 @@ protected function get_pages($dir) {
      *
      * @param array $page array with page id and file path
      */
-    function internal_links($page) {
+    protected function internalLinks($page) {
         global $conf;
         $instructions = p_get_instructions(file_get_contents($page['file']));
         $cns = getNS($page['id']);

dokuwiki/conf/acronyms.conf

@@ -20,6 +20,7 @@ FTP          File Transfer Protocol
 FOSS         Free & Open-Source Software
 FLOSS        Free/Libre and Open Source Software
 FUD          Fear, Uncertainty, and Doubt
+FYI          For your information
 GB           Gigabyte
 GHz          Gigahertz
 GPL          GNU General Public License