IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

PHP7 compatible function definitions.

Browse Source
This commit is contained in:
James Cole 2016-04-06 16:37:28 +02:00
parent c8440af9a5
commit 250b2c2f53
71 changed files with 220 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Export/Collector/AttachmentCollector.php
View File

@ -53,9 +53,9 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
} }
/** /**
* * @return bool
*/ */
public function run() public function run(): bool
{ {
// grab all the users attachments: // grab all the users attachments:
$attachments = $this->getAttachments(); $attachments = $this->getAttachments();
@ -70,6 +70,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
$this->exportDisk->put($file, $this->explanationString); $this->exportDisk->put($file, $this->explanationString);
Log::debug('Also put explanation file "' . $file . '" in the zip.'); Log::debug('Also put explanation file "' . $file . '" in the zip.');
$this->getFiles()->push($file); $this->getFiles()->push($file);
return true;
} }
/** /**

2
app/Export/Collector/BasicCollector.php
View File

@ -40,7 +40,7 @@ class BasicCollector
/** /**
* @return Collection * @return Collection
*/ */
public function getFiles() public function getFiles(): Collection
{ {
return $this->files; return $this->files;
} }

4
app/Export/Collector/CollectorInterface.php
View File

@ -22,12 +22,12 @@ interface CollectorInterface
/** /**
* @return Collection * @return Collection
*/ */
public function getFiles(); public function getFiles(): Collection;
/** /**
* @return bool * @return bool
*/ */
public function run(); public function run(): bool;
/** /**
* @param Collection $files * @param Collection $files

5
app/Export/Collector/UploadCollector.php
View File

@ -47,9 +47,9 @@ class UploadCollector extends BasicCollector implements CollectorInterface
} }
/** /**
* * @return bool
*/ */
public function run() public function run(): bool
{ {
// grab upload directory. // grab upload directory.
$files = $this->uploadDisk->files(); $files = $this->uploadDisk->files();
@ -58,6 +58,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
foreach ($files as $entry) { foreach ($files as $entry) {
$this->processOldUpload($entry); $this->processOldUpload($entry);
} }
return true;
} }
/** /**

4
app/Export/ConfigurationFile.php
View File

@ -38,9 +38,9 @@ class ConfigurationFile
} }
/** /**
* @return bool * @return string
*/ */
public function make() public function make(): string
{ {
$fields = array_keys(get_class_vars(Entry::class)); $fields = array_keys(get_class_vars(Entry::class));
$types = Entry::getTypes(); $types = Entry::getTypes();

76
app/Export/Entry.php
View File

@ -171,7 +171,7 @@ class Entry
/** /**
* @return int * @return int
*/ */
public function getBillId() public function getBillId(): int
{ {
return $this->billId; return $this->billId;
} }
@ -179,7 +179,7 @@ class Entry
/** /**
* @param int $billId * @param int $billId
*/ */
public function setBillId($billId) public function setBillId(int $billId)
{ {
$this->billId = $billId; $this->billId = $billId;
} }
@ -187,7 +187,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getBillName() public function getBillName(): string
{ {
return $this->billName; return $this->billName;
} }
@ -195,7 +195,7 @@ class Entry
/** /**
* @param string $billName * @param string $billName
*/ */
public function setBillName($billName) public function setBillName(string $billName)
{ {
$this->billName = $billName; $this->billName = $billName;
} }
@ -203,7 +203,7 @@ class Entry
/** /**
* @return int * @return int
*/ */
public function getBudgetId() public function getBudgetId(): int
{ {
return $this->budgetId; return $this->budgetId;
} }
@ -211,7 +211,7 @@ class Entry
/** /**
* @param int $budgetId * @param int $budgetId
*/ */
public function setBudgetId($budgetId) public function setBudgetId(int $budgetId)
{ {
$this->budgetId = $budgetId; $this->budgetId = $budgetId;
} }
@ -219,7 +219,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getBudgetName() public function getBudgetName(): string
{ {
return $this->budgetName; return $this->budgetName;
} }
@ -227,7 +227,7 @@ class Entry
/** /**
* @param string $budgetName * @param string $budgetName
*/ */
public function setBudgetName($budgetName) public function setBudgetName(string $budgetName)
{ {
$this->budgetName = $budgetName; $this->budgetName = $budgetName;
} }
@ -235,7 +235,7 @@ class Entry
/** /**
* @return int * @return int
*/ */
public function getCategoryId() public function getCategoryId(): int
{ {
return $this->categoryId; return $this->categoryId;
} }
@ -243,7 +243,7 @@ class Entry
/** /**
* @param int $categoryId * @param int $categoryId
*/ */
public function setCategoryId($categoryId) public function setCategoryId(int $categoryId)
{ {
$this->categoryId = $categoryId; $this->categoryId = $categoryId;
} }
@ -251,7 +251,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getCategoryName() public function getCategoryName(): string
{ {
return $this->categoryName; return $this->categoryName;
} }
@ -259,7 +259,7 @@ class Entry
/** /**
* @param string $categoryName * @param string $categoryName
*/ */
public function setCategoryName($categoryName) public function setCategoryName(string $categoryName)
{ {
$this->categoryName = $categoryName; $this->categoryName = $categoryName;
} }
@ -267,7 +267,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getDate() public function getDate(): string
{ {
return $this->date; return $this->date;
} }
@ -283,7 +283,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getDescription() public function getDescription(): string
{ {
return $this->description; return $this->description;
} }
@ -299,7 +299,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getFromAccountIban() public function getFromAccountIban(): string
{ {
return $this->fromAccountIban; return $this->fromAccountIban;
} }
@ -307,7 +307,7 @@ class Entry
/** /**
* @param string $fromAccountIban * @param string $fromAccountIban
*/ */
public function setFromAccountIban($fromAccountIban) public function setFromAccountIban(string $fromAccountIban)
{ {
$this->fromAccountIban = $fromAccountIban; $this->fromAccountIban = $fromAccountIban;
} }
@ -315,7 +315,7 @@ class Entry
/** /**
* @return int * @return int
*/ */
public function getFromAccountId() public function getFromAccountId():int
{ {
return $this->fromAccountId; return $this->fromAccountId;
} }
@ -323,7 +323,7 @@ class Entry
/** /**
* @param int $fromAccountId * @param int $fromAccountId
*/ */
public function setFromAccountId($fromAccountId) public function setFromAccountId(int $fromAccountId)
{ {
$this->fromAccountId = $fromAccountId; $this->fromAccountId = $fromAccountId;
} }
@ -331,7 +331,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getFromAccountName() public function getFromAccountName(): string
{ {
return $this->fromAccountName; return $this->fromAccountName;
} }
@ -339,23 +339,23 @@ class Entry
/** /**
* @param string $fromAccountName * @param string $fromAccountName
*/ */
public function setFromAccountName($fromAccountName) public function setFromAccountName(string $fromAccountName)
{ {
$this->fromAccountName = $fromAccountName; $this->fromAccountName = $fromAccountName;
} }
/** /**
* @return mixed * @return string
*/ */
public function getFromAccountNumber() public function getFromAccountNumber(): string
{ {
return $this->fromAccountNumber; return $this->fromAccountNumber;
} }
/** /**
* @param mixed $fromAccountNumber * @param string $fromAccountNumber
*/ */
public function setFromAccountNumber($fromAccountNumber) public function setFromAccountNumber(string $fromAccountNumber)
{ {
$this->fromAccountNumber = $fromAccountNumber; $this->fromAccountNumber = $fromAccountNumber;
} }
@ -363,7 +363,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getFromAccountType() public function getFromAccountType(): string
{ {
return $this->fromAccountType; return $this->fromAccountType;
} }
@ -371,7 +371,7 @@ class Entry
/** /**
* @param string $fromAccountType * @param string $fromAccountType
*/ */
public function setFromAccountType($fromAccountType) public function setFromAccountType(string $fromAccountType)
{ {
$this->fromAccountType = $fromAccountType; $this->fromAccountType = $fromAccountType;
} }
@ -379,7 +379,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getToAccountIban() public function getToAccountIban(): string
{ {
return $this->toAccountIban; return $this->toAccountIban;
} }
@ -387,7 +387,7 @@ class Entry
/** /**
* @param string $toAccountIban * @param string $toAccountIban
*/ */
public function setToAccountIban($toAccountIban) public function setToAccountIban(string $toAccountIban)
{ {
$this->toAccountIban = $toAccountIban; $this->toAccountIban = $toAccountIban;
} }
@ -395,7 +395,7 @@ class Entry
/** /**
* @return int * @return int
*/ */
public function getToAccountId() public function getToAccountId(): int
{ {
return $this->toAccountId; return $this->toAccountId;
} }
@ -403,7 +403,7 @@ class Entry
/** /**
* @param int $toAccountId * @param int $toAccountId
*/ */
public function setToAccountId($toAccountId) public function setToAccountId(int $toAccountId)
{ {
$this->toAccountId = $toAccountId; $this->toAccountId = $toAccountId;
} }
@ -411,7 +411,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getToAccountName() public function getToAccountName(): string
{ {
return $this->toAccountName; return $this->toAccountName;
} }
@ -419,23 +419,23 @@ class Entry
/** /**
* @param string $toAccountName * @param string $toAccountName
*/ */
public function setToAccountName($toAccountName) public function setToAccountName(string $toAccountName)
{ {
$this->toAccountName = $toAccountName; $this->toAccountName = $toAccountName;
} }
/** /**
* @return mixed * @return string
*/ */
public function getToAccountNumber() public function getToAccountNumber(): string
{ {
return $this->toAccountNumber; return $this->toAccountNumber;
} }
/** /**
* @param mixed $toAccountNumber * @param string $toAccountNumber
*/ */
public function setToAccountNumber($toAccountNumber) public function setToAccountNumber(string $toAccountNumber)
{ {
$this->toAccountNumber = $toAccountNumber; $this->toAccountNumber = $toAccountNumber;
} }
@ -443,7 +443,7 @@ class Entry
/** /**
* @return string * @return string
*/ */
public function getToAccountType() public function getToAccountType(): string
{ {
return $this->toAccountType; return $this->toAccountType;
} }
@ -451,7 +451,7 @@ class Entry
/** /**
* @param string $toAccountType * @param string $toAccountType
*/ */
public function setToAccountType($toAccountType) public function setToAccountType(string $toAccountType)
{ {
$this->toAccountType = $toAccountType; $this->toAccountType = $toAccountType;
} }

2
app/Export/Exporter/BasicExporter.php
View File

@ -39,7 +39,7 @@ class BasicExporter
/** /**
* @return Collection * @return Collection
*/ */
public function getEntries() public function getEntries(): Collection
{ {
return $this->entries; return $this->entries;
} }

7
app/Export/Exporter/CsvExporter.php
View File

@ -39,15 +39,15 @@ class CsvExporter extends BasicExporter implements ExporterInterface
/** /**
* @return string * @return string
*/ */
public function getFileName() public function getFileName(): string
{ {
return $this->fileName; return $this->fileName;
} }
/** /**
* * @return bool
*/ */
public function run() public function run(): bool
{ {
// create temporary file: // create temporary file:
$this->tempFile(); $this->tempFile();
@ -72,6 +72,7 @@ class CsvExporter extends BasicExporter implements ExporterInterface
} }
$writer->insertAll($rows); $writer->insertAll($rows);
return true;
} }
private function tempFile() private function tempFile()

8
app/Export/Exporter/ExporterInterface.php
View File

@ -22,17 +22,17 @@ interface ExporterInterface
/** /**
* @return Collection * @return Collection
*/ */
public function getEntries(); public function getEntries(): Collection;
/** /**
* @return string * @return string
*/ */
public function getFileName(); public function getFileName(): string;
/** /**
* * @return bool
*/ */
public function run(); public function run(): bool;
/** /**
* @param Collection $entries * @param Collection $entries

41
app/Export/Processor.php
View File

@ -73,19 +73,20 @@ class Processor
} }
/** /**
* * @return bool
*/ */
public function collectAttachments() public function collectAttachments(): bool
{ {
$attachmentCollector = app('FireflyIII\Export\Collector\AttachmentCollector', [$this->job]); $attachmentCollector = app('FireflyIII\Export\Collector\AttachmentCollector', [$this->job]);
$attachmentCollector->run(); $attachmentCollector->run();
$this->files = $this->files->merge($attachmentCollector->getFiles()); $this->files = $this->files->merge($attachmentCollector->getFiles());
return true;
} }
/** /**
* * @return bool
*/ */
public function collectJournals() public function collectJournals(): bool
{ {
$args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']]; $args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']];
$journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args); $journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args);
@ -97,20 +98,25 @@ class Processor
$this->settings['endDate']->format('Y-m-d') $this->settings['endDate']->format('Y-m-d')
. ').' . ').'
); );
return true;
} }
public function collectOldUploads() /**
* @return bool
*/
public function collectOldUploads(): bool
{ {
$uploadCollector = app('FireflyIII\Export\Collector\UploadCollector', [$this->job]); $uploadCollector = app('FireflyIII\Export\Collector\UploadCollector', [$this->job]);
$uploadCollector->run(); $uploadCollector->run();
$this->files = $this->files->merge($uploadCollector->getFiles()); $this->files = $this->files->merge($uploadCollector->getFiles());
return true;
} }
/** /**
* * @return bool
*/ */
public function convertJournals() public function convertJournals(): bool
{ {
$count = 0; $count = 0;
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
@ -119,15 +125,24 @@ class Processor
$count++; $count++;
} }
Log::debug('Converted ' . $count . ' journals to "Entry" objects.'); Log::debug('Converted ' . $count . ' journals to "Entry" objects.');
return true;
} }
public function createConfigFile() /**
* @return bool
*/
public function createConfigFile(): bool
{ {
$this->configurationMaker = app('FireflyIII\Export\ConfigurationFile', [$this->job]); $this->configurationMaker = app('FireflyIII\Export\ConfigurationFile', [$this->job]);
$this->files->push($this->configurationMaker->make()); $this->files->push($this->configurationMaker->make());
return true;
} }
public function createZipFile() /**
* @return bool
* @throws FireflyException
*/
public function createZipFile(): bool
{ {
$zip = new ZipArchive; $zip = new ZipArchive;
$file = $this->job->key . '.zip'; $file = $this->job->key . '.zip';
@ -156,12 +171,13 @@ class Processor
$disk->delete($file); $disk->delete($file);
} }
Log::debug('Done!'); Log::debug('Done!');
return true;
} }
/** /**
* * @return bool
*/ */
public function exportJournals() public function exportJournals(): bool
{ {
$exporterClass = Config::get('firefly.export_formats.' . $this->exportFormat); $exporterClass = Config::get('firefly.export_formats.' . $this->exportFormat);
$exporter = app($exporterClass, [$this->job]); $exporter = app($exporterClass, [$this->job]);
@ -170,12 +186,13 @@ class Processor
$exporter->run(); $exporter->run();
$this->files->push($exporter->getFileName()); $this->files->push($exporter->getFileName());
Log::debug('Added "' . $exporter->getFileName() . '" to the list of files to include in the zip.'); Log::debug('Added "' . $exporter->getFileName() . '" to the list of files to include in the zip.');
return true;
} }
/** /**
* @return Collection * @return Collection
*/ */
public function getFiles() public function getFiles(): Collection
{ {
return $this->files; return $this->files;
} }

2
app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
View File

@ -25,7 +25,7 @@ interface CategoryChartGeneratorInterface
* *
* @return array * @return array
*/ */
public function all(Collection $entries); public function all(Collection $entries): array;
/** /**
* @param Collection $categories * @param Collection $categories

7
app/Handlers/Events/SendRegistrationMail.php
View File

@ -38,13 +38,13 @@ class SendRegistrationMail
* *
* @param UserRegistration $event * @param UserRegistration $event
* *
* @return void * @return bool
*/ */
public function handle(UserRegistration $event) public function handle(UserRegistration $event): bool
{ {
$sendMail = env('SEND_REGISTRATION_MAIL', true); $sendMail = env('SEND_REGISTRATION_MAIL', true);
if (!$sendMail) { if (!$sendMail) {
return; return true;
} }
// get the email address // get the email address
$email = $event->user->email; $email = $event->user->email;
@ -60,5 +60,6 @@ class SendRegistrationMail
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
} }
return true;
} }
} }

10
app/Handlers/Events/UserConfirmation.php
View File

@ -39,24 +39,30 @@ class UserConfirmation
/** /**
* @param ResendConfirmation $event * @param ResendConfirmation $event
*
* @return bool
*/ */
public function resendConfirmation(ResendConfirmation $event) public function resendConfirmation(ResendConfirmation $event): bool
{ {
$user = $event->user; $user = $event->user;
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
$this->doConfirm($user, $ipAddress); $this->doConfirm($user, $ipAddress);
return true;
} }
/** /**
* Handle the event. * Handle the event.
* *
* @param UserRegistration $event * @param UserRegistration $event
*
* @return bool
*/ */
public function sendConfirmation(UserRegistration $event) public function sendConfirmation(UserRegistration $event): bool
{ {
$user = $event->user; $user = $event->user;
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
$this->doConfirm($user, $ipAddress); $this->doConfirm($user, $ipAddress);
return true;
} }
/** /**

4
app/Handlers/Events/UserEventListener.php
View File

@ -21,8 +21,10 @@ class UserEventListener
{ {
/** /**
* Handle user logout events. * Handle user logout events.
*
* @return bool
*/ */
public function onUserLogout() public function onUserLogout(): bool
{ {
// dump stuff from the session: // dump stuff from the session:
Session::forget('twofactor-authenticated'); Session::forget('twofactor-authenticated');

2
app/Helpers/Csv/Converter/AmountComma.php
View File

@ -15,7 +15,7 @@ class AmountComma extends BasicConverter implements ConverterInterface
/** /**
* @return float|int * @return float|int
*/ */
public function convert() public function convert(): string
{ {
$value = str_replace(',', '.', strval($this->value)); $value = str_replace(',', '.', strval($this->value));

2
app/Helpers/Csv/Converter/AssetAccountName.php
View File

@ -18,7 +18,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
/** /**
* @return Account|null * @return Account|null
*/ */
public function convert() public function convert(): Account
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface'); $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');

2
app/Helpers/Csv/Converter/AssetAccountNumber.php
View File

@ -27,7 +27,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
/** /**
* @return Account|null * @return Account|null
*/ */
public function convert() public function convert(): Account
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface'); $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');

18
app/Helpers/Csv/Converter/BasicConverter.php
View File

@ -23,7 +23,7 @@ class BasicConverter
/** /**
* @return array * @return array
*/ */
public function getData() public function getData(): array
{ {
return $this->data; return $this->data;
} }
@ -39,7 +39,7 @@ class BasicConverter
/** /**
* @return string * @return string
*/ */
public function getField() public function getField(): string
{ {
return $this->field; return $this->field;
} }
@ -47,7 +47,7 @@ class BasicConverter
/** /**
* @param string $field * @param string $field
*/ */
public function setField($field) public function setField(string $field)
{ {
$this->field = $field; $this->field = $field;
} }
@ -55,7 +55,7 @@ class BasicConverter
/** /**
* @return int * @return int
*/ */
public function getIndex() public function getIndex(): int
{ {
return $this->index; return $this->index;
} }
@ -63,7 +63,7 @@ class BasicConverter
/** /**
* @param int $index * @param int $index
*/ */
public function setIndex($index) public function setIndex(int $index)
{ {
$this->index = $index; $this->index = $index;
} }
@ -71,7 +71,7 @@ class BasicConverter
/** /**
* @return array * @return array
*/ */
public function getMapped() public function getMapped(): array
{ {
return $this->mapped; return $this->mapped;
} }
@ -79,7 +79,7 @@ class BasicConverter
/** /**
* @param array $mapped * @param array $mapped
*/ */
public function setMapped($mapped) public function setMapped(array $mapped)
{ {
$this->mapped = $mapped; $this->mapped = $mapped;
} }
@ -87,7 +87,7 @@ class BasicConverter
/** /**
* @return string * @return string
*/ */
public function getValue() public function getValue(): string
{ {
return $this->value; return $this->value;
} }
@ -95,7 +95,7 @@ class BasicConverter
/** /**
* @param string $value * @param string $value
*/ */
public function setValue($value) public function setValue(string $value)
{ {
$this->value = $value; $this->value = $value;
} }

2
app/Helpers/Csv/Converter/BillId.php
View File

@ -16,7 +16,7 @@ class BillId extends BasicConverter implements ConverterInterface
/** /**
* @return Bill * @return Bill
*/ */
public function convert() public function convert(): Bill
{ {
/** @var BillRepositoryInterface $repository */ /** @var BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface'); $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');

2
app/Helpers/Csv/Converter/BillName.php
View File

@ -16,7 +16,7 @@ class BillName extends BasicConverter implements ConverterInterface
/** /**
* @return Bill * @return Bill
*/ */
public function convert() public function convert(): Bill
{ {
/** @var BillRepositoryInterface $repository */ /** @var BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface'); $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');

2
app/Helpers/Csv/Converter/BudgetId.php
View File

@ -16,7 +16,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
/** /**
* @return Budget * @return Budget
*/ */
public function convert() public function convert(): Budget
{ {
/** @var BudgetRepositoryInterface $repository */ /** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');

2
app/Helpers/Csv/Converter/BudgetName.php
View File

@ -17,7 +17,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
/** /**
* @return Budget * @return Budget
*/ */
public function convert() public function convert(): Budget
{ {
/** @var BudgetRepositoryInterface $repository */ /** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');

2
app/Helpers/Csv/Converter/CategoryId.php
View File

@ -16,7 +16,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
/** /**
* @return Category * @return Category
*/ */
public function convert() public function convert(): Budget
{ {
/** @var SingleCategoryRepositoryInterface $repository */ /** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface'); $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');

2
app/Helpers/Csv/Converter/CategoryName.php
View File

@ -17,7 +17,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
/** /**
* @return Category * @return Category
*/ */
public function convert() public function convert(): Budget
{ {
/** @var SingleCategoryRepositoryInterface $repository */ /** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface'); $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');

8
app/Helpers/Csv/Converter/ConverterInterface.php
View File

@ -24,21 +24,21 @@ interface ConverterInterface
* @param string $field * @param string $field
* *
*/ */
public function setField($field); public function setField(string $field);
/** /**
* @param int $index * @param int $index
*/ */
public function setIndex($index); public function setIndex(int $index);
/** /**
* @param array $mapped * @param array $mapped
*/ */
public function setMapped($mapped); public function setMapped(array $mapped);
/** /**
* @param string $value * @param string $value
*/ */
public function setValue($value); public function setValue(string $value);
} }

2
app/Helpers/Csv/Converter/CurrencyCode.php
View File

@ -16,7 +16,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
/** /**
* @return TransactionCurrency * @return TransactionCurrency
*/ */
public function convert() public function convert(): TransactionCurrency
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');

2
app/Helpers/Csv/Converter/CurrencyId.php
View File

@ -16,7 +16,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
/** /**
* @return TransactionCurrency * @return TransactionCurrency
*/ */
public function convert() public function convert(): TransactionCurrency
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');

2
app/Helpers/Csv/Converter/CurrencyName.php
View File

@ -16,7 +16,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
/** /**
* @return TransactionCurrency * @return TransactionCurrency
*/ */
public function convert() public function convert(): TransactionCurrency
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');

2
app/Helpers/Csv/Converter/CurrencySymbol.php
View File

@ -16,7 +16,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
/** /**
* @return TransactionCurrency * @return TransactionCurrency
*/ */
public function convert() public function convert(): TransactionCurrency
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');

2
app/Helpers/Csv/Converter/Date.php
View File

@ -19,7 +19,7 @@ class Date extends BasicConverter implements ConverterInterface
* @return Carbon * @return Carbon
* @throws FireflyException * @throws FireflyException
*/ */
public function convert() public function convert(): Carbon
{ {
$format = session('csv-date-format'); $format = session('csv-date-format');
try { try {

2
app/Helpers/Csv/Converter/Description.php
View File

@ -14,7 +14,7 @@ class Description extends BasicConverter implements ConverterInterface
/** /**
* @return string * @return string
*/ */
public function convert() public function convert(): string
{ {
$description = $this->data['description'] ?? ''; $description = $this->data['description'] ?? '';

2
app/Helpers/Csv/Converter/INGDebetCredit.php
View File

@ -24,7 +24,7 @@ class INGDebetCredit extends BasicConverter implements ConverterInterface
/** /**
* @return int * @return int
*/ */
public function convert() public function convert(): int
{ {
if ($this->value === 'Af') { if ($this->value === 'Af') {
return -1; return -1;

2
app/Helpers/Csv/Converter/OpposingAccountId.php
View File

@ -17,7 +17,7 @@ class OpposingAccountId extends BasicConverter implements ConverterInterface
/** /**
* @return Account * @return Account
*/ */
public function convert() public function convert(): Account
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface'); $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');

2
app/Helpers/Csv/Converter/RabobankDebetCredit.php
View File

@ -15,7 +15,7 @@ class RabobankDebetCredit extends BasicConverter implements ConverterInterface
/** /**
* @return int * @return int
*/ */
public function convert() public function convert(): int
{ {
if ($this->value == 'D') { if ($this->value == 'D') {
return -1; return -1;

2
app/Helpers/Csv/Converter/TagsComma.php
View File

@ -16,7 +16,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
/** /**
* @return Collection * @return Collection
*/ */
public function convert() public function convert(): Collection
{ {
/** @var TagRepositoryInterface $repository */ /** @var TagRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface'); $repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');

2
app/Helpers/Csv/Converter/TagsSpace.php
View File

@ -16,7 +16,7 @@ class TagsSpace extends BasicConverter implements ConverterInterface
/** /**
* @return Collection * @return Collection
*/ */
public function convert() public function convert(): Collection
{ {
/** @var TagRepositoryInterface $repository */ /** @var TagRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface'); $repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');

26
app/Helpers/Csv/Data.php
View File

@ -57,7 +57,7 @@ class Data
* *
* @return string * @return string
*/ */
public function getCsvFileContent() public function getCsvFileContent(): string
{ {
return $this->csvFileContent ?? ''; return $this->csvFileContent ?? '';
} }
@ -72,10 +72,10 @@ class Data
} }
/** /**
* * FIXME may return null
* @return string * @return string
*/ */
public function getCsvFileLocation() public function getCsvFileLocation(): string
{ {
return $this->csvFileLocation; return $this->csvFileLocation;
} }
@ -91,10 +91,10 @@ class Data
} }
/** /**
* * FIXME may return null
* @return string * @return string
*/ */
public function getDateFormat() public function getDateFormat(): string
{ {
return $this->dateFormat; return $this->dateFormat;
} }
@ -110,10 +110,10 @@ class Data
} }
/** /**
* * FIXME may return null
* @return string * @return string
*/ */
public function getDelimiter() public function getDelimiter(): string
{ {
return $this->delimiter; return $this->delimiter;
} }
@ -132,7 +132,7 @@ class Data
* *
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
return $this->map; return $this->map;
} }
@ -151,7 +151,7 @@ class Data
* *
* @return array * @return array
*/ */
public function getMapped() public function getMapped(): array
{ {
return $this->mapped; return $this->mapped;
} }
@ -170,7 +170,7 @@ class Data
* *
* @return Reader * @return Reader
*/ */
public function getReader() public function getReader(): Reader
{ {
if (!is_null($this->csvFileContent) && strlen($this->csvFileContent) === 0) { if (!is_null($this->csvFileContent) && strlen($this->csvFileContent) === 0) {
$this->loadCsvFile(); $this->loadCsvFile();
@ -188,7 +188,7 @@ class Data
* *
* @return array * @return array
*/ */
public function getRoles() public function getRoles(): array
{ {
return $this->roles; return $this->roles;
} }
@ -207,7 +207,7 @@ class Data
* *
* @return array * @return array
*/ */
public function getSpecifix() public function getSpecifix(): array
{ {
return is_array($this->specifix) ? $this->specifix : []; return is_array($this->specifix) ? $this->specifix : [];
} }
@ -226,7 +226,7 @@ class Data
* *
* @return bool * @return bool
*/ */
public function hasHeaders() public function hasHeaders(): bool
{ {
return $this->hasHeaders; return $this->hasHeaders;
} }

15
app/Helpers/Csv/Importer.php
View File

@ -57,7 +57,7 @@ class Importer
* *
* @return array * @return array
*/ */
public function getErrors() public function getErrors(): array
{ {
return $this->errors; return $this->errors;
} }
@ -67,7 +67,7 @@ class Importer
* *
* @return int * @return int
*/ */
public function getImported() public function getImported(): int
{ {
return $this->imported; return $this->imported;
} }
@ -75,7 +75,7 @@ class Importer
/** /**
* @return Collection * @return Collection
*/ */
public function getJournals() public function getJournals(): Collection
{ {
return $this->journals; return $this->journals;
} }
@ -85,7 +85,7 @@ class Importer
* *
* @return int * @return int
*/ */
public function getRows() public function getRows(): int
{ {
return $this->rows; return $this->rows;
} }
@ -93,7 +93,7 @@ class Importer
/** /**
* @return array * @return array
*/ */
public function getSpecifix() public function getSpecifix(): array
{ {
return is_array($this->specifix) ? $this->specifix : []; return is_array($this->specifix) ? $this->specifix : [];
} }
@ -144,10 +144,11 @@ class Importer
} }
/** /**
* * FIXME can return text
*
* @return TransactionJournal|string * @return TransactionJournal|string
*/ */
protected function createTransactionJournal() protected function createTransactionJournal(): TransactionJournal
{ {
$date = $this->importData['date']; $date = $this->importData['date'];
if (is_null($this->importData['date'])) { if (is_null($this->importData['date'])) {

2
app/Helpers/Csv/Mapper/AnyAccount.php
View File

@ -16,7 +16,7 @@ class AnyAccount implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->accounts()->with('accountType')->orderBy('accounts.name', 'ASC')->get(['accounts.*']); $result = Auth::user()->accounts()->with('accountType')->orderBy('accounts.name', 'ASC')->get(['accounts.*']);

2
app/Helpers/Csv/Mapper/AssetAccount.php
View File

@ -17,7 +17,7 @@ class AssetAccount implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->accounts()->with( $result = Auth::user()->accounts()->with(
['accountmeta' => function (HasMany $query) { ['accountmeta' => function (HasMany $query) {

2
app/Helpers/Csv/Mapper/Bill.php
View File

@ -16,7 +16,7 @@ class Bill implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->bills()->get(['bills.*']); $result = Auth::user()->bills()->get(['bills.*']);
$list = []; $list = [];

2
app/Helpers/Csv/Mapper/Budget.php
View File

@ -16,7 +16,7 @@ class Budget implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->budgets()->get(['budgets.*']); $result = Auth::user()->budgets()->get(['budgets.*']);
$list = []; $list = [];

2
app/Helpers/Csv/Mapper/Category.php
View File

@ -16,7 +16,7 @@ class Category implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->categories()->get(['categories.*']); $result = Auth::user()->categories()->get(['categories.*']);
$list = []; $list = [];

2
app/Helpers/Csv/Mapper/MapperInterface.php
View File

@ -12,5 +12,5 @@ interface MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap(); public function getMap(): array;
} }

2
app/Helpers/Csv/Mapper/Tag.php
View File

@ -16,7 +16,7 @@ class Tag implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$result = Auth::user()->budgets()->get(['tags.*']); $result = Auth::user()->budgets()->get(['tags.*']);
$list = []; $list = [];

2
app/Helpers/Csv/Mapper/TransactionCurrency.php
View File

@ -15,7 +15,7 @@ class TransactionCurrency implements MapperInterface
/** /**
* @return array * @return array
*/ */
public function getMap() public function getMap(): array
{ {
$currencies = TC::get(); $currencies = TC::get();
$list = []; $list = [];

2
app/Helpers/Csv/PostProcessing/Amount.php
View File

@ -17,7 +17,7 @@ class Amount implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
$amount = $this->data['amount'] ?? '0'; $amount = $this->data['amount'] ?? '0';
$modifier = strval($this->data['amount-modifier']); $modifier = strval($this->data['amount-modifier']);

2
app/Helpers/Csv/PostProcessing/AssetAccount.php
View File

@ -23,7 +23,7 @@ class AssetAccount implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
$result = $this->checkIdNameObject(); // has object in ID or Name? $result = $this->checkIdNameObject(); // has object in ID or Name?
if (!is_null($result)) { if (!is_null($result)) {

2
app/Helpers/Csv/PostProcessing/Bill.php
View File

@ -16,7 +16,7 @@ class Bill implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
// get bill id. // get bill id.

2
app/Helpers/Csv/PostProcessing/Currency.php
View File

@ -19,7 +19,7 @@ class Currency implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
// fix currency // fix currency

2
app/Helpers/Csv/PostProcessing/Description.php
View File

@ -16,7 +16,7 @@ class Description implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
$description = $this->data['description'] ?? ''; $description = $this->data['description'] ?? '';
$this->data['description'] = trim($description); $this->data['description'] = trim($description);

2
app/Helpers/Csv/PostProcessing/OpposingAccount.php
View File

@ -22,7 +22,7 @@ class OpposingAccount implements PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process() public function process(): array
{ {
// three values: // three values:
// opposing-account-id, opposing-account-iban, opposing-account-name // opposing-account-id, opposing-account-iban, opposing-account-name

2
app/Helpers/Csv/PostProcessing/PostProcessorInterface.php
View File

@ -14,7 +14,7 @@ interface PostProcessorInterface
/** /**
* @return array * @return array
*/ */
public function process(); public function process(): array;
/** /**
* @param array $data * @param array $data

2
app/Helpers/Csv/Specifix/AbnAmroDescription.php
View File

@ -32,7 +32,7 @@ class AbnAmroDescription extends Specifix implements SpecifixInterface
/** /**
* @return array * @return array
*/ */
public function fix() public function fix(): array
{ {
// Try to parse the description in known formats. // Try to parse the description in known formats.
$parsed = $this->parseSepaDescription() || $this->parseTRTPDescription() || $this->parseGEABEADescription() || $this->parseABNAMRODescription(); $parsed = $this->parseSepaDescription() || $this->parseTRTPDescription() || $this->parseGEABEADescription() || $this->parseABNAMRODescription();

2
app/Helpers/Csv/Specifix/Dummy.php
View File

@ -26,7 +26,7 @@ class Dummy extends Specifix implements SpecifixInterface
/** /**
* @return array * @return array
*/ */
public function fix() public function fix(): array
{ {
return $this->data; return $this->data;

2
app/Helpers/Csv/Specifix/RabobankDescription.php
View File

@ -29,7 +29,7 @@ class RabobankDescription extends Specifix implements SpecifixInterface
/** /**
* @return array * @return array
*/ */
public function fix() public function fix(): array
{ {
$this->rabobankFixEmptyOpposing(); $this->rabobankFixEmptyOpposing();

2
app/Helpers/Csv/Specifix/Specifix.php
View File

@ -24,7 +24,7 @@ class Specifix
/** /**
* @return int * @return int
*/ */
public function getProcessorType() public function getProcessorType(): int
{ {
return $this->processorType; return $this->processorType;
} }

2
app/Helpers/Csv/Specifix/SpecifixInterface.php
View File

@ -20,7 +20,7 @@ interface SpecifixInterface
/** /**
* @return int * @return int
*/ */
public function getProcessorType(); public function getProcessorType(): int;
/** /**
* @param array $data * @param array $data

12
app/Helpers/Csv/Wizard.php
View File

@ -29,7 +29,7 @@ class Wizard implements WizardInterface
* *
* @return array * @return array
*/ */
public function getMappableValues(Reader $reader, array $map, bool $hasHeaders) public function getMappableValues(Reader $reader, array $map, bool $hasHeaders): array
{ {
$values = []; $values = [];
/* /*
@ -59,7 +59,7 @@ class Wizard implements WizardInterface
* *
* @return array * @return array
*/ */
public function processSelectedMapping(array $roles, array $map) public function processSelectedMapping(array $roles, array $map): array
{ {
$configRoles = Config::get('csv.roles'); $configRoles = Config::get('csv.roles');
$maps = []; $maps = [];
@ -86,7 +86,7 @@ class Wizard implements WizardInterface
* *
* @return array * @return array
*/ */
public function processSelectedRoles(array $input) public function processSelectedRoles(array $input): array
{ {
$roles = []; $roles = [];
@ -110,7 +110,7 @@ class Wizard implements WizardInterface
* *
* @return bool * @return bool
*/ */
public function sessionHasValues(array $fields) public function sessionHasValues(array $fields): bool
{ {
foreach ($fields as $field) { foreach ($fields as $field) {
if (!Session::has($field)) { if (!Session::has($field)) {
@ -129,7 +129,7 @@ class Wizard implements WizardInterface
* @return array * @return array
* @throws FireflyException * @throws FireflyException
*/ */
public function showOptions(array $map) public function showOptions(array $map): array
{ {
$options = []; $options = [];
foreach ($map as $index => $columnRole) { foreach ($map as $index => $columnRole) {
@ -157,7 +157,7 @@ class Wizard implements WizardInterface
* *
* @return string * @return string
*/ */
public function storeCsvFile(string $path) public function storeCsvFile(string $path): string
{ {
$time = str_replace(' ', '-', microtime()); $time = str_replace(' ', '-', microtime());
$fileName = 'csv-upload-' . Auth::user()->id . '-' . $time . '.csv.encrypted'; $fileName = 'csv-upload-' . Auth::user()->id . '-' . $time . '.csv.encrypted';

12
app/Helpers/Csv/WizardInterface.php
View File

@ -19,7 +19,7 @@ interface WizardInterface
* *
* @return array * @return array
*/ */
public function getMappableValues(Reader $reader, array $map, bool $hasHeaders); public function getMappableValues(Reader $reader, array $map, bool $hasHeaders): array;
/** /**
* @param array $roles * @param array $roles
@ -27,34 +27,34 @@ interface WizardInterface
* *
* @return array * @return array
*/ */
public function processSelectedMapping(array $roles, array $map); public function processSelectedMapping(array $roles, array $map): array;
/** /**
* @param array $input * @param array $input
* *
* @return array * @return array
*/ */
public function processSelectedRoles(array $input); public function processSelectedRoles(array $input): array;
/** /**
* @param array $fields * @param array $fields
* *
* @return bool * @return bool
*/ */
public function sessionHasValues(array $fields); public function sessionHasValues(array $fields): bool;
/** /**
* @param array $map * @param array $map
* *
* @return array * @return array
*/ */
public function showOptions(array $map); public function showOptions(array $map): array;
/** /**
* @param string $path * @param string $path
* *
* @return string * @return string
*/ */
public function storeCsvFile(string $path); public function storeCsvFile(string $path): string;
} }

4
app/Helpers/FiscalHelper.php
View File

@ -36,7 +36,7 @@ class FiscalHelper implements FiscalHelperInterface
* *
* @return Carbon date object * @return Carbon date object
*/ */
public function endOfFiscalYear(Carbon $date) public function endOfFiscalYear(Carbon $date): Carbon
{ {
// get start of fiscal year for passed date // get start of fiscal year for passed date
$endDate = $this->startOfFiscalYear($date); $endDate = $this->startOfFiscalYear($date);
@ -57,7 +57,7 @@ class FiscalHelper implements FiscalHelperInterface
* *
* @return Carbon date object * @return Carbon date object
*/ */
public function startOfFiscalYear(Carbon $date) public function startOfFiscalYear(Carbon $date): Carbon
{ {
// get start mm-dd. Then create a start date in the year passed. // get start mm-dd. Then create a start date in the year passed.
$startDate = clone $date; $startDate = clone $date;

4
app/Helpers/FiscalHelperInterface.php
View File

@ -21,7 +21,7 @@ interface FiscalHelperInterface
* *
* @return Carbon date object * @return Carbon date object
*/ */
public function endOfFiscalYear(Carbon $date); public function endOfFiscalYear(Carbon $date): Carbon;
/** /**
* This method produces a clone of the Carbon date object passed, checks preferences * This method produces a clone of the Carbon date object passed, checks preferences
@ -31,6 +31,6 @@ interface FiscalHelperInterface
* *
* @return Carbon date object * @return Carbon date object
*/ */
public function startOfFiscalYear(Carbon $date); public function startOfFiscalYear(Carbon $date): Carbon;
} }

2
app/Helpers/Report/AccountReportHelper.php
View File

@ -34,7 +34,7 @@ class AccountReportHelper implements AccountReportHelperInterface
* *
* @return AccountCollection * @return AccountCollection
*/ */
public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts) public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts): AccountCollection
{ {
$startAmount = '0'; $startAmount = '0';
$endAmount = '0'; $endAmount = '0';

2
app/Helpers/Report/AccountReportHelperInterface.php
View File

@ -32,6 +32,6 @@ interface AccountReportHelperInterface
* *
* @return AccountCollection * @return AccountCollection
*/ */
public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts); public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts): AccountCollection;
} }

10
app/Helpers/Report/BalanceReportHelper.php
View File

@ -58,7 +58,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @return Balance * @return Balance
*/ */
public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts) public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts): Balance
{ {
$balance = new Balance; $balance = new Balance;
@ -91,7 +91,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @return BalanceLine * @return BalanceLine
*/ */
private function createBalanceLine(BudgetModel $budget, Collection $accounts, Collection $spentData) private function createBalanceLine(BudgetModel $budget, Collection $accounts, Collection $spentData): BalanceLine
{ {
$line = new BalanceLine; $line = new BalanceLine;
$line->setBudget($budget); $line->setBudget($budget);
@ -128,7 +128,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @return BalanceLine * @return BalanceLine
*/ */
private function createDifferenceBalanceLine(Collection $accounts, Collection $spentData, Carbon $start, Carbon $end) private function createDifferenceBalanceLine(Collection $accounts, Collection $spentData, Carbon $start, Carbon $end): BalanceLine
{ {
$diff = new BalanceLine; $diff = new BalanceLine;
$tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end); $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);
@ -173,7 +173,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @return BalanceLine * @return BalanceLine
*/ */
private function createEmptyBalanceLine(Collection $accounts, Collection $spentData) private function createEmptyBalanceLine(Collection $accounts, Collection $spentData): BalanceLine
{ {
$empty = new BalanceLine; $empty = new BalanceLine;
@ -206,7 +206,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @return BalanceLine * @return BalanceLine
*/ */
private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end) private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end): BalanceLine
{ {
$tags = new BalanceLine; $tags = new BalanceLine;
$tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end); $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);

2
app/Helpers/Report/BalanceReportHelperInterface.php
View File

@ -29,5 +29,5 @@ interface BalanceReportHelperInterface
* *
* @return Balance * @return Balance
*/ */
public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts); public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts): Balance;
} }

2
app/Helpers/Report/BudgetReportHelperInterface.php
View File

@ -29,5 +29,5 @@ interface BudgetReportHelperInterface
* *
* @return BudgetCollection * @return BudgetCollection
*/ */
public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts); public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): BudgetCollection;
} }

10
app/Helpers/Report/ReportHelper.php
View File

@ -61,7 +61,7 @@ class ReportHelper implements ReportHelperInterface
* *
* @return BillCollection * @return BillCollection
*/ */
public function getBillReport(Carbon $start, Carbon $end, Collection $accounts) public function getBillReport(Carbon $start, Carbon $end, Collection $accounts): BillCollection
{ {
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */ /** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface'); $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
@ -108,7 +108,7 @@ class ReportHelper implements ReportHelperInterface
* *
* @return CategoryCollection * @return CategoryCollection
*/ */
public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts) public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts): CategoryCollection
{ {
$object = new CategoryCollection; $object = new CategoryCollection;
@ -135,7 +135,7 @@ class ReportHelper implements ReportHelperInterface
* *
* @return Expense * @return Expense
*/ */
public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts) public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): Expense
{ {
$object = new Expense; $object = new Expense;
$set = $this->query->expense($accounts, $start, $end); $set = $this->query->expense($accounts, $start, $end);
@ -157,7 +157,7 @@ class ReportHelper implements ReportHelperInterface
* *
* @return Income * @return Income
*/ */
public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts) public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): Income
{ {
$object = new Income; $object = new Income;
$set = $this->query->income($accounts, $start, $end); $set = $this->query->income($accounts, $start, $end);
@ -175,7 +175,7 @@ class ReportHelper implements ReportHelperInterface
* *
* @return array * @return array
*/ */
public function listOfMonths(Carbon $date) public function listOfMonths(Carbon $date): array
{ {
/** @var FiscalHelperInterface $fiscalHelper */ /** @var FiscalHelperInterface $fiscalHelper */
$fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface'); $fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface');

10
app/Helpers/Report/ReportHelperInterface.php
View File

@ -30,7 +30,7 @@ interface ReportHelperInterface
* *
* @return BillCollection * @return BillCollection
*/ */
public function getBillReport(Carbon $start, Carbon $end, Collection $accounts); public function getBillReport(Carbon $start, Carbon $end, Collection $accounts): BillCollection;
/** /**
* @param Carbon $start * @param Carbon $start
@ -39,7 +39,7 @@ interface ReportHelperInterface
* *
* @return CategoryCollection * @return CategoryCollection
*/ */
public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts); public function getCategoryReport(Carbon $start, Carbon $end, Collection $accounts): CategoryCollection;
/** /**
* Get a full report on the users expenses during the period for a list of accounts. * Get a full report on the users expenses during the period for a list of accounts.
@ -50,7 +50,7 @@ interface ReportHelperInterface
* *
* @return Expense * @return Expense
*/ */
public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts); public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): Expense;
/** /**
* Get a full report on the users incomes during the period for the given accounts. * Get a full report on the users incomes during the period for the given accounts.
@ -61,14 +61,14 @@ interface ReportHelperInterface
* *
* @return Income * @return Income
*/ */
public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts); public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): Income;
/** /**
* @param Carbon $date * @param Carbon $date
* *
* @return array * @return array
*/ */
public function listOfMonths(Carbon $date); public function listOfMonths(Carbon $date): array;
/** /**
* Returns an array of tags and their comparitive size with amounts bla bla. * Returns an array of tags and their comparitive size with amounts bla bla.

8
app/Helpers/Report/ReportQuery.php
View File

@ -28,7 +28,7 @@ class ReportQuery implements ReportQueryInterface
* *
* @return array * @return array
*/ */
public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end) public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end): array
{ {
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$query = Auth::user()->transactionjournals() $query = Auth::user()->transactionjournals()
@ -72,7 +72,7 @@ class ReportQuery implements ReportQueryInterface
* *
* @return Collection * @return Collection
*/ */
public function expense(Collection $accounts, Carbon $start, Carbon $end) public function expense(Collection $accounts, Carbon $start, Carbon $end): array
{ {
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$set = Auth::user()->transactionjournals() $set = Auth::user()->transactionjournals()
@ -107,7 +107,7 @@ class ReportQuery implements ReportQueryInterface
* *
* @return Collection * @return Collection
*/ */
public function income(Collection $accounts, Carbon $start, Carbon $end) public function income(Collection $accounts, Carbon $start, Carbon $end): Collection
{ {
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$set = Auth::user()->transactionjournals() $set = Auth::user()->transactionjournals()
@ -142,7 +142,7 @@ class ReportQuery implements ReportQueryInterface
* *
* @return array * @return array
*/ */
public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end) public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end): array
{ {
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
$query = Auth::user()->transactionjournals() $query = Auth::user()->transactionjournals()

8
app/Helpers/Report/ReportQueryInterface.php
View File

@ -24,7 +24,7 @@ interface ReportQueryInterface
* *
* @return array * @return array
*/ */
public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end); public function earnedPerMonth(Collection $accounts, Carbon $start, Carbon $end): array;
/** /**
* This method returns all the "out" transaction journals for the given account and given period. The amount * This method returns all the "out" transaction journals for the given account and given period. The amount
@ -36,7 +36,7 @@ interface ReportQueryInterface
* *
* @return Collection * @return Collection
*/ */
public function expense(Collection $accounts, Carbon $start, Carbon $end); public function expense(Collection $accounts, Carbon $start, Carbon $end): Collection;
/** /**
* This method returns all the "in" transaction journals for the given account and given period. The amount * This method returns all the "in" transaction journals for the given account and given period. The amount
@ -48,7 +48,7 @@ interface ReportQueryInterface
* *
* @return Collection * @return Collection
*/ */
public function income(Collection $accounts, Carbon $start, Carbon $end); public function income(Collection $accounts, Carbon $start, Carbon $end): Collection;
/** /**
* Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers) * Returns an array of the amount of money spent in the given accounts (on withdrawals, opening balances and transfers)
@ -60,7 +60,7 @@ interface ReportQueryInterface
* *
* @return array * @return array
*/ */
public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end); public function spentPerMonth(Collection $accounts, Carbon $start, Carbon $end): array;
} }