Fix the same bug again, but properly now

tvdijen · May 16, 2019 · 6eb8941 · 6eb8941
1 parent 1b8acfa
commit 6eb8941
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/TestSuite/Store.php b/lib/TestSuite/Store.php
@@ -97,15 +97,16 @@ private function testPhpSession(TestConfiguration $configuration)
                 break;
             case 'memcache':
             case 'memcached':
-                \SimpleSAML\Configuration::setPreLoadedConfig(
-                    \SimpleSAML\Configuration::loadFromArray(
-                        [
-                            'memcache_store.servers' => $this->parsePhpMemcachedConfiguration(session_save_path())
-                        ]
-                    )
-                );
+                $tmp_configuration = \SimpleSAML\Configuration::getInstance();
+                $tmp_configuration = $tmp_configuration->toArray();
+                $tmp_configuration['memcache_store.servers'] = $this->parsePhpMemcachedConfiguration(session_save_path());
+                $tmp_configuration = \SimpleSAML\Configuration::loadFromArray($tmp_configuration);
+                \SimpleSAML\Configuration::setPreloadedConfig($tmp_configuration);
+
                 $test = new Store\Memcache($configuration);
                 $results = $test->getTestResults();
+
+                \SimpleSAML\Configuration::setPreloadedConfig($configuration->getGlobalConfig());
                 break;
 //          case 'sqlite':
 //          case 'mm':