From 58062bfb94518288e7bf95141fc58ccef128fbc2 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 1 May 2020 09:41:19 +0200 Subject: [PATCH] Minor - format code --- .../Controller/ResourceController.php | 1 + .../Entity/Resource/ResourceLink.php | 2 - src/CoreBundle/Entity/Usergroup.php | 1 - .../Traits/ResourceControllerTrait.php | 47 +++++++++---------- .../EventListener/CourseListener.php | 2 +- .../EventListener/TwigListener.php | 1 - 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php index fb93e0ca0c..b8fcf3bb1e 100644 --- a/src/CoreBundle/Controller/ResourceController.php +++ b/src/CoreBundle/Controller/ResourceController.php @@ -661,6 +661,7 @@ class ResourceController extends AbstractResourceController implements CourseCon 'type' => $type, 'comment_form' => $form->createView(), ]; + return $this->render( $repository->getTemplates()->getFromAction(__FUNCTION__, $request->isXmlHttpRequest()), $params diff --git a/src/CoreBundle/Entity/Resource/ResourceLink.php b/src/CoreBundle/Entity/Resource/ResourceLink.php index 00732382bd..4e0620e076 100644 --- a/src/CoreBundle/Entity/Resource/ResourceLink.php +++ b/src/CoreBundle/Entity/Resource/ResourceLink.php @@ -344,8 +344,6 @@ class ResourceLink return self::VISIBILITY_DRAFT === $this->getVisibility(); } - /** - */ public function getResource() { // return $this; diff --git a/src/CoreBundle/Entity/Usergroup.php b/src/CoreBundle/Entity/Usergroup.php index 6f94712ee5..6dab106b8b 100644 --- a/src/CoreBundle/Entity/Usergroup.php +++ b/src/CoreBundle/Entity/Usergroup.php @@ -9,7 +9,6 @@ use Doctrine\ORM\Mapping as ORM; use Gedmo\Timestampable\Traits\TimestampableEntity; /** - * * @ORM\Table(name="usergroup") * @ORM\Entity */ diff --git a/src/CoreBundle/Traits/ResourceControllerTrait.php b/src/CoreBundle/Traits/ResourceControllerTrait.php index d6182c14ec..84b89e52c5 100644 --- a/src/CoreBundle/Traits/ResourceControllerTrait.php +++ b/src/CoreBundle/Traits/ResourceControllerTrait.php @@ -140,29 +140,29 @@ trait ResourceControllerTrait // var_dump($originalParent->getPath(), $originalParent->getPathForDisplay()); // $parentList = []; - /* while (null !== $parent) { - if ($type !== $parent->getResourceType()->getName()) { - break; - } - $parent = $parent->getParent(); - if ($parent) { - $resource = $repo->findOneBy(['resourceNode' => $parent->getId()]); - if ($resource) { - $parentList[] = $resource; - } - } - } - $parentList = array_reverse($parentList); - foreach ($parentList as $item) { - $params = $routeParams; - $params['id'] = $item->getResourceNode()->getId(); - $breadcrumb->addChild( - $item->getResourceName(), - [ - 'uri' => $this->generateUrl('chamilo_core_resource_list', $params), - ] - ); - }*/ + /* while (null !== $parent) { + if ($type !== $parent->getResourceType()->getName()) { + break; + } + $parent = $parent->getParent(); + if ($parent) { + $resource = $repo->findOneBy(['resourceNode' => $parent->getId()]); + if ($resource) { + $parentList[] = $resource; + } + } + } + $parentList = array_reverse($parentList); + foreach ($parentList as $item) { + $params = $routeParams; + $params['id'] = $item->getResourceNode()->getId(); + $breadcrumb->addChild( + $item->getResourceName(), + [ + 'uri' => $this->generateUrl('chamilo_core_resource_list', $params), + ] + ); + }*/ foreach ($parentList as $id => $title) { $params = $routeParams; @@ -175,7 +175,6 @@ trait ResourceControllerTrait ); } - $params = $routeParams; $params['id'] = $resourceNode->getId(); if (false === $settings->isAllowNodeCreation() || $resourceNode->hasResourceFile()) { diff --git a/src/CourseBundle/EventListener/CourseListener.php b/src/CourseBundle/EventListener/CourseListener.php index c9623036eb..e38c733232 100644 --- a/src/CourseBundle/EventListener/CourseListener.php +++ b/src/CourseBundle/EventListener/CourseListener.php @@ -152,7 +152,7 @@ class CourseListener if (empty($groupId)) { $sessionHandler->remove('gid'); } else { - dump("Load chamilo group from DB"); + dump('Load chamilo group from DB'); $group = $em->getRepository('ChamiloCourseBundle:CGroupInfo')->find($groupId); if (!$group) { diff --git a/src/ThemeBundle/EventListener/TwigListener.php b/src/ThemeBundle/EventListener/TwigListener.php index dbdca59fe3..f87e1475e2 100644 --- a/src/ThemeBundle/EventListener/TwigListener.php +++ b/src/ThemeBundle/EventListener/TwigListener.php @@ -40,7 +40,6 @@ class TwigListener implements EventSubscriberInterface return false; } - $translator = $this->container->get('translator'); $settingsManager = $container->get('chamilo.settings.manager');