Merge pull request #309 from GrahamCampbell/allowed-values

Validation exception list allowed values

Author: GrahamCampbell

src/Validator.php

@@ -117,9 +117,9 @@ public function allowedValues(array $choices)
     {
         return $this->assertCallback(
             function ($value) use ($choices) {
-                return in_array($value, $choices);
+                return in_array($value, $choices, true);
             },
-            'is not an allowed value'
+            sprintf('is not one of [%s]', implode(', ', $choices))
         );
     }
 

tests/Dotenv/DotenvTest.php

@@ -182,13 +182,13 @@ public function testDotenvAllowedValues()
      * @depends testDotenvLoadsServerGlobals
      *
      * @expectedException \Dotenv\Exception\ValidationException
-     * @expectedExceptionMessage One or more environment variables failed assertions: FOO is not an allowed value.
+     * @expectedExceptionMessage One or more environment variables failed assertions: FOO is not one of [buzz, buz].
      */
     public function testDotenvProhibitedValues()
     {
         $dotenv = Dotenv::create($this->fixturesFolder);
         $dotenv->load();
-        $dotenv->required('FOO')->allowedValues(['buzz']);
+        $dotenv->required('FOO')->allowedValues(['buzz', 'buz']);
     }
 
     /**

tests/Dotenv/ValidatorBooleanTest.php

@@ -85,6 +85,7 @@ public function invalidBooleanValuesDataProvider()
     /**
      * @dataProvider invalidBooleanValuesDataProvider
      * @expectedException Dotenv\Exception\ValidationException
+     * @expectedExceptionMessage One or more environment variables failed assertions: INVALID_
      */
     public function testCanInvalidateNonBooleans($boolean)
     {