Merge remote-tracking branch 'upstream/5.2-dev' into upmerges/2024-08-14

Author: Bodge-IT

libraries/src/Console/UpdateCoreCommand.php

@@ -12,13 +12,14 @@
 use Joomla\Application\Cli\CliInput;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\Console\Command\AbstractCommand;
 use Joomla\Database\DatabaseInterface;
+use Joomla\Filesystem\Exception\FilesystemException;
+use Joomla\Filesystem\File;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -298,13 +299,20 @@ private function updateJoomlaCore($updatemodel): bool
                 // Remove the administrator/cache/autoload_psr4.php file
                 $autoloadFile = JPATH_CACHE . '/autoload_psr4.php';
 
-                if (file_exists($autoloadFile)) {
-                    File::delete($autoloadFile);
-                }
-
-                // Remove the xml
-                if (file_exists(JPATH_BASE . '/joomla.xml')) {
-                    File::delete(JPATH_BASE . '/joomla.xml');
+                try {
+                    if (file_exists($autoloadFile)) {
+                        File::delete($autoloadFile);
+                    }
+
+                    // Remove the xml
+                    if (file_exists(JPATH_BASE . '/joomla.xml')) {
+                        File::delete(JPATH_BASE . '/joomla.xml');
+                    }
+                } catch (FilesystemException $exception) {
+                    $this->progressBar->clear();
+                    $this->ioStyle->error($exception->getMessage());
+                    $this->progressBar->display();
+                    $this->progressBar->advance();
                 }
 
                 InstallerHelper::cleanupInstall($package['file'], $package['extractdir']);

plugins/api-authentication/token/src/Extension/Token.php

@@ -252,8 +252,8 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         $response->username      = $user->username;
         $response->email         = $user->email;
         $response->fullname      = $user->name;
-        $response->timezone      = $user->get('timezone');
-        $response->language      = $user->get('language');
+        $response->timezone      = $user->getParam('timezone', $this->getApplication()->get('offset', 'UTC'));
+        $response->language      = $user->getParam('language', $this->getApplication()->get('language'));
 
         // Stop event propagation when status is STATUS_SUCCESS
         $event->stopPropagation();

plugins/task/rotatelogs/src/Extension/RotateLogs.php

@@ -10,13 +10,14 @@
 
 namespace Joomla\Plugin\Task\RotateLogs\Extension;
 
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
 use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Event\SubscriberInterface;
+use Joomla\Filesystem\Exception\FilesystemException;
+use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
 
@@ -100,7 +101,10 @@ private function rotateLogs(ExecuteTaskEvent $event): int
             if ($version >= $logsToKeep) {
                 // Delete files which have version greater than or equals $logsToKeep
                 foreach ($files as $file) {
-                    File::delete($logPath . '/' . $file);
+                    try {
+                        File::delete($logPath . '/' . $file);
+                    } catch (FilesystemException $exception) {
+                    }
                 }
             } else {
                 // For files which have version smaller than $logsToKeep, rotate (increase version number)
@@ -140,7 +144,10 @@ private function rotate($path, $filename, $currentVersion)
             $rotatedFile = $path . '/' . implode('.', $parts);
         }
 
-        File::move($path . '/' . $filename, $rotatedFile);
+        try {
+            File::move($path . '/' . $filename, $rotatedFile);
+        } catch (FilesystemException $exception) {
+        }
     }
 
     /**