fix read comments for arrays might not return the expected result

matomo-org · Jan 14, 2016 · bd2711b · bd2711b
1 parent 95c29ad
commit bd2711b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/IniReader.php b/src/IniReader.php
@@ -177,7 +177,15 @@ public function readComments($filename)
 
             list($key, $value) = explode('=', $line, 2);
 
-            $descriptions[$section][trim($key)] = $lastComment;
+            $key = trim($key);
+            if (strpos($key, '[]') === strlen($key) - 2) {
+                $key = substr($key, 0, -2);
+            }
+
+            if (empty($descriptions[$section][$key])) {
+                $descriptions[$section][$key] = $lastComment;
+            }
+
             $lastComment = '';
         }
 

diff --git a/tests/IniReaderDisabledFunctionTest.php b/tests/IniReaderDisabledFunctionTest.php
@@ -54,12 +54,12 @@ public function test_readComments()
 ',
                     'testkey7' => 'Proin convallis augue sed sapien bibendum, et maximus purus rutrum.
 ',
-                    'test_key8[]' => '',
+                    'test_key8' => '',
                     'test_key9' => '',
                 ),
             'log' =>
                 array (
-                    'log_writers[]' => 'Fusce maximus bibendum lectus, nec tristique enim malesuada hendrerit.
+                    'log_writers' => 'Fusce maximus bibendum lectus, nec tristique enim malesuada hendrerit.
 ',
                     'log_level' => '
 Quisque lorem justo, sollicitudin at pellentesque interdum, euismod quis nulla.

diff --git a/tests/resources/test.ini.php b/tests/resources/test.ini.php
@@ -35,6 +35,7 @@
 [log]
 ; Fusce maximus bibendum lectus, nec tristique enim malesuada hendrerit.
 log_writers[] = screen
+log_writers[] = file
 
 ; Quisque lorem justo, sollicitudin at pellentesque interdum, euismod quis nulla.
 ; Sed malesuada dolor in tempus ornare. Etiam lobortis commodo congue.