Merge branch '3.6'

Author: GrahamCampbell

src/Validator.php

@@ -128,6 +128,10 @@ public function allowedValues(array $choices)
     {
         return $this->assertCallback(
             function ($value) use ($choices) {
+                if ($value === null) {
+                    return true;
+                }
+
                 return in_array($value, $choices, true);
             },
             sprintf('is not one of [%s]', implode(', ', $choices))

tests/Dotenv/ValidatorTest.php

@@ -41,6 +41,14 @@ public function testDotenvAllowedValuesIfPresent()
         $this->assertTrue(true);
     }
 
+    public function testDotenvAllowedValuesIfNotPresent()
+    {
+        $dotenv = Dotenv::create($this->fixturesFolder);
+        $dotenv->load();
+        $dotenv->ifPresent('FOOQWERTYOOOOOO')->allowedValues(['bar', 'baz']);
+        $this->assertTrue(true);
+    }
+
     /**
      * @expectedException \Dotenv\Exception\ValidationException
      * @expectedExceptionMessage One or more environment variables failed assertions: FOO is not one of [buzz, buz].