Scrutinizer - Test correction of major issue in possibly conflicting namespaces for User entity

pull/2487/head
Yannick Warnier 8 years ago
parent ac31763a52
commit 2dda18f9cd
  1. 8
      main/admin/add_drh_to_user.php

@ -1,7 +1,7 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User as UserEntity;
use Chamilo\CoreBundle\Entity\UserRelUser; use Chamilo\CoreBundle\Entity\UserRelUser;
$cidReset = true; $cidReset = true;
@ -16,7 +16,7 @@ if (!isset($_REQUEST['u'])) {
$em = Database::getManager(); $em = Database::getManager();
$relationsRepo = $em->getRepository('ChamiloCoreBundle:UserRelUser'); $relationsRepo = $em->getRepository('ChamiloCoreBundle:UserRelUser');
/** @var User $user */ /** @var UserEntity $user */
$user = UserManager::getManager()->find($_REQUEST['u']); $user = UserManager::getManager()->find($_REQUEST['u']);
if (!$user) { if (!$user) {
@ -29,7 +29,7 @@ $hrmOptions = [];
/** @var UserRelUser $subscribedUser */ /** @var UserRelUser $subscribedUser */
foreach ($subscribedUsers as $subscribedUser) { foreach ($subscribedUsers as $subscribedUser) {
/** @var User $hrm */ /** @var UserEntity $hrm */
$hrm = UserManager::getManager()->find($subscribedUser->getFriendUserId()); $hrm = UserManager::getManager()->find($subscribedUser->getFriendUserId());
if (!$hrm) { if (!$hrm) {
@ -64,7 +64,7 @@ if ($form->validate()) {
$values = $form->exportValues(); $values = $form->exportValues();
foreach ($values['hrm'] as $hrmId) { foreach ($values['hrm'] as $hrmId) {
/** @var User $hrm */ /** @var UserEntity $hrm */
$hrm = UserManager::getManager()->find($hrmId); $hrm = UserManager::getManager()->find($hrmId);
if (!$hrm) { if (!$hrm) {

Loading…
Cancel
Save