From 2864194563f02764a3d61cd68a41efcf010403a8 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 28 Jan 2021 14:31:39 +0100 Subject: [PATCH] Minor - format code --- main/inc/lib/PortfolioController.php | 665 +++++++++--------- main/inc/lib/hook/HookPortfolioItemAdded.php | 4 +- .../lib/hook/HookPortfolioItemCommented.php | 2 +- ...ookPortfolioItemAddedObserverInterface.php | 2 +- .../XApiPortfolioItemAddedHookObserver.php | 15 +- ...XApiPortfolioItemCommentedHookObserver.php | 15 +- 6 files changed, 350 insertions(+), 353 deletions(-) diff --git a/main/inc/lib/PortfolioController.php b/main/inc/lib/PortfolioController.php index 13ff070aa3..d6a075972a 100644 --- a/main/inc/lib/PortfolioController.php +++ b/main/inc/lib/PortfolioController.php @@ -113,40 +113,6 @@ class PortfolioController $this->renderView($content, get_lang('AddCategory'), $actions); } - /** - * @param bool $showHeader - */ - private function renderView(string $content, string $toolName, array $actions = [], $showHeader = true) - { - global $this_section; - - $this_section = $this->course ? SECTION_COURSES : SECTION_SOCIAL; - - $view = new Template($toolName); - - if ($showHeader) { - $view->assign('header', $toolName); - } - - $actionsStr = ''; - - if ($this->course) { - $actionsStr .= Display::return_introduction_section(TOOL_PORTFOLIO); - } - - if ($actions) { - $actions = implode(PHP_EOL, $actions); - - $actionsStr .= Display::toolbarAction('portfolio-toolbar', [$actions]); - } - - $view->assign('baseurl', $this->baseUrl); - $view->assign('actions', $actionsStr); - - $view->assign('content', $content); - $view->display_one_col_template(); - } - /** * @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\OptimisticLockException @@ -220,15 +186,6 @@ class PortfolioController $this->renderView($content, get_lang('EditCategory'), $actions); } - private function categoryBelongToOwner(PortfolioCategory $category): bool - { - if ($category->getUser()->getId() != $this->owner->getId()) { - return false; - } - - return true; - } - /** * @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\OptimisticLockException @@ -482,15 +439,6 @@ class PortfolioController ); } - private function itemBelongToOwner(Portfolio $item): bool - { - if ($item->getUser()->getId() != $this->owner->getId()) { - return false; - } - - return true; - } - /** * @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\OptimisticLockException @@ -609,187 +557,6 @@ class PortfolioController $this->renderView($content, get_lang('Portfolio'), $actions); } - private function createFormTagFilter(): FormValidator - { - $extraField = new ExtraField('portfolio'); - $tagFieldInfo = $extraField->get_handler_field_info_by_tags('tags'); - - $chbxTagOptions = array_map( - function (array $tagOption) { - return $tagOption['tag']; - }, - $tagFieldInfo['options'] - ); - - $frmTagList = new FormValidator( - 'frm_tag_list', - 'get', - $this->baseUrl, - '', - [], - FormValidator::LAYOUT_BOX - ); - - if (!empty($chbxTagOptions)) { - $frmTagList->addCheckBoxGroup('tags', $tagFieldInfo['display_text'], $chbxTagOptions); - } - - $frmTagList->addText('text', get_lang('Search'), false)->setIcon('search'); - $frmTagList->applyFilter('text', 'trim'); - $frmTagList->addHtml('
'); - $frmTagList->addButtonFilter(get_lang('Filter')); - - if ($this->course) { - $frmTagList->addHidden('cidReq', $this->course->getCode()); - $frmTagList->addHidden('id_session', $this->session ? $this->session->getId() : 0); - $frmTagList->addHidden('gidReq', 0); - $frmTagList->addHidden('gradebook', 0); - $frmTagList->addHidden('origin', ''); - } - - return $frmTagList; - } - - /** - * @param bool $listByUser - * - * @throws \Exception - * @return \FormValidator - */ - private function createFormStudentFilter(bool $listByUser = false): FormValidator - { - $frmStudentList = new FormValidator( - 'frm_student_list', - 'get', - $this->baseUrl, - '', - [], - FormValidator::LAYOUT_BOX - ); - $slctStudentOptions = []; - - if ($listByUser) { - $slctStudentOptions[$this->owner->getId()] = $this->owner->getCompleteName(); - } - - $urlParams = http_build_query( - [ - 'a' => 'search_user_by_course', - 'course_id' => $this->course->getId(), - 'session_id' => $this->session ? $this->session->getId() : 0, - ] - ); - - $frmStudentList->addSelectAjax( - 'user', - get_lang('SelectLearnerPortfolio'), - $slctStudentOptions, - [ - 'url' => api_get_path(WEB_AJAX_PATH)."course.ajax.php?$urlParams", - 'placeholder' => get_lang('SearchStudent'), - ] - ); - $frmStudentList->addHtml('
'); - $frmStudentList->addHtml( - Display::url( - get_lang('SeeMyPortfolio'), - $this->baseUrl.http_build_query(['user' => api_get_user_id()]) - ) - ); - - return $frmStudentList; - } - - private function getCategoriesForIndex(int $currentUserId): array - { - $categoriesCriteria = []; - $categoriesCriteria['user'] = $this->owner; - - if ($currentUserId !== $this->owner->getId()) { - $categoriesCriteria['isVisible'] = true; - } - - return $this->em - ->getRepository(PortfolioCategory::class) - ->findBy($categoriesCriteria); - } - - private function getItemsForIndex( - int $currentUserId, - bool $listByUser = false, - FormValidator $frmFilterList = null - ) { - if ($this->course) { - $queryBuilder = $this->em->createQueryBuilder(); - $queryBuilder - ->select('pi') - ->from(Portfolio::class, 'pi') - ->where('pi.course = :course'); - - $queryBuilder->setParameter('course', $this->course); - - if ($this->session) { - $queryBuilder->andWhere('pi.session = :session'); - $queryBuilder->setParameter('session', $this->session); - } else { - $queryBuilder->andWhere('pi.session IS NULL'); - } - - if ($listByUser) { - $queryBuilder->andWhere('pi.user = :user'); - $queryBuilder->setParameter('user', $this->owner); - - if ($currentUserId !== $this->owner->getId()) { - $queryBuilder->andWhere('pi.isVisible = TRUE'); - } - } - - if ($frmFilterList && $frmFilterList->validate()) { - $values = $frmFilterList->exportValues(); - - if (!empty($values['tags'])) { - $queryBuilder - ->innerJoin(ExtraFieldRelTag::class, 'efrt', Join::WITH, 'efrt.itemId = pi.id') - ->innerJoin(ExtraFieldEntity::class, 'ef', Join::WITH, 'ef.id = efrt.fieldId') - ->andWhere('ef.extraFieldType = :efType') - ->andWhere('ef.variable = :variable') - ->andWhere('efrt.tagId IN (:tags)'); - - $queryBuilder->setParameter('efType', ExtraFieldEntity::PORTFOLIO_TYPE); - $queryBuilder->setParameter('variable', 'tags'); - $queryBuilder->setParameter('tags', $values['tags']); - } - - if (!empty($values['text'])) { - $queryBuilder->andWhere( - $queryBuilder->expr()->orX( - $queryBuilder->expr()->like('pi.title', ':text'), - $queryBuilder->expr()->like('pi.content', ':text') - ) - ); - - $queryBuilder->setParameter('text', '%'.$values['text'].'%'); - } - } - - $items = $queryBuilder->getQuery()->getResult(); - } else { - $itemsCriteria = []; - $itemsCriteria['category'] = null; - $itemsCriteria['user'] = $this->owner; - - if ($currentUserId !== $this->owner->getId()) { - $itemsCriteria['isVisible'] = true; - } - - $items = $this->em - ->getRepository(Portfolio::class) - ->findBy($itemsCriteria, ['creationDate' => 'DESC']); - } - - return $items; - } - /** * @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\OptimisticLockException @@ -958,57 +725,10 @@ class PortfolioController /** * @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\OptimisticLockException - * @throws \Doctrine\ORM\TransactionRequiredException */ - private function createCommentForm(Portfolio $item): string + public function copyItem(Portfolio $originItem) { - $formAction = $this->baseUrl.http_build_query(['action' => 'view', 'id' => $item->getId()]); - - $form = new FormValidator('frm_comment', 'post', $formAction); - $form->addHtmlEditor('content', get_lang('Comments'), true, false, ['ToolbarSet' => 'Minimal']); - $form->addHidden('item', $item->getId()); - $form->addHidden('parent', 0); - $form->applyFilter('content', 'trim'); - $form->addButtonSave(get_lang('Save')); - - if ($form->validate()) { - $values = $form->exportValues(); - - $parentComment = $this->em->find(PortfolioComment::class, $values['parent']); - - $comment = new PortfolioComment(); - $comment - ->setAuthor($this->owner) - ->setParent($parentComment) - ->setContent($values['content']) - ->setDate(api_get_utc_datetime(null, false, true)) - ->setItem($item); - - $this->em->persist($comment); - $this->em->flush(); - - $hook = HookPortfolioItemCommented::create(); - $hook->setEventData(['comment' => $comment]); - $hook->notifyItemCommented(); - - Display::addFlash( - Display::return_message(get_lang('CommentAdded'), 'success') - ); - - header("Location: $formAction"); - exit; - } - - return $form->returnForm(); - } - - /** - * @throws \Doctrine\ORM\ORMException - * @throws \Doctrine\ORM\OptimisticLockException - */ - public function copyItem(Portfolio $originItem) - { - $currentTime = api_get_utc_datetime(null, false, true); + $currentTime = api_get_utc_datetime(null, false, true); $portfolio = new Portfolio(); $portfolio @@ -1612,6 +1332,336 @@ class PortfolioController ); } + public function exportZip() + { + $itemsHtml = $this->getItemsInHtmlFormatted(); + $commentsHtml = $this->getCommentsInHtmlFormatted(); + + $view = new Template('', false, false, false, false, false, false); + $template = $view->get_template('layout/blank.tpl'); + + $sysArchivePath = api_get_path(SYS_ARCHIVE_PATH); + $tempPortfolioDirectory = $sysArchivePath."portfolio/{$this->owner->getId()}/"; + + $filenames = []; + + $fs = new Filesystem(); + + foreach ($itemsHtml as $i => $itemHtml) { + $view->assign('content', $itemHtml); + $itemFileContent = $view->fetch($template); + $itemFilename = $tempPortfolioDirectory.'items/item-'.($i + 1).'.html'; + + $filenames[] = $itemFilename; + + $fs->dumpFile($itemFilename, $itemFileContent); + } + + foreach ($commentsHtml as $i => $commentHtml) { + $view->assign('content', $commentHtml); + $commentFileContent = $view->fetch($template); + $commentFilename = $tempPortfolioDirectory.'comments/comment-'.($i + 1).'.html'; + + $filenames[] = $commentFilename; + + $fs->dumpFile($commentFilename, $commentFileContent); + } + + $zipName = $this->owner->getCompleteName() + .($this->course ? '_'.$this->course->getCode() : '') + .'_'.get_lang('Portfolio'); + $tempZipFile = $sysArchivePath."portfolio/$zipName.zip"; + $zip = new PclZip($tempZipFile); + + foreach ($filenames as $filename) { + $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $tempPortfolioDirectory); + } + + DocumentManager::file_send_for_download($tempZipFile, true, "$zipName.zip"); + + $fs->remove($tempPortfolioDirectory); + $fs->remove($tempZipFile); + } + + /** + * @param bool $showHeader + */ + private function renderView(string $content, string $toolName, array $actions = [], $showHeader = true) + { + global $this_section; + + $this_section = $this->course ? SECTION_COURSES : SECTION_SOCIAL; + + $view = new Template($toolName); + + if ($showHeader) { + $view->assign('header', $toolName); + } + + $actionsStr = ''; + + if ($this->course) { + $actionsStr .= Display::return_introduction_section(TOOL_PORTFOLIO); + } + + if ($actions) { + $actions = implode(PHP_EOL, $actions); + + $actionsStr .= Display::toolbarAction('portfolio-toolbar', [$actions]); + } + + $view->assign('baseurl', $this->baseUrl); + $view->assign('actions', $actionsStr); + + $view->assign('content', $content); + $view->display_one_col_template(); + } + + private function categoryBelongToOwner(PortfolioCategory $category): bool + { + if ($category->getUser()->getId() != $this->owner->getId()) { + return false; + } + + return true; + } + + private function itemBelongToOwner(Portfolio $item): bool + { + if ($item->getUser()->getId() != $this->owner->getId()) { + return false; + } + + return true; + } + + private function createFormTagFilter(): FormValidator + { + $extraField = new ExtraField('portfolio'); + $tagFieldInfo = $extraField->get_handler_field_info_by_tags('tags'); + + $chbxTagOptions = array_map( + function (array $tagOption) { + return $tagOption['tag']; + }, + $tagFieldInfo['options'] + ); + + $frmTagList = new FormValidator( + 'frm_tag_list', + 'get', + $this->baseUrl, + '', + [], + FormValidator::LAYOUT_BOX + ); + + if (!empty($chbxTagOptions)) { + $frmTagList->addCheckBoxGroup('tags', $tagFieldInfo['display_text'], $chbxTagOptions); + } + + $frmTagList->addText('text', get_lang('Search'), false)->setIcon('search'); + $frmTagList->applyFilter('text', 'trim'); + $frmTagList->addHtml('
'); + $frmTagList->addButtonFilter(get_lang('Filter')); + + if ($this->course) { + $frmTagList->addHidden('cidReq', $this->course->getCode()); + $frmTagList->addHidden('id_session', $this->session ? $this->session->getId() : 0); + $frmTagList->addHidden('gidReq', 0); + $frmTagList->addHidden('gradebook', 0); + $frmTagList->addHidden('origin', ''); + } + + return $frmTagList; + } + + /** + * @throws \Exception + * + * @return \FormValidator + */ + private function createFormStudentFilter(bool $listByUser = false): FormValidator + { + $frmStudentList = new FormValidator( + 'frm_student_list', + 'get', + $this->baseUrl, + '', + [], + FormValidator::LAYOUT_BOX + ); + $slctStudentOptions = []; + + if ($listByUser) { + $slctStudentOptions[$this->owner->getId()] = $this->owner->getCompleteName(); + } + + $urlParams = http_build_query( + [ + 'a' => 'search_user_by_course', + 'course_id' => $this->course->getId(), + 'session_id' => $this->session ? $this->session->getId() : 0, + ] + ); + + $frmStudentList->addSelectAjax( + 'user', + get_lang('SelectLearnerPortfolio'), + $slctStudentOptions, + [ + 'url' => api_get_path(WEB_AJAX_PATH)."course.ajax.php?$urlParams", + 'placeholder' => get_lang('SearchStudent'), + ] + ); + $frmStudentList->addHtml('
'); + $frmStudentList->addHtml( + Display::url( + get_lang('SeeMyPortfolio'), + $this->baseUrl.http_build_query(['user' => api_get_user_id()]) + ) + ); + + return $frmStudentList; + } + + private function getCategoriesForIndex(int $currentUserId): array + { + $categoriesCriteria = []; + $categoriesCriteria['user'] = $this->owner; + + if ($currentUserId !== $this->owner->getId()) { + $categoriesCriteria['isVisible'] = true; + } + + return $this->em + ->getRepository(PortfolioCategory::class) + ->findBy($categoriesCriteria); + } + + private function getItemsForIndex( + int $currentUserId, + bool $listByUser = false, + FormValidator $frmFilterList = null + ) { + if ($this->course) { + $queryBuilder = $this->em->createQueryBuilder(); + $queryBuilder + ->select('pi') + ->from(Portfolio::class, 'pi') + ->where('pi.course = :course'); + + $queryBuilder->setParameter('course', $this->course); + + if ($this->session) { + $queryBuilder->andWhere('pi.session = :session'); + $queryBuilder->setParameter('session', $this->session); + } else { + $queryBuilder->andWhere('pi.session IS NULL'); + } + + if ($listByUser) { + $queryBuilder->andWhere('pi.user = :user'); + $queryBuilder->setParameter('user', $this->owner); + + if ($currentUserId !== $this->owner->getId()) { + $queryBuilder->andWhere('pi.isVisible = TRUE'); + } + } + + if ($frmFilterList && $frmFilterList->validate()) { + $values = $frmFilterList->exportValues(); + + if (!empty($values['tags'])) { + $queryBuilder + ->innerJoin(ExtraFieldRelTag::class, 'efrt', Join::WITH, 'efrt.itemId = pi.id') + ->innerJoin(ExtraFieldEntity::class, 'ef', Join::WITH, 'ef.id = efrt.fieldId') + ->andWhere('ef.extraFieldType = :efType') + ->andWhere('ef.variable = :variable') + ->andWhere('efrt.tagId IN (:tags)'); + + $queryBuilder->setParameter('efType', ExtraFieldEntity::PORTFOLIO_TYPE); + $queryBuilder->setParameter('variable', 'tags'); + $queryBuilder->setParameter('tags', $values['tags']); + } + + if (!empty($values['text'])) { + $queryBuilder->andWhere( + $queryBuilder->expr()->orX( + $queryBuilder->expr()->like('pi.title', ':text'), + $queryBuilder->expr()->like('pi.content', ':text') + ) + ); + + $queryBuilder->setParameter('text', '%'.$values['text'].'%'); + } + } + + $items = $queryBuilder->getQuery()->getResult(); + } else { + $itemsCriteria = []; + $itemsCriteria['category'] = null; + $itemsCriteria['user'] = $this->owner; + + if ($currentUserId !== $this->owner->getId()) { + $itemsCriteria['isVisible'] = true; + } + + $items = $this->em + ->getRepository(Portfolio::class) + ->findBy($itemsCriteria, ['creationDate' => 'DESC']); + } + + return $items; + } + + /** + * @throws \Doctrine\ORM\ORMException + * @throws \Doctrine\ORM\OptimisticLockException + * @throws \Doctrine\ORM\TransactionRequiredException + */ + private function createCommentForm(Portfolio $item): string + { + $formAction = $this->baseUrl.http_build_query(['action' => 'view', 'id' => $item->getId()]); + + $form = new FormValidator('frm_comment', 'post', $formAction); + $form->addHtmlEditor('content', get_lang('Comments'), true, false, ['ToolbarSet' => 'Minimal']); + $form->addHidden('item', $item->getId()); + $form->addHidden('parent', 0); + $form->applyFilter('content', 'trim'); + $form->addButtonSave(get_lang('Save')); + + if ($form->validate()) { + $values = $form->exportValues(); + + $parentComment = $this->em->find(PortfolioComment::class, $values['parent']); + + $comment = new PortfolioComment(); + $comment + ->setAuthor($this->owner) + ->setParent($parentComment) + ->setContent($values['content']) + ->setDate(api_get_utc_datetime(null, false, true)) + ->setItem($item); + + $this->em->persist($comment); + $this->em->flush(); + + $hook = HookPortfolioItemCommented::create(); + $hook->setEventData(['comment' => $comment]); + $hook->notifyItemCommented(); + + Display::addFlash( + Display::return_message(get_lang('CommentAdded'), 'success') + ); + + header("Location: $formAction"); + exit; + } + + return $form->returnForm(); + } + private function getItemsInHtmlFormatted(): array { $itemsRepo = $this->em->getRepository(Portfolio::class); @@ -1737,55 +1787,4 @@ class PortfolioController return $commentsHtml; } - - public function exportZip() - { - $itemsHtml = $this->getItemsInHtmlFormatted(); - $commentsHtml = $this->getCommentsInHtmlFormatted(); - - $view = new Template('', false, false, false, false, false, false); - $template = $view->get_template('layout/blank.tpl'); - - $sysArchivePath = api_get_path(SYS_ARCHIVE_PATH); - $tempPortfolioDirectory = $sysArchivePath."portfolio/{$this->owner->getId()}/"; - - $filenames = []; - - $fs = new Filesystem(); - - foreach ($itemsHtml as $i => $itemHtml) { - $view->assign('content', $itemHtml); - $itemFileContent = $view->fetch($template); - $itemFilename = $tempPortfolioDirectory.'items/item-'.($i + 1).'.html'; - - $filenames[] = $itemFilename; - - $fs->dumpFile($itemFilename, $itemFileContent); - } - - foreach ($commentsHtml as $i => $commentHtml) { - $view->assign('content', $commentHtml); - $commentFileContent = $view->fetch($template); - $commentFilename = $tempPortfolioDirectory.'comments/comment-'.($i + 1).'.html'; - - $filenames[] = $commentFilename; - - $fs->dumpFile($commentFilename, $commentFileContent); - } - - $zipName = $this->owner->getCompleteName() - .($this->course ? '_'.$this->course->getCode() : '') - .'_'.get_lang('Portfolio'); - $tempZipFile = $sysArchivePath."portfolio/$zipName.zip"; - $zip = new PclZip($tempZipFile); - - foreach ($filenames as $filename) { - $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $tempPortfolioDirectory); - } - - DocumentManager::file_send_for_download($tempZipFile, true, "$zipName.zip"); - - $fs->remove($tempPortfolioDirectory); - $fs->remove($tempZipFile); - } } diff --git a/main/inc/lib/hook/HookPortfolioItemAdded.php b/main/inc/lib/hook/HookPortfolioItemAdded.php index b9a0f48473..92353913a7 100644 --- a/main/inc/lib/hook/HookPortfolioItemAdded.php +++ b/main/inc/lib/hook/HookPortfolioItemAdded.php @@ -3,7 +3,7 @@ /* For licensing terms, see /license.txt */ /** - * Class HookPortfolioItemAdded + * Class HookPortfolioItemAdded. */ class HookPortfolioItemAdded extends HookEvent implements HookPortfolioItemAddedEventInterface { @@ -18,7 +18,7 @@ class HookPortfolioItemAdded extends HookEvent implements HookPortfolioItemAdded } /** - * @inheritDoc + * {@inheritDoc} */ public function notifyItemAdded() { diff --git a/main/inc/lib/hook/HookPortfolioItemCommented.php b/main/inc/lib/hook/HookPortfolioItemCommented.php index d188b96b20..3618f818e3 100644 --- a/main/inc/lib/hook/HookPortfolioItemCommented.php +++ b/main/inc/lib/hook/HookPortfolioItemCommented.php @@ -15,7 +15,7 @@ class HookPortfolioItemCommented extends HookEvent implements HookPortfolioItemC } /** - * @inheritDoc + * {@inheritDoc} */ public function notifyItemCommented() { diff --git a/main/inc/lib/hook/interfaces/HookPortfolioItemAddedObserverInterface.php b/main/inc/lib/hook/interfaces/HookPortfolioItemAddedObserverInterface.php index 03dd0e1e98..8a02795b58 100644 --- a/main/inc/lib/hook/interfaces/HookPortfolioItemAddedObserverInterface.php +++ b/main/inc/lib/hook/interfaces/HookPortfolioItemAddedObserverInterface.php @@ -3,7 +3,7 @@ /* For licensing terms, see /license.txt */ /** - * Interface HookPortfolioItemAddedObserverInterface + * Interface HookPortfolioItemAddedObserverInterface. */ interface HookPortfolioItemAddedObserverInterface extends HookObserverInterface { diff --git a/plugin/xapi/src/Hook/XApiPortfolioItemAddedHookObserver.php b/plugin/xapi/src/Hook/XApiPortfolioItemAddedHookObserver.php index fe3de7a4e3..5cc8692e6d 100644 --- a/plugin/xapi/src/Hook/XApiPortfolioItemAddedHookObserver.php +++ b/plugin/xapi/src/Hook/XApiPortfolioItemAddedHookObserver.php @@ -12,8 +12,7 @@ use Xabbuh\XApi\Model\Verb; /** * Class XApiPortfolioItemAddedHookObserver. */ -class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver - implements HookPortfolioItemAddedObserverInterface +class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver implements HookPortfolioItemAddedObserverInterface { /** * @var \Chamilo\CoreBundle\Entity\Portfolio @@ -21,7 +20,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver private $item; /** - * @inheritDoc + * {@inheritDoc} */ public function hookItemAdded(HookPortfolioItemAddedEventInterface $hookEvent) { @@ -43,7 +42,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getId() { @@ -54,7 +53,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActor() { @@ -64,7 +63,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getVerb() { @@ -77,7 +76,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActivity() { @@ -98,7 +97,7 @@ class XApiPortfolioItemAddedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActivityResult() { diff --git a/plugin/xapi/src/Hook/XApiPortfolioItemCommentedHookObserver.php b/plugin/xapi/src/Hook/XApiPortfolioItemCommentedHookObserver.php index 7553198e38..0554fd931e 100644 --- a/plugin/xapi/src/Hook/XApiPortfolioItemCommentedHookObserver.php +++ b/plugin/xapi/src/Hook/XApiPortfolioItemCommentedHookObserver.php @@ -12,8 +12,7 @@ use Xabbuh\XApi\Model\Verb; /** * Class XApiPortfolioItemCommentedHookObserver. */ -class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver - implements HookPortfolioItemCommentedObserverInterface +class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver implements HookPortfolioItemCommentedObserverInterface { /** * @var \Chamilo\CoreBundle\Entity\PortfolioComment @@ -21,7 +20,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver private $comment; /** - * @inheritDoc + * {@inheritDoc} */ public function hookItemCommented(HookPortfolioItemCommentedEventInterface $hookEvent) { @@ -43,7 +42,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getId() { @@ -54,7 +53,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActor() { @@ -64,7 +63,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getVerb() { @@ -77,7 +76,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActivity() { @@ -109,7 +108,7 @@ class XApiPortfolioItemCommentedHookObserver extends XApiActivityHookObserver } /** - * @inheritDoc + * {@inheritDoc} */ protected function getActivityResult() {