.travis.yml

@@ -1,40 +1,58 @@
 matrix:
   include:
-    - dist: trusty
+    - name: HHVM 3.18
+      dist: trusty
       language: php
       php: hhvm-3.18
+      before_install: travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
       install: travis_retry composer install --no-suggest --prefer-dist -n -o
       script: vendor/bin/phpunit
-    - dist: trusty
+    - name: HHVM 3.30
+      dist: trusty
+      language: php
+      php: hhvm-3.30
+      before_install: travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
+      install: travis_retry composer install --no-suggest --prefer-dist -n -o
+      script: vendor/bin/phpunit
+    - name: PHP 5.4
+      dist: trusty
       language: php
       php: 5.4
       install: travis_retry composer install --no-suggest --prefer-dist -n -o
       script: vendor/bin/phpunit
-    - dist: trusty
+    - name: PHP 5.5.9
+      dist: trusty
       language: php
       php: 5.5.9
       install: travis_retry composer install --no-suggest --prefer-dist -n -o
       script: vendor/bin/phpunit
-    - dist: trusty
+    - name: PHP 5.5
+      dist: trusty
       language: php
       php: 5.5
       install: travis_retry composer install --no-suggest --prefer-dist -n -o
       script: vendor/bin/phpunit
-    - dist: xenial
+    - name: PHP 5.6
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:5.6 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:5.6
-    - dist: xenial
+    - name: PHP 7.0
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.0 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.0
-    - dist: xenial
+    - name: PHP 7.1
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.1 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.1
-    - dist: xenial
+    - name: PHP 7.2
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.2 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.2
-    - dist: xenial
+    - name: PHP 7.3
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.3 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.3
-    - dist: xenial
+    - name: PHP 7.4
+      dist: xenial
       install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.4 install --no-suggest --prefer-dist -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.4

composer.json

@@ -22,6 +22,7 @@
     },
     "require-dev": {
         "ext-filter": "*",
+        "ext-pcre": "*",
         "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
@@ -30,7 +31,8 @@
         }
     },
     "suggest": {
-        "ext-filter": "Required to use the boolean validator."
+        "ext-filter": "Required to use the boolean validator.",
+        "ext-pcre": "Required to use most of the library."
     },
     "extra": {
         "branch-alias": {

src/Environment/AbstractVariables.php

@@ -64,7 +64,7 @@ public function get($name)
      *
      * @return string|null
      */
-    protected abstract function getInternal($name);
+    abstract protected function getInternal($name);
 
     /**
      * Set an environment variable.
@@ -100,7 +100,7 @@ public function set($name, $value = null)
      *
      * @return void
      */
-    protected abstract function setInternal($name, $value = null);
+    abstract protected function setInternal($name, $value = null);
 
     /**
      * Clear an environment variable.
@@ -132,7 +132,7 @@ public function clear($name)
      *
      * @return void
      */
-    protected abstract function clearInternal($name);
+    abstract protected function clearInternal($name);
 
     /**
      * Determine if the environment is immutable.

src/Parser.php

@@ -135,7 +135,7 @@ private static function parseValue($value)
                     if ($char === $value[0] || $char === '\\') {
                         return [$data[0].$char, self::QUOTED_STATE];
                     } elseif (in_array($char, ['f', 'n', 'r', 't', 'v'], true)) {
-                        return [$data[0].stripcslashes('\\' . $char), self::QUOTED_STATE];
+                        return [$data[0].stripcslashes('\\'.$char), self::QUOTED_STATE];
                     } else {
                         throw new InvalidFileException(
                             self::getErrorMessage('an unexpected escape sequence', $value)

src/Validator.php

@@ -50,7 +50,6 @@ function ($value) {
                 'is missing'
             );
         }
-
     }
 
     /**
@@ -133,6 +132,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))
@@ -151,15 +154,14 @@ function ($value) use ($choices) {
     public function allowedRegexValues($regex)
     {
         return $this->assertCallback(
-            function ($value) use ($regex)
-            {
+            function ($value) use ($regex) {
                 if ($value === null) {
                     return true;
                 }
 
                 return Regex::match($regex, $value)->success()->getOrElse(0) === 1;
             },
-            sprintf('does not match "%s"' , $regex)
+            sprintf('does not match "%s"', $regex)
         );
     }
 

tests/Dotenv/LinesTest.php

@@ -30,7 +30,7 @@ public function testProcessQuotes()
 
         $expected = [
             "TEST=\"test\n     test\\\"test\\\"\n     test\"",
-            "TEST_ND=\"test\\ntest\"",
+            'TEST_ND="test\\ntest"',
             'TEST_NS=\'test\\ntest\'',
             'TEST_EQD="https://vision.googleapis.com/v1/images:annotate?key="',
             'TEST_EQS=\'https://vision.googleapis.com/v1/images:annotate?key=\'',

tests/Dotenv/ValidatorTest.php

@@ -39,6 +39,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].