diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index 41057f18f49e3..87f3b805f0708 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Model for the global configuration @@ -56,20 +57,20 @@ public function getData() { // Get the config data. $config = new JConfig; - $data = JArrayHelper::fromObject($config); + $data = ArrayHelper::fromObject($config); // Prime the asset_id for the rules. $data['asset_id'] = 1; // Get the text filter data $params = JComponentHelper::getParams('com_config'); - $data['filters'] = JArrayHelper::fromObject($params->get('filters')); + $data['filters'] = ArrayHelper::fromObject($params->get('filters')); // If no filter data found, get from com_content (update of 1.6/1.7 site) if (empty($data['filters'])) { $contentParams = JComponentHelper::getParams('com_content'); - $data['filters'] = JArrayHelper::fromObject($contentParams->get('filters')); + $data['filters'] = ArrayHelper::fromObject($contentParams->get('filters')); } // Check for data in the session. @@ -223,7 +224,7 @@ public function save($data) // Get the previous configuration. $prev = new JConfig; - $prev = JArrayHelper::fromObject($prev); + $prev = ArrayHelper::fromObject($prev); // Merge the new data in. We do this to preserve values that were not in the form. $data = array_merge($prev, $data); @@ -301,7 +302,7 @@ public function removeroot() { // Get the previous configuration. $prev = new JConfig; - $prev = JArrayHelper::fromObject($prev); + $prev = ArrayHelper::fromObject($prev); // Create the new configuration object, and unset the root_user property $config = new Registry('config'); diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php index c633d649a11b5..fb1633284a9a4 100644 --- a/administrator/components/com_content/controllers/article.php +++ b/administrator/components/com_content/controllers/article.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * The article controller * @@ -49,14 +51,13 @@ public function __construct($config = array()) */ protected function allowAdd($data = array()) { - $user = JFactory::getUser(); - $categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); + $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); $allow = null; if ($categoryId) { // If the category has been passed in the data or URL check it. - $allow = $user->authorise('core.create', 'com_content.category.' . $categoryId); + $allow = JFactory::getUser()->authorise('core.create', 'com_content.category.' . $categoryId); } if ($allow === null) diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php index 23f431ed04644..4a3e838820d8a 100644 --- a/administrator/components/com_content/controllers/articles.php +++ b/administrator/components/com_content/controllers/articles.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Articles list controller class. * @@ -54,7 +56,7 @@ public function featured() $ids = $this->input->get('cid', array(), 'array'); $values = array('featured' => 1, 'unfeatured' => 0); $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); + $value = ArrayHelper::getValue($values, $task, 0, 'int'); // Access checks. foreach ($ids as $i => $id) diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php index 8d25ff1198f7b..e1e73675e4edb 100644 --- a/administrator/components/com_content/helpers/html/contentadministrator.php +++ b/administrator/components/com_content/helpers/html/contentadministrator.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'); /** @@ -114,7 +116,7 @@ public static function featured($value = 0, $i, $canChange = true) 0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'), 1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'), ); - $state = JArrayHelper::getValue($states, (int) $value, $states[1]); + $state = ArrayHelper::getValue($states, (int) $value, $states[1]); $icon = $state[0]; if ($canChange) diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php index 01656c6429418..f5a39717cd249 100644 --- a/administrator/components/com_content/models/article.php +++ b/administrator/components/com_content/models/article.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'); @@ -625,7 +626,7 @@ public function featured($pks, $value = 0) { // Sanitize the ids. $pks = (array) $pks; - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); if (empty($pks)) { diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php index 5e525fed1236d..3452d9e7ba20a 100644 --- a/administrator/components/com_content/models/articles.php +++ b/administrator/components/com_content/models/articles.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Methods supporting a list of article records. * @@ -249,7 +251,7 @@ protected function getListQuery() } elseif (is_array($categoryId)) { - JArrayHelper::toInteger($categoryId); + $categoryId = ArrayHelper::toInteger($categoryId); $categoryId = implode(',', $categoryId); $query->where('a.catid IN (' . $categoryId . ')'); } diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index f5d2ef8faeb59..f41cbb406f2b4 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + JLoader::register('ContentModelArticles', __DIR__ . '/articles.php'); /** @@ -143,7 +145,7 @@ protected function getListQuery($resolveFKs = true) } elseif (is_array($categoryId)) { - JArrayHelper::toInteger($categoryId); + $categoryId = ArrayHelper::toInteger($categoryId); $categoryId = implode(',', $categoryId); $query->where('a.catid IN (' . $categoryId . ')'); } diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php index 2cd1108e441fc..d5670725a6579 100644 --- a/administrator/components/com_contenthistory/controllers/history.php +++ b/administrator/components/com_contenthistory/controllers/history.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Contenthistory list controller class. * @@ -40,8 +42,7 @@ public function delete() $model = $this->getModel(); // Make sure the item ids are integers - jimport('joomla.utilities.arrayhelper'); - JArrayHelper::toInteger($cid); + $cid = ArrayHelper::toInteger($cid); // Remove the items. if ($model->delete($cid)) @@ -103,8 +104,7 @@ public function keep() $model = $this->getModel(); // Make sure the item ids are integers - jimport('joomla.utilities.arrayhelper'); - JArrayHelper::toInteger($cid); + $cid = ArrayHelper::toInteger($cid); // Remove the items. if ($model->keep($cid)) diff --git a/administrator/components/com_installer/controllers/languages.php b/administrator/components/com_installer/controllers/languages.php index 934385052adee..80653629053de 100644 --- a/administrator/components/com_installer/controllers/languages.php +++ b/administrator/components/com_installer/controllers/languages.php @@ -8,6 +8,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Languages Installer Controller * @@ -81,13 +83,12 @@ public function install() // Get array of selected languages $lids = $this->input->get('cid', array(), 'array'); - JArrayHelper::toInteger($lids, array()); + $lids = ArrayHelper::toInteger($lids, array()); if (!$lids) { // No languages have been selected - $app = JFactory::getApplication(); - $app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED')); + JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED')); } else { diff --git a/administrator/components/com_installer/controllers/manage.php b/administrator/components/com_installer/controllers/manage.php index 15049b7965cc0..c76649eed19e5 100644 --- a/administrator/components/com_installer/controllers/manage.php +++ b/administrator/components/com_installer/controllers/manage.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Installer Manage Controller * @@ -47,7 +49,7 @@ public function publish() $ids = $this->input->get('cid', array(), 'array'); $values = array('publish' => 1, 'unpublish' => 0); $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); + $value = ArrayHelper::getValue($values, $task, 0, 'int'); if (empty($ids)) { @@ -96,7 +98,7 @@ public function remove() $eid = $this->input->get('cid', array(), 'array'); $model = $this->getModel('manage'); - JArrayHelper::toInteger($eid, array()); + $eid = ArrayHelper::toInteger($eid, array()); $model->remove($eid); $this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false)); } @@ -118,7 +120,7 @@ public function refresh() $uid = $this->input->get('cid', array(), 'array'); $model = $this->getModel('manage'); - JArrayHelper::toInteger($uid, array()); + $uid = ArrayHelper::toInteger($uid, array()); $model->refresh($uid); $this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false)); } diff --git a/administrator/components/com_installer/controllers/update.php b/administrator/components/com_installer/controllers/update.php index 36290c57d4896..983dc16f853d2 100644 --- a/administrator/components/com_installer/controllers/update.php +++ b/administrator/components/com_installer/controllers/update.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Installer Update Controller * @@ -32,7 +34,7 @@ public function update() $model = $this->getModel('update'); $uid = $this->input->get('cid', array(), 'array'); - JArrayHelper::toInteger($uid, array()); + $uid = ArrayHelper::toInteger($uid, array()); // Get the minimum stability. $component = JComponentHelper::getComponent('com_installer'); @@ -43,8 +45,7 @@ public function update() if ($model->getState('result', false)) { - $cache = JFactory::getCache('mod_menu'); - $cache->clean(); + JFactory::getCache('mod_menu')->clean(); } $app = JFactory::getApplication(); diff --git a/administrator/components/com_installer/controllers/updatesites.php b/administrator/components/com_installer/controllers/updatesites.php index 81b9e50cccdf6..d82355d9d0248 100644 --- a/administrator/components/com_installer/controllers/updatesites.php +++ b/administrator/components/com_installer/controllers/updatesites.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Installer Update Sites Controller * @@ -53,7 +55,7 @@ public function publish() $ids = $this->input->get('cid', array(), 'array'); $values = array('publish' => 1, 'unpublish' => 0); $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); + $value = ArrayHelper::getValue($values, $task, 0, 'int'); if (empty($ids)) { diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php index f09d1572d8396..99719f31197ed 100644 --- a/administrator/components/com_installer/models/discover.php +++ b/administrator/components/com_installer/models/discover.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** @@ -189,7 +191,7 @@ public function discover_install() $eid = array($eid); } - JArrayHelper::toInteger($eid); + $eid = ArrayHelper::toInteger($eid); $failed = false; foreach ($eid as $id) diff --git a/administrator/components/com_languages/controllers/languages.php b/administrator/components/com_languages/controllers/languages.php index fb440e4535ae3..9236ff7d63555 100644 --- a/administrator/components/com_languages/controllers/languages.php +++ b/administrator/components/com_languages/controllers/languages.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Languages controller Class. * @@ -41,12 +43,12 @@ public function getModel($name = 'Language', $prefix = 'LanguagesModel', $config */ public function saveOrderAjax() { - $pks = $this->input->post->get('cid', array(), 'array'); + $pks = $this->input->post->get('cid', array(), 'array'); $order = $this->input->post->get('order', array(), 'array'); // Sanitize the input. - JArrayHelper::toInteger($pks); - JArrayHelper::toInteger($order); + $pks = ArrayHelper::toInteger($pks); + $order = ArrayHelper::toInteger($order); // Get the model. $model = $this->getModel(); diff --git a/administrator/components/com_languages/models/language.php b/administrator/components/com_languages/models/language.php index 4aaf2e56dd311..42911fbc552ac 100644 --- a/administrator/components/com_languages/models/language.php +++ b/administrator/components/com_languages/models/language.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Languages Component Language Model * @@ -108,7 +110,7 @@ public function getItem($langId = null) } $properties = $table->getProperties(1); - $value = JArrayHelper::toObject($properties, 'JObject'); + $value = ArrayHelper::toObject($properties, 'JObject'); return $value; } diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php index 420f9b8da488b..6cca36ba32f18 100644 --- a/administrator/components/com_menus/controllers/items.php +++ b/administrator/components/com_menus/controllers/items.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * The Menu Item Controller * @@ -126,7 +128,7 @@ public function setDefault() $cid = $this->input->get('cid', array(), 'array'); $data = array('setDefault' => 1, 'unsetDefault' => 0); $task = $this->getTask(); - $value = JArrayHelper::getValue($data, $task, 0, 'int'); + $value = ArrayHelper::getValue($data, $task, 0, 'int'); if (empty($cid)) { @@ -138,7 +140,7 @@ public function setDefault() $model = $this->getModel(); // Make sure the item ids are integers - JArrayHelper::toInteger($cid); + $cid = ArrayHelper::toInteger($cid); // Publish the items. if (!$model->setHome($cid, $value)) @@ -184,7 +186,7 @@ public function publish() $cid = JFactory::getApplication()->input->get('cid', array(), 'array'); $data = array('publish' => 1, 'unpublish' => 0, 'trash' => -2, 'report' => -3); $task = $this->getTask(); - $value = JArrayHelper::getValue($data, $task, 0, 'int'); + $value = ArrayHelper::getValue($data, $task, 0, 'int'); if (empty($cid)) { @@ -196,7 +198,7 @@ public function publish() $model = $this->getModel(); // Make sure the item ids are integers - JArrayHelper::toInteger($cid); + $cid = ArrayHelper::toInteger($cid); // Publish the items. try diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php index 078b599126b5d..8849abd9cce53 100644 --- a/administrator/components/com_menus/models/fields/menutype.php +++ b/administrator/components/com_menus/models/fields/menutype.php @@ -9,6 +9,8 @@ defined('JPATH_BASE') or die; +use Joomla\Utilities\ArrayHelper; + JFormHelper::loadFieldClass('list'); /** @@ -21,7 +23,7 @@ class JFormFieldMenutype extends JFormFieldList /** * The form field type. * - * @var string + * @var string * @since 1.6 */ protected $type = 'menutype'; @@ -29,7 +31,7 @@ class JFormFieldMenutype extends JFormFieldList /** * Method to get the field input markup. * - * @return string The field input markup. + * @return string The field input markup. * * @since 1.6 */ @@ -67,7 +69,7 @@ protected function getInput() $link = $this->form->getValue('link'); // Clean the link back to the option, view and layout - $value = JText::_(JArrayHelper::getValue($rlu, MenusHelper::getLinkKey($link))); + $value = JText::_(ArrayHelper::getValue($rlu, MenusHelper::getLinkKey($link))); break; } // Include jQuery diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index 4ff8cad4db369..ce02be27260be 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; jimport('joomla.filesystem.path'); JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); @@ -149,7 +150,7 @@ protected function batchCopy($value, $pks, $contexts) // $value comes as {menutype}.{parent_id} $parts = explode('.', $value); $menuType = $parts[0]; - $parentId = (int) JArrayHelper::getValue($parts, 1, 0); + $parentId = (int) ArrayHelper::getValue($parts, 1, 0); $table = $this->getTable(); $db = $this->getDbo(); @@ -354,7 +355,7 @@ protected function batchMove($value, $pks, $contexts) // $value comes as {menutype}.{parent_id} $parts = explode('.', $value); $menuType = $parts[0]; - $parentId = (int) JArrayHelper::getValue($parts, 1, 0); + $parentId = (int) ArrayHelper::getValue($parts, 1, 0); $table = $this->getTable(); $db = $this->getDbo(); @@ -472,7 +473,7 @@ protected function batchMove($value, $pks, $contexts) { // Remove any duplicates and sanitize ids. $children = array_unique($children); - JArrayHelper::toInteger($children); + $children = ArrayHelper::toInteger($children); // Update the menutype field in all nodes where necessary. $query->clear() @@ -536,8 +537,8 @@ public function getForm($data = array(), $loadData = true) } else { - $this->setState('item.link', JArrayHelper::getValue($data, 'link')); - $this->setState('item.type', JArrayHelper::getValue($data, 'type')); + $this->setState('item.link', ArrayHelper::getValue($data, 'link')); + $this->setState('item.type', ArrayHelper::getValue($data, 'type')); } // Get the form. @@ -725,7 +726,7 @@ public function getItem($pk = null) // Convert to the JObject before adding the params. $properties = $table->getProperties(1); - $result = JArrayHelper::toObject($properties); + $result = ArrayHelper::toObject($properties); // Convert the params field to an array. $registry = new Registry; diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php index facb74f037fd4..5e61c6bb09d0e 100644 --- a/administrator/components/com_menus/models/menu.php +++ b/administrator/components/com_menus/models/menu.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Menu Item Model for Menus. @@ -131,7 +132,7 @@ public function &getItem($itemId = null) } $properties = $table->getProperties(1); - $value = JArrayHelper::toObject($properties, 'JObject'); + $value = ArrayHelper::toObject($properties, 'JObject'); return $value; } @@ -262,7 +263,7 @@ public function delete($itemIds) // Sanitize the ids. $itemIds = (array) $itemIds; - JArrayHelper::toInteger($itemIds); + $itemIds = ArrayHelper::toInteger($itemIds); // Get a group row instance. $table = $this->getTable(); diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php index 62d0b913c91d8..8b1b4de76f2eb 100644 --- a/administrator/components/com_menus/models/menus.php +++ b/administrator/components/com_menus/models/menus.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Menu List Model for Menus. * @@ -70,7 +72,7 @@ public function getItems() // Get the menu types of menus in the list. $db = $this->getDbo(); - $menuTypes = JArrayHelper::getColumn($items, 'menutype'); + $menuTypes = ArrayHelper::getColumn($items, 'menutype'); // Quote the strings. $menuTypes = implode( diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php index eb0650a295ed5..dc793b974130e 100644 --- a/administrator/components/com_messages/helpers/html/messages.php +++ b/administrator/components/com_messages/helpers/html/messages.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * JHtml administrator messages class. * @@ -73,7 +75,7 @@ public static function status($i, $value = 0, $canChange = false) 0 => array('unpublish', 'messages.publish', 'COM_MESSAGES_OPTION_UNREAD', 'COM_MESSAGES_MARK_AS_READ'), ); - $state = JArrayHelper::getValue($states, (int) $value, $states[0]); + $state = ArrayHelper::getValue($states, (int) $value, $states[0]); $icon = $state[0]; if ($canChange) diff --git a/administrator/components/com_messages/tables/message.php b/administrator/components/com_messages/tables/message.php index 3fdd1b1ed5d87..387153cee18e8 100644 --- a/administrator/components/com_messages/tables/message.php +++ b/administrator/components/com_messages/tables/message.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Message Table class * @@ -79,7 +81,7 @@ public function check() * to checkin rows that it can after adjustments are made. * * @param mixed $pks An optional array of primary key values to update. If not - * set the instance property value is used. + * set the instance property value is used. * @param integer $state The publishing state. eg. [0 = unpublished, 1 = published] * @param integer $userId The user id of the user performing the operation. * @@ -92,7 +94,7 @@ public function publish($pks = null, $state = 1, $userId = 0) $k = $this->_tbl_key; // Sanitize input. - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); $state = (int) $state; // If there are no primary keys set check to see if the instance key is set. diff --git a/administrator/components/com_modules/controllers/modules.php b/administrator/components/com_modules/controllers/modules.php index eb3f1776bc39f..cc2514724a74e 100644 --- a/administrator/components/com_modules/controllers/modules.php +++ b/administrator/components/com_modules/controllers/modules.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Modules list controller class. * @@ -29,7 +31,7 @@ public function duplicate() JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $pks = $this->input->post->get('cid', array(), 'array'); - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); try { diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php index 1d14eacfbebb8..fd054b03cf868 100644 --- a/administrator/components/com_modules/helpers/html/modules.php +++ b/administrator/components/com_modules/helpers/html/modules.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * JHtml module helper class. * @@ -167,7 +169,7 @@ public static function positions($clientId, $state = 1, $selectedPosition = '') } } - $options = JArrayHelper::sortObjects($options, 'text'); + $options = ArrayHelper::sortObjects($options, 'text'); } $templateGroups[$template] = ModulesHelper::createOptionGroup(ucfirst($template), $options); diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php index c572033858132..c8ae66a175257 100644 --- a/administrator/components/com_modules/helpers/modules.php +++ b/administrator/components/com_modules/helpers/modules.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Modules component helper. * @@ -208,7 +210,7 @@ public static function getModules($clientId) $modules[$i]->text = JText::_($module->text); } - JArrayHelper::sortObjects($modules, 'text', 1, true, true); + $modules = ArrayHelper::sortObjects($modules, 'text', 1, true, true); return $modules; } diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php index 55b9643f21dab..a00ac747273fd 100644 --- a/administrator/components/com_modules/models/module.php +++ b/administrator/components/com_modules/models/module.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Module model. @@ -522,9 +523,9 @@ public function getForm($data = array(), $loadData = true) } else { - $clientId = JArrayHelper::getValue($data, 'client_id'); - $module = JArrayHelper::getValue($data, 'module'); - $id = JArrayHelper::getValue($data, 'id'); + $clientId = ArrayHelper::getValue($data, 'client_id'); + $module = ArrayHelper::getValue($data, 'module'); + $id = ArrayHelper::getValue($data, 'id'); } // Add the default fields directory @@ -693,7 +694,7 @@ public function getItem($pk = null) // Convert to the JObject before adding other data. $properties = $table->getProperties(1); - $this->_cache[$pk] = JArrayHelper::toObject($properties, 'JObject'); + $this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject'); // Convert the params field to an array. $registry = new Registry; diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php index d421aea9c70fa..6389c41e4b39f 100644 --- a/administrator/components/com_modules/models/select.php +++ b/administrator/components/com_modules/models/select.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Module model. * @@ -146,7 +148,7 @@ public function getItems() } } - $items = JArrayHelper::sortObjects($items, 'name', 1, true, true); + $items = ArrayHelper::sortObjects($items, 'name', 1, true, true); // TODO: Use the cached XML from the extensions table? diff --git a/administrator/components/com_newsfeeds/controllers/newsfeed.php b/administrator/components/com_newsfeeds/controllers/newsfeed.php index f5d5d86adf59d..a06a9f5e7a9ae 100644 --- a/administrator/components/com_newsfeeds/controllers/newsfeed.php +++ b/administrator/components/com_newsfeeds/controllers/newsfeed.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Newsfeed controller class. * @@ -27,14 +29,13 @@ class NewsfeedsControllerNewsfeed extends JControllerForm */ protected function allowAdd($data = array()) { - $user = JFactory::getUser(); - $categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); + $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); $allow = null; if ($categoryId) { // If the category has been passed in the URL check it. - $allow = $user->authorise('core.create', $this->option . '.category.' . $categoryId); + $allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId); } if ($allow === null) diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php index 8acc1e79d34f8..7580806a93447 100644 --- a/administrator/components/com_plugins/models/plugin.php +++ b/administrator/components/com_plugins/models/plugin.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Plugin model. @@ -62,7 +63,7 @@ public function __construct($config = array()) * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. * - * @return JForm A JForm object on success, false on failure. + * @return JForm A JForm object on success, false on failure. * * @since 1.6 */ @@ -77,8 +78,8 @@ public function getForm($data = array(), $loadData = true) } else { - $folder = JArrayHelper::getValue($data, 'folder', '', 'cmd'); - $element = JArrayHelper::getValue($data, 'element', '', 'cmd'); + $folder = ArrayHelper::getValue($data, 'folder', '', 'cmd'); + $element = ArrayHelper::getValue($data, 'element', '', 'cmd'); } // Add the default fields directory @@ -163,7 +164,7 @@ public function getItem($pk = null) // Convert to the JObject before adding other data. $properties = $table->getProperties(1); - $this->_cache[$pk] = JArrayHelper::toObject($properties, 'JObject'); + $this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject'); // Convert the params field to an array. $registry = new Registry; diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php index 421bf26d982b0..93ef18b8d8935 100644 --- a/administrator/components/com_plugins/models/plugins.php +++ b/administrator/components/com_plugins/models/plugins.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Methods supporting a list of plugin records. * @@ -147,7 +149,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0) } $direction = ($this->getState('list.direction') == 'desc') ? -1 : 1; - JArrayHelper::sortObjects($result, $ordering, $direction, true, true); + $result = ArrayHelper::sortObjects($result, $ordering, $direction, true, true); $total = count($result); $this->cache[$this->getStoreId('getTotal')] = $total; diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php index cd9a47dcbe8a2..0cd78816e755c 100644 --- a/administrator/components/com_redirect/controllers/links.php +++ b/administrator/components/com_redirect/controllers/links.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Redirect link list controller class. * @@ -41,7 +43,7 @@ public function activate() // Get the model. $model = $this->getModel(); - JArrayHelper::toInteger($ids); + $ids = ArrayHelper::toInteger($ids); // Remove the items. if (!$model->activate($ids, $newUrl, $comment)) @@ -82,7 +84,7 @@ public function duplicateUrls() // Get the model. $model = $this->getModel(); - JArrayHelper::toInteger($ids); + $ids = ArrayHelper::toInteger($ids); // Remove the items. if (!$model->duplicateUrls($ids, $newUrl, $comment)) diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php index 9c8cd27372c58..f50376671e35d 100644 --- a/administrator/components/com_redirect/helpers/html/redirect.php +++ b/administrator/components/com_redirect/helpers/html/redirect.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Utility class for creating HTML Grids. * @@ -45,7 +47,7 @@ public static function published($value = 0, $i = null, $canChange = true) -2 => array('trash', 'links.publish', 'JTRASHED', 'COM_REDIRECT_ENABLE_LINK'), ); - $state = JArrayHelper::getValue($states, (int) $value, $states[0]); + $state = ArrayHelper::getValue($states, (int) $value, $states[0]); $icon = $state[0]; if ($canChange) diff --git a/administrator/components/com_redirect/models/link.php b/administrator/components/com_redirect/models/link.php index d27c1412189ea..6a1f7f1d20e33 100644 --- a/administrator/components/com_redirect/models/link.php +++ b/administrator/components/com_redirect/models/link.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Redirect link model. * @@ -158,7 +160,7 @@ public function activate(&$pks, $url, $comment = null) // Sanitize the ids. $pks = (array) $pks; - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); // Populate default comment if necessary. $comment = (!empty($comment)) ? $comment : JText::sprintf('COM_REDIRECT_REDIRECTED_ON', JHtml::_('date', time())); @@ -216,7 +218,7 @@ public function duplicateUrls(&$pks, $url, $comment = null) // Sanitize the ids. $pks = (array) $pks; - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); // Access checks. if (!$user->authorise('core.edit', 'com_redirect')) diff --git a/administrator/components/com_templates/controllers/styles.php b/administrator/components/com_templates/controllers/styles.php index 4ae3c4cc8156c..819cfe35f3522 100644 --- a/administrator/components/com_templates/controllers/styles.php +++ b/administrator/components/com_templates/controllers/styles.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Template styles list controller class. * @@ -35,7 +37,7 @@ public function duplicate() throw new Exception(JText::_('COM_TEMPLATES_NO_TEMPLATE_SELECTED')); } - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); $model = $this->getModel(); $model->duplicate($pks); @@ -86,7 +88,7 @@ public function setDefault() throw new Exception(JText::_('COM_TEMPLATES_NO_TEMPLATE_SELECTED')); } - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); // Pop off the first element. $id = array_shift($pks); @@ -115,7 +117,7 @@ public function unsetDefault() JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN')); $pks = $this->input->get->get('cid', array(), 'array'); - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); try { diff --git a/administrator/components/com_templates/models/style.php b/administrator/components/com_templates/models/style.php index 422f15661d0f5..b823249c26355 100644 --- a/administrator/components/com_templates/models/style.php +++ b/administrator/components/com_templates/models/style.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Template style model. @@ -264,8 +265,8 @@ public function getForm($data = array(), $loadData = true) } else { - $clientId = JArrayHelper::getValue($data, 'client_id'); - $template = JArrayHelper::getValue($data, 'template'); + $clientId = ArrayHelper::getValue($data, 'client_id'); + $template = ArrayHelper::getValue($data, 'template'); } // Add the default fields directory @@ -349,7 +350,7 @@ public function getItem($pk = null) // Convert to the JObject before adding other data. $properties = $table->getProperties(1); - $this->_cache[$pk] = JArrayHelper::toObject($properties, 'JObject'); + $this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject'); // Convert the params field to an array. $registry = new Registry; @@ -540,7 +541,7 @@ public function save($data) if (!empty($data['assigned']) && is_array($data['assigned'])) { - JArrayHelper::toInteger($data['assigned']); + $data['assigned'] = ArrayHelper::toInteger($data['assigned']); // Update the mapping for menu items that this style IS assigned to. $query = $db->getQuery(true) diff --git a/administrator/components/com_users/controllers/level.php b/administrator/components/com_users/controllers/level.php index 5161047017e1e..cead58f845f6e 100644 --- a/administrator/components/com_users/controllers/level.php +++ b/administrator/components/com_users/controllers/level.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * User view level controller class. * @@ -69,7 +71,7 @@ public function delete() // Get the model. $model = $this->getModel(); - JArrayHelper::toInteger($ids); + $ids = ArrayHelper::toInteger($ids); // Remove the items. if (!$model->delete($ids)) diff --git a/administrator/components/com_users/controllers/users.php b/administrator/components/com_users/controllers/users.php index 52d5ec0df4819..998b3653744b5 100644 --- a/administrator/components/com_users/controllers/users.php +++ b/administrator/components/com_users/controllers/users.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Users list controller class. * @@ -69,7 +71,7 @@ public function changeBlock() $ids = $this->input->get('cid', array(), 'array'); $values = array('block' => 1, 'unblock' => 0); $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); + $value = ArrayHelper::getValue($values, $task, 0, 'int'); if (empty($ids)) { diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php index 61f6780306576..18dd519d80ff6 100644 --- a/administrator/components/com_users/helpers/debug.php +++ b/administrator/components/com_users/helpers/debug.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Users component debugging helper. * @@ -52,7 +54,7 @@ public static function getComponents() } // Sort by component name - JArrayHelper::sortObjects($items, 'text', 1, true, true); + $items = ArrayHelper::sortObjects($items, 'text', 1, true, true); } return $items; diff --git a/administrator/components/com_users/models/group.php b/administrator/components/com_users/models/group.php index dd5f2c4404c77..17292a1916cc3 100644 --- a/administrator/components/com_users/models/group.php +++ b/administrator/components/com_users/models/group.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * User group model. * @@ -113,7 +115,7 @@ protected function loadFormData() */ protected function preprocessForm(JForm $form, $data, $group = '') { - $obj = is_array($data) ? JArrayHelper::toObject($data, 'JObject') : $data; + $obj = is_array($data) ? ArrayHelper::toObject($data, 'JObject') : $data; if (isset($obj->parent_id) && $obj->parent_id == 0 && $obj->id > 0) { diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 5cc0eb03ad15c..6fd28a626ae72 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * User model. @@ -612,7 +613,7 @@ public function batch($commands, $pks, $contexts) { // Sanitize user ids. $pks = array_unique($pks); - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); // Remove any values of zero. if (array_search(0, $pks, true)) @@ -631,7 +632,7 @@ public function batch($commands, $pks, $contexts) if (!empty($commands['group_id'])) { - $cmd = JArrayHelper::getValue($commands, 'group_action', 'add'); + $cmd = ArrayHelper::getValue($commands, 'group_action', 'add'); if (!$this->batchUser((int) $commands['group_id'], $pks, $cmd)) { @@ -699,7 +700,7 @@ public function batchReset($user_ids, $action) // Get the DB object $db = $this->getDbo(); - JArrayHelper::toInteger($user_ids); + $user_ids = ArrayHelper::toInteger($user_ids); $query = $db->getQuery(true); @@ -740,7 +741,7 @@ public function batchUser($group_id, $user_ids, $action) // Get the DB object $db = $this->getDbo(); - JArrayHelper::toInteger($user_ids); + $user_ids = ArrayHelper::toInteger($user_ids); // Non-super admin cannot work with super-admin group if ((!JFactory::getUser()->get('isRoot') && JAccess::checkGroup($group_id, 'core.admin')) || $group_id < 1) diff --git a/administrator/components/com_users/tables/note.php b/administrator/components/com_users/tables/note.php index bcc49d6e2b2c6..b926236fd0d8c 100644 --- a/administrator/components/com_users/tables/note.php +++ b/administrator/components/com_users/tables/note.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * User notes table class * @@ -82,7 +84,7 @@ public function publish($pks = null, $state = 1, $userId = 0) $k = $this->_tbl_key; // Sanitize input. - JArrayHelper::toInteger($pks); + $pks = ArrayHelper::toInteger($pks); $userId = (int) $userId; $state = (int) $state; diff --git a/administrator/modules/mod_menu/helper.php b/administrator/modules/mod_menu/helper.php index bcd8bdcfc5fef..7dcc925d1d0e2 100644 --- a/administrator/modules/mod_menu/helper.php +++ b/administrator/modules/mod_menu/helper.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Helper for mod_menu * @@ -149,8 +151,6 @@ public static function getComponents($authCheck = true) } } - $result = JArrayHelper::sortObjects($result, 'text', 1, false, true); - - return $result; + return ArrayHelper::sortObjects($result, 'text', 1, false, true); } } diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index 1ed1c32e73b23..e6a32e506b7f0 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /* @var $menu JAdminCSSMenu */ $shownew = (boolean) $params->get('shownew', 1); @@ -142,7 +144,7 @@ // Menu Types $menuTypes = ModMenuHelper::getMenus(); - $menuTypes = JArrayHelper::sortObjects($menuTypes, 'title', 1, false); + $menuTypes = ArrayHelper::sortObjects($menuTypes, 'title', 1, false); foreach ($menuTypes as $menuType) { diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php index a1823eff9868f..0dbc89fb59075 100644 --- a/administrator/templates/hathor/html/mod_menu/default_enabled.php +++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php @@ -9,6 +9,8 @@ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /* @var $menu JAdminCSSMenu */ $shownew = (boolean) $params->get('shownew', 1); @@ -131,7 +133,7 @@ // Menu Types $menuTypes = ModMenuHelper::getMenus(); - $menuTypes = JArrayHelper::sortObjects($menuTypes, 'title', 1, false); + $menuTypes = ArrayHelper::sortObjects($menuTypes, 'title', 1, false); foreach ($menuTypes as $menuType) {