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

Fix reading .env file

Browse Source
This commit is contained in:
Pig Fang 2018-10-19 21:43:25 +08:00
parent 12539d5f9d
commit 1e120d3ec7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
tests/SetupControllerTest.php
View File

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