Minor - flint fixes

pull/3064/head
Julio 5 years ago
parent 7621d0251a
commit 9c9115c4ef
  1. 3
      src/CoreBundle/Controller/AbstractResourceController.php
  2. 4
      src/CoreBundle/Controller/CourseController.php
  3. 41
      src/CoreBundle/Controller/ResourceController.php
  4. 2
      src/CoreBundle/Controller/ResourceUploadController.php
  5. 10
      src/CoreBundle/Controller/SessionController.php
  6. 3
      src/CoreBundle/Entity/AccessUrl.php
  7. 4
      src/CoreBundle/Repository/PersonalFileRepository.php
  8. 2
      src/CoreBundle/Twig/Extension/ChamiloExtension.php

@ -19,9 +19,6 @@ abstract class AbstractResourceController extends BaseController
$this->resourceRepositoryFactory = $resourceFactory;
}
/**
* @return ResourceRepository
*/
public function getRepositoryFromRequest(Request $request): ResourceRepository
{
$tool = $request->get('tool');

@ -3,6 +3,7 @@
namespace Chamilo\CoreBundle\Controller;
use CCourseDescription;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Form\Type\CourseType;
@ -13,8 +14,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use \UserManager;
use \CCourseDescription;
use UserManager;
/**
* Class CourseController.

@ -39,6 +39,7 @@ use ZipStream\ZipStream;
/**
* Class ResourceController.
*
* @todo improve/refactor $this->denyAccessUnlessGranted
* @Route("/resources")
*
@ -80,25 +81,6 @@ class ResourceController extends AbstractResourceController implements CourseCon
);
}
private function getParentResourceNode(Request $request)
{
$parentNodeId = $request->get('id');
if (empty($parentNodeId)) {
if ($this->hasCourse()) {
$parentResourceNode = $this->getCourse()->getResourceNode();
} else {
/** @var User $user */
$parentResourceNode = $this->getUser()->getResourceNode();
}
} else {
$repo = $this->getDoctrine()->getRepository('ChamiloCoreBundle:Resource\ResourceNode');
$parentResourceNode = $repo->find($parentNodeId);
}
return $parentResourceNode;
}
/**
* @Route("/{tool}/{type}/{id}/list", name="chamilo_core_resource_list")
*
@ -736,7 +718,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
}
/**
* Gets a document when calling route resources_document_get_file
* Gets a document when calling route resources_document_get_file.
* @deprecated
*
* @throws \League\Flysystem\FileNotFoundException
@ -951,6 +933,25 @@ class ResourceController extends AbstractResourceController implements CourseCon
}
}
private function getParentResourceNode(Request $request)
{
$parentNodeId = $request->get('id');
if (empty($parentNodeId)) {
if ($this->hasCourse()) {
$parentResourceNode = $this->getCourse()->getResourceNode();
} else {
/** @var User $user */
$parentResourceNode = $this->getUser()->getResourceNode();
}
} else {
$repo = $this->getDoctrine()->getRepository('ChamiloCoreBundle:Resource\ResourceNode');
$parentResourceNode = $repo->find($parentNodeId);
}
return $parentResourceNode;
}
/**
* @param Request $request
* @param ResourceNode $resourceNode

@ -23,7 +23,7 @@ class ResourceUploadController extends BlueimpController
{
/**
* This will upload an image to the selected node id.
* This action is listend by the ResourceUploadListener
* This action is listend by the ResourceUploadListener.
*
* @return JsonResponse
*/

@ -3,24 +3,20 @@
namespace Chamilo\CoreBundle\Controller;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Form\Type\CourseType;
use Chamilo\CoreBundle\Framework\Container;
use Chamilo\CourseBundle\Entity\CCourseDescription;
use CoursesController;
use Essence\Essence;
use ExtraFieldValue;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use SessionManager;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use SessionManager;
use ExtraFieldValue;
use UserManager;
use CoursesController;
/**
* Class SessionController.

@ -147,9 +147,6 @@ class AccessUrl extends AbstractResource implements ResourceInterface
$this->createdBy = 1;
}
/**
* @return string
*/
public function __toString(): string
{
return (string) $this->getUrl();

@ -6,10 +6,6 @@ namespace Chamilo\CoreBundle\Repository;
use APY\DataGridBundle\Grid\Column\Column;
use APY\DataGridBundle\Grid\Grid;
use Chamilo\CoreBundle\Entity\PersonalFile;
use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile;

@ -16,7 +16,7 @@ class ChamiloExtension extends AbstractExtension
private $illustrationRepository;
/**
* @param SettingsHelper $helper
* @param IllustrationRepository $illustrationRepository
*/
public function __construct(IllustrationRepository $illustrationRepository)
{

Loading…
Cancel
Save