Merge pull request #1166 from acelaya-forks/feature/fix-undefined-var

Feature/fix undefined var
This commit is contained in:
Alejandro Celaya 2021-08-26 10:06:33 +02:00 committed by GitHub
commit b0d33f3a85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
* *Nothing*
### Fixed
* *Nothing*
* [#1165](https://github.com/shlinkio/shlink/issues/1165) Fixed warning displayed when trying to locate visits and there are none pending.
## [2.8.1] - 2021-08-15

View File

@ -70,15 +70,17 @@ class VisitRepository extends EntitySpecificationRepository implements VisitRepo
$qb = (clone $originalQueryBuilder)->andWhere($qb->expr()->gt('v.id', $lastId));
$iterator = $qb->getQuery()->toIterable();
$resultsFound = false;
/** @var Visit|null $lastProcessedVisit */
$lastProcessedVisit = null;
foreach ($iterator as $key => $visit) {
$resultsFound = true;
$lastProcessedVisit = $visit;
yield $key => $visit;
}
// As the query is ordered by ID, we can take the last one every time in order to exclude the whole list
/** @var Visit|null $visit */
$lastId = $visit?->getId() ?? $lastId;
$lastId = $lastProcessedVisit?->getId() ?? $lastId;
} while ($resultsFound);
}