Fix deprecations and code style issues

This commit is contained in:
2024-03-07 15:26:58 +01:00
parent f0dbb17172
commit 1d636f5e9e
38 changed files with 111 additions and 131 deletions

View File

@@ -555,7 +555,7 @@ class AccompanyingPeriod implements
// ensure continuity of histories
$criteria = new Criteria();
$criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
$criteria->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Ascending, 'id' => \Doctrine\Common\Collections\Order::Ascending]);
/** @var \Iterator $locations */
$locations = $this->getLocationHistories()->matching($criteria)->getIterator();
@@ -1536,7 +1536,7 @@ class AccompanyingPeriod implements
{
// ensure continuity of histories
$criteria = new Criteria();
$criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
$criteria->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Ascending, 'id' => \Doctrine\Common\Collections\Order::Ascending]);
/** @var \Iterator $steps */
$steps = $this->getStepHistories()->matching($criteria)->getIterator();

View File

@@ -1205,7 +1205,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
->where(
$expr->eq('shareHousehold', false)
)
->orderBy(['startDate' => Criteria::DESC]);
->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Descending]);
return $this->getHouseholdParticipations()
->matching($criteria);
@@ -1227,7 +1227,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
->where(
$expr->eq('shareHousehold', true)
)
->orderBy(['startDate' => Criteria::DESC, 'id' => Criteria::DESC]);
->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Descending, 'id' => \Doctrine\Common\Collections\Order::Descending]);
return $this->getHouseholdParticipations()
->matching($criteria);