kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 00:27:30 +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

18
app/Helpers/Collector/Extensions/AccountCollection.php
View File

@@ -36,7 +36,7 @@ trait AccountCollection
/**
* These accounts must not be included.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -56,7 +56,7 @@ trait AccountCollection
/**
* These accounts must not be destination accounts.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -75,7 +75,7 @@ trait AccountCollection
/**
* These accounts must not be source accounts.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -94,7 +94,7 @@ trait AccountCollection
/**
* Define which accounts can be part of the source and destination transactions.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -117,7 +117,7 @@ trait AccountCollection
/**
* Both source AND destination must be in this list of accounts.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -140,7 +140,7 @@ trait AccountCollection
/**
* Define which accounts can be part of the source and destination transactions.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -159,7 +159,7 @@ trait AccountCollection
/**
* Define which accounts can NOT be part of the source and destination transactions.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -182,7 +182,7 @@ trait AccountCollection
/**
* Define which accounts can be part of the source and destination transactions.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/
@@ -201,7 +201,7 @@ trait AccountCollection
/**
* Either account can be set, but NOT both. This effectively excludes internal transfers.
*
* @param Collection $accounts
* @param Collection $accounts
*
* @return GroupCollectorInterface
*/

14
app/Helpers/Collector/Extensions/AmountCollection.php
View File

@@ -35,7 +35,7 @@ trait AmountCollection
/**
* Get transactions with a specific amount.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -67,7 +67,7 @@ trait AmountCollection
/**
* Get transactions where the amount is less than.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -85,7 +85,7 @@ trait AmountCollection
/**
* Get transactions where the amount is more than.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -103,7 +103,7 @@ trait AmountCollection
/**
* Get transactions with a specific foreign amount.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -122,7 +122,7 @@ trait AmountCollection
/**
* Get transactions with a specific foreign amount.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -141,7 +141,7 @@ trait AmountCollection
/**
* Get transactions where the amount is less than.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/
@@ -160,7 +160,7 @@ trait AmountCollection
/**
* Get transactions where the amount is more than.
*
* @param string $amount
* @param string $amount
*
* @return GroupCollectorInterface
*/

272
app/Helpers/Collector/Extensions/AttachmentCollection.php
View File

@@ -37,7 +37,7 @@ use Log;
trait AttachmentCollection
{
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameContains(string $name): GroupCollectorInterface
@@ -49,33 +49,10 @@ trait AttachmentCollection
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = str_contains(strtolower($attachment['filename']), strtolower($name)) || str_contains(strtolower($attachment['title']), strtolower($name));
if (true === $result) {
return true;
}
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameDoesNotContain(string $name): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($name): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = !str_contains(strtolower($attachment['filename']), strtolower($name)) && !str_contains(strtolower($attachment['title']), strtolower($name));
$result = str_contains(strtolower($attachment['filename']), strtolower($name)) || str_contains(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
@@ -137,10 +114,10 @@ trait AttachmentCollection
}
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameEnds(string $name): GroupCollectorInterface
public function attachmentNameDoesNotContain(string $name): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
@@ -149,7 +126,10 @@ trait AttachmentCollection
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = str_ends_with(strtolower($attachment['filename']), strtolower($name)) || str_ends_with(strtolower($attachment['title']), strtolower($name));
$result = !str_contains(strtolower($attachment['filename']), strtolower($name)) && !str_contains(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
@@ -163,7 +143,7 @@ trait AttachmentCollection
}
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameDoesNotEnd(string $name): GroupCollectorInterface
@@ -175,7 +155,10 @@ trait AttachmentCollection
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = !str_ends_with(strtolower($attachment['filename']), strtolower($name)) && !str_ends_with(strtolower($attachment['title']), strtolower($name));
$result = !str_ends_with(strtolower($attachment['filename']), strtolower($name)) && !str_ends_with(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
@@ -189,7 +172,65 @@ trait AttachmentCollection
}
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameDoesNotStart(string $name): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($name): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = !str_starts_with(strtolower($attachment['filename']), strtolower($name)) && !str_starts_with(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameEnds(string $name): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($name): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = str_ends_with(strtolower($attachment['filename']), strtolower($name)) || str_ends_with(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameIs(string $name): GroupCollectorInterface
@@ -215,7 +256,7 @@ trait AttachmentCollection
}
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameIsNot(string $name): GroupCollectorInterface
@@ -241,7 +282,7 @@ trait AttachmentCollection
}
/**
* @param string $name
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameStarts(string $name): GroupCollectorInterface
@@ -253,7 +294,10 @@ trait AttachmentCollection
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = str_starts_with(strtolower($attachment['filename']), strtolower($name)) || str_starts_with(strtolower($attachment['title']), strtolower($name));
$result = str_starts_with(strtolower($attachment['filename']), strtolower($name)) || str_starts_with(
strtolower($attachment['title']),
strtolower($name)
);
if (true === $result) {
return true;
}
@@ -267,33 +311,7 @@ trait AttachmentCollection
}
/**
* @param string $name
* @return GroupCollectorInterface
*/
public function attachmentNameDoesNotStart(string $name): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($name): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
$result = !str_starts_with(strtolower($attachment['filename']), strtolower($name)) && !str_starts_with(strtolower($attachment['title']), strtolower($name));
if (true === $result) {
return true;
}
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesAre(string $value): GroupCollectorInterface
@@ -307,7 +325,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && $notes === $value;
}
}
@@ -319,7 +337,7 @@ trait AttachmentCollection
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesAreNot(string $value): GroupCollectorInterface
@@ -333,7 +351,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && $notes !== $value;
}
}
@@ -345,7 +363,7 @@ trait AttachmentCollection
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesContains(string $value): GroupCollectorInterface
@@ -359,7 +377,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && str_contains(strtolower($notes), strtolower($value));
}
}
@@ -371,7 +389,7 @@ trait AttachmentCollection
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesDoNotContain(string $value): GroupCollectorInterface
@@ -385,7 +403,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && !str_contains(strtolower($notes), strtolower($value));
}
}
@@ -397,33 +415,7 @@ trait AttachmentCollection
}
/**
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesEnds(string $value): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($value): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
return $notes !== '' && str_ends_with(strtolower($notes), strtolower($value));
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesDoNotEnd(string $value): GroupCollectorInterface
@@ -437,7 +429,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && !str_ends_with(strtolower($notes), strtolower($value));
}
}
@@ -449,33 +441,7 @@ trait AttachmentCollection
}
/**
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesStarts(string $value): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($value): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
return $notes !== '' && str_starts_with(strtolower($notes), strtolower($value));
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $value
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesDoNotStart(string $value): GroupCollectorInterface
@@ -489,7 +455,7 @@ trait AttachmentCollection
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string) $object->notes()?->first()?->text;
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && !str_starts_with(strtolower($notes), strtolower($value));
}
}
@@ -500,6 +466,58 @@ trait AttachmentCollection
return $this;
}
/**
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesEnds(string $value): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($value): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && str_ends_with(strtolower($notes), strtolower($value));
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* @param string $value
* @return GroupCollectorInterface
*/
public function attachmentNotesStarts(string $value): GroupCollectorInterface
{
$this->hasAttachments();
$this->withAttachmentInformation();
$filter = function (int $index, array $object) use ($value): bool {
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
/** @var array $attachment */
foreach ($transaction['attachments'] as $attachment) {
/** @var Attachment $object */
$object = auth()->user()->attachments()->find($attachment['id']);
$notes = (string)$object->notes()?->first()?->text;
return $notes !== '' && str_starts_with(strtolower($notes), strtolower($value));
}
}
return false;
};
$this->postFilters[] = $filter;
return $this;
}
/**
* Has attachments
*

452
app/Helpers/Collector/Extensions/MetaCollection.php
View File

@@ -53,10 +53,29 @@ trait MetaCollection
return $this;
}
/**
* Will include bill name + ID, if any.
*
* @return GroupCollectorInterface
*/
public function withBillInformation(): GroupCollectorInterface
{
if (false === $this->hasBillInformation) {
// join bill table
$this->query->leftJoin('bills', 'bills.id', '=', 'transaction_journals.bill_id');
// add fields
$this->fields[] = 'bills.id as bill_id';
$this->fields[] = 'bills.name as bill_name';
$this->hasBillInformation = true;
}
return $this;
}
/**
* Exclude a specific budget.
*
* @param Budget $budget
* @param Budget $budget
*
* @return GroupCollectorInterface
*/
@@ -72,6 +91,27 @@ trait MetaCollection
return $this;
}
/**
* Will include budget ID + name, if any.
*
* @return GroupCollectorInterface
*/
public function withBudgetInformation(): GroupCollectorInterface
{
if (false === $this->hasBudgetInformation) {
// join link table
$this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
// join cat table
$this->query->leftJoin('budgets', 'budget_transaction_journal.budget_id', '=', 'budgets.id');
// add fields
$this->fields[] = 'budgets.id as budget_id';
$this->fields[] = 'budgets.name as budget_name';
$this->hasBudgetInformation = true;
}
return $this;
}
/**
* @inheritDoc
*/
@@ -104,10 +144,31 @@ trait MetaCollection
return $this;
}
/**
* Will include category ID + name, if any.
*
* @return GroupCollectorInterface
*/
public function withCategoryInformation(): GroupCollectorInterface
{
if (false === $this->hasCatInformation) {
// join link table
$this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
// join cat table
$this->query->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id');
// add fields
$this->fields[] = 'categories.id as category_id';
$this->fields[] = 'categories.name as category_name';
$this->hasCatInformation = true;
}
return $this;
}
/**
* Exclude a specific category.
*
* @param Category $category
* @param Category $category
*
* @return GroupCollectorInterface
*/
@@ -126,11 +187,11 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function externalIdContains(string $externalId): GroupCollectorInterface
public function excludeExternalId(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s%%', $externalId));
$this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId)));
return $this;
}
@@ -138,11 +199,48 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function externalIdDoesNotContain(string $externalId): GroupCollectorInterface
public function excludeExternalUrl(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', '!=', json_encode($url));
return $this;
}
/**
* @inheritDoc
*/
public function excludeInternalReference(string $internalReference): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s%%', $internalReference));
return $this;
}
/**
* @inheritDoc
*/
public function excludeRecurrenceId(string $recurringId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'recurrence_id');
$this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($recurringId)));
return $this;
}
/**
* @inheritDoc
*/
public function externalIdContains(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s%%', $externalId));
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s%%', $externalId));
return $this;
}
@@ -163,11 +261,11 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function externalIdEnds(string $externalId): GroupCollectorInterface
public function externalIdDoesNotContain(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s"', $externalId));
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s%%', $externalId));
return $this;
}
@@ -187,7 +285,7 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function externalIdStarts(string $externalId): GroupCollectorInterface
public function externalIdDoesNotStart(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
@@ -199,7 +297,19 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function externalIdDoesNotStart(string $externalId): GroupCollectorInterface
public function externalIdEnds(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s"', $externalId));
return $this;
}
/**
* @inheritDoc
*/
public function externalIdStarts(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
@@ -209,7 +319,7 @@ trait MetaCollection
}
/**
* @param string $url
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlContains(string $url): GroupCollectorInterface
@@ -224,7 +334,7 @@ trait MetaCollection
}
/**
* @param string $url
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlDoesNotContain(string $url): GroupCollectorInterface
@@ -237,8 +347,41 @@ trait MetaCollection
return $this;
}
/**
* @param string $url
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlDoesNotEnd(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$url = json_encode($url);
$url = str_replace('\\', '\\\\', ltrim($url, '"'));
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s', $url));
return $this;
}
/**
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlDoesNotStart(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$url = json_encode($url);
$url = str_replace('\\', '\\\\', rtrim($url, '"'));
//var_dump($url);
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%s%%', $url));
return $this;
}
/**
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlEnds(string $url): GroupCollectorInterface
@@ -253,21 +396,7 @@ trait MetaCollection
}
/**
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlDoesNotEnd(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$url = json_encode($url);
$url = str_replace('\\', '\\\\', ltrim($url, '"'));
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s', $url));
return $this;
}
/**
* @param string $url
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlStarts(string $url): GroupCollectorInterface
@@ -283,23 +412,6 @@ trait MetaCollection
return $this;
}
/**
* @param string $url
* @return GroupCollectorInterface
*/
public function externalUrlDoesNotStart(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$url = json_encode($url);
$url = str_replace('\\', '\\\\', rtrim($url, '"'));
//var_dump($url);
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%s%%', $url));
return $this;
}
/**
* Where has no tags.
*
@@ -368,18 +480,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function internalReferenceEnds(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s"', $externalId));
return $this;
}
/**
* @inheritDoc
*/
@@ -392,18 +492,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function internalReferenceStarts(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'LIKE', sprintf('"%s%%', $externalId));
return $this;
}
/**
* @inheritDoc
*/
@@ -417,7 +505,31 @@ trait MetaCollection
}
/**
* @param string $value
* @inheritDoc
*/
public function internalReferenceEnds(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s"', $externalId));
return $this;
}
/**
* @inheritDoc
*/
public function internalReferenceStarts(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'LIKE', sprintf('"%s%%', $externalId));
return $this;
}
/**
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -453,7 +565,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -469,7 +581,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -485,7 +597,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -501,7 +613,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -514,7 +626,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -527,7 +639,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -543,7 +655,7 @@ trait MetaCollection
}
/**
* @param string $value
* @param string $value
*
* @return GroupCollectorInterface
*/
@@ -558,7 +670,7 @@ trait MetaCollection
/**
* Limit the search to a specific bill.
*
* @param Bill $bill
* @param Bill $bill
*
* @return GroupCollectorInterface
*/
@@ -570,29 +682,10 @@ trait MetaCollection
return $this;
}
/**
* Will include bill name + ID, if any.
*
* @return GroupCollectorInterface
*/
public function withBillInformation(): GroupCollectorInterface
{
if (false === $this->hasBillInformation) {
// join bill table
$this->query->leftJoin('bills', 'bills.id', '=', 'transaction_journals.bill_id');
// add fields
$this->fields[] = 'bills.id as bill_id';
$this->fields[] = 'bills.name as bill_name';
$this->hasBillInformation = true;
}
return $this;
}
/**
* Limit the search to a specific set of bills.
*
* @param Collection $bills
* @param Collection $bills
*
* @return GroupCollectorInterface
*/
@@ -607,7 +700,7 @@ trait MetaCollection
/**
* Limit the search to a specific budget.
*
* @param Budget $budget
* @param Budget $budget
*
* @return GroupCollectorInterface
*/
@@ -619,31 +712,10 @@ trait MetaCollection
return $this;
}
/**
* Will include budget ID + name, if any.
*
* @return GroupCollectorInterface
*/
public function withBudgetInformation(): GroupCollectorInterface
{
if (false === $this->hasBudgetInformation) {
// join link table
$this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
// join cat table
$this->query->leftJoin('budgets', 'budget_transaction_journal.budget_id', '=', 'budgets.id');
// add fields
$this->fields[] = 'budgets.id as budget_id';
$this->fields[] = 'budgets.name as budget_name';
$this->hasBudgetInformation = true;
}
return $this;
}
/**
* Limit the search to a specific set of budgets.
*
* @param Collection $budgets
* @param Collection $budgets
*
* @return GroupCollectorInterface
*/
@@ -660,7 +732,7 @@ trait MetaCollection
/**
* Limit the search to a specific bunch of categories.
*
* @param Collection $categories
* @param Collection $categories
*
* @return GroupCollectorInterface
*/
@@ -674,31 +746,10 @@ trait MetaCollection
return $this;
}
/**
* Will include category ID + name, if any.
*
* @return GroupCollectorInterface
*/
public function withCategoryInformation(): GroupCollectorInterface
{
if (false === $this->hasCatInformation) {
// join link table
$this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
// join cat table
$this->query->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id');
// add fields
$this->fields[] = 'categories.id as category_id';
$this->fields[] = 'categories.name as category_name';
$this->hasCatInformation = true;
}
return $this;
}
/**
* Limit the search to a specific category.
*
* @param Category $category
* @param Category $category
*
* @return GroupCollectorInterface
*/
@@ -722,19 +773,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function excludeExternalId(string $externalId): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId)));
return $this;
}
/**
* @inheritDoc
*/
@@ -747,18 +785,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function excludeExternalUrl(string $url): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', '!=', json_encode($url));
return $this;
}
/**
* @inheritDoc
*/
@@ -772,19 +798,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function excludeInternalReference(string $internalReference): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', 'NOT LIKE', sprintf('%%%s%%', $internalReference));
return $this;
}
/**
* @inheritDoc
*/
@@ -800,11 +813,12 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function excludeRecurrenceId(string $recurringId): GroupCollectorInterface
public function setSepaCT(string $sepaCT): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'recurrence_id');
$this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($recurringId)));
$this->query->where('journal_meta.name', '=', 'sepa_ct_id');
$this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($sepaCT)));
$this->query->whereNull('journal_meta.deleted_at');
return $this;
}
@@ -812,7 +826,7 @@ trait MetaCollection
/**
* Limit results to a specific tag.
*
* @param Tag $tag
* @param Tag $tag
*
* @return GroupCollectorInterface
*/
@@ -827,7 +841,7 @@ trait MetaCollection
/**
* Limit results to a specific set of tags.
*
* @param Collection $tags
* @param Collection $tags
*
* @return GroupCollectorInterface
*/
@@ -842,7 +856,7 @@ trait MetaCollection
/**
* Without tags
*
* @param Collection $tags
* @param Collection $tags
*
* @return GroupCollectorInterface
*/
@@ -921,10 +935,10 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function withExternalUrl(): GroupCollectorInterface
public function withExternalId(): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->whereNotNull('journal_meta.data');
return $this;
@@ -933,10 +947,10 @@ trait MetaCollection
/**
* @inheritDoc
*/
public function withExternalId(): GroupCollectorInterface
public function withExternalUrl(): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.name', '=', 'external_url');
$this->query->whereNotNull('journal_meta.data');
return $this;
@@ -980,26 +994,6 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function withoutExternalUrl(): GroupCollectorInterface
{
$this->joinMetaDataTables();
// TODO not sure if this will work properly.
$this->query->where(function (Builder $q1) {
$q1->where(function (Builder $q2) {
$q2->where('journal_meta.name', '=', 'external_url');
$q2->whereNull('journal_meta.data');
})->orWhere(function (Builder $q3) {
$q3->where('journal_meta.name', '!=', 'external_url');
})->orWhere(function (Builder $q4) {
$q4->whereNull('journal_meta.name');
});
});
return $this;
}
/**
* @inheritDoc
*/
@@ -1021,6 +1015,27 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function withoutExternalUrl(): GroupCollectorInterface
{
$this->joinMetaDataTables();
// TODO not sure if this will work properly.
$this->query->where(function (Builder $q1) {
$q1->where(function (Builder $q2) {
$q2->where('journal_meta.name', '=', 'external_url');
$q2->whereNull('journal_meta.data');
})->orWhere(function (Builder $q3) {
$q3->where('journal_meta.name', '!=', 'external_url');
})->orWhere(function (Builder $q4) {
$q4->whereNull('journal_meta.name');
});
});
return $this;
}
/**
* @return GroupCollectorInterface
*/
@@ -1047,17 +1062,4 @@ trait MetaCollection
return $this;
}
/**
* @inheritDoc
*/
public function setSepaCT(string $sepaCT): GroupCollectorInterface
{
$this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'sepa_ct_id');
$this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($sepaCT)));
$this->query->whereNull('journal_meta.deleted_at');
return $this;
}
}

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