diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index a51c8521170fe..88d148ff58e5a 100644 --- a/.php-cs-fixer.dist.php +++ b/.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 diff --git a/administrator/components/com_admin/src/Model/SysinfoModel.php b/administrator/components/com_admin/src/Model/SysinfoModel.php index 33365916235e2..6a11358ea4c85 100644 --- a/administrator/components/com_admin/src/Model/SysinfoModel.php +++ b/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]); diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php index 2b759b42e3ff9..0478d443b6ba6 100644 --- a/administrator/components/com_categories/src/Model/CategoriesModel.php +++ b/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); } diff --git a/administrator/components/com_finder/src/Indexer/Adapter.php b/administrator/components/com_finder/src/Indexer/Adapter.php index c04fcb3a77614..f398751b16d3d 100644 --- a/administrator/components/com_finder/src/Indexer/Adapter.php +++ b/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; } } diff --git a/administrator/components/com_finder/src/Indexer/DebugAdapter.php b/administrator/components/com_finder/src/Indexer/DebugAdapter.php index bbd58a082d789..b389c897aa040 100644 --- a/administrator/components/com_finder/src/Indexer/DebugAdapter.php +++ b/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; } } diff --git a/administrator/components/com_finder/src/Indexer/Parser/Html.php b/administrator/components/com_finder/src/Indexer/Parser/Html.php index 888990b11bfca..ac569bbe45117 100644 --- a/administrator/components/com_finder/src/Indexer/Parser/Html.php +++ b/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); diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php index 0c3de718e1cd5..7a92521c3a1a6 100644 --- a/administrator/components/com_finder/src/Indexer/Query.php +++ b/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); diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php index 370341810d3bb..6ad08571ad286 100644 --- a/administrator/components/com_installer/src/Model/InstallModel.php +++ b/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; diff --git a/administrator/components/com_installer/src/Model/InstallerModel.php b/administrator/components/com_installer/src/Model/InstallerModel.php index cf641cc4d15d2..e57297043d0f2 100644 --- a/administrator/components/com_installer/src/Model/InstallerModel.php +++ b/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); diff --git a/administrator/components/com_installer/src/Model/UpdateModel.php b/administrator/components/com_installer/src/Model/UpdateModel.php index fdb7932df5125..21555b68ce574 100644 --- a/administrator/components/com_installer/src/Model/UpdateModel.php +++ b/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; diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php index 16b14f57618e5..0ade2440207dd 100644 --- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php +++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php @@ -626,18 +626,18 @@ protected function getListQuery() if (is_numeric($supported)) { switch ($supported) { - // Show Update Sites which support Download Keys case 1: + // Show Update Sites which support Download Keys $supportedIDs = InstallerHelper::getDownloadKeySupportedSites($enabled); break; - // Show Update Sites which are missing Download Keys case -1: + // Show Update Sites which are missing Download Keys $supportedIDs = InstallerHelper::getDownloadKeyExistsSites(false, $enabled); break; - // Show Update Sites which have valid Download Keys case 2: + // Show Update Sites which have valid Download Keys $supportedIDs = InstallerHelper::getDownloadKeyExistsSites(true, $enabled); break; } diff --git a/administrator/components/com_installer/src/Model/WarningsModel.php b/administrator/components/com_installer/src/Model/WarningsModel.php index 5c5796ec4cb8a..1c596941b65b1 100644 --- a/administrator/components/com_installer/src/Model/WarningsModel.php +++ b/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[] = [ diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php index 9e113573f1cfa..98c33cd1f0197 100644 --- a/administrator/components/com_joomlaupdate/extract.php +++ b/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')) { diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php index 977531e1347fe..b77ef7e498542 100644 --- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php +++ b/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. diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 649e00c56c392..5147b60e20b6d 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -233,24 +233,25 @@ public function display($tpl = null) $params = ComponentHelper::getParams('com_joomlaupdate'); switch ($params->get('updatesource', 'default')) { - // "Minor & Patch Release for Current version AND Next Major Release". case 'next': + // "Minor & Patch Release for Current version AND Next Major Release". $this->langKey = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT'; $this->updateSourceKey = Text::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT'); break; - // "Testing" case 'testing': + // "Testing" $this->langKey = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING'; $this->updateSourceKey = Text::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING'); break; - // "Custom" case 'custom': + // "Custom" $this->langKey = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM'; $this->updateSourceKey = Text::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM'); break; + default: /** * "Minor & Patch Release for Current version (recommended and default)". * The commented "case" below are for documenting where 'default' and legacy options falls @@ -259,7 +260,6 @@ public function display($tpl = null) * case 'lts': * case 'nochange': */ - default: $this->langKey = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT'; $this->updateSourceKey = Text::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT'); } diff --git a/administrator/components/com_media/src/Controller/ApiController.php b/administrator/components/com_media/src/Controller/ApiController.php index 6ee85b357b2b8..530f97a0db6cb 100644 --- a/administrator/components/com_media/src/Controller/ApiController.php +++ b/administrator/components/com_media/src/Controller/ApiController.php @@ -347,9 +347,9 @@ private function checkContent() $contentLength = $this->input->server->getInt('CONTENT_LENGTH'); $params = ComponentHelper::getParams('com_media'); $paramsUploadMaxsize = $params->get('upload_maxsize', 0) * 1024 * 1024; - $uploadMaxFilesize = $helper->toBytes(ini_get('upload_max_filesize')); - $postMaxSize = $helper->toBytes(ini_get('post_max_size')); - $memoryLimit = $helper->toBytes(ini_get('memory_limit')); + $uploadMaxFilesize = $helper->toBytes(\ini_get('upload_max_filesize')); + $postMaxSize = $helper->toBytes(\ini_get('post_max_size')); + $memoryLimit = $helper->toBytes(\ini_get('memory_limit')); if ( ($paramsUploadMaxsize > 0 && $contentLength > $paramsUploadMaxsize) diff --git a/administrator/components/com_media/src/Controller/PluginController.php b/administrator/components/com_media/src/Controller/PluginController.php index f9f6c4210a815..b97b636fdeb71 100644 --- a/administrator/components/com_media/src/Controller/PluginController.php +++ b/administrator/components/com_media/src/Controller/PluginController.php @@ -94,16 +94,16 @@ public function oauthcallback() * - control-panel : Redirect to Control Panel */ switch ($action) { - /** - * Close a window opened by developer - * Use this for close New Windows opened for OAuth Process - */ case 'close': + /** + * Close a window opened by developer + * Use this for close New Windows opened for OAuth Process + */ $this->setRedirect(Route::_('index.php?option=com_media&view=plugin&action=close', false)); break; - // Redirect browser to any page specified by the user case 'redirect': + // Redirect browser to any page specified by the user if (!isset($eventResults['redirect_uri'])) { throw new \Exception("Redirect URI must be set in the plugin"); } @@ -111,14 +111,14 @@ public function oauthcallback() $this->setRedirect($eventResults['redirect_uri']); break; - // Redirect browser to Control Panel case 'control-panel': + // Redirect browser to Control Panel $this->setRedirect(Route::_('index.php', false)); break; - // Redirect browser to Media Manager case 'media-manager': default: + // Redirect browser to Media Manager $this->setRedirect(Route::_('index.php?option=com_media&view=media', false)); } } catch (\Exception $e) { diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php index 5f01072d44d69..6d30bff5426b2 100644 --- a/administrator/components/com_menus/src/View/Items/HtmlView.php +++ b/administrator/components/com_menus/src/View/Items/HtmlView.php @@ -141,7 +141,7 @@ public function display($tpl = null) case 'component': default: // Load language - $lang->load($item->componentname . '.sys', JPATH_ADMINISTRATOR) + $lang->load($item->componentname . '.sys', JPATH_ADMINISTRATOR) || $lang->load($item->componentname . '.sys', JPATH_ADMINISTRATOR . '/components/' . $item->componentname); if (!empty($item->componentname)) { diff --git a/administrator/components/com_privacy/src/Controller/RequestController.php b/administrator/components/com_privacy/src/Controller/RequestController.php index d13d0dead3c2d..846ebf68862b5 100644 --- a/administrator/components/com_privacy/src/Controller/RequestController.php +++ b/administrator/components/com_privacy/src/Controller/RequestController.php @@ -393,10 +393,10 @@ private function canTransition($item, $newStatus) // A confirmed item can be marked completed or invalid return \in_array($newStatus, ['-1', '2'], true); - // An item which is already in an invalid or complete state cannot transition, likewise if we don't know the state don't change anything case '-1': case '2': default: + // An item which is already in an invalid or complete state cannot transition, likewise if we don't know the state don't change anything return false; } } diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php index c42e2dc7061d8..bfd1772ccce3b 100644 --- a/administrator/components/com_privacy/src/View/Request/HtmlView.php +++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php @@ -173,8 +173,8 @@ protected function addToolbar() break; - // Item is in a "locked" state and cannot transition default: + // Item is in a "locked" state and cannot transition break; } diff --git a/administrator/components/com_users/src/Controller/DisplayController.php b/administrator/components/com_users/src/Controller/DisplayController.php index 864e6d23a483a..3530077485a9d 100644 --- a/administrator/components/com_users/src/Controller/DisplayController.php +++ b/administrator/components/com_users/src/Controller/DisplayController.php @@ -49,15 +49,15 @@ protected function canView($view) $canDo = ContentHelper::getActions('com_users'); switch ($view) { - // Special permissions. case 'groups': case 'group': case 'levels': case 'level': + // Special permissions. return $canDo->get('core.admin'); - // Default permissions. default: + // Default permissions. return true; } } diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php index 794b8731edab1..cdbbd8ed9baef 100644 --- a/administrator/components/com_users/src/Model/UserModel.php +++ b/administrator/components/com_users/src/Model/UserModel.php @@ -703,20 +703,20 @@ public function batchUser($groupId, $userIds, $action) $db = $this->getDatabase(); switch ($action) { - // Sets users to a selected group case 'set': + // Sets users to a selected group $doDelete = 'all'; $doAssign = true; break; - // Remove users from a selected group case 'del': + // Remove users from a selected group $doDelete = 'group'; break; - // Add users to a selected group case 'add': default: + // Add users to a selected group $doAssign = true; break; } diff --git a/administrator/components/com_workflow/src/Model/WorkflowModel.php b/administrator/components/com_workflow/src/Model/WorkflowModel.php index 1816f9e7d767f..fdfeb49ace3dd 100644 --- a/administrator/components/com_workflow/src/Model/WorkflowModel.php +++ b/administrator/components/com_workflow/src/Model/WorkflowModel.php @@ -291,7 +291,7 @@ public function setDefault($pk, $value = 1) if ( $table->load( [ - 'default' => '1', + 'default' => '1', 'extension' => $table->get('extension'), ] ) diff --git a/administrator/components/com_workflow/src/Table/WorkflowTable.php b/administrator/components/com_workflow/src/Table/WorkflowTable.php index d0564f0d75c1c..ce6718394c3e5 100644 --- a/administrator/components/com_workflow/src/Table/WorkflowTable.php +++ b/administrator/components/com_workflow/src/Table/WorkflowTable.php @@ -212,7 +212,7 @@ public function store($updateNulls = true) if ( $table->load( [ - 'default' => '1', + 'default' => '1', 'extension' => $this->extension, ] ) diff --git a/api/components/com_media/src/Controller/MediaController.php b/api/components/com_media/src/Controller/MediaController.php index b1624960e342e..ed21098dc32bf 100644 --- a/api/components/com_media/src/Controller/MediaController.php +++ b/api/components/com_media/src/Controller/MediaController.php @@ -350,9 +350,9 @@ private function checkContent(): void // Check if the size of the request body does not exceed various server imposed limits. if ( ($params->get('upload_maxsize', 0) > 0 && $serverlength > ($params->get('upload_maxsize', 0) * 1024 * 1024)) - || $serverlength > $helper->toBytes(ini_get('upload_max_filesize')) - || $serverlength > $helper->toBytes(ini_get('post_max_size')) - || $serverlength > $helper->toBytes(ini_get('memory_limit')) + || $serverlength > $helper->toBytes(\ini_get('upload_max_filesize')) + || $serverlength > $helper->toBytes(\ini_get('post_max_size')) + || $serverlength > $helper->toBytes(\ini_get('memory_limit')) ) { throw new \RuntimeException(Text::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'), 400); } diff --git a/build/build.php b/build/build.php index f9bd948c62eda..262df44faeec1 100644 --- a/build/build.php +++ b/build/build.php @@ -512,14 +512,14 @@ function clean_composer(string $dir) break; - // Deleted files case 'D': + // Deleted files $deletedFiles[] = $fileName; break; - // Regular additions and modifications default: + // Regular additions and modifications $filesArray[$fileName] = true; break; diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php index f8aaceb484b36..4c06d66bf8cf5 100644 --- a/components/com_ajax/ajax.php +++ b/components/com_ajax/ajax.php @@ -204,14 +204,14 @@ // Return the results in the desired format switch ($format) { - // JSONinzed case 'json': + // JSONinzed echo new JsonResponse($results, null, false, $input->get('ignoreMessages', true, 'bool')); break; - // Handle as raw format default: + // Handle as raw format // Output exception if ($results instanceof Exception) { // Log an error @@ -222,7 +222,7 @@ // Echo exception type and message $out = \get_class($results) . ': ' . $results->getMessage(); - } elseif (is_scalar($results)) { + } elseif (\is_scalar($results)) { // Output string/ null $out = (string) $results; } else { diff --git a/components/com_finder/src/View/Search/HtmlView.php b/components/com_finder/src/View/Search/HtmlView.php index c06fbdf37119c..0cebb3691cb45 100644 --- a/components/com_finder/src/View/Search/HtmlView.php +++ b/components/com_finder/src/View/Search/HtmlView.php @@ -242,7 +242,7 @@ protected function getFields() // Create hidden input elements for each part of the URI. foreach ($elements as $n => $v) { - if (is_scalar($v)) { + if (\is_scalar($v)) { $fields .= ''; } } diff --git a/components/com_users/src/Controller/DisplayController.php b/components/com_users/src/Controller/DisplayController.php index 6d9b827df0e89..6cf720999980c 100644 --- a/components/com_users/src/Controller/DisplayController.php +++ b/components/com_users/src/Controller/DisplayController.php @@ -73,8 +73,8 @@ public function display($cachable = false, $urlparams = false) $model = $this->getModel('Registration'); break; - // Handle view specific models. case 'profile': + // Handle view specific models. // If the user is a guest, redirect to the login page. $user = $this->app->getIdentity(); @@ -88,8 +88,8 @@ public function display($cachable = false, $urlparams = false) $model = $this->getModel($vName); break; - // Handle the default views. case 'login': + // Handle the default views. $model = $this->getModel($vName); break; diff --git a/composer.json b/composer.json index b6c329e5cbe59..a3a747aeec770 100644 --- a/composer.json +++ b/composer.json @@ -75,10 +75,10 @@ "paragonie/sodium_compat": "^1.20", "phpmailer/phpmailer": "^6.8.1", "psr/link": "~1.1.1", - "symfony/console": "^6.3.4", + "symfony/console": "^6.4.2", "symfony/error-handler": "^6.3.2", "symfony/ldap": "^6.3.0", - "symfony/options-resolver": "^6.3.0", + "symfony/options-resolver": "^6.4.0", "symfony/polyfill-mbstring": "^1.28.0", "symfony/web-link": "^6.3.0", "symfony/yaml": "^6.3.3", @@ -103,9 +103,9 @@ "voku/portable-utf8": "^6.0.13" }, "require-dev": { - "phpunit/phpunit": "^9.6.11", - "friendsofphp/php-cs-fixer": "3.4.0", - "squizlabs/php_codesniffer": "^3.7.2", + "phpunit/phpunit": "^9.6.13", + "friendsofphp/php-cs-fixer": "^3.49.0", + "squizlabs/php_codesniffer": "^3.9.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", "joomla/mediawiki": "^3.0", "joomla/test": "~3.0", diff --git a/composer.lock b/composer.lock index 9bb79d3fcb06c..efbbaf7d829df 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a11e9fcd1917529c4c799d5c8760ec09", + "content-hash": "512066162eb059912f62ce10ccb488cf", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -3737,16 +3737,16 @@ }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", "shasum": "" }, "require": { @@ -3754,7 +3754,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -3768,12 +3768,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3807,7 +3811,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.4.2" }, "funding": [ { @@ -3823,11 +3827,11 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3874,7 +3878,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -4044,16 +4048,16 @@ }, { "name": "symfony/options-resolver", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd" + "reference": "22301f0e7fdeaacc14318928612dee79be99860e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd", - "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e", "shasum": "" }, "require": { @@ -4091,7 +4095,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.0" }, "funding": [ { @@ -4107,7 +4111,7 @@ "type": "tidelift" } ], - "time": "2023-05-12T14:21:09+00:00" + "time": "2023-08-08T10:16:24+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4606,33 +4610,29 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.1", + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -4642,7 +4642,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4669,7 +4672,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -4685,20 +4688,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.3.2", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "53d1a83225002635bca3482fcbf963001313fb68" + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", - "reference": "53d1a83225002635bca3482fcbf963001313fb68", + "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", "shasum": "" }, "require": { @@ -4712,11 +4715,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4755,7 +4758,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.2" + "source": "https://github.com/symfony/string/tree/v6.4.2" }, "funding": [ { @@ -4771,7 +4774,7 @@ "type": "tidelift" } ], - "time": "2023-07-05T08:41:27+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/uid", @@ -6396,30 +6399,30 @@ "packages-dev": [ { "name": "composer/pcre", - "version": "1.0.1", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -6447,7 +6450,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.1" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -6463,7 +6466,7 @@ "type": "tidelift" } ], - "time": "2022-01-21T20:24:37+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -6548,27 +6551,27 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -6594,7 +6597,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.5" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -6610,7 +6613,7 @@ "type": "tidelift" } ], - "time": "2022-02-24T20:20:32+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -6687,94 +6690,18 @@ }, "time": "2022-02-04T12:51:07+00:00" }, - { - "name": "doctrine/annotations", - "version": "1.14.3", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1 || ^2", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" - }, - "time": "2023-02-01T09:20:38+00:00" - }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -6806,9 +6733,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/instantiator", @@ -6880,84 +6807,6 @@ ], "time": "2022-12-30T00:23:10+00:00" }, - { - "name": "doctrine/lexer", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2022-12-14T08:49:07+00:00" - }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.2.1", @@ -7005,52 +6854,48 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.4.0", + "version": "v3.49.0", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2", + "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2", "shasum": "" }, "require": { - "composer/semver": "^3.2", - "composer/xdebug-handler": "^2.0", - "doctrine/annotations": "^1.12", + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", - "php": "^7.2.5 || ^8.0", - "php-cs-fixer/diff": "^2.0", - "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0", - "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0", - "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0", - "symfony/finder": "^4.4.20 || ^5.0 || ^6.0", - "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.23", - "symfony/polyfill-php81": "^1.23", - "symfony/process": "^4.4.20 || ^5.0 || ^6.0", - "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0" + "php": "^7.4 || ^8.0", + "sebastian/diff": "^4.0 || ^5.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.8", - "php-coveralls/php-coveralls": "^2.5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^8.5.21 || ^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "symfony/phpunit-bridge": "^5.2.4 || ^6.0", - "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0" + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6 || ^10.5.5", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -7080,9 +6925,15 @@ } ], "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0" + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0" }, "funding": [ { @@ -7090,7 +6941,7 @@ "type": "github" } ], - "time": "2021-12-11T16:25:08+00:00" + "time": "2024-02-02T00:41:40+00:00" }, { "name": "joomla/mediawiki", @@ -7633,59 +7484,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "php-cs-fixer/diff", - "version": "v2.0.2", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "sebastian/diff v3 backport support for PHP 5.6+", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" - }, - "abandoned": true, - "time": "2020-10-14T08:32:19+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -8323,55 +8121,6 @@ ], "time": "2023-09-19T05:39:22+00:00" }, - { - "name": "psr/cache", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" - }, - "time": "2021-02-03T23:26:27+00:00" - }, { "name": "sabre/event", "version": "5.1.4", @@ -9404,16 +9153,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.9.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -9423,11 +9172,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -9442,35 +9191,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.3.2", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e" + "reference": "e95216850555cd55e71b857eb9d6c2674124603a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e", - "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e95216850555cd55e71b857eb9d6c2674124603a", + "reference": "e95216850555cd55e71b857eb9d6c2674124603a", "shasum": "" }, "require": { @@ -9487,13 +9259,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/error-handler": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -9521,7 +9293,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.2" }, "funding": [ { @@ -9537,11 +9309,11 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:56:43+00:00" + "time": "2023-12-27T22:16:42+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -9597,7 +9369,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { @@ -9617,16 +9389,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", "shasum": "" }, "require": { @@ -9660,7 +9432,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.3.1" + "source": "https://github.com/symfony/filesystem/tree/v6.4.0" }, "funding": [ { @@ -9676,27 +9448,27 @@ "type": "tidelift" } ], - "time": "2023-06-01T08:30:39+00:00" + "time": "2023-07-26T17:27:13+00:00" }, { "name": "symfony/finder", - "version": "v6.3.3", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e", - "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -9724,7 +9496,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.3.3" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -9740,20 +9512,20 @@ "type": "tidelift" } ], - "time": "2023-07-31T08:31:44+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/process", - "version": "v6.3.4", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54" + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54", - "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54", + "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241", + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241", "shasum": "" }, "require": { @@ -9785,7 +9557,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.3.4" + "source": "https://github.com/symfony/process/tree/v6.4.2" }, "funding": [ { @@ -9801,11 +9573,11 @@ "type": "tidelift" } ], - "time": "2023-08-07T10:39:22+00:00" + "time": "2023-12-22T16:42:54+00:00" }, { "name": "symfony/stopwatch", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -9847,7 +9619,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.3.0" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.0" }, "funding": [ { diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php index 543b0f8c2f921..8385974fe05ab 100644 --- a/installation/src/Application/InstallationApplication.php +++ b/installation/src/Application/InstallationApplication.php @@ -248,7 +248,7 @@ public function execute() } // If gzip compression is enabled in configuration and the server is compliant, compress the output. - if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler')) { + if ($this->get('gzip') && !\ini_get('zlib.output_compression') && (\ini_get('output_handler') != 'ob_gzhandler')) { $this->compress(); } } catch (\Throwable $throwable) { diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php index a40d2dd7ea69e..b393a222c8e3e 100644 --- a/installation/src/Model/ChecksModel.php +++ b/installation/src/Model/ChecksModel.php @@ -35,7 +35,7 @@ class ChecksModel extends BaseInstallationModel */ public function getIniParserAvailability() { - $disabled_functions = ini_get('disable_functions'); + $disabled_functions = \ini_get('disable_functions'); if (!empty($disabled_functions)) { // Attempt to detect them in the PHP INI disable_functions variable. @@ -95,7 +95,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_NOTICE_MBLANG_NOTDEFAULT'); $options[] = $option; } @@ -161,28 +161,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; diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index 6332f1e3e2906..2ea7735bbee92 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -312,7 +312,7 @@ public function execute() } // If gzip compression is enabled in configuration and the server is compliant, compress the output. - if ($this->get('gzip') && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler') { + if ($this->get('gzip') && !\ini_get('zlib.output_compression') && \ini_get('output_handler') !== 'ob_gzhandler') { $this->compress(); // Trigger the onAfterCompress event. @@ -1190,7 +1190,7 @@ public function setUserState($key, $value) public function toString($compress = false) { // Don't compress something if the server is going to do it anyway. Waste of time. - if ($compress && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler') { + if ($compress && !\ini_get('zlib.output_compression') && \ini_get('output_handler') !== 'ob_gzhandler') { $this->compress(); } diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php index 5e1635ae9355f..968b31d6e3488 100644 --- a/libraries/src/Application/WebApplication.php +++ b/libraries/src/Application/WebApplication.php @@ -193,7 +193,7 @@ public function execute() } // If gzip compression is enabled in configuration and the server is compliant, compress the output. - if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') !== 'ob_gzhandler')) { + if ($this->get('gzip') && !\ini_get('zlib.output_compression') && (\ini_get('output_handler') !== 'ob_gzhandler')) { $this->compress(); } @@ -404,7 +404,7 @@ protected function loadSystemUris($requestUri = null) $uri = Uri::getInstance($this->get('uri.request')); // If we are working from a CGI SAPI with the 'cgi.fix_pathinfo' directive disabled we use PHP_SELF. - if (strpos(PHP_SAPI, 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI'])) { + if (strpos(PHP_SAPI, 'cgi') !== false && !\ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI'])) { // We aren't expecting PATH_INFO within PHP_SELF so this should work. $path = \dirname($_SERVER['PHP_SELF']); } else { diff --git a/libraries/src/Cache/Storage/ApcuStorage.php b/libraries/src/Cache/Storage/ApcuStorage.php index 1d701dc334831..3c34139445ede 100644 --- a/libraries/src/Cache/Storage/ApcuStorage.php +++ b/libraries/src/Cache/Storage/ApcuStorage.php @@ -220,11 +220,11 @@ public function gc() */ public static function isSupported() { - $supported = \extension_loaded('apcu') && ini_get('apc.enabled'); + $supported = \extension_loaded('apcu') && \ini_get('apc.enabled'); // If on the CLI interface, the `apc.enable_cli` option must also be enabled if ($supported && PHP_SAPI === 'cli') { - $supported = ini_get('apc.enable_cli'); + $supported = \ini_get('apc.enable_cli'); } return (bool) $supported; diff --git a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php index a9ffb25cf069b..65cc0674444d5 100644 --- a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php +++ b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php @@ -315,7 +315,7 @@ private function renderAttributes(array $attributes): string if (!($this->_doc->isHtml5() && $isNoValueAttrib)) { // Json encode value if it's an array. - $value = !is_scalar($value) ? json_encode($value) : $value; + $value = !\is_scalar($value) ? json_encode($value) : $value; $buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"'; } diff --git a/libraries/src/Document/Renderer/Html/StylesRenderer.php b/libraries/src/Document/Renderer/Html/StylesRenderer.php index 39cef83b2a4ec..e1cd1a98aefa3 100644 --- a/libraries/src/Document/Renderer/Html/StylesRenderer.php +++ b/libraries/src/Document/Renderer/Html/StylesRenderer.php @@ -313,7 +313,7 @@ private function renderAttributes(array $attributes): string if (!($this->_doc->isHtml5() && $isNoValueAttrib)) { // Json encode value if it's an array. - $value = !is_scalar($value) ? json_encode($value) : $value; + $value = !\is_scalar($value) ? json_encode($value) : $value; $buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"'; } diff --git a/libraries/src/Event/Plugin/AjaxEvent.php b/libraries/src/Event/Plugin/AjaxEvent.php index 06b3efa3defca..2db78c940983d 100644 --- a/libraries/src/Event/Plugin/AjaxEvent.php +++ b/libraries/src/Event/Plugin/AjaxEvent.php @@ -86,7 +86,7 @@ public function addResult($data): void if (\is_array($this->arguments['result'])) { $this->arguments['result'][] = $data; - } elseif (is_scalar($this->arguments['result']) && is_scalar($data)) { + } elseif (\is_scalar($this->arguments['result']) && \is_scalar($data)) { $this->arguments['result'] .= $data; } else { throw new \UnexpectedValueException('Mixed data in the result for the event ' . $this->getName()); diff --git a/libraries/src/Filesystem/File.php b/libraries/src/Filesystem/File.php index 38be4f957cef6..020d7506d6a28 100644 --- a/libraries/src/Filesystem/File.php +++ b/libraries/src/Filesystem/File.php @@ -228,9 +228,9 @@ public static function canFlushFileCache() } if ( - ini_get('opcache.enable') + \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) ) { static::$canFlushFileCache = true; } else { @@ -404,7 +404,7 @@ public static function move($src, $dest, $path = '', $useStreams = false) public static function write($file, $buffer, $useStreams = false) { if (\function_exists('set_time_limit')) { - set_time_limit(ini_get('max_execution_time')); + set_time_limit(\ini_get('max_execution_time')); } // If the destination directory doesn't exist we need to create it @@ -465,7 +465,7 @@ public static function write($file, $buffer, $useStreams = false) public static function append($file, $buffer, $useStreams = false) { if (\function_exists('set_time_limit')) { - set_time_limit(ini_get('max_execution_time')); + set_time_limit(\ini_get('max_execution_time')); } // If the file doesn't exist, just write instead of append diff --git a/libraries/src/Filesystem/FilesystemHelper.php b/libraries/src/Filesystem/FilesystemHelper.php index 032c8cd64cd10..9d70f3c273e10 100644 --- a/libraries/src/Filesystem/FilesystemHelper.php +++ b/libraries/src/Filesystem/FilesystemHelper.php @@ -309,8 +309,8 @@ public static function fileUploadMaxSize($unitOutput = true) static $output_type = true; if ($max_size === false || $output_type != $unitOutput) { - $max_size = self::parseSize(ini_get('post_max_size')); - $upload_max = self::parseSize(ini_get('upload_max_filesize')); + $max_size = self::parseSize(\ini_get('post_max_size')); + $upload_max = self::parseSize(\ini_get('upload_max_filesize')); if ($upload_max > 0 && ($upload_max < $max_size || $max_size == 0)) { $max_size = $upload_max; diff --git a/libraries/src/Filesystem/Folder.php b/libraries/src/Filesystem/Folder.php index e126b3f14c3f9..73a27b5da87d0 100644 --- a/libraries/src/Filesystem/Folder.php +++ b/libraries/src/Filesystem/Folder.php @@ -47,7 +47,7 @@ abstract class Folder public static function copy($src, $dest, $path = '', $force = false, $useStreams = false) { if (\function_exists('set_time_limit')) { - set_time_limit(ini_get('max_execution_time')); + set_time_limit(\ini_get('max_execution_time')); } $FTPOptions = ClientHelper::getCredentials('ftp'); @@ -219,7 +219,7 @@ public static function create($path = '', $mode = 0755) $ftp->chmod($path, $mode); } else { // We need to get and explode the open_basedir paths - $obd = ini_get('open_basedir'); + $obd = \ini_get('open_basedir'); // If open_basedir is set we need to get the open_basedir that the path is in if ($obd != null) { @@ -288,7 +288,7 @@ public static function create($path = '', $mode = 0755) public static function delete($path) { if (\function_exists('set_time_limit')) { - set_time_limit(ini_get('max_execution_time')); + set_time_limit(\ini_get('max_execution_time')); } // Sanity check @@ -571,7 +571,7 @@ public static function folders( protected static function _items($path, $filter, $recurse, $full, $exclude, $excludeFilterString, $findFiles) { if (\function_exists('set_time_limit')) { - set_time_limit(ini_get('max_execution_time')); + set_time_limit(\ini_get('max_execution_time')); } $arr = []; diff --git a/libraries/src/Filesystem/Path.php b/libraries/src/Filesystem/Path.php index 744dd87b49735..365028bb4c92b 100644 --- a/libraries/src/Filesystem/Path.php +++ b/libraries/src/Filesystem/Path.php @@ -62,7 +62,7 @@ public static function check($path, $basePath = '') public static function isOwner($path) { $tmp = md5(random_bytes(16)); - $ssp = ini_get('session.save_path'); + $ssp = \ini_get('session.save_path'); $jtp = JPATH_SITE . '/tmp'; // Try to find a writable directory diff --git a/libraries/src/Filesystem/Stream.php b/libraries/src/Filesystem/Stream.php index c934813bb2402..a0d57fe1c3856 100644 --- a/libraries/src/Filesystem/Stream.php +++ b/libraries/src/Filesystem/Stream.php @@ -254,24 +254,24 @@ public function open( // Capture PHP errors $php_errormsg = 'Error Unknown whilst opening a file'; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); // Decide which context to use: switch ($this->processingmethod) { - // Gzip doesn't support contexts or streams case 'gz': + // Gzip doesn't support contexts or streams $this->fh = gzopen($filename, $mode, $useIncludePath); break; - // Bzip2 is much like gzip except it doesn't use the include path case 'bz': + // Bzip2 is much like gzip except it doesn't use the include path $this->fh = bzopen($filename, $mode); break; - // Fopen can handle streams case 'f': default: + // Fopen can handle streams // One supplied at open; overrides everything if ($context) { $this->fh = fopen($filename, $mode, $useIncludePath, $context); @@ -324,7 +324,7 @@ public function close() // Capture PHP errors $php_errormsg = 'Error Unknown'; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); switch ($this->processingmethod) { @@ -382,7 +382,7 @@ public function eof() // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); switch ($this->processingmethod) { @@ -430,7 +430,7 @@ public function filesize() // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $res = @filesize($this->filename); @@ -493,7 +493,7 @@ public function gets($length = 0) // Capture PHP errors $php_errormsg = 'Error Unknown'; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); switch ($this->processingmethod) { @@ -560,7 +560,7 @@ public function read($length = 0) // Capture PHP errors $php_errormsg = 'Error Unknown'; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $remaining = $length; @@ -639,7 +639,7 @@ public function seek($offset, $whence = SEEK_SET) // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); switch ($this->processingmethod) { @@ -688,7 +688,7 @@ public function tell() // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); switch ($this->processingmethod) { @@ -760,7 +760,7 @@ public function write(&$string, $length = 0, $chunk = 0) // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $remaining = $length; $start = 0; @@ -828,7 +828,7 @@ public function chmod($filename = '', $mode = 0) // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $sch = parse_url($filename, PHP_URL_SCHEME); @@ -994,7 +994,7 @@ public function applyContextToStream() if ($this->fh) { // Capture PHP errors $php_errormsg = 'Unknown error setting context option'; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $retval = @stream_context_set_option($this->fh, $this->contextOptions); @@ -1032,7 +1032,7 @@ public function appendFilter($filterName, $readWrite = STREAM_FILTER_READ, $para if ($this->fh) { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $res = @stream_filter_append($this->fh, $filterName, $readWrite, $params); @@ -1072,7 +1072,7 @@ public function prependFilter($filterName, $readWrite = STREAM_FILTER_READ, $par if ($this->fh) { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $res = @stream_filter_prepend($this->fh, $filterName, $readWrite, $params); @@ -1109,7 +1109,7 @@ public function removeFilter(&$resource, $byindex = false) { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); if ($byindex) { @@ -1148,7 +1148,7 @@ public function copy($src, $dest, $context = null, $usePrefix = true, $relative { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $chmodDest = $this->_getFilename($dest, 'w', $usePrefix, $relative); @@ -1201,7 +1201,7 @@ public function move($src, $dest, $context = null, $usePrefix = true, $relative { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $src = $this->_getFilename($src, 'w', $usePrefix, $relative); @@ -1249,7 +1249,7 @@ public function delete($filename, $context = null, $usePrefix = true, $relative { // Capture PHP errors $php_errormsg = ''; - $track_errors = ini_get('track_errors'); + $track_errors = \ini_get('track_errors'); ini_set('track_errors', true); $filename = $this->_getFilename($filename, 'w', $usePrefix, $relative); diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php index c1a839ab225b6..bea6338dbfc71 100644 --- a/libraries/src/Form/Field/CalendarField.php +++ b/libraries/src/Form/Field/CalendarField.php @@ -415,8 +415,8 @@ public function filter($value, $group = null, Registry $input = null) $return = Factory::getDate($value, $app->get('offset'))->toSql(); break; - // Convert a date to UTC based on the user timezone offset. case 'USER_UTC': + // Convert a date to UTC based on the user timezone offset. // Get the user timezone setting defaulting to the server timezone setting. $offset = $app->getIdentity()->getParam('timezone', $app->get('offset')); diff --git a/libraries/src/Form/Field/GroupedlistField.php b/libraries/src/Form/Field/GroupedlistField.php index a56ea8568a29f..1cbaf445be63d 100644 --- a/libraries/src/Form/Field/GroupedlistField.php +++ b/libraries/src/Form/Field/GroupedlistField.php @@ -56,8 +56,8 @@ protected function getGroups() foreach ($this->element->children() as $element) { switch ($element->getName()) { - // The element is an