Merge branch 'master' into fix-nc-env-inclusion

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --cc lib/private/Config.php
Simple merge

diff --cc tests/lib/ConfigTest.php
index e5d0c94003ba86445c80f562b7c92eec66ca87fa,60006aa43de1e4bd2b632ab063dff885277877f3..94ee8da5dec22388eb7ad9ed3efd07fe6da2c90e
--- 1/tests/lib/ConfigTest.php
--- 2/tests/lib/ConfigTest.php
+++ b/tests/lib/ConfigTest.php
@@@ -41,14 -41,7 +41,14 @@@ class ConfigTest extends TestCase 
                $this->assertSame($expectedConfig, $this->getConfig()->getKeys());
        }
  
-       public function testGetValue() {
 +      public function testGetKeysReturnsEnvironmentKeysIfSet() {
 +              $expectedConfig = ['foo', 'beers', 'alcohol_free', 'taste'];
 +              putenv('NC_taste=great');
 +              $this->assertSame($expectedConfig, $this->getConfig()->getKeys());
 +              putenv('NC_taste');
 +      }
 +
+       public function testGetValue(): void {
                $config = $this->getConfig();
                $this->assertSame('bar', $config->getValue('foo'));
                $this->assertSame(null, $config->getValue('bar'));