Code cleanup

joomla · Dec 3, 2024 · 0e383a7 · 0e383a7
1 parent 9800738
commit 0e383a7
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 20 deletions.
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
@@ -99,7 +99,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
             }
 
             // Attempt to load the xml file.
-            if (!$xml = simplexml_load_file($formFile)) {
+            if (!simplexml_load_file($formFile)) {
                 throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
             }
         }

diff --git a/components/com_config/src/Model/TemplatesModel.php b/components/com_config/src/Model/TemplatesModel.php
@@ -113,7 +113,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
         }
 
         // Attempt to load the xml file.
-        if (!$xml = simplexml_load_file($formFile)) {
+        if (!simplexml_load_file($formFile)) {
             throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
         }
 

diff --git a/components/com_contact/src/Model/CategoriesModel.php b/components/com_contact/src/Model/CategoriesModel.php
@@ -139,9 +139,9 @@ public function getItems()
     }
 
     /**
-     * Gets the id of the parent category for the selected list of categories
+     * Gets the parent category for the selected list of categories
      *
-     * @return   integer  The id of the parent category
+     * @return   CategoryNode|null  The parent category
      *
      * @since    1.6.0
      */

diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
@@ -252,7 +252,7 @@ public function getItem($pk = null)
                 }
 
                 // Compute access permissions.
-                if (($access = $this->getState('filter.access'))) {
+                if ($this->getState('filter.access')) {
                     // If the access filter has been set, we already know this user can view.
                     $data->params->set('access-view', true);
                 } else {

diff --git a/components/com_contact/src/Service/Router.php b/components/com_contact/src/Service/Router.php
@@ -126,7 +126,7 @@ public function getCategorySegment($id, $query)
 
             if ($this->noIDs) {
                 foreach ($path as &$segment) {
-                    list($id, $segment) = explode(':', $segment, 2);
+                    [, $segment] = explode(':', $segment, 2);
                 }
             }
 

diff --git a/components/com_content/src/Helper/QueryHelper.php b/components/com_content/src/Helper/QueryHelper.php
@@ -172,8 +172,6 @@ public static function orderbySecondary($orderby, $orderDate = 'created', ?Datab
      */
     public static function getQueryDate($orderDate, ?DatabaseInterface $db = null)
     {
-        $db = $db ?: Factory::getDbo();
-
         switch ($orderDate) {
             case 'modified':
                 $queryDate = ' CASE WHEN a.modified IS NULL THEN a.created ELSE a.modified END';

diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
@@ -249,7 +249,7 @@ public function getItem($pk = null)
                 }
 
                 // Compute view access permissions.
-                if ($access = $this->getState('filter.access')) {
+                if ($this->getState('filter.access')) {
                     // If the access filter has been set, we already know this user can view.
                     $data->params->set('access-view', true);
                 } else {

diff --git a/components/com_content/src/Service/Router.php b/components/com_content/src/Service/Router.php
@@ -127,7 +127,7 @@ public function getCategorySegment($id, $query)
 
             if ($this->noIDs) {
                 foreach ($path as &$segment) {
-                    list($id, $segment) = explode(':', $segment, 2);
+                    [, $segment] = explode(':', $segment, 2);
                 }
             }
 

diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
@@ -113,7 +113,7 @@ public function getItems()
         $results = [];
 
         // Convert the rows to result objects.
-        foreach ($items as $rk => $row) {
+        foreach ($items as $row) {
             // Build the result object.
             if (\is_resource($row->object)) {
                 $result = unserialize(stream_get_contents($row->object));

diff --git a/components/com_newsfeeds/src/Model/NewsfeedModel.php b/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -179,7 +179,7 @@ public function &getItem($pk = null)
 
                 // Compute access permissions.
 
-                if ($access = $this->getState('filter.access')) {
+                if ($this->getState('filter.access')) {
                     // If the access filter has been set, we already know this user can view.
                     $data->params->set('access-view', true);
                 } else {

diff --git a/components/com_newsfeeds/src/Service/Router.php b/components/com_newsfeeds/src/Service/Router.php
@@ -122,7 +122,7 @@ public function getCategorySegment($id, $query)
 
             if ($this->noIDs) {
                 foreach ($path as &$segment) {
-                    list($id, $segment) = explode(':', $segment, 2);
+                    [, $segment] = explode(':', $segment, 2);
                 }
             }
 

diff --git a/components/com_privacy/src/Model/RemindModel.php b/components/com_privacy/src/Model/RemindModel.php
@@ -17,7 +17,6 @@
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Component\Privacy\Administrator\Table\ConsentTable;
 use Joomla\Database\Exception\ExecutionFailureException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -70,9 +69,6 @@ public function remindRequest($data)
             return false;
         }
 
-        /** @var ConsentTable $table */
-        $table = $this->getTable();
-
         $db    = $this->getDatabase();
         $query = $db->getQuery(true)
             ->select($db->quoteName(['r.id', 'r.user_id', 'r.token']));

diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
@@ -268,7 +268,7 @@ public function build(&$query)
 
         foreach ($segments as &$segment) {
             if (strpos($segment, ':')) {
-                [$void, $segment] = explode(':', $segment, 2);
+                [, $segment] = explode(':', $segment, 2);
             }
         }
 

diff --git a/components/com_users/src/Model/ResetModel.php b/components/com_users/src/Model/ResetModel.php
@@ -76,7 +76,7 @@ public function getForm($data = [], $loadData = true)
     public function getResetCompleteForm($data = [], $loadData = true)
     {
         // Get the form.
-        $form = $this->loadForm('com_users.reset_complete', 'reset_complete', $options = ['control' => 'jform']);
+        $form = $this->loadForm('com_users.reset_complete', 'reset_complete', ['control' => 'jform']);
 
         if (empty($form)) {
             return false;
@@ -99,7 +99,7 @@ public function getResetCompleteForm($data = [], $loadData = true)
     public function getResetConfirmForm($data = [], $loadData = true)
     {
         // Get the form.
-        $form = $this->loadForm('com_users.reset_confirm', 'reset_confirm', $options = ['control' => 'jform']);
+        $form = $this->loadForm('com_users.reset_confirm', 'reset_confirm', ['control' => 'jform']);
 
         if (empty($form)) {
             return false;