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

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