Skip to content

Commit 20dc0f8

Browse files
authored
Merge branch 'master' into fix/clean-app-namespace-handling
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
2 parents 2095622 + bcefc59 commit 20dc0f8

3,468 files changed

Lines changed: 22902 additions & 11020 deletions

File tree

Some content is hidden

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

.github/workflows/block-unconventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
with:
3232
persist-credentials: false
3333

34-
- uses: webiny/action-conventional-commits@faccb24fc2550dd15c0390d944379d2d8ed9690e # v1.3.1
34+
- uses: webiny/action-conventional-commits@7f91b1595ca1951cdb671ddc9f07a49081ec5b69 # v1.4.2
3535
with:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
run: ./node_modules/cypress/bin/cypress install
166166

167167
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
168-
uses: cypress-io/github-action@783cb3f07983868532cabaedaa1e6c00ff4786a8 # v7.1.9
168+
uses: cypress-io/github-action@c495c3ddffba403ba11be95fffb67e25203b3799 # v7.1.10
169169
with:
170170
# We already installed the dependencies in the init job
171171
install: false

apps/admin_audit/lib/AppInfo/Application.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public function __construct() {
7979
parent::__construct('admin_audit');
8080
}
8181

82+
#[\Override]
8283
public function register(IRegistrationContext $context): void {
8384
$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
8485
return new AuditLogger($c->get(ILogFactory::class), $c->get(IConfig::class));
@@ -132,6 +133,7 @@ public function register(IRegistrationContext $context): void {
132133
$context->registerEventListener(CacheEntryRemovedEvent::class, CacheEventListener::class);
133134
}
134135

136+
#[\Override]
135137
public function boot(IBootContext $context): void {
136138
/** @var IAuditLogger $logger */
137139
$logger = $context->getAppContainer()->get(IAuditLogger::class);

apps/admin_audit/lib/AuditLogger.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,47 @@ public function __construct(ILogFactory $logFactory, IConfig $config) {
3535
$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
3636
}
3737

38+
#[\Override]
3839
public function emergency($message, array $context = []): void {
3940
$this->parentLogger->emergency($message, $context);
4041
}
4142

43+
#[\Override]
4244
public function alert($message, array $context = []): void {
4345
$this->parentLogger->alert($message, $context);
4446
}
4547

48+
#[\Override]
4649
public function critical($message, array $context = []): void {
4750
$this->parentLogger->critical($message, $context);
4851
}
4952

53+
#[\Override]
5054
public function error($message, array $context = []): void {
5155
$this->parentLogger->error($message, $context);
5256
}
5357

58+
#[\Override]
5459
public function warning($message, array $context = []): void {
5560
$this->parentLogger->warning($message, $context);
5661
}
5762

63+
#[\Override]
5864
public function notice($message, array $context = []): void {
5965
$this->parentLogger->notice($message, $context);
6066
}
6167

68+
#[\Override]
6269
public function info($message, array $context = []): void {
6370
$this->parentLogger->info($message, $context);
6471
}
6572

73+
#[\Override]
6674
public function debug($message, array $context = []): void {
6775
$this->parentLogger->debug($message, $context);
6876
}
6977

78+
#[\Override]
7079
public function log($level, $message, array $context = []): void {
7180
$this->parentLogger->log($level, $message, $context);
7281
}

apps/admin_audit/lib/BackgroundJobs/Rotate.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function __construct(
2424
$this->setInterval(60 * 60 * 3);
2525
}
2626

27+
#[\Override]
2728
protected function run($argument): void {
2829
$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
2930
$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);

apps/admin_audit/lib/Listener/AppManagementEventListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* @template-implements IEventListener<AppEnableEvent|AppDisableEvent|AppUpdateEvent>
2121
*/
2222
class AppManagementEventListener extends Action implements IEventListener {
23+
#[\Override]
2324
public function handle(Event $event): void {
2425
if ($event instanceof AppEnableEvent) {
2526
$this->appEnable($event);

apps/admin_audit/lib/Listener/AuthEventListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* @template-implements IEventListener<BeforeUserLoggedInEvent|UserLoggedInWithCookieEvent|UserLoggedInEvent|BeforeUserLoggedOutEvent|AnyLoginFailedEvent>
2323
*/
2424
class AuthEventListener extends Action implements IEventListener {
25+
#[\Override]
2526
public function handle(Event $event): void {
2627
if ($event instanceof BeforeUserLoggedInEvent) {
2728
$this->beforeUserLoggedIn($event);

apps/admin_audit/lib/Listener/CacheEventListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @template-implements IEventListener<CacheEntryInsertedEvent|CacheEntryRemovedEvent>
2020
*/
2121
class CacheEventListener extends Action implements IEventListener {
22+
#[\Override]
2223
public function handle(Event $event): void {
2324
if ($event instanceof CacheEntryInsertedEvent) {
2425
$this->entryInserted($event);

apps/admin_audit/lib/Listener/ConsoleEventListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* @template-implements IEventListener<ConsoleEvent>
1919
*/
2020
class ConsoleEventListener extends Action implements IEventListener {
21+
#[\Override]
2122
public function handle(Event $event): void {
2223
if ($event instanceof ConsoleEvent) {
2324
$this->runCommand($event);

apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
/** @template-implements IEventListener<CriticalActionPerformedEvent> */
1818
class CriticalActionPerformedEventListener extends Action implements IEventListener {
19+
#[\Override]
1920
public function handle(Event $event): void {
2021
if (!($event instanceof CriticalActionPerformedEvent)) {
2122
return;

0 commit comments

Comments
 (0)