From 1a288c35e5b26bfd4b8c9816b03345794122f2bc Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 9 Nov 2018 15:31:53 +0100
Subject: [PATCH] Minor - Fix doctrine issues, wrong return type, wrong
 criteria value

---
 src/UserBundle/Entity/User.php               | 13 +++++++------
 src/UserBundle/Repository/UserRepository.php |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/UserBundle/Entity/User.php b/src/UserBundle/Entity/User.php
index 9305585bb5..c5bfd09c49 100644
--- a/src/UserBundle/Entity/User.php
+++ b/src/UserBundle/Entity/User.php
@@ -11,6 +11,7 @@ use Chamilo\CoreBundle\Entity\Skill;
 use Chamilo\CoreBundle\Entity\UsergroupRelUser;
 use Chamilo\ThemeBundle\Model\UserInterface as ThemeUser;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping as ORM;
@@ -370,7 +371,7 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement
     protected $sessions;
 
     /**
-     * @var ArrayCollection
+     * @var Collection
      *
      * @ORM\OneToMany(
      *     targetEntity="Chamilo\CourseBundle\Entity\CGroupRelUser",
@@ -382,7 +383,7 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement
     protected $courseGroupsAsMember;
 
     /**
-     * @var ArrayCollection
+     * @var Collection
      *
      * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CGroupRelTutor", mappedBy="user", orphanRemoval=true)
      */
@@ -2023,17 +2024,17 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getCourseGroupsAsMember(): ArrayCollection
+    public function getCourseGroupsAsMember(): Collection
     {
         return $this->courseGroupsAsMember;
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getCourseGroupsAsTutor(): ArrayCollection
+    public function getCourseGroupsAsTutor(): Collection
     {
         return $this->courseGroupsAsTutor;
     }
diff --git a/src/UserBundle/Repository/UserRepository.php b/src/UserBundle/Repository/UserRepository.php
index 4286f6399c..4ff00c2e11 100644
--- a/src/UserBundle/Repository/UserRepository.php
+++ b/src/UserBundle/Repository/UserRepository.php
@@ -728,6 +728,7 @@ class UserRepository extends EntityRepository
         }
 
         // TrackEOnline
+        $trackEOnlineList = [];
         /** @var TrackEOnline $item */
         foreach ($trackResults['ChamiloCoreBundle:TrackEOnline'] as $item) {
             $date = $item->getLoginDate() ? $item->getLoginDate()->format($dateFormat) : '';
@@ -869,7 +870,7 @@ class UserRepository extends EntityRepository
 
         // cGroupRelUser
         $criteria = [
-            'userId' => $userId,
+            'user' => $userId,
         ];
         $result = $em->getRepository('ChamiloCourseBundle:CGroupRelUser')->findBy($criteria);
         $cGroupRelUser = [];