From b9330b42a9c264d6a8d98e1fe63574bd2e9237b8 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sat, 26 Jun 2021 17:36:16 +0700 Subject: [PATCH] Codestyle error fixes --- src/components/com_weblinks/helpers/icon.php | 4 +-- .../src/Controller/WeblinkController.php | 4 +++ .../src/Model/CategoriesModel.php | 11 +++++++ .../com_weblinks/src/Model/CategoryModel.php | 32 ++++++++----------- .../src/View/Weblink/HtmlView.php | 26 ++++++++++++--- .../src/Helper/WeblinksHelper.php | 2 +- 6 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/components/com_weblinks/helpers/icon.php b/src/components/com_weblinks/helpers/icon.php index e4a433c..6150446 100644 --- a/src/components/com_weblinks/helpers/icon.php +++ b/src/components/com_weblinks/helpers/icon.php @@ -19,8 +19,8 @@ class JHtmlIcon /** * Create a link to create a new weblink * - * @param mixed $weblink Unused - * @param mixed $params Unused + * @param object $category The category information + * @param \Joomla\Registry\Registry $params The item parameters * * @return string */ diff --git a/src/components/com_weblinks/src/Controller/WeblinkController.php b/src/components/com_weblinks/src/Controller/WeblinkController.php index 8773f93..49f8d75 100644 --- a/src/components/com_weblinks/src/Controller/WeblinkController.php +++ b/src/components/com_weblinks/src/Controller/WeblinkController.php @@ -60,7 +60,11 @@ class WeblinkController extends FormController { // Redirect to the return page. $this->setRedirect($this->getReturnPage()); + + return false; } + + return true; } /** diff --git a/src/components/com_weblinks/src/Model/CategoriesModel.php b/src/components/com_weblinks/src/Model/CategoriesModel.php index 36b0913..bfb8263 100644 --- a/src/components/com_weblinks/src/Model/CategoriesModel.php +++ b/src/components/com_weblinks/src/Model/CategoriesModel.php @@ -10,6 +10,7 @@ namespace Joomla\Component\Weblinks\Site\Model; use Joomla\CMS\Categories\Categories; +use Joomla\CMS\Categories\CategoryNode; use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\ListModel; use Joomla\Registry\Registry; @@ -38,8 +39,18 @@ class CategoriesModel extends ListModel */ protected $_extension = 'com_weblinks'; + /** + * Parent category + * + * @var CategoryNode|null + */ private $_parent = null; + /** + * Categories data + * + * @var false|array + */ private $_items = null; /** diff --git a/src/components/com_weblinks/src/Model/CategoryModel.php b/src/components/com_weblinks/src/Model/CategoryModel.php index ebafd07..72270dd 100644 --- a/src/components/com_weblinks/src/Model/CategoryModel.php +++ b/src/components/com_weblinks/src/Model/CategoryModel.php @@ -12,6 +12,7 @@ namespace Joomla\Component\Weblinks\Site\Model; defined('_JEXEC') or die; use Joomla\CMS\Categories\Categories; +use Joomla\CMS\Categories\CategoryNode; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Helper\TagsHelper; @@ -28,18 +29,24 @@ use Joomla\Registry\Registry; class CategoryModel extends ListModel { /** - * Category items data + * Category item data * - * @var array + * @var CategoryNode|null */ protected $_item = null; - protected $_articles = null; - - protected $_siblings = null; - + /** + * Array of child-categories + * + * @var CategoryNode[]|null + */ protected $_children = null; + /** + * Parent category of the current one + * + * @var CategoryNode|null + */ protected $_parent = null; /** @@ -65,19 +72,6 @@ class CategoryModel extends ListModel parent::__construct($config); } - /** - * The category that applies. - * - * @var object - */ - protected $_category = null; - - /** - * The list of other weblink categories. - * - * @var array - */ - protected $_categories = null; /** * Method to get a list of items. diff --git a/src/components/com_weblinks/src/View/Weblink/HtmlView.php b/src/components/com_weblinks/src/View/Weblink/HtmlView.php index 2b39b5d..de13ff1 100644 --- a/src/components/com_weblinks/src/View/Weblink/HtmlView.php +++ b/src/components/com_weblinks/src/View/Weblink/HtmlView.php @@ -21,10 +21,26 @@ defined('_JEXEC') or die; */ class HtmlView extends BaseHtmlView { + /** + * The weblink object + * + * @var \JObject + */ protected $item; + /** + * The page parameters + * + * @var \Joomla\Registry\Registry|null + */ protected $params; + /** + * The item model state + * + * @var \Joomla\Registry\Registry + * @since 1.6 + */ protected $state; /** @@ -38,7 +54,7 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $app = Factory::getApplication(); + $app = Factory::getApplication(); $this->item = $this->get('Item'); $this->state = $this->get('State'); @@ -49,17 +65,17 @@ class HtmlView extends BaseHtmlView $offset = $this->state->get('list.offset'); - $app->triggerEvent('onContentPrepare', array ('com_weblinks.weblink', &$item, &$item->params, $offset)); + $app->triggerEvent('onContentPrepare', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event = new \stdClass; - $results = $app->triggerEvent('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->afterDisplayTitle = trim(implode("\n", $results)); - $results = $app->triggerEvent('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->beforeDisplayContent = trim(implode("\n", $results)); - $results = $app->triggerEvent('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->afterDisplayContent = trim(implode("\n", $results)); parent::display($tpl); diff --git a/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php index fca27f0..03478a6 100644 --- a/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php +++ b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php @@ -85,7 +85,7 @@ class WeblinksHelper $model->setState( 'list.select', - 'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ',' . 'DATE_FORMAT(a.created, "%Y-%m-%d") AS created' + 'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', DATE_FORMAT(a.created, "%Y-%m-%d") AS created' ); $model->setState('filter.c.published', 1);