Skip to content

Commit e6e6a95

Browse files
CarlSchwanCarlSchwan
committed
Update autoloader
Signed-off-by: Carl Schwan <[email protected]>
1 parent ad4fe1c commit e6e6a95

12 files changed

Lines changed: 52 additions & 57 deletions

File tree

‎apps/admin_audit/lib/Actions/GroupManagement.php‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,11 @@ class GroupManagement extends Action implements IEventListener {
4747
public function handle(Event $event): void {
4848
if ($event instanceof UserAddedEvent) {
4949
$this->addUser($event->getGroup(), $event->getUser());
50-
}
51-
52-
if ($event instanceof UserRemovedEvent) {
53-
$this->addUser($event->getGroup(), $event->getUser());
54-
}
55-
56-
if ($event instanceof GroupCreatedEvent) {
50+
} else if ($event instanceof UserRemovedEvent) {
51+
$this->removeUser($event->getGroup(), $event->getUser());
52+
} else if ($event instanceof GroupCreatedEvent) {
5753
$this->createGroup($event->getGroup());
58-
}
59-
60-
if ($event instanceof GroupDeletedEvent) {
54+
} else if ($event instanceof GroupDeletedEvent) {
6155
$this->deleteGroup($event->getGroup());
6256
}
6357
}

‎apps/admin_audit/lib/Actions/UserManagement.php‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
use OCP\User\Events\UserCreatedEvent;
4141
use OCP\User\Events\UserDeletedEvent;
4242
use OCP\User\Events\UserIdAssignedEvent;
43-
use OCP\User\Events\UserIdUnAssignedEvent;
43+
use OCP\User\Events\UserIdUnassignedEvent;
4444

4545
/**
4646
* Class UserManagement logs all user management related actions.
@@ -51,25 +51,15 @@ class UserManagement extends Action implements IEventListener {
5151
public function handle(Event $event): void {
5252
if ($event instanceof UserCreatedEvent) {
5353
$this->create($event->getUser()->getUID());
54-
}
55-
56-
if ($event instanceof UserDeletedEvent) {
54+
} else if ($event instanceof UserDeletedEvent) {
5755
$this->delete($event->getUser()->getUID());
58-
}
59-
60-
if ($event instanceof UserChangedEvent) {
56+
} else if ($event instanceof UserChangedEvent) {
6157
$this->change($event);
62-
}
63-
64-
if ($event instanceof UserIdAssignedEvent) {
65-
$this->assign($event->getName());
66-
}
67-
68-
if ($event instanceof UserIdUnassignedEvent) {
69-
$this->assign($event->getName());
70-
}
71-
72-
if ($event instanceof PasswordUpdatedEvent) {
58+
} else if ($event instanceof UserIdAssignedEvent) {
59+
$this->assign($event->getUserId());
60+
} else if ($event instanceof UserIdUnassignedEvent) {
61+
$this->unassign($event->getUserId());
62+
} else if ($event instanceof PasswordUpdatedEvent) {
7363
$this->setPassword($event->getUser());
7464
}
7565
}

‎apps/admin_audit/lib/AppInfo/Application.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
use OCP\User\Events\UserChangedEvent;
7777
use OCP\User\Events\UserCreatedEvent;
7878
use OCP\User\Events\UserDeletedEvent;
79-
use OCP\User\Events\UserIdUnAssignedEvent;
79+
use OCP\User\Events\UserIdUnassignedEvent;
8080
use OCP\User\Events\UserLoggedInEvent;
8181
use OCP\User\Events\UserLoggedOutEvent;
8282
use OCP\Util;
@@ -107,7 +107,7 @@ public function register(IRegistrationContext $context): void {
107107
$context->registerEventListener(UserChangedEvent::class, UserManagement::class);
108108
$context->registerEventListener(PasswordUpdatedEvent::class, UserManagement::class);
109109
$context->registerEventListener(UserIdAssignedEvent::class, UserManagement::class);
110-
$context->registerEventListener(UserIdUnAssignedEvent::class, UserManagement::class);
110+
$context->registerEventListener(UserIdUnassignedEvent::class, UserManagement::class);
111111

112112
// Group management
113113
$context->registerEventListener(GroupCreatedEvent::class, GroupManagement::class);

‎apps/user_ldap/ajax/clearMappings.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
use OCA\User_LDAP\Mapping\UserMapping;
2727
use OCA\User_LDAP\Mapping\GroupMapping;
2828
use OCP\EventDispatcher\IEventDispatcher;
29-
use OCP\User\Events\BeforeUserIdUnAssignedEvent;
30-
use OCP\User\Events\UserIdUnAssignedEvent;
29+
use OCP\User\Events\BeforeUserIdUnassignedEvent;
30+
use OCP\User\Events\UserIdUnassignedEvent;
3131

3232
// Check user and app status
3333
\OC_JSON::checkAdminUser();
@@ -42,12 +42,12 @@
4242
/** @var IEventDispatcher $dispatcher */
4343
$dispatcher = \OC::$server->get(IEventDispatcher::class);
4444
$result = $mapping->clearCb(
45-
function ($uid) use ($dispatcher) {
46-
$dispatcher->dispatchTyped(new BeforeUserIdUnAssignedEvent($uid));
45+
function (string $uid) use ($dispatcher): void {
46+
$dispatcher->dispatchTyped(new BeforeUserIdUnassignedEvent($uid));
4747
\OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]);
4848
},
49-
function ($uid) use ($dispatcher) {
50-
$dispatcher->dispatchTyped(new UserIdUnAssignedEvent($uid));
49+
function (string $uid) use ($dispatcher): void {
50+
$dispatcher->dispatchTyped(new UserIdUnassignedEvent($uid));
5151
\OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]);
5252
}
5353
);

‎apps/user_ldap/lib/Jobs/Sync.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
*/
2626
namespace OCA\User_LDAP\Jobs;
2727

28-
use OCA\User_LDAP\User\User;
29-
use OCP\AppFramework\Utility\ITimeFactory;
30-
use OCP\BackgroundJob\TimedJob;
3128
use OC\ServerNotAvailableException;
3229
use OCA\User_LDAP\AccessFactory;
3330
use OCA\User_LDAP\Configuration;
@@ -36,6 +33,9 @@
3633
use OCA\User_LDAP\LDAP;
3734
use OCA\User_LDAP\Mapping\UserMapping;
3835
use OCA\User_LDAP\User\Manager;
36+
use OCA\User_LDAP\User\User;
37+
use OCP\AppFramework\Utility\ITimeFactory;
38+
use OCP\BackgroundJob\TimedJob;
3939
use OCP\EventDispatcher\IEventDispatcher;
4040
use OCP\IAvatarManager;
4141
use OCP\IConfig;

‎apps/user_ldap/lib/Mapping/AbstractMapping.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public function getListOfIdsByDn(array $fdns): array {
256256
$qb->setParameter('hashList', $fdnsSlice, IQueryBuilder::PARAM_STR_ARRAY);
257257
$this->collectResultsFromListOfIdsQuery($qb, $results);
258258
$slice++;
259-
} while (count($fdnsSlice) === 1000);
259+
} while (count($fdnsSlice) >= 1000);
260260

261261
return $results;
262262
}

‎lib/composer/autoload.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
// autoload.php @generated by Composer
44

5+
if (PHP_VERSION_ID < 50600) {
6+
echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
7+
exit(1);
8+
}
9+
510
require_once __DIR__ . '/composer/autoload_real.php';
611

712
return ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c::getLoader();

‎lib/composer/composer/autoload_classmap.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@
585585
'OCP\\User\\Events\\BeforePasswordUpdatedEvent' => $baseDir . '/lib/public/User/Events/BeforePasswordUpdatedEvent.php',
586586
'OCP\\User\\Events\\BeforeUserCreatedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserCreatedEvent.php',
587587
'OCP\\User\\Events\\BeforeUserDeletedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserDeletedEvent.php',
588+
'OCP\\User\\Events\\BeforeUserIdUnassignedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserIdUnassignedEvent.php',
588589
'OCP\\User\\Events\\BeforeUserLoggedInEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedInEvent.php',
589590
'OCP\\User\\Events\\BeforeUserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php',
590591
'OCP\\User\\Events\\BeforeUserLoggedOutEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedOutEvent.php',
@@ -593,6 +594,8 @@
593594
'OCP\\User\\Events\\UserChangedEvent' => $baseDir . '/lib/public/User/Events/UserChangedEvent.php',
594595
'OCP\\User\\Events\\UserCreatedEvent' => $baseDir . '/lib/public/User/Events/UserCreatedEvent.php',
595596
'OCP\\User\\Events\\UserDeletedEvent' => $baseDir . '/lib/public/User/Events/UserDeletedEvent.php',
597+
'OCP\\User\\Events\\UserIdAssignedEvent' => $baseDir . '/lib/public/User/Events/UserIdAssignedEvent.php',
598+
'OCP\\User\\Events\\UserIdUnassignedEvent' => $baseDir . '/lib/public/User/Events/UserIdUnassignedEvent.php',
596599
'OCP\\User\\Events\\UserLiveStatusEvent' => $baseDir . '/lib/public/User/Events/UserLiveStatusEvent.php',
597600
'OCP\\User\\Events\\UserLoggedInEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInEvent.php',
598601
'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php',

‎lib/composer/composer/autoload_static.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
614614
'OCP\\User\\Events\\BeforePasswordUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforePasswordUpdatedEvent.php',
615615
'OCP\\User\\Events\\BeforeUserCreatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserCreatedEvent.php',
616616
'OCP\\User\\Events\\BeforeUserDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserDeletedEvent.php',
617+
'OCP\\User\\Events\\BeforeUserIdUnassignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserIdUnassignedEvent.php',
617618
'OCP\\User\\Events\\BeforeUserLoggedInEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedInEvent.php',
618619
'OCP\\User\\Events\\BeforeUserLoggedInWithCookieEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php',
619620
'OCP\\User\\Events\\BeforeUserLoggedOutEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedOutEvent.php',
@@ -622,6 +623,8 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
622623
'OCP\\User\\Events\\UserChangedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserChangedEvent.php',
623624
'OCP\\User\\Events\\UserCreatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserCreatedEvent.php',
624625
'OCP\\User\\Events\\UserDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserDeletedEvent.php',
626+
'OCP\\User\\Events\\UserIdAssignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserIdAssignedEvent.php',
627+
'OCP\\User\\Events\\UserIdUnassignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserIdUnassignedEvent.php',
625628
'OCP\\User\\Events\\UserLiveStatusEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLiveStatusEvent.php',
626629
'OCP\\User\\Events\\UserLoggedInEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedInEvent.php',
627630
'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php',

‎lib/public/User/Events/BeforeUserIdUnassignedEvent.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
/**
88
* @since 25.0.0
99
*/
10-
class BeforeUserIdUnAssignedEvent extends Event {
11-
private string $name;
10+
class BeforeUserIdUnassignedEvent extends Event {
11+
private string $userId;
1212

1313
/**
1414
* @since 25.0.0
1515
*/
16-
public function __construct(string $name) {
16+
public function __construct(string $userId) {
1717
parent::__construct();
18-
$this->name = $name;
18+
$this->userId = $userId;
1919
}
2020

2121
/**
2222
* @since 25.0.0
2323
*/
24-
public function getName(): string {
25-
return $this->name;
24+
public function getUserId(): string {
25+
return $this->userId;
2626
}
2727
}

0 commit comments

Comments
 (0)