Merge branch 'master' into php8

2022-10-25 06:37:15 +02:00
parent 5b2ec7f7c2 849c1c7cd1
commit f6edcc1acd
48 changed files with 512 additions and 83 deletions
--- a/tst/ViewTest.php
+++ b/tst/ViewTest.php
@@ -102,6 +102,10 @@ class ViewTest extends TestCase
                $content,
                $template . ': outputs error correctly'
            );
+            if ($template === 'yourlsproxy') {
+                // yourlsproxy template only displays error message
+                continue;
+            }
            $this->assertMatchesRegularExpression(
                '#<[^>]+id="password"[^>]*>#',
                $content,