Fix phpstam issues

pull/4197/head
Angel Fernando Quiroz Campos 4 years ago
parent b33e86e155
commit 499bec4a62
  1. 11
      src/CoreBundle/Controller/Api/AbstractFeedbackSocialPostController.php
  2. 3
      src/CoreBundle/Controller/Api/BaseResourceFileAction.php
  3. 28
      src/CoreBundle/Controller/CourseController.php
  4. 2
      src/CoreBundle/Controller/NewsController.php
  5. 1
      src/CoreBundle/DataFixtures/AccessUserUrlFixtures.php
  6. 2
      src/CoreBundle/EventListener/LogoutListener.php
  7. 2
      src/CoreBundle/Security/Authorization/Voter/SocialPostVoter.php
  8. 6
      src/CoreBundle/Traits/Repository/ORM/TreeRepositoryTrait.php

@ -20,15 +20,11 @@ use Symfony\Component\Security\Core\User\UserInterface;
#[AsController] #[AsController]
abstract class AbstractFeedbackSocialPostController extends AbstractController abstract class AbstractFeedbackSocialPostController extends AbstractController
{ {
protected User|UserInterface $currentUser;
public function __construct( public function __construct(
protected Security $security, protected Security $security,
protected EntityManager $entityManager, protected EntityManager $entityManager,
protected SettingsManager $settingsManager protected SettingsManager $settingsManager
) { ) {
$this->currentUser = $this->security->getUser();
if ('true' !== $this->settingsManager->getSetting('social.allow_social_tool')) { if ('true' !== $this->settingsManager->getSetting('social.allow_social_tool')) {
throw new AccessDeniedException(); throw new AccessDeniedException();
} }
@ -36,18 +32,21 @@ abstract class AbstractFeedbackSocialPostController extends AbstractController
protected function getFeedbackForCurrentUser(SocialPost $socialPost): SocialPostFeedback protected function getFeedbackForCurrentUser(SocialPost $socialPost): SocialPostFeedback
{ {
/** @var User $user */
$user = $this->security->getUser();
$feedback = $this->entityManager $feedback = $this->entityManager
->getRepository(SocialPostFeedback::class) ->getRepository(SocialPostFeedback::class)
->findOneBy( ->findOneBy(
[ [
'user' => $this->currentUser, 'user' => $user,
'socialPost' => $socialPost, 'socialPost' => $socialPost,
] ]
) )
; ;
if (null === $feedback) { if (null === $feedback) {
$feedback = (new SocialPostFeedback())->setUser($this->currentUser); $feedback = (new SocialPostFeedback())->setUser($user);
$socialPost->addFeedback($feedback); $socialPost->addFeedback($feedback);
} }

@ -18,6 +18,7 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
use Chamilo\CourseBundle\Entity\CGroup; use Chamilo\CourseBundle\Entity\CGroup;
use DateTime; use DateTime;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
use Exception; use Exception;
use InvalidArgumentException; use InvalidArgumentException;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
@ -26,7 +27,7 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
class BaseResourceFileAction class BaseResourceFileAction
{ {
public static function setLinks(AbstractResource $resource, EntityManager $em): void public static function setLinks(AbstractResource $resource, EntityManagerInterface $em): void
{ {
$resourceNode = $resource->getResourceNode(); $resourceNode = $resource->getResourceNode();
$links = $resource->getResourceLinkArray(); $links = $resource->getResourceLinkArray();

@ -9,6 +9,7 @@ namespace Chamilo\CoreBundle\Controller;
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField; use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\Tag; use Chamilo\CoreBundle\Entity\Tag;
use Chamilo\CoreBundle\Entity\User;
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
use Chamilo\CoreBundle\Repository\LanguageRepository; use Chamilo\CoreBundle\Repository\LanguageRepository;
use Chamilo\CoreBundle\Repository\LegalRepository; use Chamilo\CoreBundle\Repository\LegalRepository;
@ -27,11 +28,11 @@ use Chamilo\CourseBundle\Settings\SettingsFormFactory;
use CourseManager; use CourseManager;
use Database; use Database;
use Display; use Display;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Event; use Event;
use Exercise; use Exercise;
use ExtraFieldValue; use ExtraFieldValue;
use Fhaculty\Graph\Graph;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
@ -39,7 +40,6 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Validator\Exception\ValidatorException; use Symfony\Component\Validator\Exception\ValidatorException;
use UnserializeApi;
use UserManager; use UserManager;
/** /**
@ -51,6 +51,7 @@ class CourseController extends ToolBaseController
#[Route('/{cid}/checkLegal.json', name: 'chamilo_core_course_check_legal_json')] #[Route('/{cid}/checkLegal.json', name: 'chamilo_core_course_check_legal_json')]
public function checkTermsAndConditionJson(Request $request, LegalRepository $legalTermsRepo, LanguageRepository $languageRepository): Response public function checkTermsAndConditionJson(Request $request, LegalRepository $legalTermsRepo, LanguageRepository $languageRepository): Response
{ {
/** @var User $user */
$user = $this->getUser(); $user = $this->getUser();
$course = $this->getCourse(); $course = $this->getCourse();
$responseData = [ $responseData = [
@ -153,6 +154,7 @@ class CourseController extends ToolBaseController
$session = $request->getSession(); $session = $request->getSession();
$userId = 0; $userId = 0;
/** @var ?User $user */
$user = $this->getUser(); $user = $this->getUser();
if (null !== $user) { if (null !== $user) {
$userId = $user->getId(); $userId = $user->getId();
@ -407,11 +409,15 @@ class CourseController extends ToolBaseController
} }
#[Route('/{id}/about', name: 'chamilo_core_course_about')] #[Route('/{id}/about', name: 'chamilo_core_course_about')]
public function about(Course $course, IllustrationRepository $illustrationRepository, CCourseDescriptionRepository $courseDescriptionRepository): Response public function about(
{ Course $course,
IllustrationRepository $illustrationRepository,
CCourseDescriptionRepository $courseDescriptionRepository,
EntityManagerInterface $em
): Response {
$courseId = $course->getId(); $courseId = $course->getId();
$userId = $this->getUser()->getId(); /** @var ?User $user */
$em = $this->getDoctrine()->getManager(); $user = $this->getUser();
/** @var EntityRepository $fieldsRepo */ /** @var EntityRepository $fieldsRepo */
$fieldsRepo = $em->getRepository(ExtraField::class); $fieldsRepo = $em->getRepository(ExtraField::class);
@ -498,7 +504,11 @@ class CourseController extends ToolBaseController
'custom' => array_reverse($courseCustom), 'custom' => array_reverse($courseCustom),
]; ];
$subscriptionUser = CourseManager::is_user_subscribed_in_course($userId, $course->getCode()); $subscriptionUser = false;
if ($user) {
$subscriptionUser = CourseManager::is_user_subscribed_in_course($user->getId(), $course->getCode());
}
/*$allowSubscribe = false; /*$allowSubscribe = false;
if ($course->getSubscribe() || api_is_platform_admin()) { if ($course->getSubscribe() || api_is_platform_admin()) {
@ -601,7 +611,7 @@ class CourseController extends ToolBaseController
LIMIT 1"; LIMIT 1";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
$lp_data = Database::fetch_array($result, 'ASSOC'); $lp_data = Database::fetch_array($result);
if (!empty($lp_data['iid'])) { if (!empty($lp_data['iid'])) {
if ($allowAutoLaunchForCourseAdmins) { if ($allowAutoLaunchForCourseAdmins) {
$showAutoLaunchLpWarning = true; $showAutoLaunchLpWarning = true;
@ -686,7 +696,7 @@ class CourseController extends ToolBaseController
LIMIT 1"; LIMIT 1";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
$row = Database::fetch_array($result, 'ASSOC'); $row = Database::fetch_array($result);
$exerciseId = $row['iid']; $exerciseId = $row['iid'];
$url = api_get_path(WEB_CODE_PATH). $url = api_get_path(WEB_CODE_PATH).
'exercise/overview.php?exerciseId='.$exerciseId.'&'.api_get_cidreq(); 'exercise/overview.php?exerciseId='.$exerciseId.'&'.api_get_cidreq();

@ -6,6 +6,7 @@ declare(strict_types=1);
namespace Chamilo\CoreBundle\Controller; namespace Chamilo\CoreBundle\Controller;
use Chamilo\CoreBundle\Entity\User;
use Chamilo\CoreBundle\Repository\SysAnnouncementRepository; use Chamilo\CoreBundle\Repository\SysAnnouncementRepository;
use Chamilo\CoreBundle\Traits\ControllerTrait; use Chamilo\CoreBundle\Traits\ControllerTrait;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
@ -23,6 +24,7 @@ class NewsController extends BaseController
#[Route('/list', name: 'news_index', methods: ['GET'])] #[Route('/list', name: 'news_index', methods: ['GET'])]
public function indexAction(SysAnnouncementRepository $sysAnnouncementRepository): Response public function indexAction(SysAnnouncementRepository $sysAnnouncementRepository): Response
{ {
/** @var User $user */
$user = $this->getUser(); $user = $this->getUser();
$list = []; $list = [];

@ -34,7 +34,6 @@ class AccessUserUrlFixtures extends Fixture implements ContainerAwareInterface
// Login as admin // Login as admin
$token = new UsernamePasswordToken( $token = new UsernamePasswordToken(
$admin, $admin,
$admin->getPassword(),
'public', 'public',
$admin->getRoles() $admin->getRoles()
); );

@ -8,7 +8,6 @@ namespace Chamilo\CoreBundle\EventListener;
use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\User;
use Database; use Database;
use Doctrine\DBAL\Cache\ArrayStatement;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
@ -71,7 +70,6 @@ class LogoutListener
LIMIT 0,1"; LIMIT 0,1";
$loginId = null; $loginId = null;
$connection = $this->em->getConnection(); $connection = $this->em->getConnection();
/** @var ArrayStatement $result */
$result = $connection->executeQuery($sql); $result = $connection->executeQuery($sql);
if ($result->rowCount() > 0) { if ($result->rowCount() > 0) {
$row = $result->fetchAssociative(); $row = $result->fetchAssociative();

@ -51,7 +51,7 @@ class SocialPostVoter extends Voter
return false; return false;
} }
/** @var User $currentUser */ /** @var ?User $currentUser */
$currentUser = $token->getUser(); $currentUser = $token->getUser();
if (null === $currentUser) { if (null === $currentUser) {

@ -2,7 +2,7 @@
namespace Chamilo\CoreBundle\Traits\Repository\ORM; namespace Chamilo\CoreBundle\Traits\Repository\ORM;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;
use Gedmo\Tool\Wrapper\EntityWrapper; use Gedmo\Tool\Wrapper\EntityWrapper;
use Gedmo\Tree\RepositoryUtils; use Gedmo\Tree\RepositoryUtils;
@ -27,7 +27,7 @@ trait TreeRepositoryTrait
protected $repoUtils = null; protected $repoUtils = null;
/** /**
* @return EntityManager * @return EntityManagerInterface
*/ */
abstract protected function getEntityManager(); abstract protected function getEntityManager();
@ -55,7 +55,7 @@ trait TreeRepositoryTrait
* } * }
* *
*/ */
public function initializeTreeRepository(EntityManager $em, ClassMetadata $class) public function initializeTreeRepository(EntityManagerInterface $em, ClassMetadata $class)
{ {
$treeListener = null; $treeListener = null;
foreach ($em->getEventManager()->getListeners() as $listeners) { foreach ($em->getEventManager()->getListeners() as $listeners) {

Loading…
Cancel
Save