Bump doctrine/orm from 2.12.3 to 2.14.1

src/Classes/JsonApiData.php

@@ -4,25 +4,24 @@
 
 namespace App\Classes;
 
+use App\RelationshipVoter\AbstractVoter;
 use App\Service\EntityRepositoryLookup;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class JsonApiData
 {
     protected array $data = [];
     protected array $includes = [];
     protected array $sideLoadCandidates = [];
-    protected EntityRepositoryLookup $entityRepositoryLookup;
-    protected NormalizerInterface $normalizer;
 
     public function __construct(
-        EntityRepositoryLookup $entityRepositoryLookup,
-        NormalizerInterface $normalizer,
+        protected EntityRepositoryLookup $entityRepositoryLookup,
+        protected NormalizerInterface $normalizer,
+        protected AuthorizationCheckerInterface $authorizationChecker,
         array $data,
         array $sideLoadFields
     ) {
-        $this->entityRepositoryLookup = $entityRepositoryLookup;
-        $this->normalizer = $normalizer;
         foreach ($data as $item) {
             $shapedItem = $this->shapeItem($item);
             $this->data[] = $shapedItem;
@@ -157,16 +156,21 @@ protected function executeSideLoad(): void
             if ($newIds !== []) {
                 $manager = $this->entityRepositoryLookup->getRepositoryForEndpoint($type);
                 $dtos = $manager->findDTOsBy(['id' => $newIds]);
-                foreach ($dtos as $dto) {
+                $filteredDtos = array_filter(
+                    $dtos,
+                    fn($object) => $this->authorizationChecker->isGranted(AbstractVoter::VIEW, $object)
+                );
+                foreach ($filteredDtos as $dto) {
                     $data = $this->normalizer->normalize($dto, 'json-api');
                     $shaped = $this->shapeItem($data);
                     $this->includes[] = $shaped;
                 }
             }
             foreach ($ids as $id) {
-                $item = $this->getIncluded((string) $id, $type);
-                foreach ($candidates[$id] as $sideLoadFields) {
-                    $this->extractSideLoadData($item['relationships'], $sideLoadFields);
+                if ($item = $this->getIncluded((string) $id, $type)) {
+                    foreach ($candidates[$id] as $sideLoadFields) {
+                        $this->extractSideLoadData($item['relationships'], $sideLoadFields);
+                    }
                 }
             }
         }

src/Controller/IcsController.php

@@ -10,8 +10,8 @@
 use App\Repository\IlmSessionRepository;
 use App\Repository\OfferingRepository;
 use App\Repository\UserRepository;
+use DateInterval;
 use DateTime;
-use DateTimeImmutable;
 use Eluceo\iCal\Domain\ValueObject\Location;
 use Exception;
 use Eluceo\iCal\Domain\Entity\Calendar;
@@ -58,7 +58,7 @@ public function getICSFeed(Request $request, $key)
 
         $calendar = new Calendar();
         $calendar->setProductIdentifier('Ilios Calendar for ' . $user->getFirstAndLastName());
-        //$calendar->setPublishedTTL('P1H');
+        $calendar->setPublishedTTL(new DateInterval('PT1H'));
 
         $from = new DateTime(self::LOOK_BACK);
         $to =  new DateTime(self::LOOK_FORWARD);

src/EventListener/ClearCachedDto.php

@@ -4,7 +4,7 @@
 
 namespace App\EventListener;
 
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\PersistentCollection;
 use Flagception\Manager\FeatureManagerInterface;
@@ -39,10 +39,10 @@ public function onFlush(OnFlushEventArgs $eventArgs)
             foreach ($entities as $entity) {
                 $entityName = $entityManager->getMetadataFactory()->getMetadataFor($entity::class)->getName();
                 if ($action === 'create') {
-                    $tags[] = DTOCacheTagger::getTag($entityName, false);
+                    $tags[] = DTOCacheManager::getTag($entityName, false);
                 } else {
                     $id = (string) $entity;
-                    $tags[] = DTOCacheTagger::getTag($entityName, $id);
+                    $tags[] = DTOCacheManager::getTag($entityName, $id);
                 }
             }
         }
@@ -53,12 +53,12 @@ public function onFlush(OnFlushEventArgs $eventArgs)
             foreach ($col->getDeleteDiff() as $entity) {
                 $entityName = $entityManager->getMetadataFactory()->getMetadataFor($entity::class)->getName();
                 $id = (string) $entity;
-                $tags[] = DTOCacheTagger::getTag($entityName, $id);
+                $tags[] = DTOCacheManager::getTag($entityName, $id);
             }
             foreach ($col->getInsertDiff() as $entity) {
                 $entityName = $entityManager->getMetadataFactory()->getMetadataFor($entity::class)->getName();
                 $id = (string) $entity;
-                $tags[] = DTOCacheTagger::getTag($entityName, $id);
+                $tags[] = DTOCacheManager::getTag($entityName, $id);
             }
         }
 

src/Repository/AamcMethodRepository.php

@@ -5,16 +5,14 @@
 namespace App\Repository;
 
 use App\Entity\AamcMethod;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
 use App\Entity\DTO\AamcMethodDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function array_values;
 
@@ -28,9 +26,7 @@ class AamcMethodRepository extends ServiceEntityRepository implements
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AamcMethod::class);
     }

src/Repository/AamcPcrsRepository.php

@@ -4,7 +4,7 @@
 
 namespace App\Repository;
 
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -13,8 +13,6 @@
 use App\Entity\AamcPcrs;
 use App\Entity\DTO\AamcPcrsDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 class AamcPcrsRepository extends ServiceEntityRepository implements
     DTORepositoryInterface,
@@ -26,9 +24,7 @@ class AamcPcrsRepository extends ServiceEntityRepository implements
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AamcPcrs::class);
     }

src/Repository/AamcResourceTypeRepository.php

@@ -5,16 +5,14 @@
 namespace App\Repository;
 
 use App\Entity\AamcResourceType;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
 use App\Entity\DTO\AamcResourceTypeDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function array_values;
 
@@ -28,9 +26,7 @@ class AamcResourceTypeRepository extends ServiceEntityRepository implements
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AamcResourceType::class);
     }

src/Repository/AlertChangeTypeRepository.php

@@ -5,16 +5,14 @@
 namespace App\Repository;
 
 use App\Entity\AlertChangeType;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
 use App\Entity\DTO\AlertChangeTypeDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function array_values;
 
@@ -28,9 +26,7 @@ class AlertChangeTypeRepository extends ServiceEntityRepository implements
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AlertChangeType::class);
     }

src/Repository/AlertRepository.php

@@ -5,15 +5,13 @@
 namespace App\Repository;
 
 use App\Entity\Alert;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
 use App\Entity\DTO\AlertDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function array_values;
 
@@ -23,9 +21,7 @@ class AlertRepository extends ServiceEntityRepository implements DTORepositoryIn
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, Alert::class);
     }

src/Repository/ApplicationConfigRepository.php

@@ -4,7 +4,7 @@
 
 namespace App\Repository;
 
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -13,8 +13,6 @@
 use App\Entity\ApplicationConfig;
 use App\Entity\DTO\ApplicationConfigDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 class ApplicationConfigRepository extends ServiceEntityRepository implements
     DTORepositoryInterface,
@@ -27,9 +25,7 @@ class ApplicationConfigRepository extends ServiceEntityRepository implements
     public function __construct(
         ManagerRegistry $registry,
         protected bool $cacheEnabled,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, ApplicationConfig::class);
     }

src/Repository/AssessmentOptionRepository.php

@@ -5,16 +5,14 @@
 namespace App\Repository;
 
 use App\Entity\AssessmentOption;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ImportableEntityRepository;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
 use App\Entity\DTO\AssessmentOptionDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function array_values;
 
@@ -28,9 +26,7 @@ class AssessmentOptionRepository extends ServiceEntityRepository implements
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AssessmentOption::class);
     }

src/Repository/AuditLogRepository.php

@@ -5,25 +5,21 @@
 namespace App\Repository;
 
 use App\Entity\AuditLog;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ManagerRepository;
 use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 class AuditLogRepository extends ServiceEntityRepository implements DTORepositoryInterface, RepositoryInterface
 {
     use ManagerRepository;
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, AuditLog::class);
     }

src/Repository/AuthenticationRepository.php

@@ -5,7 +5,7 @@
 namespace App\Repository;
 
 use App\Entity\Authentication;
-use App\Service\DTOCacheTagger;
+use App\Service\DTOCacheManager;
 use App\Traits\ManagerRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\NonUniqueResultException;
@@ -15,8 +15,6 @@
 use App\Entity\AuthenticationInterface;
 use App\Entity\DTO\AuthenticationDTO;
 use Doctrine\Persistence\ManagerRegistry;
-use Flagception\Manager\FeatureManagerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 
 use function is_array;
 
@@ -26,9 +24,7 @@ class AuthenticationRepository extends ServiceEntityRepository implements DTORep
 
     public function __construct(
         ManagerRegistry $registry,
-        protected CacheInterface $cache,
-        protected DTOCacheTagger $cacheTagger,
-        protected FeatureManagerInterface $featureManager,
+        protected DTOCacheManager $cacheManager,
     ) {
         parent::__construct($registry, Authentication::class);
     }