diff --git a/src/CoreBundle/Controller/SocialController.php b/src/CoreBundle/Controller/SocialController.php index 7c4572ef7e..f8edbc0efd 100644 --- a/src/CoreBundle/Controller/SocialController.php +++ b/src/CoreBundle/Controller/SocialController.php @@ -531,8 +531,8 @@ class SocialController extends AbstractController return $this->json(['error' => 'Unauthorized']); } - $receivedMessagesCount = count($messageRepository->findReceivedInvitationsByUser($user)); - $pendingGroupInvitationsCount = count($usergroupRepository->getGroupsByUser($userId, Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION)); + $receivedMessagesCount = \count($messageRepository->findReceivedInvitationsByUser($user)); + $pendingGroupInvitationsCount = \count($usergroupRepository->getGroupsByUser($userId, Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION)); $totalInvitationsCount = $receivedMessagesCount + $pendingGroupInvitationsCount; return $this->json(['totalInvitationsCount' => $totalInvitationsCount]); @@ -694,10 +694,12 @@ class SocialController extends AbstractController if (!$result) { return $this->json(['error' => 'Invitation already exists or could not be sent']); } + break; case 'send_message': $result = MessageManager::send_message($friendUser, $subject, $content); + break; case 'add_friend': @@ -707,10 +709,12 @@ class SocialController extends AbstractController $userRepository->relateUsers($friendUser, $currentUser, $relationType); $messageRepository->invitationAccepted($friendUser, $currentUser); + break; case 'deny_friend': $messageRepository->invitationDenied($friendUser, $currentUser); + break; default: @@ -728,7 +732,6 @@ class SocialController extends AbstractController #[Route('/user-relation/{currentUserId}/{profileUserId}', name: 'chamilo_core_social_get_user_relation')] public function getUserRelation(int $currentUserId, int $profileUserId, EntityManagerInterface $em): JsonResponse { - $isAllowed = $this->checkUserRelationship($currentUserId, $profileUserId, $em); return $this->json([ @@ -770,7 +773,8 @@ class SocialController extends AbstractController ], 'friend' => $otherUserId, 'user' => $currentUserId, - ]); + ]) + ; if (null !== $relation) { return true; @@ -783,7 +787,8 @@ class SocialController extends AbstractController UserRelUser::USER_RELATION_TYPE_GOODFRIEND, ], 'user' => $currentUserId, - ]); + ]) + ; foreach ($friendsOfCurrentUser as $friendRelation) { $friendId = $friendRelation->getFriend()->getId(); @@ -795,7 +800,8 @@ class SocialController extends AbstractController ], 'friend' => $otherUserId, 'user' => $friendId, - ]); + ]) + ; if (null !== $relationThroughFriend) { return true; @@ -805,7 +811,6 @@ class SocialController extends AbstractController return false; } - private function checkUserStatus(int $userId, UserRepository $userRepository): bool { $userStatus = $userRepository->getExtraUserDataByField($userId, 'user_chat_status'); diff --git a/src/CoreBundle/Entity/PersonalFile.php b/src/CoreBundle/Entity/PersonalFile.php index 600866d262..348273146e 100644 --- a/src/CoreBundle/Entity/PersonalFile.php +++ b/src/CoreBundle/Entity/PersonalFile.php @@ -153,6 +153,7 @@ class PersonalFile extends AbstractResource implements ResourceInterface, String public function setComment(?string $comment): self { $this->comment = $comment; + return $this; } diff --git a/src/CoreBundle/Entity/User.php b/src/CoreBundle/Entity/User.php index a320c39e47..6c4bbddac4 100644 --- a/src/CoreBundle/Entity/User.php +++ b/src/CoreBundle/Entity/User.php @@ -2419,6 +2419,7 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso $friendsOfFriends[] = $friendOfFriendRelation->getFriend(); } } + return $friendsOfFriends; } diff --git a/src/CoreBundle/EventListener/LoginSuccessHandler.php b/src/CoreBundle/EventListener/LoginSuccessHandler.php index ff7cf93334..f7f403090d 100644 --- a/src/CoreBundle/EventListener/LoginSuccessHandler.php +++ b/src/CoreBundle/EventListener/LoginSuccessHandler.php @@ -12,6 +12,7 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Repository\TrackELoginRepository; use Chamilo\CoreBundle\Repository\TrackEOnlineRepository; use Chamilo\CoreBundle\Settings\SettingsManager; +use DateTime; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -146,7 +147,7 @@ class LoginSuccessHandler /** @var TrackELoginRepository $trackELoginRepository */ $trackELoginRepository = $this->entityManager->getRepository(TrackELogin::class); - $trackELoginRepository->createLoginRecord($user, new \DateTime(), $userIp); + $trackELoginRepository->createLoginRecord($user, new DateTime(), $userIp); $trackEOnlineRepository->createOnlineSession($user, $userIp); $session->set('login_records_created', true); diff --git a/src/CoreBundle/EventListener/LogoutListener.php b/src/CoreBundle/EventListener/LogoutListener.php index 875ed8a6a1..ca283dd165 100644 --- a/src/CoreBundle/EventListener/LogoutListener.php +++ b/src/CoreBundle/EventListener/LogoutListener.php @@ -9,6 +9,8 @@ namespace Chamilo\CoreBundle\EventListener; use Chamilo\CoreBundle\Entity\TrackELogin; use Chamilo\CoreBundle\Entity\TrackEOnline; use Chamilo\CoreBundle\Entity\User; +use DateTime; +use DateTimeZone; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -62,7 +64,7 @@ class LogoutListener $trackELoginRepository = $this->em->getRepository(TrackELogin::class); $loginAs = $this->checker->isGranted('ROLE_PREVIOUS_ADMIN'); if (!$loginAs) { - $currentDate = new \DateTime("now", new \DateTimeZone('UTC')); + $currentDate = new DateTime('now', new DateTimeZone('UTC')); $trackELoginRepository->updateLastLoginLogoutDate($userId, $currentDate); } diff --git a/src/CoreBundle/Repository/TrackELoginRepository.php b/src/CoreBundle/Repository/TrackELoginRepository.php index 4b69534509..392e8c7f29 100644 --- a/src/CoreBundle/Repository/TrackELoginRepository.php +++ b/src/CoreBundle/Repository/TrackELoginRepository.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Repository; use Chamilo\CoreBundle\Entity\TrackELogin; use Chamilo\CoreBundle\Entity\User; +use DateTime; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; -use DateTime; class TrackELoginRepository extends ServiceEntityRepository { @@ -42,7 +42,8 @@ class TrackELoginRepository extends ServiceEntityRepository ->orderBy('t.loginDate', 'DESC') ->setMaxResults(1) ->getQuery() - ->getSingleScalarResult(); + ->getSingleScalarResult() + ; if ($lastLoginId) { $qb = $this->createQueryBuilder('t') @@ -50,7 +51,8 @@ class TrackELoginRepository extends ServiceEntityRepository ->set('t.logoutDate', ':logoutDate') ->where('t.loginId = :loginId') ->setParameter('loginId', $lastLoginId) - ->setParameter('logoutDate', $logoutDate); + ->setParameter('logoutDate', $logoutDate) + ; $qb->getQuery()->execute(); } diff --git a/src/CoreBundle/Repository/TrackEOnlineRepository.php b/src/CoreBundle/Repository/TrackEOnlineRepository.php index a6af2220cd..0f26ce1d54 100644 --- a/src/CoreBundle/Repository/TrackEOnlineRepository.php +++ b/src/CoreBundle/Repository/TrackEOnlineRepository.php @@ -56,7 +56,7 @@ class TrackEOnlineRepository extends ServiceEntityRepository { $trackEOnline = new TrackEOnline(); $trackEOnline->setLoginUserId($user->getId()); - $trackEOnline->setLoginDate(new \DateTime()); + $trackEOnline->setLoginDate(new DateTime()); $trackEOnline->setUserIp($userIp); $trackEOnline->setCId($cId); $trackEOnline->setSessionId($sessionId); diff --git a/src/CoreBundle/Security/Authorization/Voter/UserVoter.php b/src/CoreBundle/Security/Authorization/Voter/UserVoter.php index a7a8f8ba56..0d281fd81f 100644 --- a/src/CoreBundle/Security/Authorization/Voter/UserVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/UserVoter.php @@ -67,7 +67,7 @@ class UserVoter extends Voter } $friendsOfFriends = $currentUSer->getFriendsOfFriends(); - if (in_array($user, $friendsOfFriends, true)) { + if (\in_array($user, $friendsOfFriends, true)) { return true; } diff --git a/src/CoreBundle/State/CalendarEventProvider.php b/src/CoreBundle/State/CalendarEventProvider.php index 166ebee72c..04f7dfc85b 100644 --- a/src/CoreBundle/State/CalendarEventProvider.php +++ b/src/CoreBundle/State/CalendarEventProvider.php @@ -12,8 +12,8 @@ use Chamilo\CoreBundle\ApiResource\CalendarEvent; use Chamilo\CoreBundle\Entity\AccessUrl; use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Repository\SessionRepository; -use Chamilo\CoreBundle\Settings\SettingsManager; use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper; +use Chamilo\CoreBundle\Settings\SettingsManager; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Security;