Merge branch 'dokufreaks:master' into clear-both-missing-causes-following-caption-to-wrap

Author: fjf2002

.github/workflows/phpTestLinux.yml

@@ -10,11 +10,8 @@ jobs:
 
         strategy:
             matrix:
-                php-versions: ['7.2', '7.3', '7.4', '8.0']
+                php-versions: ['7.4', '8.0']
                 dokuwiki-branch: [ 'master', 'stable']
-                exclude:
-                    -   dokuwiki-branch: 'stable'
-                        php-versions: '8.0'
             fail-fast: false
 
         steps:

_test/locallink_conversion.test.php

@@ -31,12 +31,12 @@ public function setUp() : void
 
     public function testLocalConverted() {
         $html = p_wiki_xhtml('test:includefirst');
-        $this->assertContains('href="'.wl('included').'#jump"', $html);
-        $this->assertNotContains('href="#jump"', $html);
+        $this->assertStringContainsString('href="'.wl('included').'#jump"', $html);
+        $this->assertStringNotContainsString('href="#jump"', $html);
     }
 
     public function testLocalExistsIfIncluded() {
         $html = p_wiki_xhtml('test:includefull');
-        $this->assertContains('href="#jump"', $html);
+        $this->assertStringContainsString('href="#jump"', $html);
     }
 }

_test/media_linktitle_conversion.test.php

@@ -34,21 +34,21 @@ public function setUp() : void
 
     public function testInternalLinkTitleConversion() {
         $html = p_wiki_xhtml('test:include');
-        $this->assertContains('src="'.ml('wiki:dokuwiki.png').'"', $html);
+        $this->assertStringContainsString('src="'.ml('wiki:dokuwiki.png').'"', $html);
     }
 
     public function testLocalLinkTitleConversion() {
         $html = p_wiki_xhtml('test:include');
-        $this->assertContains('src="'.ml('wiki:dokuwiki.png', array('w' => '200')).'"', $html);
+        $this->assertStringContainsString('src="'.ml('wiki:dokuwiki.png', array('w' => '200')).'"', $html);
     }
 
     public function testInterWikiLinkTitleConversion() {
         $html = p_wiki_xhtml('test:include');
-        $this->assertContains('src="'.ml('wiki:dokuwiki.png', array('w' => '300')).'"', $html);
+        $this->assertStringContainsString('src="'.ml('wiki:dokuwiki.png', array('w' => '300')).'"', $html);
     }
 
     public function testExternalMediaNotConverted() {
         $html = p_wiki_xhtml('test:include');
-        $this->assertContains('src="'.ml('https://www.dokuwiki.org/lib/tpl/dokuwiki/images/logo.png').'"', $html);
+        $this->assertStringContainsString('src="'.ml('https://www.dokuwiki.org/lib/tpl/dokuwiki/images/logo.png').'"', $html);
     }
 }

plugin.info.txt

@@ -1,7 +1,7 @@
 base   include
 author Michael Hamann, Gina Häussge, Christopher Smith, Michael Klier, Esther Brunner
 email  michael@content-space.de
-date   2022-01-23
+date   2023-09-22
 name   include plugin
 desc   Functions to include another page in a wiki page
 url    http://dokuwiki.org/plugin:include