Move Config::encodeValues/Config::decodeValues from Config to IniFileChain since they are vital to correctly storing/loading settings w/o strange bugs.

3 files changed, 11 insertions, 13 deletions

diff --git a/tests/PHPUnit/Unit/Config/IniFileChainTest.php b/tests/PHPUnit/Unit/Config/IniFileChainTest.php
index 307aba74cf..ca5e0797a8 100644
--- a/tests/PHPUnit/Unit/Config/IniFileChainTest.php
+++ b/tests/PHPUnit/Unit/Config/IniFileChainTest.php
@@ -141,7 +141,7 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
                         )
                     ),
                     'Section2' => array(
-                        'var4' => 'value5'
+                        'var4' => 'val$ue5'
                     )
                 )
             ),
@@ -160,7 +160,7 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
                         )
                     ),
                     'Section2' => array(
-                        'var4' => 'value5'
+                        'var4' => 'val$ue5'
                     )
                 )
             )
@@ -194,7 +194,7 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
 
         $data =& $fileChain->get('Section1');
 
-        $this->assertEquals(array('var1' => 'value2', 'var3' => array('value3', 'value4')), $data);
+        $this->assertEquals(array('var1' => 'val"ue2', 'var3' => array('value3', 'value4')), $data);
 
         $data['var1'] = 'changed';
         $data['var3'][] = 'newValue';
@@ -241,7 +241,7 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
             __DIR__ . '/test_files/default_settings_2.ini.php'
         );
 
-        $this->assertEquals(array('var1' => 'value2', 'var3' => array('value3', 'value4')), $fileChain->getFrom($defaultSettingsPath, 'Section1'));
+        $this->assertEquals(array('var1' => 'val"ue2', 'var3' => array('value3', 'value4')), $fileChain->getFrom($defaultSettingsPath, 'Section1'));
     }
 
     public function getTestDataForDumpTest()
@@ -253,7 +253,7 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
                 ),
                 __DIR__ . '/test_files/default_settings_2.ini.php', // user settings
                 "; some header\n",
-                "; some header\n[Section1]\nvar1 = \"overriddenValue1\"\nvar3[] = \"overriddenValue2\"\nvar3[] = \"overriddenValue3\"\n\n[Section2]\nvar4 = \"value5\"\n\n",
+                "; some header\n[Section1]\nvar1 = \"overriddenValue1\"\nvar3[] = \"overriddenValue2\"\nvar3[] = \"overriddenValue3\"\n\n[Section2]\nvar4 = \"val$ue5\"\n\n",
                 "; some header\n[Section1]\nvar1 = \"overriddenValue1\"\nvar3[] = \"overriddenValue2\"\nvar3[] = \"overriddenValue3\"\n\n"
             )
         );
@@ -296,12 +296,12 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase
                 array(
                     'Custom' => array('var' => 'val'),
                     'Settings0' => array('abc' => 'def2'),
-                    'Section1' => array('var1' => '5'),
+                    'Section1' => array('var1' => '5$'),
                     'Settings3' => array('var1' => '2'),
                     'Section2' => array('var4' => '9')
                 ),
                 "; some header\n",
-                "; some header\n[Settings3]\nvar1 = \"2\"\n\n[Settings0]\nabc = \"def2\"\n\n[Section1]\nvar1 = \"5\"\n\n[Section2]\nvar4 = \"9\"\n\n[Custom]\nvar = \"val\"\n\n"
+                "; some header\n[Settings3]\nvar1 = \"2\"\n\n[Settings0]\nabc = \"def2\"\n\n[Section1]\nvar1 = \"5$\"\n\n[Section2]\nvar4 = \"9\"\n\n[Custom]\nvar = \"val\"\n\n"
             )
         );
     }
diff --git a/tests/PHPUnit/Unit/Config/test_files/default_settings_1.ini.php b/tests/PHPUnit/Unit/Config/test_files/default_settings_1.ini.php
index 2eb4fdd926..20a9acaf60 100644
--- a/tests/PHPUnit/Unit/Config/test_files/default_settings_1.ini.php
+++ b/tests/PHPUnit/Unit/Config/test_files/default_settings_1.ini.php
@@ -1,9 +1,9 @@
 [Section1]
 
-var1 = "value2"
+var1 = "val"ue2"
 var3[] = "value3"
 var3[] = "value4"
 
 [Section2]
 
-var4 = "value5"
\ No newline at end of file
+var4 = "val$ue5"
\ No newline at end of file
diff --git a/tests/resources/Config/config.written.ini.php b/tests/resources/Config/config.written.ini.php
index a412b689db..c66c3c2d43 100644
--- a/tests/resources/Config/config.written.ini.php
+++ b/tests/resources/Config/config.written.ini.php
@@ -1,10 +1,8 @@
 ; <?php exit; ?> DO NOT REMOVE THIS LINE
 ; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.
-[Development]
-disable_merged_assets = 0
-
 [Category]
 test = "&amp;6^ geagea'''&quot;;;&amp;"
 
-[PluginsInstalled]
+[Development]
+disable_merged_assets = 0