Merge branch '3.6'

GrahamCampbell · GrahamCampbell · commit 8f71e9a538bd · 2020-05-22T16:42:23.000+01:00
diff --git a/src/Loader/Parser.php b/src/Loader/Parser.php
@@ -3,6 +3,7 @@
 namespace Dotenv\Loader;
 
 use Dotenv\Exception\InvalidFileException;
+use Dotenv\Regex\Regex;
 use Dotenv\Result\Error;
 use Dotenv\Result\Success;
 use RuntimeException;
@@ -91,7 +92,7 @@ private static function parseName($name)
      */
     private static function isValidName($name)
     {
-        return preg_match('~\A[a-zA-Z0-9_.]+\z~', $name) === 1;
+        return Regex::match('~\A[a-zA-Z0-9_.]+\z~', $name)->success()->getOrElse(0) === 1;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Dotenv\Loader;`
`4`	`4`
`5`	`5`	`use Dotenv\Exception\InvalidFileException;`
	`6`	`+use Dotenv\Regex\Regex;`
`6`	`7`	`use Dotenv\Result\Error;`
`7`	`8`	`use Dotenv\Result\Success;`
`8`	`9`	`use RuntimeException;`
`@@ -91,7 +92,7 @@ private static function parseName($name)`
`91`	`92`	`*/`
`92`	`93`	`private static function isValidName($name)`
`93`	`94`	`{`
`94`		`- return preg_match('~\A[a-zA-Z0-9_.]+\z~', $name) === 1;`
	`95`	`+ return Regex::match('~\A[a-zA-Z0-9_.]+\z~', $name)->success()->getOrElse(0) === 1;`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`/**`