[5.1] Updating php-cs-fixer and php_codesniffer to latest versions

.php-cs-fixer.dist.php

@@ -70,8 +70,8 @@
             '@PSR12'                         => true,
             // Short array syntax
             'array_syntax'                   => ['syntax' => 'short'],
-            // Lists should not have a trailing comma like list($foo, $bar,) = ...
-            'no_trailing_comma_in_list_call' => true,
+            // List of values separated by a comma is contained on a single line should not have a trailing comma like [$foo, $bar,] = ...
+            'no_trailing_comma_in_singleline' => true,
             // Arrays on multiline should have a trailing comma
             'trailing_comma_in_multiline'    => ['elements' => ['arrays']],
             // Align elements in multiline array and variable declarations on new lines below each other

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -244,17 +244,17 @@ public function &getPhpSettings(): array
         }
 
         $this->php_settings = [
-            'memory_limit'        => ini_get('memory_limit'),
-            'upload_max_filesize' => ini_get('upload_max_filesize'),
-            'post_max_size'       => ini_get('post_max_size'),
-            'display_errors'      => ini_get('display_errors') == '1',
-            'short_open_tag'      => ini_get('short_open_tag') == '1',
-            'file_uploads'        => ini_get('file_uploads') == '1',
-            'output_buffering'    => (int) ini_get('output_buffering') !== 0,
-            'open_basedir'        => ini_get('open_basedir'),
-            'session.save_path'   => ini_get('session.save_path'),
-            'session.auto_start'  => ini_get('session.auto_start'),
-            'disable_functions'   => ini_get('disable_functions'),
+            'memory_limit'        => \ini_get('memory_limit'),
+            'upload_max_filesize' => \ini_get('upload_max_filesize'),
+            'post_max_size'       => \ini_get('post_max_size'),
+            'display_errors'      => \ini_get('display_errors') == '1',
+            'short_open_tag'      => \ini_get('short_open_tag') == '1',
+            'file_uploads'        => \ini_get('file_uploads') == '1',
+            'output_buffering'    => (int) \ini_get('output_buffering') !== 0,
+            'open_basedir'        => \ini_get('open_basedir'),
+            'session.save_path'   => \ini_get('session.save_path'),
+            'session.auto_start'  => \ini_get('session.auto_start'),
+            'disable_functions'   => \ini_get('disable_functions'),
             'xml'                 => \extension_loaded('xml'),
             'zlib'                => \extension_loaded('zlib'),
             'zip'                 => \function_exists('zip_open') && \function_exists('zip_read'),
@@ -263,7 +263,7 @@ public function &getPhpSettings(): array
             'gd'                  => \extension_loaded('gd'),
             'iconv'               => \function_exists('iconv'),
             'intl'                => \function_exists('transliterator_transliterate'),
-            'max_input_vars'      => ini_get('max_input_vars'),
+            'max_input_vars'      => \ini_get('max_input_vars'),
         ];
 
         return $this->php_settings;
@@ -355,7 +355,7 @@ private function getCompatPluginParameters()
     public function phpinfoEnabled(): bool
     {
         // remove any spaces from the ini value before exploding it
-        $disabledFunctions = str_replace(' ', '', ini_get('disable_functions'));
+        $disabledFunctions = str_replace(' ', '', \ini_get('disable_functions'));
         return !\in_array('phpinfo', explode(',', $disabledFunctions));
     }
 
@@ -666,7 +666,7 @@ public function getDirectory(bool $public = false): array
      */
     private function addDirectory(string $name, string $path, string $message = ''): void
     {
-        $this->directories[$name] = ['writable' => is_writable($path), 'message' => $message,];
+        $this->directories[$name] = ['writable' => is_writable($path), 'message' => $message];
     }
 
     /**
@@ -718,7 +718,7 @@ protected function parsePhpInfo(string $html): array
                 foreach ($vals as $val) {
                     // 3cols
                     if (preg_match($p2, $val, $matches)) {
-                        $r[$name][trim($matches[1])] = [trim($matches[2]), trim($matches[3]),];
+                        $r[$name][trim($matches[1])] = [trim($matches[2]), trim($matches[3])];
                     } elseif (preg_match($p3, $val, $matches)) {
                         // 2cols
                         $r[$name][trim($matches[1])] = trim($matches[2]);

administrator/components/com_categories/src/Model/CategoriesModel.php

@@ -249,8 +249,8 @@ protected function getListQuery()
             $categoryId = $categoryId ? [$categoryId] : [];
         }
 
-        // Case: Using both categories filter and by level filter
         if (\count($categoryId)) {
+            // Case: Using both categories filter and by level filter
             $categoryTable    = Table::getInstance('Category', 'JTable');
             $subCatItemsWhere = [];
 
@@ -263,9 +263,8 @@ protected function getListQuery()
             }
 
             $query->where('(' . implode(' OR ', $subCatItemsWhere) . ')');
-
-        // Case: Using only the by level filter
         } elseif ($level) {
+            // Case: Using only the by level filter
             $query->where($db->quoteName('a.level') . ' <= :level')
                 ->bind(':level', $level, ParameterType::INTEGER);
         }

administrator/components/com_finder/src/Indexer/Adapter.php

@@ -922,20 +922,20 @@ protected function translateState($item, $category = null)
 
         // Translate the state
         switch ($item) {
-            // Published items should always show up in search results
             case 1:
+                // Published items should always show up in search results
                 return 1;
 
-            // Archived items should only show up when option is enabled
             case 2:
+                // Archived items should only show up when option is enabled
                 if ($this->params->get('search_archived', 1) == 0) {
                     return 0;
                 }
 
                 return 1;
 
-            // All other states should return an unpublished state
             default:
+                // All other states should return an unpublished state
                 return 0;
         }
     }

administrator/components/com_finder/src/Indexer/DebugAdapter.php

@@ -920,13 +920,13 @@ protected function translateState($item, $category = null)
 
         // Translate the state
         switch ($item) {
-            // Published and archived items only should return a published state
             case 1:
             case 2:
+                // Published and archived items only should return a published state
                 return 1;
 
-            // All other states should return an unpublished state
             default:
+                // All other states should return an unpublished state
                 return 0;
         }
     }

administrator/components/com_finder/src/Indexer/Parser/Html.php

@@ -38,7 +38,7 @@ class Html extends Parser
     public function parse($input)
     {
         // Strip invalid UTF-8 characters.
-        $oldSetting = ini_get('mbstring.substitute_character');
+        $oldSetting = \ini_get('mbstring.substitute_character');
         ini_set('mbstring.substitute_character', 'none');
         $input = mb_convert_encoding($input, 'UTF-8', 'UTF-8');
         ini_set('mbstring.substitute_character', $oldSetting);

administrator/components/com_finder/src/Indexer/Query.php

@@ -794,9 +794,9 @@ protected function processString($input, $lang, $mode)
 
                 // Now we have to handle the filter string.
                 switch ($modifier) {
-                    // Handle a before and after date filters.
                     case 'before':
                     case 'after':
+                        // Handle a before and after date filters.
                         // Get the time offset.
                         $offset = Factory::getApplication()->get('offset');
 
@@ -820,8 +820,8 @@ protected function processString($input, $lang, $mode)
 
                         break;
 
-                    // Handle a taxonomy branch filter.
                     default:
+                        // Handle a taxonomy branch filter.
                         // Try to find the node id.
                         $return = Taxonomy::getNodeByTitle($modifier, $value);
 

administrator/components/com_installer/src/Model/InstallModel.php

@@ -274,7 +274,7 @@ protected function _getPackageFromUpload()
         $userfile = $input->files->get('install_package', null, 'raw');
 
         // Make sure that file uploads are enabled in php.
-        if (!(bool) ini_get('file_uploads')) {
+        if (!(bool) \ini_get('file_uploads')) {
             Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'), 'error');
 
             return false;

administrator/components/com_installer/src/Model/InstallerModel.php

@@ -176,7 +176,7 @@ protected function translate(&$items)
                     break;
                 case 'file':
                     $extension = 'files_' . $item->element;
-                        $lang->load("$extension.sys", JPATH_SITE);
+                    $lang->load("$extension.sys", JPATH_SITE);
                     break;
                 case 'library':
                     $parts     = explode('/', $item->element);

administrator/components/com_installer/src/Model/UpdateModel.php

@@ -552,8 +552,8 @@ protected function loadFormData()
     protected function preparePreUpdate($update, $table)
     {
         switch ($table->type) {
-            // Components could have a helper which adds additional data
             case 'component':
+                // Components could have a helper which adds additional data
                 $ename = str_replace('com_', '', $table->element);
                 $fname = $ename . '.php';
                 $cname = ucfirst($ename) . 'Helper';
@@ -570,8 +570,8 @@ protected function preparePreUpdate($update, $table)
 
                 break;
 
-            // Modules could have a helper which adds additional data
             case 'module':
+                // Modules could have a helper which adds additional data
                 $cname = str_replace('_', '', $table->element) . 'Helper';
                 $path  = ($table->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/modules/' . $table->element . '/helper.php';
 
@@ -585,9 +585,9 @@ protected function preparePreUpdate($update, $table)
 
                 break;
 
-            // If we have a plugin, we can use the plugin trigger "onInstallerBeforePackageDownload"
-            // But we should make sure, that our plugin is loaded, so we don't need a second "installer" plugin
             case 'plugin':
+                // If we have a plugin, we can use the plugin trigger "onInstallerBeforePackageDownload"
+                // But we should make sure, that our plugin is loaded, so we don't need a second "installer" plugin
                 $cname = str_replace('plg_', '', $table->element);
                 PluginHelper::importPlugin($table->folder, $cname);
                 break;

administrator/components/com_installer/src/Model/UpdatesitesModel.php

@@ -631,12 +631,12 @@ protected function getListQuery()
                     $supportedIDs = InstallerHelper::getDownloadKeySupportedSites($enabled);
                     break;
 
-                // Show Update Sites which are missing Download Keys
+                    // Show Update Sites which are missing Download Keys
                 case -1:
                     $supportedIDs = InstallerHelper::getDownloadKeyExistsSites(false, $enabled);
                     break;
 
-                // Show Update Sites which have valid Download Keys
+                    // Show Update Sites which have valid Download Keys
                 case 2:
                     $supportedIDs = InstallerHelper::getDownloadKeyExistsSites(true, $enabled);
                     break;

administrator/components/com_installer/src/Model/WarningsModel.php

@@ -98,7 +98,7 @@ public function getItems()
         // 16MB
         $minLimit = 16 * 1024 * 1024;
 
-        $file_uploads = ini_get('file_uploads');
+        $file_uploads = \ini_get('file_uploads');
 
         if (!$file_uploads) {
             $messages[] = [
@@ -107,7 +107,7 @@ public function getItems()
             ];
         }
 
-        $upload_dir = ini_get('upload_tmp_dir');
+        $upload_dir = \ini_get('upload_tmp_dir');
 
         if (!$upload_dir) {
             $messages[] = [
@@ -135,7 +135,7 @@ public function getItems()
             ];
         }
 
-        $memory_limit = $this->return_bytes(ini_get('memory_limit'));
+        $memory_limit = $this->return_bytes(\ini_get('memory_limit'));
 
         if ($memory_limit > -1) {
             if ($memory_limit < $minLimit) {
@@ -153,8 +153,8 @@ public function getItems()
             }
         }
 
-        $post_max_size       = $this->return_bytes(ini_get('post_max_size'));
-        $upload_max_filesize = $this->return_bytes(ini_get('upload_max_filesize'));
+        $post_max_size       = $this->return_bytes(\ini_get('post_max_size'));
+        $upload_max_filesize = $this->return_bytes(\ini_get('upload_max_filesize'));
 
         if ($post_max_size > 0 && $post_max_size < $upload_max_filesize) {
             $messages[] = [

administrator/components/com_joomlaupdate/extract.php

@@ -1603,7 +1603,7 @@ private function getPhpMaxExecTime(): int
             return 10;
         }
 
-        $phpMaxTime = @ini_get("maximum_execution_time");
+        $phpMaxTime = @\ini_get("maximum_execution_time");
         $phpMaxTime = (!is_numeric($phpMaxTime) ? 10 : @\intval($phpMaxTime)) ?: 10;
 
         return max(1, $phpMaxTime);
@@ -1694,9 +1694,9 @@ function clearFileInOPCache(string $file): bool
     static $hasOpCache = null;
 
     if (\is_null($hasOpCache)) {
-        $hasOpCache = ini_get('opcache.enable')
+        $hasOpCache = \ini_get('opcache.enable')
             && \function_exists('opcache_invalidate')
-            && (!ini_get('opcache.restrict_api') || stripos(realpath($_SERVER['SCRIPT_FILENAME']), ini_get('opcache.restrict_api')) === 0);
+            && (!\ini_get('opcache.restrict_api') || stripos(realpath($_SERVER['SCRIPT_FILENAME']), \ini_get('opcache.restrict_api')) === 0);
     }
 
     if ($hasOpCache && (strtolower(substr($file, -4)) === '.php')) {

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -88,19 +88,19 @@ public function applyUpdateSite()
         $params = ComponentHelper::getParams('com_joomlaupdate');
 
         switch ($params->get('updatesource', 'nochange')) {
-                // "Minor & Patch Release for Current version AND Next Major Release".
             case 'next':
+                // "Minor & Patch Release for Current version AND Next Major Release".
                 $updateURL = 'https://update.joomla.org/core/sts/list_sts.xml';
                 break;
 
-                // "Testing"
             case 'testing':
+                // "Testing"
                 $updateURL = 'https://update.joomla.org/core/test/list_test.xml';
                 break;
 
+            case 'custom':
                 // "Custom"
                 // @todo: check if the customurl is valid and not just "not empty".
-            case 'custom':
                 if (trim($params->get('customurl', '')) != '') {
                     $updateURL = trim($params->get('customurl', ''));
                 } else {
@@ -110,6 +110,7 @@ public function applyUpdateSite()
                 }
                 break;
 
+            default:
                 /**
                  * "Minor & Patch Release for Current version (recommended and default)".
                  * The commented "case" below are for documenting where 'default' and legacy options falls
@@ -118,7 +119,6 @@ public function applyUpdateSite()
                  * case 'sts': (It's shown as "Default" because that option does not exist any more)
                  * case 'nochange':
                  */
-            default:
                 $updateURL = 'https://update.joomla.org/core/list.xml';
         }
 
@@ -930,7 +930,7 @@ public function upload()
         $userfile = $input->files->get('install_package', null, 'raw');
 
         // Make sure that file uploads are enabled in php.
-        if (!(bool) ini_get('file_uploads')) {
+        if (!(bool) \ini_get('file_uploads')) {
             throw new \RuntimeException(Text::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'), 500);
         }
 
@@ -1103,7 +1103,7 @@ public function getPhpOptions()
             // Check for default MB language.
             $option         = new \stdClass();
             $option->label  = Text::_('INSTL_MB_LANGUAGE_IS_DEFAULT');
-            $option->state  = strtolower(ini_get('mbstring.language')) === 'neutral';
+            $option->state  = strtolower(\ini_get('mbstring.language')) === 'neutral';
             $option->notice = $option->state ? null : Text::_('INSTL_NOTICEMBLANGNOTDEFAULT');
             $options[]      = $option;
         }
@@ -1159,28 +1159,28 @@ public function getPhpSettings()
         // Check for display errors.
         $setting              = new \stdClass();
         $setting->label       = Text::_('INSTL_DISPLAY_ERRORS');
-        $setting->state       = (bool) ini_get('display_errors');
+        $setting->state       = (bool) \ini_get('display_errors');
         $setting->recommended = false;
         $settings[]           = $setting;
 
         // Check for file uploads.
         $setting              = new \stdClass();
         $setting->label       = Text::_('INSTL_FILE_UPLOADS');
-        $setting->state       = (bool) ini_get('file_uploads');
+        $setting->state       = (bool) \ini_get('file_uploads');
         $setting->recommended = true;
         $settings[]           = $setting;
 
         // Check for output buffering.
         $setting              = new \stdClass();
         $setting->label       = Text::_('INSTL_OUTPUT_BUFFERING');
-        $setting->state       = (int) ini_get('output_buffering') !== 0;
+        $setting->state       = (int) \ini_get('output_buffering') !== 0;
         $setting->recommended = false;
         $settings[]           = $setting;
 
         // Check for session auto-start.
         $setting              = new \stdClass();
         $setting->label       = Text::_('INSTL_SESSION_AUTO_START');
-        $setting->state       = (bool) ini_get('session.auto_start');
+        $setting->state       = (bool) \ini_get('session.auto_start');
         $setting->recommended = false;
         $settings[]           = $setting;
 
@@ -1291,7 +1291,7 @@ private function getTargetMinimumPHPVersion()
      */
     public function getIniParserAvailability()
     {
-        $disabledFunctions = ini_get('disable_functions');
+        $disabledFunctions = \ini_get('disable_functions');
 
         if (!empty($disabledFunctions)) {
             // Attempt to detect them in the PHP INI disable_functions variable.