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

Updates for new Sandstorm package.

Browse Source
This commit is contained in:
James Cole
2018-07-24 20:30:52 +02:00
parent 871033501a
commit 086eccaf4a
10 changed files with 83 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Repositories/Account/AccountRepository.php
View File

@@ -371,10 +371,9 @@ class AccountRepository implements AccountRepositoryInterface
* Returns the date of the very first transaction in this account.
*
* @param Account $account
* @deprecated
* @return TransactionJournal
* @return TransactionJournal|null
*/
public function oldestJournal(Account $account): TransactionJournal
public function oldestJournal(Account $account): ?TransactionJournal
{
$first = $account->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
@@ -387,7 +386,7 @@ class AccountRepository implements AccountRepositoryInterface
return TransactionJournal::find((int)$first->id);
}
return new TransactionJournal();
return null;
}
/**
@@ -402,7 +401,7 @@ class AccountRepository implements AccountRepositoryInterface
{
$result = new Carbon;
$journal = $this->oldestJournal($account);
if (null !== $journal->id) {
if (null !== $journal) {
$result = $journal->date;
}

5
app/Repositories/Account/AccountRepositoryInterface.php
View File

@@ -164,10 +164,9 @@ interface AccountRepositoryInterface
* Returns the date of the very first transaction in this account.
*
* @param Account $account
* @deprecated
* @return TransactionJournal
* @return TransactionJournal|null
*/
public function oldestJournal(Account $account): TransactionJournal;
public function oldestJournal(Account $account): ?TransactionJournal;
/**
* Returns the date of the very first transaction in this account.

2
app/Repositories/Account/AccountTasker.php
View File

@@ -80,7 +80,7 @@ class AccountTasker implements AccountTaskerInterface
$entry['end_balance'] = $endSet[$account->id] ?? '0';
// first journal exists, and is on start, then this is the actual opening balance:
if (null !== $first->id && $first->date->isSameDay($start)) {
if (null !== $first && $first->date->isSameDay($start)) {
Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d')));
$entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount;
Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance']));

1
app/Repositories/Attachment/AttachmentRepository.php
View File

@@ -127,7 +127,6 @@ class AttachmentRepository implements AttachmentRepositoryInterface
* @return string
*
* @throws \Illuminate\Contracts\Encryption\DecryptException
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getContent(Attachment $attachment): string
{

11
app/Repositories/ExportJob/ExportJobRepository.php
View File

@@ -89,7 +89,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface
while ($count < 30) {
$key = Str::random(12);
$existing = $this->findByKey($key);
if (null === $existing->id) {
if (null === $existing) {
$exportJob = new ExportJob;
$exportJob->user()->associate($this->user);
$exportJob->key = Str::random(12);
@@ -121,16 +121,14 @@ class ExportJobRepository implements ExportJobRepositoryInterface
/**
* @param string $key
*
* @deprecated
* @return ExportJob
* @return ExportJob|null
*/
public function findByKey(string $key): ExportJob
public function findByKey(string $key): ?ExportJob
{
/** @var ExportJob $result */
$result = $this->user->exportJobs()->where('key', $key)->first(['export_jobs.*']);
if (null === $result) {
return new ExportJob;
return null;
}
return $result;
@@ -141,7 +139,6 @@ class ExportJobRepository implements ExportJobRepositoryInterface
*
* @return string
*
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getContent(ExportJob $job): string
{

6
app/Repositories/ExportJob/ExportJobRepositoryInterface.php
View File

@@ -58,11 +58,9 @@ interface ExportJobRepositoryInterface
/**
* @param string $key
*
* @deprecated
* @return ExportJob
* @return ExportJob|null
*/
public function findByKey(string $key): ExportJob;
public function findByKey(string $key): ?ExportJob;
/**
* @param ExportJob $job

9
app/Repositories/ImportJob/ImportJobRepository.php
View File

@@ -86,7 +86,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface
while ($count < 30) {
$key = Str::random(12);
$existing = $this->findByKey($key);
if (null === $existing->id) {
if (null === $existing) {
$importJob = ImportJob::create(
[
'user_id' => $this->user->id,
@@ -114,15 +114,14 @@ class ImportJobRepository implements ImportJobRepositoryInterface
/**
* @param string $key
*
* @return ImportJob
* @deprecated
* @return ImportJob|null
*/
public function findByKey(string $key): ImportJob
public function findByKey(string $key): ?ImportJob
{
/** @var ImportJob $result */
$result = $this->user->importJobs()->where('key', $key)->first(['import_jobs.*']);
if (null === $result) {
return new ImportJob;
return null;
}
return $result;

6
app/Repositories/ImportJob/ImportJobRepositoryInterface.php
View File

@@ -54,11 +54,9 @@ interface ImportJobRepositoryInterface
/**
* @param string $key
*
* @return ImportJob
* @deprecated
* @return ImportJob|null
*/
public function findByKey(string $key): ImportJob;
public function findByKey(string $key): ?ImportJob;
/**
* Return all attachments for job.

1
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -187,7 +187,6 @@ class RecurringRepository implements RecurringRepositoryInterface
* @param Carbon $start
* @param Carbon $end
*
* @throws FireflyException
*
* @return array
*/