Upgrade php-parser and allow 5.8 support (#3)

craigsansam · web-flow · commit 8bf79c5387f6 · 2019-08-13T10:03:29.000+01:00
Upgrade php-parser and allow 5.8 support
diff --git a/bin/dredd-hooks-laravel b/bin/dredd-hooks-laravel
@@ -32,7 +32,7 @@ if (!$loaded) {
 
 // Laravel will not overwrite existing environment variables, so we'll pull in custom ones here
 if (file_exists($basePath . '/.env.dredd')) {
-    $dotenv = new Dotenv\Dotenv($basePath, '.env.dredd');
+    $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory()));
     $dotenv->overload();
 }
 
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "type": "package",
     "require": {
         "php": ">=7.1",
-        "nikic/php-parser": "^3.1",
+        "nikic/php-parser": "^4.2",
         "ddelnano/dredd-hooks-php": "^1.1"
     },
     "license": "MIT",
diff --git a/server.php b/server.php
@@ -7,7 +7,7 @@
 
 // Laravel will not overwrite existing environment variables, so we'll pull in custom ones here
 if (file_exists($basePath . '/.env.dredd')) {
-    $dotenv = new Dotenv\Dotenv($basePath, '.env.dredd');
+    $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory()));
     $dotenv->overload();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ if (!$loaded) {`
`32`	`32`
`33`	`33`	`// Laravel will not overwrite existing environment variables, so we'll pull in custom ones here`
`34`	`34`	`if (file_exists($basePath . '/.env.dredd')) {`
`35`		`- $dotenv = new Dotenv\Dotenv($basePath, '.env.dredd');`
	`35`	`+ $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory()));`
`36`	`36`	`$dotenv->overload();`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`// Laravel will not overwrite existing environment variables, so we'll pull in custom ones here`
`9`	`9`	`if (file_exists($basePath . '/.env.dredd')) {`
`10`		`- $dotenv = new Dotenv\Dotenv($basePath, '.env.dredd');`
	`10`	`+ $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory()));`
`11`	`11`	`$dotenv->overload();`
`12`	`12`	`}`
`13`	`13`