Merge pull request dokufreaks#269 from annda/tests-master

Update tests for DokuWiki's master branch

Author: michitux

.travis.yml

@@ -1,18 +1,14 @@
 language: php
 sudo: false
 php:
+  - "7.4"
   - "7.3"
   - "7.2"
   - "7.1"
   - "7.0"
-  - "5.6"
 env:
   - DOKUWIKI=master
   - DOKUWIKI=stable
-matrix:
-  include:
-    - php: "5.6"
-      env: DOKUWIKI=old-stable
 before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
 install: sh travis.sh
 script: cd _test && ./phpunit.phar --stderr --group plugin_include

_test/locallink_conversion.test.php

@@ -12,7 +12,8 @@ class plugin_include_locallink_conversion_test extends DokuWikiTest {
     /** @var helper_plugin_include $helper */
     private $helper;
 
-    public function setUp() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'include';
         parent::setUp();
 

_test/media_linktitle_conversion.test.php

@@ -12,7 +12,8 @@ class plugin_include_media_linktitle_conversion_test extends DokuWikiTest {
     /** @var helper_plugin_include $helper */
     private $helper;
 
-    public function setUp() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'include';
         parent::setUp();
 

_test/namespace_includes.test.php

@@ -17,9 +17,10 @@ class plugin_include_namespaces_includes_test extends DokuWikiTest {
     /**
      * Setup - enable and load the include plugin and create the test pages
      */
-    public function setup() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'include';
-        parent::setup(); // this enables the include plugin
+        parent::setUp(); // this enables the include plugin
         $this->helper = plugin_load('helper', 'include');
 
         global $conf;

_test/nested_include.test.php

@@ -13,9 +13,10 @@ class plugin_include_nested_test extends DokuWikiTest {
         'test:plugin_include:nested:third'
     );
 
-    public function setup() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'include';
-        parent::setup();
+        parent::setUp();
     }
 
     public function test_outer_to_inner() {

_test/pagemove_support.test.php

@@ -7,10 +7,11 @@
  * @group plugins
  */
 class plugin_include_pagemove_support_test extends DokuWikiTest {
-    public function setup() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'move';
         $this->pluginsEnabled[] = 'include';
-        parent::setup();
+        parent::setUp();
     }
 
     public function test_relative_include() {

_test/safeindex.test.php

@@ -4,9 +4,10 @@
  * @group plugins
  */
 class plugin_include_safeindex_test extends DokuWikiTest {
-    public function setup() {
+    public function setUp() : void
+    {
         $this->pluginsEnabled[] = 'include';
-        parent::setup();
+        parent::setUp();
     }
 
     public function test_safeindex() {