diff --git a/src/Form/AssignmentType.php b/src/Form/AssignmentType.php index 131d727..b63c703 100644 --- a/src/Form/AssignmentType.php +++ b/src/Form/AssignmentType.php @@ -118,7 +118,7 @@ class AssignmentType extends AbstractType return $qb ->where($qb->expr()->like('user.roles', ':role')) ->setParameter('role', '%ROLE_MANAGER%') - ->orderBy('user.firstName', 'ASC') + ->orderBy('user.firstName', \SortDirection::Ascending) ; }, ]) diff --git a/src/Form/JobProfileType.php b/src/Form/JobProfileType.php index ec2cc3e..a9bb789 100644 --- a/src/Form/JobProfileType.php +++ b/src/Form/JobProfileType.php @@ -37,7 +37,7 @@ class JobProfileType extends AbstractType 'expanded' => true, 'query_builder' => function (EntityRepository $repository) { return $repository->createQueryBuilder('job_profile') - ->orderBy('job_profile.name', 'ASC') + ->orderBy('job_profile.name', \SortDirection::Ascending) ; }, ]) diff --git a/src/Form/TeamerFilterType.php b/src/Form/TeamerFilterType.php index 8ed5bb4..1be8550 100644 --- a/src/Form/TeamerFilterType.php +++ b/src/Form/TeamerFilterType.php @@ -48,7 +48,7 @@ class TeamerFilterType extends AbstractType 'empty_label' => 'nicht filtern', 'query_builder' => function (EntityRepository $repository) { return $repository->createQueryBuilder('job_profile') - ->orderBy('job_profile.name', 'ASC'); + ->orderBy('job_profile.name', \SortDirection::Ascending); }, ]) ->add('noTrainings', CheckboxType::class, [ diff --git a/src/Repository/ApplicationRepository.php b/src/Repository/ApplicationRepository.php index 41410f5..672cb10 100644 --- a/src/Repository/ApplicationRepository.php +++ b/src/Repository/ApplicationRepository.php @@ -231,7 +231,7 @@ class ApplicationRepository extends ServiceEntityRepository ->innerJoin('application.teamer', 'teamer') ->innerJoin('teamer.user', 'user') ->where($qb->expr()->neq('application.status', ':status')) - ->orderBy('application.createdAt', 'DESC') + ->orderBy('application.createdAt', \SortDirection::Descending) ->setParameter('status', Application::STATUS_REJECTED) ->setMaxResults($limit) ->getQuery() @@ -280,8 +280,8 @@ class ApplicationRepository extends ServiceEntityRepository ->innerJoin('application.assignment', 'assignment') ->innerJoin('assignment.destination', 'destination') ->groupBy('hotelCode') - ->orderBy('totalCount', 'DESC') - ->addOrderBy('hotelCode', 'ASC') + ->orderBy('totalCount', \SortDirection::Descending) + ->addOrderBy('hotelCode', \SortDirection::Ascending) ; SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo); diff --git a/src/Repository/AssignmentRepository.php b/src/Repository/AssignmentRepository.php index c0c7308..69d9df6 100644 --- a/src/Repository/AssignmentRepository.php +++ b/src/Repository/AssignmentRepository.php @@ -152,7 +152,7 @@ class AssignmentRepository extends ServiceEntityRepository ; } - if (0 < count((array)$filterDto->getHotels())) { + if (0 < count((array) $filterDto->getHotels())) { $constraints = []; foreach ($filterDto->getHotels() as $index => $hotel) { $constraints[] = $qb->expr()->like('destination.hotel', ':hotel'.$index); @@ -293,7 +293,7 @@ class AssignmentRepository extends ServiceEntityRepository $result = $qb ->select('assignment', 'job_profile') ->innerJoin('assignment.jobProfile', 'job_profile') - ->orderBy('job_profile.name', 'ASC') + ->orderBy('job_profile.name', \SortDirection::Ascending) ->where($qb->expr()->isNull('assignment.deletedAt')) ->getQuery() ->getResult() @@ -314,7 +314,7 @@ class AssignmentRepository extends ServiceEntityRepository ->innerJoin('assignment.destination', 'destination') ->innerJoin('assignment.jobProfile', 'job_profile') ->innerJoin('assignment.owner', 'owner') - ->orderBy('assignment.createdAt', 'DESC') + ->orderBy('assignment.createdAt', \SortDirection::Descending) ->setMaxResults($limit) ->getQuery() ->getResult() @@ -358,7 +358,7 @@ class AssignmentRepository extends ServiceEntityRepository } return $qb - ->orderBy('destination.dateFrom', 'ASC') + ->orderBy('destination.dateFrom', \SortDirection::Ascending) ->setMaxResults($limit) ->getQuery() ->getResult() diff --git a/src/Repository/AvailabilityRepository.php b/src/Repository/AvailabilityRepository.php index 31f3641..4d0aef9 100644 --- a/src/Repository/AvailabilityRepository.php +++ b/src/Repository/AvailabilityRepository.php @@ -35,7 +35,7 @@ class AvailabilityRepository extends ServiceEntityRepository $qb->expr()->gt('availability.dateFrom', ':today'), $qb->expr()->isNull('availability.deletedAt') )) - ->orderBy('availability.dateFrom', 'ASC') + ->orderBy('availability.dateFrom', \SortDirection::Ascending) ->setParameter('today', new \DateTimeImmutable()) ; @@ -116,7 +116,7 @@ class AvailabilityRepository extends ServiceEntityRepository ), $qb->expr()->isNull('availability.deletedAt') )) - ->orderBy('availability.dateFrom', 'ASC') + ->orderBy('availability.dateFrom', \SortDirection::Ascending) ->setParameter('teamer', $teamer) ->setParameter('availabilities', $teamer->getAvailabilities()) ->setParameter('today', new \DateTimeImmutable()) @@ -131,7 +131,7 @@ class AvailabilityRepository extends ServiceEntityRepository return $qb ->where($qb->expr()->isNotNull('availability.owner')) - ->orderBy('availability.createdAt', 'DESC') + ->orderBy('availability.createdAt', \SortDirection::Descending) ->setMaxResults($limit) ->getQuery() ->getResult() diff --git a/src/Repository/ContactRepository.php b/src/Repository/ContactRepository.php index 363d44c..f8a28d1 100644 --- a/src/Repository/ContactRepository.php +++ b/src/Repository/ContactRepository.php @@ -28,7 +28,7 @@ class ContactRepository extends ServiceEntityRepository return $qb ->leftJoin('contact.photo', 'photo') ->where($qb->expr()->isNull('contact.destination')) - ->orderBy('contact.name', 'ASC') + ->orderBy('contact.name', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -41,8 +41,8 @@ class ContactRepository extends ServiceEntityRepository return $qb ->leftJoin('contact.photo', 'photo') ->where($qb->expr()->isNotNull('contact.destination')) - ->orderBy('contact.name', 'ASC') - ->addOrderBy('contact.destination', 'ASC') + ->orderBy('contact.name', \SortDirection::Ascending) + ->addOrderBy('contact.destination', \SortDirection::Ascending) ->getQuery() ->getResult() ; diff --git a/src/Repository/DestinationRepository.php b/src/Repository/DestinationRepository.php index 045222a..b908081 100644 --- a/src/Repository/DestinationRepository.php +++ b/src/Repository/DestinationRepository.php @@ -89,8 +89,8 @@ class DestinationRepository extends ServiceEntityRepository } $dates = $qb - ->orderBy('destination.dateFrom', 'ASC') - ->addOrderBy('destination.product', 'ASC') + ->orderBy('destination.dateFrom', \SortDirection::Ascending) + ->addOrderBy('destination.product', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -119,7 +119,7 @@ class DestinationRepository extends ServiceEntityRepository return $qb ->select('destination.hotel', 'destination.hotelCode', 'destination.hotelBusProId') ->groupBy('destination.hotelBusProId', 'destination.hotel', 'destination.hotelCode') - ->orderBy('destination.hotel', 'ASC') + ->orderBy('destination.hotel', \SortDirection::Ascending) ->getQuery() ->getArrayResult() ; diff --git a/src/Repository/DispositionRepository.php b/src/Repository/DispositionRepository.php index 57866a1..af80504 100644 --- a/src/Repository/DispositionRepository.php +++ b/src/Repository/DispositionRepository.php @@ -118,7 +118,7 @@ class DispositionRepository extends ServiceEntityRepository ->setParameter('teamer', $teamer) ->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF) ->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF) - ->orderBy('destination.dateFrom', 'DESC') + ->orderBy('destination.dateFrom', \SortDirection::Descending) ->setMaxResults($limit) ->getQuery() ->getResult() @@ -173,7 +173,7 @@ class DispositionRepository extends ServiceEntityRepository Disposition::STATUS_NEW, Disposition::STATUS_CONFIRMED, ]) - ->orderBy('destination.dateFrom', 'ASC') + ->orderBy('destination.dateFrom', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -198,7 +198,7 @@ class DispositionRepository extends ServiceEntityRepository $qb->expr()->gte('destination.dateTo', ':dateTo'), $qb->expr()->eq('disposition.status', ':status') )) - ->orderBy('destination.dateFrom', 'ASC') + ->orderBy('destination.dateFrom', \SortDirection::Ascending) ->setParameter('hotelCodes', $hotelCodes) ->setParameter('dateTo', new \DateTimeImmutable()) ->setParameter('status', Disposition::STATUS_CONFIRMED) @@ -300,7 +300,7 @@ class DispositionRepository extends ServiceEntityRepository ->innerJoin('assignment.destination', 'destination') ->innerJoin('assignment.jobProfile', 'job_profile') ->where($qb->expr()->gt('destination.dateFrom', ':dateFrom')) - ->orderBy('disposition.createdAt', 'DESC') + ->orderBy('disposition.createdAt', \SortDirection::Descending) ->setParameter('dateFrom', new \DateTimeImmutable()) ->setMaxResults($limit) ->getQuery() @@ -341,7 +341,7 @@ class DispositionRepository extends ServiceEntityRepository Disposition::STATUS_COMPLETED, ]) ->groupBy('destination.hotelCode', 'destination.hotel') - ->orderBy('destination.hotel', 'ASC') + ->orderBy('destination.hotel', \SortDirection::Ascending) ; SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo); @@ -423,7 +423,7 @@ class DispositionRepository extends ServiceEntityRepository Disposition::STATUS_COMPLETED, ]) ->groupBy('hotelCode') - ->orderBy('hotelCode', 'ASC') + ->orderBy('hotelCode', \SortDirection::Ascending) ; SeasonPeriodFilter::apply($qb, $dateFrom, $dateTo); @@ -643,7 +643,7 @@ class DispositionRepository extends ServiceEntityRepository ->setParameter('dueDate', $dueDate) ->setParameter('status', Disposition::STATUS_NEW) ->setParameter('assignmentStatus', [Assignment::STATUS_CALLED_OFF, Assignment::STATUS_DELETED]) - ->orderBy('disposition.createdAt', 'ASC') + ->orderBy('disposition.createdAt', \SortDirection::Ascending) ->getQuery() ; } diff --git a/src/Repository/FeeRepository.php b/src/Repository/FeeRepository.php index f5f8f55..dd58cc1 100644 --- a/src/Repository/FeeRepository.php +++ b/src/Repository/FeeRepository.php @@ -27,7 +27,7 @@ class FeeRepository extends ServiceEntityRepository return $qb ->where($qb->expr()->isNull('fee.deletedAt')) - ->orderBy('fee.name', 'ASC') + ->orderBy('fee.name', \SortDirection::Ascending) ->getQuery() ->getResult() ; diff --git a/src/Repository/FeedbackRepository.php b/src/Repository/FeedbackRepository.php index c4ffcf7..d00313d 100644 --- a/src/Repository/FeedbackRepository.php +++ b/src/Repository/FeedbackRepository.php @@ -59,9 +59,9 @@ class FeedbackRepository extends ServiceEntityRepository ->innerJoin('feedback.feedbackSet', 'feedbackSet') ->andWhere($qb->expr()->eq('feedback.status', ':status')) ->setParameter('status', Feedback::STATUS_PUBLISHED) - ->orderBy('teamer.lastName', 'ASC') - ->addOrderBy('teamer.firstName', 'ASC') - ->addOrderBy('feedback.assignmentDateFrom', 'ASC') + ->orderBy('teamer.lastName', \SortDirection::Ascending) + ->addOrderBy('teamer.firstName', \SortDirection::Ascending) + ->addOrderBy('feedback.assignmentDateFrom', \SortDirection::Ascending) ; $this->applyFilterCriteria($qb, $filterDto); @@ -118,7 +118,7 @@ class FeedbackRepository extends ServiceEntityRepository ->innerJoin('teamer.user', 'user') ->where($qb->expr()->eq('feedback.status', ':status')) ->setParameter('status', Feedback::STATUS_NEW) - ->orderBy('feedback.createdAt', 'DESC') + ->orderBy('feedback.createdAt', \SortDirection::Descending) ->setMaxResults($limit) ->getQuery() ->getResult() @@ -149,7 +149,7 @@ class FeedbackRepository extends ServiceEntityRepository )) ->setParameter('teamer', $teamer) ->setParameter('status', Feedback::STATUS_PUBLISHED) - ->orderBy('feedback.createdAt', 'DESC') + ->orderBy('feedback.createdAt', \SortDirection::Descending) ->setMaxResults($limit) ->getQuery() ->getResult() diff --git a/src/Repository/JobProfileRepository.php b/src/Repository/JobProfileRepository.php index d3446f1..dc9c7ea 100644 --- a/src/Repository/JobProfileRepository.php +++ b/src/Repository/JobProfileRepository.php @@ -29,7 +29,7 @@ class JobProfileRepository extends ServiceEntityRepository ->select('job_profile', 'required_training') ->leftJoin('job_profile.requiredTrainings', 'required_training') ->where($qb->expr()->isNull('job_profile.deletedAt')) - ->orderBy('job_profile.name', 'ASC') + ->orderBy('job_profile.name', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -41,7 +41,7 @@ class JobProfileRepository extends ServiceEntityRepository return $qb ->where($qb->expr()->like('job_profile.requiredLicenses', ':licenseType')) - ->orderBy('job_profile.name', 'ASC') + ->orderBy('job_profile.name', \SortDirection::Ascending) ->setParameter('licenseType', '%'.$licenseType.'%') ->getQuery() ->getResult() diff --git a/src/Repository/NewsRepository.php b/src/Repository/NewsRepository.php index 41f0400..5785a9e 100644 --- a/src/Repository/NewsRepository.php +++ b/src/Repository/NewsRepository.php @@ -22,8 +22,8 @@ class NewsRepository extends ServiceEntityRepository return $qb ->where($qb->expr()->neq('news.status', ':status')) - ->orderBy('news.status', 'DESC') - ->addOrderBy('news.createdAt', 'DESC') + ->orderBy('news.status', \SortDirection::Descending) + ->addOrderBy('news.createdAt', \SortDirection::Descending) ->setParameter('status', News::STATUS_DEACTIVATED) ->setMaxResults(1) ->getQuery() diff --git a/src/Repository/StatisticsEventRepository.php b/src/Repository/StatisticsEventRepository.php index 796e6c5..134922a 100644 --- a/src/Repository/StatisticsEventRepository.php +++ b/src/Repository/StatisticsEventRepository.php @@ -91,7 +91,7 @@ class StatisticsEventRepository extends ServiceEntityRepository ->where($qb->expr()->eq('event.name', ':name')) ->setParameter('name', $name->value) ->groupBy('value') - ->orderBy('total', 'DESC') + ->orderBy('total', \SortDirection::Descending) ; $filtered = null !== $dateFrom || null !== $dateTo; diff --git a/src/Repository/TeamerRepository.php b/src/Repository/TeamerRepository.php index 457797c..7717578 100644 --- a/src/Repository/TeamerRepository.php +++ b/src/Repository/TeamerRepository.php @@ -35,8 +35,8 @@ class TeamerRepository extends ServiceEntityRepository { return $this ->createListQueryBuilder($filterDto) - ->addOrderBy('teamer.viewed', 'asc') - ->addOrderBy('teamer.lastName', 'asc') + ->addOrderBy('teamer.viewed', \SortDirection::Ascending) + ->addOrderBy('teamer.lastName', \SortDirection::Ascending) ->getQuery() ; } @@ -67,7 +67,7 @@ class TeamerRepository extends ServiceEntityRepository ) // teamer.viewed says nothing about a mailing and a DISTINCT select cannot order // by a field it does not carry, so this list sorts by name alone - ->addOrderBy('teamer.lastName', 'asc') + ->addOrderBy('teamer.lastName', \SortDirection::Ascending) ->getQuery() ->getArrayResult() ; @@ -177,8 +177,8 @@ class TeamerRepository extends ServiceEntityRepository $qb->expr()->like('teamer.firstName', ':search'), )) ->andWhere($qb->expr()->isNull('teamer.deletedAt')) - ->orderBy('teamer.lastName', 'ASC') - ->addOrderBy('teamer.firstName', 'ASC') + ->orderBy('teamer.lastName', \SortDirection::Ascending) + ->addOrderBy('teamer.firstName', \SortDirection::Ascending) ->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%') ->getQuery() ->getResult() diff --git a/src/Repository/TrainingRepository.php b/src/Repository/TrainingRepository.php index fafd59f..24ef9fe 100644 --- a/src/Repository/TrainingRepository.php +++ b/src/Repository/TrainingRepository.php @@ -29,7 +29,7 @@ class TrainingRepository extends ServiceEntityRepository ->select('training', 'training_attendance') ->leftJoin('training.trainingAttendances', 'training_attendance') ->where($qb->expr()->isNull('training.deletedAt')) - ->orderBy('training.name', 'ASC') + ->orderBy('training.name', \SortDirection::Ascending) ->getQuery() ->getResult() ; diff --git a/src/Repository/UploadRepository.php b/src/Repository/UploadRepository.php index 391cd13..3af08a7 100644 --- a/src/Repository/UploadRepository.php +++ b/src/Repository/UploadRepository.php @@ -55,7 +55,7 @@ class UploadRepository extends ServiceEntityRepository $qb->expr()->like('upload.displayName', ':filename') )) ->setParameter('filename', '%'.$this->escapeLikeWildcards($search).'%') - ->orderBy('upload.originalFilename', 'ASC') + ->orderBy('upload.originalFilename', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -97,7 +97,7 @@ class UploadRepository extends ServiceEntityRepository $qb->expr()->eq('upload.status', ':status'), $qb->expr()->isNull('upload.downloadedAt'), )) - ->orderBy('upload.createdAt', 'DESC') + ->orderBy('upload.createdAt', \SortDirection::Descending) ->setParameter('type', $type) ->setParameter('status', $status) ->getQuery() @@ -126,7 +126,7 @@ class UploadRepository extends ServiceEntityRepository ->innerJoin('assignment.destination', 'destination') ->innerJoin('disposition.teamer', 'teamer') ->innerJoin('teamer.user', 'user') - ->addOrderBy('FIELD(upload.status, :checked, :new)', 'DESC') + ->addOrderBy('FIELD(upload.status, :checked, :new)', \SortDirection::Descending) ->setParameter('new', Upload::STATUS_NEW) ->setParameter('checked', Upload::STATUS_CHECKED) ; @@ -207,7 +207,7 @@ class UploadRepository extends ServiceEntityRepository $qb->expr()->eq('upload.type', ':type'), $qb->expr()->in('upload.status', ':status') )) - ->orderBy('upload.createdAt', 'DESC') + ->orderBy('upload.createdAt', \SortDirection::Descending) ->setParameter('type', $type) ->setParameter('status', [Upload::STATUS_NEW, Upload::STATUS_PENDING]) ->getQuery() diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php index bfa60b4..6caff4b 100644 --- a/src/Repository/UserRepository.php +++ b/src/Repository/UserRepository.php @@ -55,7 +55,7 @@ class UserRepository extends ServiceEntityRepository // andWhere after a chain of orWhere yields "(... OR ...) AND ...", so this // narrows the whole list rather than widening it by one more alternative ->andWhere($qb->expr()->isNull('u.deletedAt')) - ->orderBy('u.lastName', 'ASC') + ->orderBy('u.lastName', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -83,8 +83,8 @@ class UserRepository extends ServiceEntityRepository ->andWhere($roleMatches) ->andWhere($qb->expr()->isNull('user.deletedAt')) ->andWhere($qb->expr()->isNull('user.disabledAt')) - ->orderBy('user.lastName', 'ASC') - ->addOrderBy('user.firstName', 'ASC') + ->orderBy('user.lastName', \SortDirection::Ascending) + ->addOrderBy('user.firstName', \SortDirection::Ascending) ->getQuery() ->getResult() ; @@ -132,8 +132,8 @@ class UserRepository extends ServiceEntityRepository )) ->andWhere('JSON_CONTAINS(user.roles, :role) = 1') ->andWhere($qb->expr()->isNull('user.deletedAt')) - ->orderBy('user.lastName', 'ASC') - ->addOrderBy('user.firstName', 'ASC') + ->orderBy('user.lastName', \SortDirection::Ascending) + ->addOrderBy('user.firstName', \SortDirection::Ascending) ->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%') ->setParameter('role', json_encode($role)) ->getQuery()