kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-11 12:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup [skip-ci]

Browse Source
This commit is contained in:
James Cole
2014-07-15 22:16:29 +02:00
parent 473e0f81c9
commit d280767407
35 changed files with 469 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/MigrationController.php
View File

@@ -2,21 +2,33 @@
use Firefly\Helper\Migration\MigrationHelperInterface as MHI;
/**
* Class MigrationController
*/
class MigrationController extends BaseController
{
protected $migration;
protected $_migration;
/**
* @param MHI $migration
*/
public function __construct(MHI $migration)
{
$this->migration = $migration;
$this->_migration = $migration;
View::share('menu', 'home');
}
public function dev() {
/**
* Dev method
*/
public function dev()
{
$file = Config::get('dev.import');
if(file_exists($file)) {
if (file_exists($file)) {
$user = User::find(1);
/** @noinspection PhpParamsInspection */
Auth::login($user);
/** @var Firefly\Helper\Migration\MigrationHelperInterface $migration */
$migration = App::make('Firefly\Helper\Migration\MigrationHelperInterface');
@@ -27,11 +39,17 @@ class MigrationController extends BaseController
}
}
/**
* @return \Illuminate\View\View
*/
public function index()
{
return View::make('migrate.index');
}
/**
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function postIndex()
{
if (Input::hasFile('exportFile')) {
@@ -40,12 +58,12 @@ class MigrationController extends BaseController
$file = Input::file('exportFile');
$path = $file->getRealPath();
$this->migration->loadFile($path);
$this->_migration->loadFile($path);
if (!$this->migration->validFile()) {
if (!$this->_migration->validFile()) {
return View::make('error')->with('message', 'Invalid JSON content.');
}
$this->migration->migrate();
$this->_migration->migrate();
return Redirect::route('index');
} else {
return View::make('error')->with('message', 'No file selected');