From 417c6210ce0b599d914d723cd809366afea6762c Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 8 May 2020 22:15:55 +0200
Subject: [PATCH] Test setup: Do not use env() helper

Not needed, and not working without a full Laravel installation.
---
 framework/core/tests/integration/setup.php | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/framework/core/tests/integration/setup.php b/framework/core/tests/integration/setup.php
index 8403acf5c..afe5a6063 100644
--- a/framework/core/tests/integration/setup.php
+++ b/framework/core/tests/integration/setup.php
@@ -14,12 +14,12 @@ use Flarum\Install\Installation;
 
 require __DIR__.'/../../vendor/autoload.php';
 
-$host = env('DB_HOST', 'localhost');
-$port = intval(env('DB_PORT', 3306));
-$name = env('DB_DATABASE', 'flarum_test');
-$user = env('DB_USERNAME', 'root');
-$pass = env('DB_PASSWORD', '');
-$pref = env('DB_PREFIX', '');
+$host = getenv('DB_HOST') ?: 'localhost';
+$port = intval(getenv('DB_PORT') ?: 3306);
+$name = getenv('DB_DATABASE') ?: 'flarum_test';
+$user = getenv('DB_USERNAME') ?: 'root';
+$pass = getenv('DB_PASSWORD') ?: '';
+$pref = getenv('DB_PREFIX') ?: '';
 
 echo "Connecting to database $name at $host:$port.\n";
 echo "Logging in as $user with password '$pass'.\n";
@@ -48,15 +48,9 @@ $pipeline = $installation
     ->configPath('config.php')
     ->debugMode(true)
     ->baseUrl(BaseUrl::fromString('http://localhost'))
-    ->databaseConfig(new DatabaseConfig(
-        'mysql',
-        env('DB_HOST', 'localhost'),
-        intval(env('DB_PORT', 3306)),
-        env('DB_DATABASE', 'flarum_test'),
-        env('DB_USERNAME', 'root'),
-        env('DB_PASSWORD', ''),
-        env('DB_PREFIX', '')
-    ))
+    ->databaseConfig(
+        new DatabaseConfig('mysql', $host, $port, $name, $user, $pass, $pref)
+    )
     ->adminUser(new AdminUser(
         'admin',
         'secret',