Skip to content

Commit 377000b

Browse files
richard67richard67
authored
[5.4] Upmerge changes from 5.3-dev 2025-02-25
2 parents 757e69d + 49ad95c commit 377000b

File tree

277 files changed

+657
-625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+657
-625
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
// Arrays on multiline should have a trailing comma
7777
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
7878
// Align elements in multiline array and variable declarations on new lines below each other
79-
'binary_operator_spaces' => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align']],
79+
'binary_operator_spaces' => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align', '??=' => 'align']],
8080
// The "No break" comment in switch statements
8181
'no_break_comment' => ['comment_text' => 'No break'],
8282
// Remove unused imports

‎administrator/components/com_actionlogs/src/Controller/ActionlogsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function exportLogs()
8787
if (\count($data)) {
8888
try {
8989
$rows = ActionlogsHelper::getCsvData($data);
90-
} catch (\InvalidArgumentException $exception) {
90+
} catch (\InvalidArgumentException) {
9191
$this->setMessage(Text::_('COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA'), 'error');
9292
$this->setRedirect(Route::_('index.php?option=com_actionlogs&view=actionlogs', false));
9393

‎administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public static function loadActionLogPluginsLanguage()
310310

311311
try {
312312
$rows = $db->loadObjectList();
313-
} catch (\RuntimeException $e) {
313+
} catch (\RuntimeException) {
314314
$rows = [];
315315
}
316316

‎administrator/components/com_actionlogs/src/Model/ActionlogModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
9191
try {
9292
$db->insertObject('#__action_logs', $logMessage);
9393
$loggedMessages[] = $logMessage;
94-
} catch (\RuntimeException $e) {
94+
} catch (\RuntimeException) {
9595
// Ignore it
9696
}
9797
}
9898

9999
try {
100100
// Send notification email to users who choose to be notified about the action logs
101101
$this->sendNotificationEmails($loggedMessages, $user->name, $context);
102-
} catch (MailDisabledException | phpMailerException $e) {
102+
} catch (MailDisabledException | phpMailerException) {
103103
// Ignore it
104104
}
105105
}

‎administrator/components/com_actionlogs/src/Model/ActionlogsModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ public function purge()
363363
{
364364
try {
365365
$this->getDatabase()->truncateTable('#__action_logs');
366-
} catch (\Exception $e) {
366+
} catch (\Exception) {
367367
return false;
368368
}
369369

‎administrator/components/com_admin/script.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3310,7 +3310,7 @@ protected function fixFilesystemPermissions()
33103310
try {
33113311
// Using hard-coded string because a new language string would not be available in all cases
33123312
Log::add('Fixing permissions for files and folders.', Log::INFO, 'Update');
3313-
} catch (\RuntimeException $exception) {
3313+
} catch (\RuntimeException) {
33143314
// Informational log only
33153315
}
33163316

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ public function getExtensions(): array
466466
} catch (\Exception $e) {
467467
try {
468468
Log::add(Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()), Log::WARNING, 'jerror');
469-
} catch (\RuntimeException $exception) {
469+
} catch (\RuntimeException) {
470470
Factory::getApplication()->enqueueMessage(
471471
Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()),
472472
'warning'

‎administrator/components/com_associations/src/Model/AssociationsModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public function purge($context = '', $key = '')
480480

481481
try {
482482
$db->execute();
483-
} catch (ExecutionFailureException $e) {
483+
} catch (ExecutionFailureException) {
484484
$app->enqueueMessage(Text::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
485485

486486
return false;
@@ -543,7 +543,7 @@ public function clean($context = '', $key = '')
543543

544544
try {
545545
$db->execute();
546-
} catch (ExecutionFailureException $e) {
546+
} catch (ExecutionFailureException) {
547547
$app->enqueueMessage(Text::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
548548

549549
return false;

‎administrator/components/com_cache/src/Model/CacheModel.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ public function getData()
153153
} else {
154154
$this->_data = [];
155155
}
156-
} catch (CacheConnectingException $exception) {
156+
} catch (CacheConnectingException) {
157157
$this->setError(Text::_('COM_CACHE_ERROR_CACHE_CONNECTION_FAILED'));
158158
$this->_data = [];
159-
} catch (UnsupportedCacheException $exception) {
159+
} catch (UnsupportedCacheException) {
160160
$this->setError(Text::_('COM_CACHE_ERROR_CACHE_DRIVER_UNSUPPORTED'));
161161
$this->_data = [];
162162
}
@@ -224,9 +224,9 @@ public function clean($group = '')
224224
{
225225
try {
226226
$this->getCache()->clean($group);
227-
} catch (CacheConnectingException $exception) {
227+
} catch (CacheConnectingException) {
228228
return false;
229-
} catch (UnsupportedCacheException $exception) {
229+
} catch (UnsupportedCacheException) {
230230
return false;
231231
}
232232

@@ -264,9 +264,9 @@ public function purge()
264264
{
265265
try {
266266
Factory::getCache('')->gc();
267-
} catch (CacheConnectingException $exception) {
267+
} catch (CacheConnectingException) {
268268
return false;
269-
} catch (UnsupportedCacheException $exception) {
269+
} catch (UnsupportedCacheException) {
270270
return false;
271271
}
272272

‎administrator/components/com_config/src/Model/ApplicationModel.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ public function save($data)
488488
} else {
489489
$revisedDbo->truncateTable('#__session');
490490
}
491-
} catch (\RuntimeException $e) {
491+
} catch (\RuntimeException) {
492492
/*
493493
* The database API logs errors on failures so we don't need to add any error handling mechanisms here.
494494
* Also, this data won't be added or checked anymore once the configuration is saved, so it'll purge itself
@@ -519,7 +519,7 @@ public function save($data)
519519
Log::WARNING,
520520
'jerror'
521521
);
522-
} catch (\RuntimeException $logException) {
522+
} catch (\RuntimeException) {
523523
$app->enqueueMessage(
524524
Text::sprintf(
525525
'COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT',
@@ -596,7 +596,7 @@ public function save($data)
596596
Log::WARNING,
597597
'jerror'
598598
);
599-
} catch (\RuntimeException $logException) {
599+
} catch (\RuntimeException) {
600600
$app->enqueueMessage(
601601
Text::sprintf('COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT', $path, JPATH_CACHE),
602602
'warning'
@@ -612,7 +612,7 @@ public function save($data)
612612
if ($error) {
613613
try {
614614
Log::add(Text::sprintf('COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE', $path), Log::WARNING, 'jerror');
615-
} catch (\RuntimeException $exception) {
615+
} catch (\RuntimeException) {
616616
$app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE', $path), 'warning');
617617
}
618618

@@ -629,16 +629,16 @@ public function save($data)
629629
if ((!$data['caching'] && $prev['caching']) || $data['cache_handler'] !== $prev['cache_handler']) {
630630
try {
631631
Factory::getCache()->clean();
632-
} catch (CacheConnectingException $exception) {
632+
} catch (CacheConnectingException) {
633633
try {
634634
Log::add(Text::_('COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED'), Log::WARNING, 'jerror');
635-
} catch (\RuntimeException $logException) {
635+
} catch (\RuntimeException) {
636636
$app->enqueueMessage(Text::_('COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED'), 'warning');
637637
}
638-
} catch (UnsupportedCacheException $exception) {
638+
} catch (UnsupportedCacheException) {
639639
try {
640640
Log::add(Text::_('COM_CONFIG_ERROR_CACHE_DRIVER_UNSUPPORTED'), Log::WARNING, 'jerror');
641-
} catch (\RuntimeException $logException) {
641+
} catch (\RuntimeException) {
642642
$app->enqueueMessage(Text::_('COM_CONFIG_ERROR_CACHE_DRIVER_UNSUPPORTED'), 'warning');
643643
}
644644
}
@@ -672,7 +672,7 @@ public function save($data)
672672
Log::WARNING,
673673
'jerror'
674674
);
675-
} catch (\RuntimeException $logException) {
675+
} catch (\RuntimeException) {
676676
$app->enqueueMessage(
677677
Text::sprintf('COM_CONFIG_ERROR_CUSTOM_TEMP_PATH_NOTWRITABLE_USING_DEFAULT', $path, $defaultTmpPath),
678678
'warning'
@@ -687,7 +687,7 @@ public function save($data)
687687
if ($error) {
688688
try {
689689
Log::add(Text::sprintf('COM_CONFIG_ERROR_TMP_PATH_NOTWRITABLE', $path), Log::WARNING, 'jerror');
690-
} catch (\RuntimeException $exception) {
690+
} catch (\RuntimeException) {
691691
$app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_TMP_PATH_NOTWRITABLE', $path), 'warning');
692692
}
693693
}
@@ -721,7 +721,7 @@ public function save($data)
721721
Log::WARNING,
722722
'jerror'
723723
);
724-
} catch (\RuntimeException $logException) {
724+
} catch (\RuntimeException) {
725725
$app->enqueueMessage(
726726
Text::sprintf('COM_CONFIG_ERROR_CUSTOM_LOG_PATH_NOTWRITABLE_USING_DEFAULT', $path, $defaultLogPath),
727727
'warning'
@@ -735,7 +735,7 @@ public function save($data)
735735
if ($error) {
736736
try {
737737
Log::add(Text::sprintf('COM_CONFIG_ERROR_LOG_PATH_NOTWRITABLE', $path), Log::WARNING, 'jerror');
738-
} catch (\RuntimeException $exception) {
738+
} catch (\RuntimeException) {
739739
$app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_LOG_PATH_NOTWRITABLE', $path), 'warning');
740740
}
741741
}

0 commit comments

Comments
 (0)