Fix tests (#5400)

* Avoid argc side-effects

* Fix undefined array keys in JITConfigAdapter::set()

* Avoid argv side effects in ApiTest

diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 96e4305ea39e87f38c226b0930c543fa8cb139e1..527c718ae0a2a6648d63f08303994b172d5a1fdc 100644 (file)
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -96,6 +96,13 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 
                $stored = $this->get($cat, $k, null, true);
 
+               if (!isset($this->in_db[$cat])) {
+                       $this->in_db[$cat] = [];
+               }
+               if (!isset($this->in_db[$cat][$k])) {
+                       $this->in_db[$cat] = false;
+               }
+
                if (($stored === $dbvalue) && $this->in_db[$cat][$k]) {
                        return true;
                }

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index 4e272901955b6197f388aec13d14b4906a302c85..4d19994e35e9ab0aece2286edd46bdc47c38791f 100644 (file)
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -68,6 +68,18 @@ class ApiTest extends DatabaseTest
                Config::set('system', 'theme', 'system_theme');
        }
 
+       /**
+        * Cleanup variables used by tests.
+        */
+       protected function tearDown()
+       {
+               parent::tearDown();
+
+               $app = get_app();
+               $app->argc = 1;
+               $app->argv = ['home'];
+       }
+
        /**
         * Assert that an user array contains expected keys.
         * @param array $user User array