kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +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/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.