Various code style fixes.

This commit is contained in:
James Cole
2017-01-03 17:46:08 +01:00
parent 0c6d213296
commit 2d59b6718d
3 changed files with 11 additions and 10 deletions

View File

@@ -155,7 +155,7 @@ class Processor implements ProcessorInterface
$zip->close(); $zip->close();
// delete the files: // delete the files:
$this->deleteFiles($disk); $this->deleteFiles();
return true; return true;
} }
@@ -183,10 +183,11 @@ class Processor implements ProcessorInterface
} }
/** /**
* @param FilesystemAdapter $disk *
*/ */
private function deleteFiles(FilesystemAdapter $disk) private function deleteFiles()
{ {
$disk = Storage::disk('export');
foreach ($this->getFiles() as $file) { foreach ($this->getFiles() as $file) {
$disk->delete($file); $disk->delete($file);
} }

View File

@@ -217,8 +217,8 @@ class ConvertController extends Controller
switch ($joined) { switch ($joined) {
default: default:
throw new FireflyException('Cannot handle ' . $joined); throw new FireflyException('Cannot handle ' . $joined);
case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: # one case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one
case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: #six case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
$data = [ $data = [
'name' => $data['source_account_revenue'], 'name' => $data['source_account_revenue'],
'accountType' => 'revenue', 'accountType' => 'revenue',
@@ -228,14 +228,14 @@ class ConvertController extends Controller
]; ];
$source = $accountRepository->store($data); $source = $accountRepository->store($data);
break; break;
case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: # two case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two
case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: #five case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five
$source = $sourceAccount; $source = $sourceAccount;
break; break;
case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: # three case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
$source = $destinationAccount; $source = $destinationAccount;
break; break;
case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: # four case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four
$source = $accountRepository->find(intval($data['source_account_asset'])); $source = $accountRepository->find(intval($data['source_account_asset']));
break; break;
} }

View File

@@ -23,7 +23,7 @@ use FireflyIII\Models\TransactionJournal;
* *
* @package FireflyIII\Rules\Triggers * @package FireflyIII\Rules\Triggers
*/ */
class AbstractTrigger final class AbstractTrigger
{ {
/** @var bool */ /** @var bool */
public $stopProcessing; public $stopProcessing;