Merge branch '4.4-dev' into 4.4/application-input

Author: richard67

administrator/modules/mod_menu/src/Menu/CssMenu.php

@@ -71,7 +71,7 @@ class CssMenu
     /**
      * The application
      *
-     * @var    boolean
+     * @var    CMSApplication
      *
      * @since  4.0.0
      */
@@ -249,7 +249,7 @@ protected function check($node, Registry $params)
      *
      * @param   AdministratorMenuItem  $parent  A menu item to process
      *
-     * @return  array
+     * @return  void
      *
      * @since   3.8.0
      */

administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php

@@ -68,6 +68,7 @@ public static function getRequestFormPublished()
             'published' => false,
             'link'      => '',
         ];
+        $lang = '';
 
         $db    = Factory::getDbo();
         $query = $db->getQuery(true)
@@ -102,8 +103,6 @@ public static function getRequestFormPublished()
             // Add language to the url if the site is multilingual
             if (Multilanguage::isEnabled() && $menuItem->language && $menuItem->language !== '*') {
                 $lang = '&lang=' . $menuItem->language;
-            } else {
-                $lang = '';
             }
         }
 

administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php

@@ -42,8 +42,8 @@ class QuickIconHelper
      * This method returns the array by reference so it can be
      * used to add custom buttons or remove default ones.
      *
-     * @param   Registry        $params       The module parameters
-     * @param   CMSApplication  $application  The application
+     * @param   Registry         $params       The module parameters
+     * @param   ?CMSApplication  $application  The application
      *
      * @return  array  An array of buttons
      *

libraries/src/Helper/CMSHelper.php

@@ -128,7 +128,7 @@ public function getDataObject(TableInterface $table)
 
         foreach ($fields as $field) {
             $fieldName              = $field->Field;
-            $dataObject->$fieldName = $table->get($fieldName);
+            $dataObject->$fieldName = $table->$fieldName ?? null;
         }
 
         return $dataObject;

libraries/src/Helper/MediaHelper.php

@@ -196,9 +196,9 @@ public static function checkFileExtension($extension, $component = 'com_media',
     /**
      * Checks if the file can be uploaded
      *
-     * @param   array   $file                File information
-     * @param   string  $component           The option name for the component storing the parameters
-     * @param   string  $allowedExecutables  Array of executable file types that shall be whitelisted
+     * @param   array     $file                File information
+     * @param   string    $component           The option name for the component storing the parameters
+     * @param   string[]  $allowedExecutables  Array of executable file types that shall be whitelisted
      *
      * @return  boolean
      *

libraries/src/Helper/ModuleHelper.php

@@ -599,12 +599,11 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
                 break;
 
             case 'safeuri':
-                $secureid = null;
+                $safeuri = new \stdClass();
 
                 if (\is_array($cacheparams->modeparams)) {
                     $input        = $app->getInput();
                     $uri          = $input->getArray();
-                    $safeuri      = new \stdClass();
                     $noHtmlFilter = InputFilter::getInstance();
 
                     foreach ($cacheparams->modeparams as $key => $value) {

libraries/src/Helper/TagsHelper.php

@@ -108,7 +108,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = [])
         $typeId = $ucm->getTypeId();
 
         // Insert the new tag maps
-        if (strpos('#', implode(',', $tags)) === false) {
+        if (strpos(implode(',', $tags), '#') !== false) {
             $tags = self::createTagsFromField($tags);
         }
 
@@ -1044,7 +1044,7 @@ public function tagDeleteInstances($tagId)
      */
     public function tagItem($ucmId, TableInterface $table, $tags = [], $replace = true)
     {
-        $key     = $table->get('_tbl_key');
+        $key     = $table->getKeyName();
         $oldTags = $this->getTagIds((int) $table->$key, $this->typeAlias);
         $oldTags = explode(',', $oldTags);
         $result  = $this->unTagItem($ucmId, $table);

libraries/src/Helper/UserGroupsHelper.php

@@ -42,7 +42,7 @@ final class UserGroupsHelper
     /**
      * Singleton instance.
      *
-     * @var    array
+     * @var    UserGroupsHelper
      * @since  3.6.3
      */
     private static $instance;

libraries/src/Tree/NodeInterface.php

@@ -25,7 +25,7 @@ interface NodeInterface extends ImmutableNodeInterface
      *
      * If the node already has a parent, the link is unset
      *
-     * @param   NodeInterface|null  $parent  NodeInterface for the parent to be set or null
+     * @param   NodeInterface  $parent  NodeInterface for the parent to be set
      *
      * @return  void
      *

libraries/src/Tree/NodeTrait.php

@@ -27,7 +27,7 @@ trait NodeTrait
      *
      * If the node already has a parent, the link is unset
      *
-     * @param   NodeInterface|null  $parent  NodeInterface for the parent to be set or null
+     * @param   NodeInterface  $parent  NodeInterface for the parent to be set
      *
      * @return  void
      *