Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix modifying dotenv file (fix #30)

Browse Source
This commit is contained in:
Pig Fang 2019-03-31 10:33:03 +08:00
parent d9efa1d5ff
commit 3a8504c1bf
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/SetupController.php
View File

@ -51,7 +51,7 @@ class SetupController extends Controller
);
}
$content = File::get('..'.DIRECTORY_SEPARATOR.'.env');
$content = File::get(base_path('.env'));
$content = str_replace(
'DB_CONNECTION = '.env('DB_CONNECTION'),
'DB_CONNECTION = '.$request->input('type'),
@ -87,12 +87,7 @@ class SetupController extends Controller
'DB_PREFIX = '.$request->input('prefix'),
$content
);
$content = str_replace(
'FIRST_RUN = true',
'',
$content
);
File::put('..'.DIRECTORY_SEPARATOR.'.env', $content);
File::put(base_path('.env'), $content);
return redirect('setup/info');
}

4
tests/SetupControllerTest.php
View File

@ -65,8 +65,8 @@ class SetupControllerTest extends TestCase
'password' => env('DB_PASSWORD'),
'prefix' => '',
];
File::shouldReceive('get')->with('..'.DIRECTORY_SEPARATOR.'.env')->andReturn('');
File::shouldReceive('put')->with('..'.DIRECTORY_SEPARATOR.'.env', '');
File::shouldReceive('get')->with(base_path('.env'))->andReturn('');
File::shouldReceive('put')->with(base_path('.env'), '');
$this->post('/setup/database', $fake)->assertRedirect('/setup/info');
$this->get('/setup/database')->assertRedirect('/setup/info');