diff --git a/appinfo/info.xml b/appinfo/info.xml index e8c371e19bf40c1ef23c53d6551b078f1003d316..79e77b4a31a037c226285532bb3b0fcc12ed17d7 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ * πŸ“Ž **Attachments!** Add, upload and view event attachments * πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries. ]]> - 5.3.5 + 5.3.5+murena-20251016 agpl Richard Steinmetz Sebastian Krupinski diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index dd06e1f670e70a2ae577f4cddadf5617c243bfdd..aab000e2b1477db8f4db7443579f8fc98c0ed44a 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -26,7 +26,7 @@ use OCP\Defaults; use OCP\IConfig; use OCP\IDBConnection; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\IRequest; use OCP\IUserManager; use OCP\L10N\IFactory as L10NFactory; @@ -61,8 +61,8 @@ class Application extends App implements IBootstrap { $c->get(IManager::class), $c->get(IMailer::class), $c->get(IL10N::class), - $c->get(Defaults::class), - $c->get(ILogger::class), + $c->get(Defaults::class), + $c->get(LoggerInterface::class), $c->get(IUserManager::class), $c->get(L10NFactory::class), ); @@ -85,8 +85,8 @@ class Application extends App implements IBootstrap { $c->get(IManager::class), $c->get(IMailer::class), $c->get(IL10N::class), - $c->get(Defaults::class), - $c->get(ILogger::class), + $c->get(Defaults::class), + $c->get(LoggerInterface::class), $c->get(IUserManager::class), $c->get(L10NFactory::class), ); diff --git a/lib/Middleware/InvitationMiddleware.php b/lib/Middleware/InvitationMiddleware.php index 0e8b300f291dbdb11bb4150ddfb9c442209594bc..d2a2e0b6fde83ddc536e4e7ef127ec841e76d464 100644 --- a/lib/Middleware/InvitationMiddleware.php +++ b/lib/Middleware/InvitationMiddleware.php @@ -11,7 +11,7 @@ use OCP\Defaults; use OCP\IConfig; use OCP\IDBConnection; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\IRequest; use OCP\IUserManager; use OCP\L10N\IFactory; @@ -31,7 +31,7 @@ class InvitationMiddleware extends Middleware { IMailer $mailer, IL10N $l10n, Defaults $defaults, - ILogger $logger, + LoggerInterface $logger, IUserManager $iusermanager, IFactory $languageFactory, ) { @@ -228,8 +228,8 @@ class InvitationMiddleware extends Middleware { $message->useTemplate($emailTemplate); $this->mailer->send($message); } catch (\Exception $e) { - // Log the exception and continue - $this->logger->logException($e); + // Log the exception and continue + $this->logger->error($e->getMessage(), ['exception' => $e]); } } diff --git a/tests/php/unit/BackgroundJob/CleanupOutdatedBookingJobTest.php b/tests/php/unit/BackgroundJob/CleanupOutdatedBookingJobTest.php index a52327b4d21cf5e76ba05312b426b6fd21468516..0a0ddeec042a23b066486cb46683ae074c7a5a7d 100644 --- a/tests/php/unit/BackgroundJob/CleanupOutdatedBookingJobTest.php +++ b/tests/php/unit/BackgroundJob/CleanupOutdatedBookingJobTest.php @@ -13,7 +13,6 @@ use OCA\Calendar\BackgroundJob\CleanUpOutdatedBookingsJob; use OCA\Calendar\Service\Appointments\BookingService; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Calendar\ICalendarQuery; -use OCP\ILogger; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; @@ -24,7 +23,7 @@ class CleanupOutdatedBookingJobTest extends TestCase { /** @var mixed|BookingService|MockObject */ private $service; - /** @var mixed|MockObject|LoggerInterface */ + /** @var mixed|MockObject|LoggerInterface */ private $logger; /** @var mixed|ITimeFactory|MockObject */ @@ -59,8 +58,8 @@ class CleanupOutdatedBookingJobTest extends TestCase { ->method('info'); $this->job->setLastRun(0); $this->job->execute( - $this->createMock(JobList::class), - $this->createMock(ILogger::class) + $this->createMock(JobList::class), + $this->createMock(LoggerInterface::class) ); } }