Various code cleanup [skip ci]

This commit is contained in:
James Cole 2016-10-22 09:33:03 +02:00
parent 7ce3b8d4ef
commit 12a6a61100
8 changed files with 21 additions and 22 deletions

View File

@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace FireflyIII\Console\Commands;
use Artisan;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Console\Command;

View File

@ -62,6 +62,7 @@ class Import extends Command
$job = ImportJob::whereKey($jobKey)->first();
if (!$this->isValid($job)) {
Log::error('Job is not valid for some reason. Exit.');
return;
}

View File

@ -19,7 +19,6 @@ use FireflyIII\Export\Collector\UploadCollector;
use FireflyIII\Export\Entry\Entry;
use FireflyIII\Models\ExportJob;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use Illuminate\Filesystem\FilesystemAdapter;
use Illuminate\Support\Collection;
@ -97,7 +96,7 @@ class Processor
public function collectJournals(): bool
{
/** @var JournalTaskerInterface $tasker */
$tasker = app(JournalTaskerInterface::class);
$tasker = app(JournalTaskerInterface::class);
$this->journals = $tasker->getJournalsInRange($this->accounts, $this->settings['startDate'], $this->settings['endDate']);
return true;

View File

@ -205,6 +205,7 @@ class HomeController extends Controller
Session::flash('info', 'This is an info message.');
Session::flash('warning', 'This is a warning.');
Session::flash('error', 'This is an error!');
return redirect(route('home'));
}

View File

@ -55,7 +55,7 @@ class Transaction extends Model
{
protected $dates = ['created_at', 'updated_at', 'deleted_at'];
protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount','identifier'];
protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier'];
protected $hidden = ['encrypted'];
protected $rules
= [

View File

@ -267,7 +267,7 @@ class JournalRepository implements JournalRepositoryInterface
$journal->description = $data['journal_description'];
$journal->date = $data['date'];
$journal->save();
// unlink all categories:
$journal->categories()->detach();
$journal->budgets()->detach();

View File

@ -31,22 +31,6 @@ interface UserRepositoryInterface
*/
public function all(): Collection;
/**
* @param int $userId
*
* @return User
*/
public function find(int $userId): User;
/**
* Return basic user information.
*
* @param User $user
*
* @return array
*/
public function getUserData(User $user): array;
/**
* Gives a user a role.
*
@ -63,4 +47,20 @@ interface UserRepositoryInterface
* @return int
*/
public function count(): int;
/**
* @param int $userId
*
* @return User
*/
public function find(int $userId): User;
/**
* Return basic user information.
*
* @param User $user
*
* @return array
*/
public function getUserData(User $user): array;
}

View File

@ -16,7 +16,6 @@ namespace FireflyIII\Support\Twig;
use Carbon\Carbon;
use Config;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Route;
use Twig_Extension;