Once over on files reviewing for 3.5 compat

BabDev · Feb 7, 2016 · 4a5b9f7 · 4a5b9f7
1 parent cdb5c68
commit 4a5b9f7
Show file tree

Hide file tree

Showing 61 changed files with 511 additions and 643 deletions.
diff --git a/com_podcastmanager/admin/controller.php b/com_podcastmanager/admin/controller.php
@@ -35,20 +35,19 @@ class PodcastManagerController extends JControllerLegacy
 	 * Method to display a view.
 	 *
 	 * @param   boolean  $cachable   If true, the view output will be cached
-	 * @param   array    $urlparams  An array of safe url parameters and their variable types,
-	 *                               for valid values see {@link JFilterInput::clean()}.
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
-	 * @return  PodcastManagerController  Instance of $this to support chaining.
+	 * @return  $this
 	 *
 	 * @since   1.6
 	 */
 	public function display($cachable = false, $urlparams = [])
 	{
 		include_once JPATH_COMPONENT . '/helpers/podcastmanager.php';
 
-		$view = $this->input->get('view', $this->default_view, 'word');
+		$view   = $this->input->get('view', $this->default_view, 'word');
 		$layout = $this->input->get('layout', $this->default_view, 'word');
-		$id = $this->input->get('id', null, 'int');
+		$id     = $this->input->get('id', null, 'int');
 
 		// Check for edit form.
 		if ($view == 'feed' && $layout == 'edit' && !$this->checkEditId('com_podcastmanager.edit.feed', $id))
@@ -60,7 +59,8 @@ public function display($cachable = false, $urlparams = [])
 
 			return false;
 		}
-		elseif ($view == 'podcast' && $layout == 'edit' && !$this->checkEditId('com_podcastmanager.edit.podcast', $id))
+
+		if ($view == 'podcast' && $layout == 'edit' && !$this->checkEditId('com_podcastmanager.edit.podcast', $id))
 		{
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));

diff --git a/com_podcastmanager/admin/controllers/feed.php b/com_podcastmanager/admin/controllers/feed.php
@@ -33,12 +33,12 @@ class PodcastManagerControllerFeed extends JControllerForm
 	 *
 	 * @since   2.0
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// Initialise variables.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-		$user = JFactory::getUser();
-		$userId = $user->id;
+		$user     = JFactory::getUser();
+		$userId   = $user->id;
 
 		// Check general edit permission first.
 		if ($user->authorise('core.edit', 'com_podcastmanager'))

diff --git a/com_podcastmanager/admin/controllers/feeds.php b/com_podcastmanager/admin/controllers/feeds.php
@@ -34,7 +34,7 @@ class PodcastManagerControllerFeeds extends JControllerAdmin
 	 *
 	 * @since   1.7
 	 */
-	public function getModel($name = 'Feed', $prefix = 'PodcastManagerModel', $config = array('ignore_request' => true))
+	public function getModel($name = 'Feed', $prefix = 'PodcastManagerModel', $config = ['ignore_request' => true])
 	{
 		return parent::getModel($name, $prefix, $config);
 	}

diff --git a/com_podcastmanager/admin/controllers/podcast.php b/com_podcastmanager/admin/controllers/podcast.php
@@ -14,6 +14,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Podcast edit controller class.
  *
@@ -32,22 +34,15 @@ class PodcastManagerControllerPodcast extends JControllerForm
 	 *
 	 * @since   2.0
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Initialise variables.
-		$user = JFactory::getUser();
-		$feedId = JArrayHelper::getValue($data, 'feedname', JFactory::getApplication()->input->get('filter_feedname', '', 'int'), 'int');
-		$allow = null;
+		$feedId = ArrayHelper::getValue($data, 'feedname', $this->input->get('filter_feedname', '', 'int'), 'int');
 
 		if ($feedId)
 		{
 			// If the feed has been passed in the data or URL check it.
-			$allow = $user->authorise('core.create', 'com_podcastmanager.feed.' . $feedId);
-		}
-
-		if ($allow !== null)
-		{
-			return $allow;
+			return JFactory::getUser()->authorise('core.create', 'com_podcastmanager.feed.' . $feedId);
 		}
 
 		// In the absence of better information, revert to the component permissions.
@@ -64,12 +59,12 @@ protected function allowAdd($data = array())
 	 *
 	 * @since   2.0
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// Initialise variables.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-		$user = JFactory::getUser();
-		$userId = $user->get('id');
+		$user     = JFactory::getUser();
+		$userId   = $user->get('id');
 
 		// Check feed edit permission.
 		if ($user->authorise('core.edit', 'com_podcastmanager.podcast.' . $recordId))

diff --git a/com_podcastmanager/admin/controllers/podcasts.php b/com_podcastmanager/admin/controllers/podcasts.php
@@ -34,7 +34,7 @@ class PodcastManagerControllerPodcasts extends JControllerAdmin
 	 *
 	 * @since   1.6
 	 */
-	public function getModel($name = 'Podcast', $prefix = 'PodcastManagerModel', $config = array('ignore_request' => true))
+	public function getModel($name = 'Podcast', $prefix = 'PodcastManagerModel', $config = ['ignore_request' => true])
 	{
 		return parent::getModel($name, $prefix, $config);
 	}

diff --git a/com_podcastmanager/admin/helpers/html/podcast.php b/com_podcastmanager/admin/helpers/html/podcast.php
@@ -14,6 +14,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * HTML Utility class for Podcast Manager
  *
@@ -40,15 +42,15 @@ abstract class JHtmlPodcast
 	 *
 	 * @since   1.8
 	 */
-	public static function feeds($config = array('filter.published' => array(0, 1)))
+	public static function feeds($config = ['filter.published' => [0, 1]])
 	{
 		$hash = md5('com_podcastmanager.' . serialize($config));
 
 		if (!isset(static::$items[$hash]))
 		{
 			$config = (array) $config;
-			$db = JFactory::getDbo();
-			$query = $db->getQuery(true)
+			$db     = JFactory::getDbo();
+			$query  = $db->getQuery(true)
 				->select($db->quoteName(['a.id', 'a.name']))
 				->from($db->quoteName('#__podcastmanager_feeds', 'a'));
 
@@ -61,8 +63,7 @@ public static function feeds($config = array('filter.published' => array(0, 1)))
 				}
 				elseif (is_array($config['filter.published']))
 				{
-					JArrayHelper::toInteger($config['filter.published']);
-					$query->where($db->quoteName('a.published') . ' IN (' . implode(',', $config['filter.published']) . ')');
+					$query->where($db->quoteName('a.published') . ' IN (' . implode(',', ArrayHelper::toInteger($config['filter.published'])) . ')');
 				}
 			}