kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Add debug for #2701

Browse Source
This commit is contained in:
James Cole
2019-10-22 06:09:34 +02:00
parent 6a981fb691
commit 73e3b9fe67
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php
View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Repositories\Recurring;
use Carbon\Carbon; use Carbon\Carbon;
use Log; use Log;
/** /**
* Class CalculateXOccurrencesSince * Class CalculateXOccurrencesSince
*/ */
@@ -204,7 +205,7 @@ trait CalculateXOccurrencesSince
*/ */
protected function getXYearlyOccurrencesSince(Carbon $date, Carbon $afterDate, int $count, int $skipMod, string $moment): array protected function getXYearlyOccurrencesSince(Carbon $date, Carbon $afterDate, int $count, int $skipMod, string $moment): array
{ {
Log::debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s(%s, %d, %d, %s)', __METHOD__, $date->format('Y-m-d'), $date->format('Y-m-d'), $count, $skipMod));
$return = []; $return = [];
$mutator = clone $date; $mutator = clone $date;
$total = 0; $total = 0;
@@ -212,11 +213,17 @@ trait CalculateXOccurrencesSince
$date = new Carbon($moment); $date = new Carbon($moment);
$date->year = $mutator->year; $date->year = $mutator->year;
if ($mutator > $date) { if ($mutator > $date) {
Log::debug(sprintf('mutator (%s) > date (%s), so add a year to date (%s)', $mutator->format('Y-m-d'), $date->format('Y-m-d'), $date->format('Y-m-d'),));
$date->addYear(); $date->addYear();
Log::debug(sprintf('Date is now %s', $date->format('Y-m-d')));
} }
$obj = clone $date; $obj = clone $date;
while ($total < $count) { while ($total < $count) {
if (0 === $attempts % $skipMod && $mutator->gte($afterDate)) { Log::debug(sprintf('total (%d) < count (%d) so go.', $total, $count));
Log::debug(sprintf('attempts (%d) %% skipmod (%d) === %d', $attempts, $skipMod, $attempts % $skipMod));
Log::debug(sprintf('Obj (%s) gte afterdate (%s)? %s', $obj->format('Y-m-d'), $afterDate->format('Y-m-d'), var_export($obj->gte($afterDate), true)));
if (0 === $attempts % $skipMod && $obj->gte($afterDate)) {
Log::debug('All conditions true, add obj.');
$return[] = clone $obj; $return[] = clone $obj;
$total++; $total++;
} }