Merge branch 'ini-config-boolean' of https://github.com/akrabat/zf2 i…

…nto hotfix/pr-459
zendframework · Oct 3, 2011 · 0555415 · 0555415
commit 0555415
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/Ini.php b/src/Ini.php
@@ -261,6 +261,11 @@ protected function _processKey($config, $key, $value)
                 throw new Exception\RuntimeException("Invalid key '$key'");
             }
         } else {
+            if(strtolower(trim($value)) === 'true') {
+                $value = '1';
+            } elseif(strtolower(trim($value)) === 'false') {
+                $value = '';
+            }
             $config[$key] = $value;
         }
         return $config;

diff --git a/test/IniTest.php b/test/IniTest.php
@@ -47,6 +47,7 @@ public function setUp()
         $this->_nonReadableConfig = __DIR__ . '/_files/nonreadable.ini';
         $this->_iniFileNoSectionsConfig = __DIR__ . '/_files/nosections.ini';
         $this->_iniFileInvalid = __DIR__ . '/_files/invalid.ini';
+        $this->_iniFileBooleans = __DIR__ . '/_files/booleans.ini';
     }
 
     public function testLoadSingleSection()
@@ -317,4 +318,13 @@ public function testPreservationOfIntegerKeys()
 
     }
 
+    public function testBooleans()
+    {
+        $config = new Ini($this->_iniFileBooleans, 'all');
+        $this->assertEquals(true, (bool)$config->trueValue);
+        $this->assertEquals(false, (bool)$config->falseValue);
+        $this->assertEquals(true, (bool)$config->trueString);
+        $this->assertEquals(false, (bool)$config->falseString);
+    }
+
 }
diff --git a/test/_files/booleans.ini b/test/_files/booleans.ini
@@ -0,0 +1,6 @@
+[all]
+trueValue = true
+falseValue = false
+trueString = "true"
+falseString = "false"
+