Merge pull request #1 from scratchers/booltest

add tests and fix empty string evaluated as false

Author: Mark

src/Validator.php

@@ -76,21 +76,25 @@ function ($value) {
             'is not an integer'
         );
     }
-    
+
     /**
-     *  Asset that each specified variable is a boolean.
+     * Assert that each specified variable is a boolean.
      *
      * @return \Dotenv\Validator
      */
     public function isBoolean()
     {
-		return $this->assertCallback(
-			function($value) {
-				return (filter_var($value, FILTER_VALIDATE_BOOLEAN,  FILTER_NULL_ON_FAILURE) !== NULL);
-			},
-			'is not a boolean'
-		);
-	}
+        return $this->assertCallback(
+            function ($value) {
+                if ($value === '') {
+                    return false;
+                }
+
+                return (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== NULL);
+            },
+            'is not a boolean'
+        );
+    }
 
     /**
      * Assert that each variable is amongst the given choices.

tests/Dotenv/ValidatorBooleanTest.php

@@ -0,0 +1,95 @@
+<?php
+
+use Dotenv\Dotenv;
+
+class ValidatorBooleanTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var string
+     */
+    private $fixturesFolder;
+
+    public function setUp()
+    {
+        $this->fixturesFolder = dirname(__DIR__).'/fixtures/env';
+    }
+
+    /**
+     * List of valid boolean values in fixtures/env/booleans.env
+     *
+     * @return array
+     */
+    public function validBooleanValuesDataProvider()
+    {
+        return [
+            ['VALID_EXPLICIT_LOWERCASE_TRUE'],
+            ['VALID_EXPLICIT_LOWERCASE_FALSE'],
+            ['VALID_EXPLICIT_UPPERCASE_TRUE'],
+            ['VALID_EXPLICIT_UPPERCASE_FALSE'],
+            ['VALID_EXPLICIT_MIXEDCASE_TRUE'],
+            ['VALID_EXPLICIT_MIXEDCASE_FALSE'],
+
+            ['VALID_NUMBER_TRUE'],
+            ['VALID_NUMBER_FALSE'],
+
+            ['VALID_ONOFF_LOWERCASE_TRUE'],
+            ['VALID_ONOFF_LOWERCASE_FALSE'],
+            ['VALID_ONOFF_UPPERCASE_TRUE'],
+            ['VALID_ONOFF_UPPERCASE_FALSE'],
+            ['VALID_ONOFF_MIXEDCASE_TRUE'],
+            ['VALID_ONOFF_MIXEDCASE_FALSE'],
+
+            ['VALID_YESNO_LOWERCASE_TRUE'],
+            ['VALID_YESNO_LOWERCASE_FALSE'],
+            ['VALID_YESNO_UPPERCASE_TRUE'],
+            ['VALID_YESNO_UPPERCASE_FALSE'],
+            ['VALID_YESNO_MIXEDCASE_TRUE'],
+            ['VALID_YESNO_MIXEDCASE_FALSE'],
+        ];
+    }
+
+    /**
+     * @dataProvider validBooleanValuesDataProvider
+     */
+    public function testCanValidateBooleans($boolean)
+    {
+        $dotenv = new Dotenv($this->fixturesFolder, 'booleans.env');
+        $dotenv->load();
+
+        $dotenv->required($boolean)->isBoolean();
+
+        $this->assertTrue(true); // anything wrong - an exception will be thrown
+    }
+
+    /**
+     * List of non-boolean values in fixtures/env/booleans.env
+     *
+     * @return array
+     */
+    public function invalidBooleanValuesDataProvider()
+    {
+        return [
+            ['INVALID_SOMETHING'],
+            ['INVALID_EMPTY'],
+            ['INVALID_EMPTY_STRING'],
+            ['INVALID_NULL'],
+            ['INVALID_NUMBER_POSITIVE'],
+            ['INVALID_NUMBER_NEGATIVE'],
+            ['INVALID_MINUS'],
+            ['INVALID_TILDA'],
+            ['INVALID_EXCLAMATION'],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidBooleanValuesDataProvider
+     * @expectedException Dotenv\Exception\ValidationException
+     */
+    public function testCanInvalidateNonBooleans($boolean)
+    {
+        $dotenv = new Dotenv($this->fixturesFolder, 'booleans.env');
+        $dotenv->load();
+
+        $dotenv->required($boolean)->isBoolean();
+    }
+}

tests/fixtures/env/booleans.env

@@ -0,0 +1,33 @@
+VALID_EXPLICIT_LOWERCASE_TRUE=true
+VALID_EXPLICIT_LOWERCASE_FALSE=false
+VALID_EXPLICIT_UPPERCASE_TRUE=TRUE
+VALID_EXPLICIT_UPPERCASE_FALSE=FALSE
+VALID_EXPLICIT_MIXEDCASE_TRUE=True
+VALID_EXPLICIT_MIXEDCASE_FALSE=False
+
+VALID_NUMBER_TRUE=1
+VALID_NUMBER_FALSE=0
+
+VALID_ONOFF_LOWERCASE_TRUE=on
+VALID_ONOFF_LOWERCASE_FALSE=off
+VALID_ONOFF_UPPERCASE_TRUE=ON
+VALID_ONOFF_UPPERCASE_FALSE=OFF
+VALID_ONOFF_MIXEDCASE_TRUE=On
+VALID_ONOFF_MIXEDCASE_FALSE=Off
+
+VALID_YESNO_LOWERCASE_TRUE=yes
+VALID_YESNO_LOWERCASE_FALSE=no
+VALID_YESNO_UPPERCASE_TRUE=YES
+VALID_YESNO_UPPERCASE_FALSE=NO
+VALID_YESNO_MIXEDCASE_TRUE=Yes
+VALID_YESNO_MIXEDCASE_FALSE=No
+
+INVALID_SOMETHING=something
+INVALID_EMPTY=
+INVALID_EMPTY_STRING=""
+INVALID_NULL=null
+INVALID_NUMBER_POSITIVE=2
+INVALID_NUMBER_NEGATIVE=-2
+INVALID_MINUS=-
+INVALID_TILDA=~
+INVALID_EXCLAMATION=!