Upgrade tests

annda · annda · commit d5f7546e5b5c · 2022-10-19T11:39:12.000+02:00
diff --git a/_test/json/emaillink.json b/_test/json/emaillink.json
@@ -73,7 +73,7 @@
                         "image-class": "media",
                         "image-width": "20",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
 
                     }
                 },
diff --git a/_test/json/externalimage_resized.json b/_test/json/externalimage_resized.json
@@ -13,7 +13,7 @@
                         "height": "50",
                         "id": "http:\/\/php.net\/images\/php.gif",
                         "linking": "details",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?tok=289769&amp;media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\"><img src=\"\/.\/lib\/exe\/fetch.php?w=200&amp;h=50&amp;tok=5e3b7e&amp;media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\" alt=\"http:\/\/php.net\/images\/php.gif\" width=\"200\" height=\"50\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?tok=289769&amp;media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\"><img src=\"\/.\/lib\/exe\/fetch.php?w=200&amp;h=50&amp;tok=5e3b7e&amp;media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" loading=\"lazy\" title=\"http:\/\/php.net\/images\/php.gif\" alt=\"http:\/\/php.net\/images\/php.gif\" width=\"200\" height=\"50\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/externallink_with_image.json b/_test/json/externallink_with_image.json
@@ -12,7 +12,7 @@
                         "image-src": "\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png",
                         "image-class": "media",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>"
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>"
                     }
                 }
             ]
diff --git a/_test/json/externallink_with_strong.json b/_test/json/externallink_with_strong.json
@@ -49,7 +49,7 @@
                         "image-class": "media",
                         "image-width": "20",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
                     }
                 },
                 {
diff --git a/_test/json/internalimage.json b/_test/json/internalimage.json
@@ -11,7 +11,7 @@
                         "class": "media",
                         "id": "wiki:dokuwiki-128.png",
                         "linking": "details",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/internalimage_with_direct_and_recache.json b/_test/json/internalimage_with_direct_and_recache.json
@@ -12,7 +12,7 @@
                         "id": ":wiki:dokuwiki-128.png",
                         "cache": "recache",
                         "linking": "direct",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?cache=recache&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?cache=recache&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\":wiki:dokuwiki-128.png\" alt=\":wiki:dokuwiki-128.png\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?cache=recache&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?cache=recache&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\":wiki:dokuwiki-128.png\" alt=\":wiki:dokuwiki-128.png\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/internalimage_with_title.json b/_test/json/internalimage_with_title.json
@@ -12,7 +12,7 @@
                         "title": "imagetitle",
                         "id": "wiki:dokuwiki-128.png",
                         "linking": "details",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"imagetitle\" alt=\"imagetitle\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"imagetitle\" alt=\"imagetitle\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/internalimage_with_title_and_left_alignment.json b/_test/json/internalimage_with_title_and_left_alignment.json
@@ -13,7 +13,7 @@
                         "align": "left",
                         "id": "wiki:dokuwiki-128.png",
                         "linking": "details",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"medialeft\" title=\"foo and bar\" alt=\"foo and bar\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"medialeft\" loading=\"lazy\" title=\"foo and bar\" alt=\"foo and bar\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/internalimage_with_width_and_alignment.json b/_test/json/internalimage_with_width_and_alignment.json
@@ -13,7 +13,7 @@
                         "align": "right",
                         "width": "50",
                         "linking": "details",
-                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?w=50&amp;tok=8cbae1&amp;media=wiki:dokuwiki-128.png\" class=\"mediaright\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"50\" \/><\/a>"
+                        "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?w=50&amp;tok=8cbae1&amp;media=wiki:dokuwiki-128.png\" class=\"mediaright\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"50\" \/><\/a>"
                     }
                 }
             ]
diff --git a/_test/json/internallink_with_image.json b/_test/json/internallink_with_image.json
@@ -12,7 +12,7 @@
                         "image-src": "/./lib/exe/fetch.php?media=wiki:dokuwiki-128.png",
                         "image-class": "media",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>",
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>",
                         "data-resolvedTitle": "wiki:syntax",
                         "data-resolvedID": "wiki:syntax"
                     }
diff --git a/_test/json/interwikilink.json b/_test/json/interwikilink.json
@@ -77,7 +77,7 @@
                         "image-class": "media",
                         "image-width": "20",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>",
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>",
                         "data-resolvedUrl": "https:\/\/www.dokuwiki.org\/plugin%3Aprosemirror",
                         "data-resolvedClass": "interwikilink interwiki iw_doku"
                     }
diff --git a/_test/json/locallink_only_hash.json b/_test/json/locallink_only_hash.json
@@ -81,7 +81,7 @@
                         "image-class": "media",
                         "image-width": "20",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>",
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>",
                         "data-resolvedTitle": "wiki:syntax \u21b5",
                         "data-resolvedID": "wiki:syntax#images_and_other_files",
                         "data-resolvedName": "images_and_other_files",
diff --git a/_test/json/smileys.json b/_test/json/smileys.json
@@ -17,7 +17,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_cool.gif",
+                                        "icon": "cool.svg",
                                         "syntax": "8-)"
                                     }
                                 },
@@ -51,7 +51,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_eek.gif",
+                                        "icon": "eek.svg",
                                         "syntax": "8-O"
                                     }
                                 },
@@ -85,7 +85,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_sad.gif",
+                                        "icon": "sad.svg",
                                         "syntax": ":-("
                                     }
                                 },
@@ -119,7 +119,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_smile.gif",
+                                        "icon": "smile.svg",
                                         "syntax": ":-)"
                                     }
                                 },
@@ -153,7 +153,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_wink.gif",
+                                        "icon": "wink.svg",
                                         "syntax": ";-)"
                                     }
                                 },
@@ -187,7 +187,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_fun.gif",
+                                        "icon": "fun.svg",
                                         "syntax": "^_^"
                                     }
                                 },
@@ -221,7 +221,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_question.gif",
+                                        "icon": "question.svg",
                                         "syntax": ":?:"
                                     }
                                 },
@@ -255,7 +255,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "icon_lol.gif",
+                                        "icon": "lol.svg",
                                         "syntax": "LOL"
                                     }
                                 },
@@ -289,7 +289,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "fixme.gif",
+                                        "icon": "fixme.svg",
                                         "syntax": "FIXME"
                                     }
                                 },
@@ -323,7 +323,7 @@
                                 {
                                     "type": "smiley",
                                     "attrs": {
-                                        "icon": "delete.gif",
+                                        "icon": "deleteme.svg",
                                         "syntax": "DELETEME"
                                     }
                                 },
diff --git a/_test/json/windowssharelink.json b/_test/json/windowssharelink.json
@@ -73,7 +73,7 @@
                         "image-class": "media",
                         "image-width": "20",
                         "image-id": "wiki:dokuwiki-128.png",
-                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
+                        "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&amp;tok=b935e2&amp;media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"
                     }
                 },
                 {
diff --git a/parser/ListNode.php b/parser/ListNode.php
@@ -41,7 +41,7 @@ public function toSyntax()
             $liText = str_repeat('  ', $this->depth);
             $liText .= $this->prefix;
             $lines = $li->toSyntax();
-            if ($lines[0] !== ' ') {
+            if (!empty($lines) && $lines[0] !== ' ') {
                 $liText .= ' ';
             }
             $liText .= $lines . "\n";
diff --git a/renderer.php b/renderer.php
@@ -503,7 +503,7 @@ public function externallink($link, $title = null)
         \dokuwiki\plugin\prosemirror\parser\ExternalLinkNode::render($this, $link, $title);
     }
 
-    public function interwikilink($link, $title = null, $wikiName, $wikiUri)
+    public function interwikilink($link, $title, $wikiName, $wikiUri)
     {
         \dokuwiki\plugin\prosemirror\parser\InterwikiLinkNode::render($this, $title, $wikiName, $wikiUri);
     }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`"image-class": "media",`
`74`	`74`	`"image-width": "20",`
`75`	`75`	`"image-id": "wiki:dokuwiki-128.png",`
`76`		`- "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&tok=b935e2&media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"`
	`76`	`+ "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&tok=b935e2&media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"`
`77`	`77`
`78`	`78`	`}`
`79`	`79`	`},`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"height": "50",`
`14`	`14`	`"id": "http:\/\/php.net\/images\/php.gif",`
`15`	`15`	`"linking": "details",`
`16`		`- "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?tok=289769&media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\"><img src=\"\/.\/lib\/exe\/fetch.php?w=200&h=50&tok=5e3b7e&media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\" alt=\"http:\/\/php.net\/images\/php.gif\" width=\"200\" height=\"50\" \/><\/a>"`
	`16`	`+ "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/fetch.php?tok=289769&media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" title=\"http:\/\/php.net\/images\/php.gif\"><img src=\"\/.\/lib\/exe\/fetch.php?w=200&h=50&tok=5e3b7e&media=http%3A%2F%2Fphp.net%2Fimages%2Fphp.gif\" class=\"media\" loading=\"lazy\" title=\"http:\/\/php.net\/images\/php.gif\" alt=\"http:\/\/php.net\/images\/php.gif\" width=\"200\" height=\"50\" \/><\/a>"`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"image-src": "\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png",`
`13`	`13`	`"image-class": "media",`
`14`	`14`	`"image-id": "wiki:dokuwiki-128.png",`
`15`		`- "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>"`
	`15`	`+ "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/>"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`"image-class": "media",`
`50`	`50`	`"image-width": "20",`
`51`	`51`	`"image-id": "wiki:dokuwiki-128.png",`
`52`		`- "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&tok=b935e2&media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"`
	`52`	`+ "data-resolvedImage": "<img src=\"\/.\/lib\/exe\/fetch.php?w=20&tok=b935e2&media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" width=\"20\" \/>"`
`53`	`53`	`}`
`54`	`54`	`},`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"class": "media",`
`12`	`12`	`"id": "wiki:dokuwiki-128.png",`
`13`	`13`	`"linking": "details",`
`14`		`- "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/><\/a>"`
	`14`	`+ "data-resolvedHtml": "<a href=\"\/.\/lib\/exe\/detail.php?id=wiki%3Asyntax&media=wiki:dokuwiki-128.png\" class=\"media\" title=\"wiki:dokuwiki-128.png\"><img src=\"\/.\/lib\/exe\/fetch.php?media=wiki:dokuwiki-128.png\" class=\"media\" loading=\"lazy\" title=\"wiki:dokuwiki-128.png\" alt=\"wiki:dokuwiki-128.png\" \/><\/a>"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`]`