From d174e9c8955df1661cf79eb6ff27fa97e0562e39 Mon Sep 17 00:00:00 2001
From: ThaDafinser <martin.keckeis@thyssenkrupp.com>
Date: Wed, 2 Sep 2015 15:44:29 +0200
Subject: [PATCH] fixing 3 config tests
---
core/Config/IniFileChain.php | 2 +-
tests/PHPUnit/Unit/ConfigTest.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/Config/IniFileChain.php b/core/Config/IniFileChain.php
index c8e63f4fbe..d8b4e4e28b 100644
--- a/core/Config/IniFileChain.php
+++ b/core/Config/IniFileChain.php
@@ -141,7 +141,7 @@ class IniFileChain
$configToWrite = array();
foreach ($this->mergedSettings as $sectionName => $changedSection) {
- if(isset($existingMutableSection[$sectionName])){
+ if(isset($existingMutableSettings[$sectionName])){
$existingMutableSection = $existingMutableSettings[$sectionName];
} else{
$existingMutableSection = array();
diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
index 1ab5b5ffa5..d92e1525b6 100644
--- a/tests/PHPUnit/Unit/ConfigTest.php
+++ b/tests/PHPUnit/Unit/ConfigTest.php
@@ -379,7 +379,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$configFile = PIWIK_INCLUDE_PATH . '/tmp/tmp.config.ini.php';
if(file_exists($configFile)){
- unlink($configFile);
+ @unlink($configFile);
}
copy($sourceConfigFile, $configFile);
@@ -389,7 +389,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(file_get_contents($sourceConfigFile), file_get_contents($configFile));
if(file_exists($configFile)){
- unlink($configFile);
+ @unlink($configFile);
}
}
--
GitLab