From 99e53672089b09bc1ed7a7bb5c83f8a552a5aa5e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 9 Apr 2021 12:50:02 +0200 Subject: [PATCH] Move to another namespace and class name Signed-off-by: Joas Schilling --- apps/admin_audit/composer/composer/autoload_classmap.php | 2 +- apps/admin_audit/composer/composer/autoload_static.php | 2 +- apps/admin_audit/lib/AppInfo/Application.php | 6 +++--- ...istener.php => CriticalActionPerformedEventListener.php} | 6 +++--- lib/composer/composer/autoload_classmap.php | 2 +- lib/composer/composer/autoload_static.php | 2 +- .../CriticalActionPerformedEvent.php} | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename apps/admin_audit/lib/Listener/{AuditEventListener.php => CriticalActionPerformedEventListener.php} (86%) rename lib/public/Log/{AuditEvent.php => Audit/CriticalActionPerformedEvent.php} (96%) diff --git a/apps/admin_audit/composer/composer/autoload_classmap.php b/apps/admin_audit/composer/composer/autoload_classmap.php index 1d9fde9045..e52032ca3e 100644 --- a/apps/admin_audit/composer/composer/autoload_classmap.php +++ b/apps/admin_audit/composer/composer/autoload_classmap.php @@ -20,5 +20,5 @@ return array( 'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php', 'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', 'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php', - 'OCA\\AdminAudit\\Listener\\AuditEventListener' => $baseDir . '/../lib/Listener/AuditEventListener.php', + 'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php', ); diff --git a/apps/admin_audit/composer/composer/autoload_static.php b/apps/admin_audit/composer/composer/autoload_static.php index b6556883ed..829bc2ab04 100644 --- a/apps/admin_audit/composer/composer/autoload_static.php +++ b/apps/admin_audit/composer/composer/autoload_static.php @@ -35,7 +35,7 @@ class ComposerStaticInitAdminAudit 'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php', 'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', 'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php', - 'OCA\\AdminAudit\\Listener\\AuditEventListener' => __DIR__ . '/..' . '/../lib/Listener/AuditEventListener.php', + 'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__ . '/..' . '/../lib/Listener/CriticalActionPerformedEventListener.php', ); public static function getInitializer(ClassLoader $loader) diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index 47290e0525..4ee49e7129 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -49,7 +49,7 @@ use OCA\AdminAudit\Actions\Sharing; use OCA\AdminAudit\Actions\Trashbin; use OCA\AdminAudit\Actions\UserManagement; use OCA\AdminAudit\Actions\Versions; -use OCA\AdminAudit\Listener\AuditEventListener; +use OCA\AdminAudit\Listener\CriticalActionPerformedEventListener; use OCP\App\ManagerEvent; use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootContext; @@ -62,7 +62,7 @@ use OCP\IGroupManager; use OCP\IPreview; use OCP\IServerContainer; use OCP\IUserSession; -use OCP\Log\AuditEvent; +use OCP\Log\Audit\CriticalActionPerformedEvent; use OCP\Log\ILogFactory; use OCP\Share; use OCP\Util; @@ -80,7 +80,7 @@ class Application extends App implements IBootstrap { } public function register(IRegistrationContext $context): void { - $context->registerEventListener(AuditEvent::class, AuditEventListener::class); + $context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class); } public function boot(IBootContext $context): void { diff --git a/apps/admin_audit/lib/Listener/AuditEventListener.php b/apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php similarity index 86% rename from apps/admin_audit/lib/Listener/AuditEventListener.php rename to apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php index 0e2e556185..75f7d86d42 100644 --- a/apps/admin_audit/lib/Listener/AuditEventListener.php +++ b/apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php @@ -26,11 +26,11 @@ namespace OCA\AdminAudit\Listener; use OCA\AdminAudit\Actions\Action; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; -use OCP\Log\AuditEvent; +use OCP\Log\Audit\CriticalActionPerformedEvent; -class AuditEventListener extends Action implements IEventListener { +class CriticalActionPerformedEventListener extends Action implements IEventListener { public function handle(Event $event): void { - if (!($event instanceof AuditEvent)) { + if (!($event instanceof CriticalActionPerformedEvent)) { return; } diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 49293353e9..20f8394c00 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -422,7 +422,7 @@ return array( 'OCP\\Lock\\LockedException' => $baseDir . '/lib/public/Lock/LockedException.php', 'OCP\\Lock\\ManuallyLockedException' => $baseDir . '/lib/public/Lock/ManuallyLockedException.php', 'OCP\\Lockdown\\ILockdownManager' => $baseDir . '/lib/public/Lockdown/ILockdownManager.php', - 'OCP\\Log\\AuditEvent' => $baseDir . '/lib/public/Log/AuditEvent.php', + 'OCP\\Log\\Audit\\CriticalActionPerformedEvent' => $baseDir . '/lib/public/Log/Audit/CriticalActionPerformedEvent.php', 'OCP\\Log\\IDataLogger' => $baseDir . '/lib/public/Log/IDataLogger.php', 'OCP\\Log\\IFileBased' => $baseDir . '/lib/public/Log/IFileBased.php', 'OCP\\Log\\ILogFactory' => $baseDir . '/lib/public/Log/ILogFactory.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 347f7fff8e..70e5e9dcd5 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -451,7 +451,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Lock\\LockedException' => __DIR__ . '/../../..' . '/lib/public/Lock/LockedException.php', 'OCP\\Lock\\ManuallyLockedException' => __DIR__ . '/../../..' . '/lib/public/Lock/ManuallyLockedException.php', 'OCP\\Lockdown\\ILockdownManager' => __DIR__ . '/../../..' . '/lib/public/Lockdown/ILockdownManager.php', - 'OCP\\Log\\AuditEvent' => __DIR__ . '/../../..' . '/lib/public/Log/AuditEvent.php', + 'OCP\\Log\\Audit\\CriticalActionPerformedEvent' => __DIR__ . '/../../..' . '/lib/public/Log/Audit/CriticalActionPerformedEvent.php', 'OCP\\Log\\IDataLogger' => __DIR__ . '/../../..' . '/lib/public/Log/IDataLogger.php', 'OCP\\Log\\IFileBased' => __DIR__ . '/../../..' . '/lib/public/Log/IFileBased.php', 'OCP\\Log\\ILogFactory' => __DIR__ . '/../../..' . '/lib/public/Log/ILogFactory.php', diff --git a/lib/public/Log/AuditEvent.php b/lib/public/Log/Audit/CriticalActionPerformedEvent.php similarity index 96% rename from lib/public/Log/AuditEvent.php rename to lib/public/Log/Audit/CriticalActionPerformedEvent.php index 9041367be6..307696dff0 100644 --- a/lib/public/Log/AuditEvent.php +++ b/lib/public/Log/Audit/CriticalActionPerformedEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); * */ -namespace OCP\Log; +namespace OCP\Log\Audit; use OCP\EventDispatcher\Event; @@ -33,7 +33,7 @@ use OCP\EventDispatcher\Event; * * @since 22.0.0 */ -class AuditEvent extends Event { +class CriticalActionPerformedEvent extends Event { /** @var string */ private $logMessage;