Merge remote-tracking branch 'origin/master' into php8

2022-11-03 18:55:30 +00:00
parent a731a1143c 66600e5eb3
commit ba5c859d85
5 changed files with 29 additions and 20 deletions
--- a/tst/JsonApiTest.php
+++ b/tst/JsonApiTest.php
@@ -273,7 +273,7 @@ class JsonApiTest extends TestCase
    {
        $mock_yourls_service                = $this->_path . DIRECTORY_SEPARATOR . 'yourls.json';
        $options                            = parse_ini_file(CONF, true);
-        $options['main']['basepath']        = 'https://example.com/path';
+        $options['main']['basepath']        = 'https://example.com/path'; // missing slash gets added by Configuration constructor
        $options['main']['urlshortener']    = 'https://example.com/path/shortenviayourls?link=';
        $options['yourls']['apiurl']        = $mock_yourls_service;
        Helper::createIniFile(CONF, $options);