Revert "Merge tag 'v2.10.6'"

This reverts commit 122ea4ab9e, reversing
changes made to c54a11e250.

ext/bbcode/test.php

@@ -6,7 +6,7 @@ namespace Shimmie2;
 
 class BBCodeTest extends ShimmiePHPUnitTestCase
 {
-    public function testBasics(): void
+    public function testBasics()
     {
         $this->assertEquals(
             "<b>bold</b><i>italic</i>",
@@ -14,7 +14,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testStacking(): void
+    public function testStacking()
     {
         $this->assertEquals(
             "<b>B</b><i>I</i><b>B</b>",
@@ -26,7 +26,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testFailure(): void
+    public function testFailure()
     {
         $this->assertEquals(
             "[b]bold[i]italic",
@@ -34,15 +34,15 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testCode(): void
+    public function testCode()
     {
         $this->assertEquals(
-            "<pre class='code'>[b]bold[/b]</pre>",
+            "<pre>[b]bold[/b]</pre>",
             $this->filter("[code][b]bold[/b][/code]")
         );
     }
 
-    public function testNestedList(): void
+    public function testNestedList()
     {
         $this->assertEquals(
             "<ul><li>a<ul><li>a<li>b</ul><li>b</ul>",
@@ -54,7 +54,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testSpoiler(): void
+    public function testSpoiler()
     {
         $this->assertEquals(
             "<span style=\"background-color:#000; color:#000;\">ShishNet</span>",
@@ -69,7 +69,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         #	"[spoiler]ShishNet");
     }
 
-    public function testURL(): void
+    public function testURL()
     {
         $this->assertEquals(
             "<a href=\"https://shishnet.org\">https://shishnet.org</a>",
@@ -85,7 +85,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testEmailURL(): void
+    public function testEmailURL()
     {
         $this->assertEquals(
             "<a href=\"mailto:spam@shishnet.org\">spam@shishnet.org</a>",
@@ -93,7 +93,7 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    public function testAnchor(): void
+    public function testAnchor()
     {
         $this->assertEquals(
             '<span class="anchor">Rules <a class="alink" href="#bb-rules" name="bb-rules" title="link to this anchor"> ¶ </a></span>',
@@ -101,19 +101,19 @@ class BBCodeTest extends ShimmiePHPUnitTestCase
         );
     }
 
-    private function filter(string $in): string
+    private function filter($in): string
     {
         $bb = new BBCode();
-        return $bb->_format($in);
+        return $bb->format($in);
     }
 
-    private function strip(string $in): string
+    private function strip($in): string
     {
         $bb = new BBCode();
         return $bb->strip($in);
     }
 
-    public function testSiteLinks(): void
+    public function testSiteLinks()
     {
         $this->assertEquals(
             '<a class="shm-clink" data-clink-sel="" href="/test/post/view/123">&gt;&gt;123</a>',