Code reordering and reformatting. I should really start employing style CI.

This commit is contained in:
James Cole
2021-09-18 10:26:12 +02:00
parent 9b9d52e99f
commit 4003cea759
344 changed files with 2776 additions and 2605 deletions

View File

@@ -132,15 +132,15 @@ class RecurringRepository implements RecurringRepositoryInterface
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|string
* @return null|int
*/
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int
{
$return = '';
/** @var RecurrenceTransactionMeta $meta */
foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
if ('category_name' === $meta->name) {
$return = (string)$meta->value;
if ('category_id' === $meta->name) {
$return = (int)$meta->value;
}
}
@@ -152,15 +152,15 @@ class RecurringRepository implements RecurringRepositoryInterface
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|int
* @return null|string
*/
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string
{
$return = '';
/** @var RecurrenceTransactionMeta $meta */
foreach ($recTransaction->recurrenceTransactionMeta as $meta) {
if ('category_id' === $meta->name) {
$return = (int)$meta->value;
if ('category_name' === $meta->name) {
$return = (string)$meta->value;
}
}

View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\User;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
/**
* Interface RecurringRepositoryInterface
*
@@ -77,18 +78,18 @@ interface RecurringRepositoryInterface
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|string
* @return null|int
*/
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string;
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int;
/**
* Get the category from a recurring transaction transaction.
*
* @param RecurrenceTransaction $recTransaction
*
* @return null|int
* @return null|string
*/
public function getCategoryId(RecurrenceTransaction $recTransaction): ?int;
public function getCategoryName(RecurrenceTransaction $recTransaction): ?string;
/**
* Returns the count of journals created for this recurrence, possibly limited by time.