chore

Author: tchapi

src/Controller/Admin/CalendarController.php

@@ -6,7 +6,6 @@
 use App\Entity\CalendarInstance;
 use App\Entity\CalendarSubscription;
 use App\Entity\Principal;
-use App\Entity\SchedulingObject;
 use App\Entity\User;
 use App\Form\CalendarInstanceType;
 use Doctrine\Persistence\ManagerRegistry;

src/Repository/CalendarInstanceRepository.php

@@ -2,8 +2,11 @@
 
 namespace App\Repository;
 
+use App\Entity\Calendar;
 use App\Entity\CalendarInstance;
+use App\Entity\CalendarObject;
 use App\Entity\Principal;
+use App\Entity\SchedulingObject;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -37,11 +40,11 @@ public function findSharedInstancesOfInstance(int $calendarId, bool $withCalenda
             return $query->addSelect('p.displayName', 'p.email')
                 ->getQuery()
                 ->getArrayResult();
-        } else {
-            // Returns CalendarInstances as objects
-            return $query->getQuery()
-                ->getResult();
         }
+
+        // Returns CalendarInstances as objects
+        return $query->getQuery()
+            ->getResult();
     }
 
     /**
@@ -76,7 +79,7 @@ public function hasDifferentOwner(int $calendarId, string $principalUri): bool
 
     public function findAllSchedulingObjectsForCalendar(int $calendarId): array
     {
-        $objectRepository = $this->getEntityManager()->getRepository(\App\Entity\SchedulingObject::class);
+        $objectRepository = $this->getEntityManager()->getRepository(SchedulingObject::class);
 
         return $objectRepository->createQueryBuilder('s')
             ->leftJoin(CalendarObject::class, 'c', \Doctrine\ORM\Query\Expr\Join::WITH, 'c.uri = s.uri')
@@ -96,7 +99,7 @@ public function findAllSchedulingObjectsForCalendar(int $calendarId): array
      */
     public function getObjectCountsByComponentType(int $calendarId): array
     {
-        $objectRepository = $this->getEntityManager()->getRepository(\App\Entity\CalendarObject::class);
+        $objectRepository = $this->getEntityManager()->getRepository(CalendarObject::class);
 
         // Instead of three separate queries, get all counts in a single query
         $results = $objectRepository->createQueryBuilder('o')
@@ -108,9 +111,9 @@ public function getObjectCountsByComponentType(int $calendarId): array
             ->getResult();
 
         $componentTypeMap = [
-            \App\Entity\Calendar::COMPONENT_EVENTS => 'events',
-            \App\Entity\Calendar::COMPONENT_NOTES => 'notes',
-            \App\Entity\Calendar::COMPONENT_TODOS => 'tasks',
+            Calendar::COMPONENT_EVENTS => 'events',
+            Calendar::COMPONENT_NOTES => 'notes',
+            Calendar::COMPONENT_TODOS => 'tasks',
         ];
 
         $counts = [