kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-09 03:44:57 +00:00
Code Issues Projects Releases Wiki Activity

Various PSR12 code cleanup

Browse Source
This commit is contained in:
James Cole
2022-12-29 19:41:57 +01:00
parent 0022009dd5
commit dbf3e76ecc
340 changed files with 4079 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
app/Helpers/Collector/Extensions/TimeCollection.php
View File

@@ -33,7 +33,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
trait TimeCollection
{
/**
* @param string $day
* @param string $day
* @return GroupCollectorInterface
*/
public function dayAfter(string $day): GroupCollectorInterface
@@ -43,7 +43,7 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $day
* @return GroupCollectorInterface
*/
public function dayBefore(string $day): GroupCollectorInterface
@@ -53,7 +53,7 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $day
* @return GroupCollectorInterface
*/
public function dayIs(string $day): GroupCollectorInterface
@@ -63,7 +63,7 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $day
* @return GroupCollectorInterface
*/
public function dayIsNot(string $day): GroupCollectorInterface
@@ -73,9 +73,9 @@ trait TimeCollection
}
/**
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @return GroupCollectorInterface
*/
public function excludeMetaDateRange(Carbon $start, Carbon $end, string $field): GroupCollectorInterface
@@ -103,9 +103,21 @@ trait TimeCollection
}
/**
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @inheritDoc
*/
public function withMetaDate(string $field): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', $field);
$this->query->whereNotNull('journal_meta.data');
return $this;
}
/**
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @return GroupCollectorInterface
*/
public function excludeObjectRange(Carbon $start, Carbon $end, string $field): GroupCollectorInterface
@@ -120,8 +132,8 @@ trait TimeCollection
}
/**
* @param Carbon $start
* @param Carbon $end
* @param Carbon $start
* @param Carbon $end
* @return GroupCollectorInterface
*/
public function excludeRange(Carbon $start, Carbon $end): GroupCollectorInterface
@@ -139,8 +151,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function metaDayAfter(string $day, string $field): GroupCollectorInterface
@@ -150,7 +162,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->day >= (int) $day;
return $transaction[$field]->day >= (int)$day;
}
}
@@ -162,20 +174,8 @@ trait TimeCollection
}
/**
* @inheritDoc
*/
public function withMetaDate(string $field): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', $field);
$this->query->whereNotNull('journal_meta.data');
return $this;
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function metaDayBefore(string $day, string $field): GroupCollectorInterface
@@ -185,7 +185,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->day <= (int) $day;
return $transaction[$field]->day <= (int)$day;
}
}
@@ -197,8 +197,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function metaDayIs(string $day, string $field): GroupCollectorInterface
@@ -208,7 +208,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return (int) $day === $transaction[$field]->day;
return (int)$day === $transaction[$field]->day;
}
}
@@ -219,8 +219,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function metaDayIsNot(string $day, string $field): GroupCollectorInterface
@@ -230,7 +230,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return (int) $day !== $transaction[$field]->day;
return (int)$day !== $transaction[$field]->day;
}
}
@@ -241,8 +241,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function metaMonthAfter(string $month, string $field): GroupCollectorInterface
@@ -252,7 +252,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->month >= (int) $month;
return $transaction[$field]->month >= (int)$month;
}
}
@@ -264,8 +264,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function metaMonthBefore(string $month, string $field): GroupCollectorInterface
@@ -275,7 +275,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->month <= (int) $month;
return $transaction[$field]->month <= (int)$month;
}
}
@@ -287,8 +287,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function metaMonthIs(string $month, string $field): GroupCollectorInterface
@@ -298,7 +298,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return (int) $month === $transaction[$field]->month;
return (int)$month === $transaction[$field]->month;
}
}
@@ -309,8 +309,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function metaMonthIsNot(string $month, string $field): GroupCollectorInterface
@@ -320,7 +320,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return (int) $month !== $transaction[$field]->month;
return (int)$month !== $transaction[$field]->month;
}
}
@@ -331,8 +331,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function metaYearAfter(string $year, string $field): GroupCollectorInterface
@@ -342,7 +342,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->year >= (int) $year;
return $transaction[$field]->year >= (int)$year;
}
}
@@ -354,8 +354,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function metaYearBefore(string $year, string $field): GroupCollectorInterface
@@ -365,7 +365,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $transaction[$field]->year <= (int) $year;
return $transaction[$field]->year <= (int)$year;
}
}
@@ -377,8 +377,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function metaYearIs(string $year, string $field): GroupCollectorInterface
@@ -388,7 +388,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $year === (string) $transaction[$field]->year;
return $year === (string)$transaction[$field]->year;
}
}
@@ -400,8 +400,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function metaYearIsNot(string $year, string $field): GroupCollectorInterface
@@ -411,7 +411,7 @@ trait TimeCollection
foreach ($object['transactions'] as $transaction) {
if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
) {
return $year !== (string) $transaction[$field]->year;
return $year !== (string)$transaction[$field]->year;
}
}
return true;
@@ -422,7 +422,7 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $month
* @return GroupCollectorInterface
*/
public function monthAfter(string $month): GroupCollectorInterface
@@ -432,7 +432,7 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $month
* @return GroupCollectorInterface
*/
public function monthBefore(string $month): GroupCollectorInterface
@@ -442,7 +442,7 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $month
* @return GroupCollectorInterface
*/
public function monthIs(string $month): GroupCollectorInterface
@@ -452,7 +452,7 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $month
* @return GroupCollectorInterface
*/
public function monthIsNot(string $month): GroupCollectorInterface
@@ -462,8 +462,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function objectDayAfter(string $day, string $field): GroupCollectorInterface
@@ -473,8 +473,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function objectDayBefore(string $day, string $field): GroupCollectorInterface
@@ -484,8 +484,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function objectDayIs(string $day, string $field): GroupCollectorInterface
@@ -495,8 +495,8 @@ trait TimeCollection
}
/**
* @param string $day
* @param string $field
* @param string $day
* @param string $field
* @return GroupCollectorInterface
*/
public function objectDayIsNot(string $day, string $field): GroupCollectorInterface
@@ -506,8 +506,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function objectMonthAfter(string $month, string $field): GroupCollectorInterface
@@ -517,8 +517,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function objectMonthBefore(string $month, string $field): GroupCollectorInterface
@@ -528,8 +528,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function objectMonthIs(string $month, string $field): GroupCollectorInterface
@@ -539,8 +539,8 @@ trait TimeCollection
}
/**
* @param string $month
* @param string $field
* @param string $month
* @param string $field
* @return GroupCollectorInterface
*/
public function objectMonthIsNot(string $month, string $field): GroupCollectorInterface
@@ -550,8 +550,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function objectYearAfter(string $year, string $field): GroupCollectorInterface
@@ -561,8 +561,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function objectYearBefore(string $year, string $field): GroupCollectorInterface
@@ -572,8 +572,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function objectYearIs(string $year, string $field): GroupCollectorInterface
@@ -583,8 +583,8 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $field
* @param string $year
* @param string $field
* @return GroupCollectorInterface
*/
public function objectYearIsNot(string $year, string $field): GroupCollectorInterface
@@ -596,7 +596,7 @@ trait TimeCollection
/**
* Collect transactions after a specific date.
*
* @param Carbon $date
* @param Carbon $date
*
* @return GroupCollectorInterface
*/
@@ -611,7 +611,7 @@ trait TimeCollection
/**
* Collect transactions before a specific date.
*
* @param Carbon $date
* @param Carbon $date
*
* @return GroupCollectorInterface
*/
@@ -626,7 +626,7 @@ trait TimeCollection
/**
* Collect transactions created on a specific date.
*
* @param Carbon $date
* @param Carbon $date
*
* @return GroupCollectorInterface
*/
@@ -641,8 +641,8 @@ trait TimeCollection
}
/**
* @param Carbon $date
* @param string $field
* @param Carbon $date
* @param string $field
* @return GroupCollectorInterface
*/
public function setMetaAfter(Carbon $date, string $field): GroupCollectorInterface
@@ -665,8 +665,8 @@ trait TimeCollection
}
/**
* @param Carbon $date
* @param string $field
* @param Carbon $date
* @param string $field
* @return GroupCollectorInterface
*/
public function setMetaBefore(Carbon $date, string $field): GroupCollectorInterface
@@ -688,9 +688,9 @@ trait TimeCollection
}
/**
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @return GroupCollectorInterface
*/
public function setMetaDateRange(Carbon $start, Carbon $end, string $field): GroupCollectorInterface
@@ -718,8 +718,8 @@ trait TimeCollection
}
/**
* @param Carbon $date
* @param string $field
* @param Carbon $date
* @param string $field
* @return GroupCollectorInterface
*/
public function setObjectAfter(Carbon $date, string $field): GroupCollectorInterface
@@ -731,8 +731,8 @@ trait TimeCollection
}
/**
* @param Carbon $date
* @param string $field
* @param Carbon $date
* @param string $field
* @return GroupCollectorInterface
*/
public function setObjectBefore(Carbon $date, string $field): GroupCollectorInterface
@@ -743,9 +743,9 @@ trait TimeCollection
}
/**
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @param Carbon $start
* @param Carbon $end
* @param string $field
* @return GroupCollectorInterface
*/
public function setObjectRange(Carbon $start, Carbon $end, string $field): GroupCollectorInterface
@@ -761,8 +761,8 @@ trait TimeCollection
/**
* Set the start and end time of the results to return.
*
* @param Carbon $start
* @param Carbon $end
* @param Carbon $start
* @param Carbon $end
*
* @return GroupCollectorInterface
*/
@@ -784,7 +784,7 @@ trait TimeCollection
/**
* Collect transactions updated on a specific date.
*
* @param Carbon $date
* @param Carbon $date
*
* @return GroupCollectorInterface
*/
@@ -799,7 +799,7 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $year
* @return GroupCollectorInterface
*/
public function yearAfter(string $year): GroupCollectorInterface
@@ -809,7 +809,7 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $year
* @return GroupCollectorInterface
*/
public function yearBefore(string $year): GroupCollectorInterface
@@ -819,7 +819,7 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $year
* @return GroupCollectorInterface
*/
public function yearIs(string $year): GroupCollectorInterface
@@ -829,7 +829,7 @@ trait TimeCollection
}
/**
* @param string $year
* @param string $year
* @return GroupCollectorInterface
*/
public function yearIsNot(string $year): GroupCollectorInterface