@@ -34,94 +34,94 @@ |
||
34 | 34 | */ |
35 | 35 | interface IManager extends IProvider { |
36 | 36 | |
37 | - /** |
|
38 | - * @param int $id |
|
39 | - * @return ICollection |
|
40 | - * @throws CollectionException when the collection could not be found |
|
41 | - * @since 16.0.0 |
|
42 | - */ |
|
43 | - public function getCollection(int $id): ICollection; |
|
44 | - |
|
45 | - /** |
|
46 | - * @param int $id |
|
47 | - * @param IUser|null $user |
|
48 | - * @return ICollection |
|
49 | - * @throws CollectionException when the collection could not be found |
|
50 | - * @since 16.0.0 |
|
51 | - */ |
|
52 | - public function getCollectionForUser(int $id, ?IUser $user): ICollection; |
|
53 | - |
|
54 | - /** |
|
55 | - * @param string $name |
|
56 | - * @return ICollection |
|
57 | - * @since 16.0.0 |
|
58 | - */ |
|
59 | - public function newCollection(string $name): ICollection; |
|
60 | - |
|
61 | - /** |
|
62 | - * Can a user/guest access the collection |
|
63 | - * |
|
64 | - * @param ICollection $collection |
|
65 | - * @param IUser|null $user |
|
66 | - * @return bool |
|
67 | - * @since 16.0.0 |
|
68 | - */ |
|
69 | - public function canAccessCollection(ICollection $collection, ?IUser $user): bool; |
|
70 | - |
|
71 | - /** |
|
72 | - * @param IUser|null $user |
|
73 | - * @since 16.0.0 |
|
74 | - */ |
|
75 | - public function invalidateAccessCacheForUser(?IUser $user): void; |
|
76 | - |
|
77 | - /** |
|
78 | - * @param IResource $resource |
|
79 | - * @since 16.0.0 |
|
80 | - */ |
|
81 | - public function invalidateAccessCacheForResource(IResource $resource): void; |
|
82 | - |
|
83 | - /** |
|
84 | - * @param IResource $resource |
|
85 | - * @param IUser|null $user |
|
86 | - * @since 16.0.0 |
|
87 | - */ |
|
88 | - public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void; |
|
89 | - |
|
90 | - /** |
|
91 | - * @param IProvider $provider |
|
92 | - * @since 16.0.0 |
|
93 | - */ |
|
94 | - public function invalidateAccessCacheForProvider(IProvider $provider): void; |
|
95 | - |
|
96 | - /** |
|
97 | - * @param IProvider $provider |
|
98 | - * @param IUser|null $user |
|
99 | - * @since 16.0.0 |
|
100 | - */ |
|
101 | - public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void; |
|
102 | - |
|
103 | - /** |
|
104 | - * @param string $type |
|
105 | - * @param string $id |
|
106 | - * @return IResource |
|
107 | - * @since 16.0.0 |
|
108 | - */ |
|
109 | - public function createResource(string $type, string $id): IResource; |
|
110 | - |
|
111 | - /** |
|
112 | - * @param string $type |
|
113 | - * @param string $id |
|
114 | - * @param IUser|null $user |
|
115 | - * @return IResource |
|
116 | - * @throws ResourceException |
|
117 | - * @since 16.0.0 |
|
118 | - */ |
|
119 | - public function getResourceForUser(string $type, string $id, ?IUser $user): IResource; |
|
120 | - |
|
121 | - /** |
|
122 | - * @param string $provider |
|
123 | - * @since 16.0.0 |
|
124 | - * @deprecated 18.0.0 Use IProviderManager::registerResourceProvider instead |
|
125 | - */ |
|
126 | - public function registerResourceProvider(string $provider): void; |
|
37 | + /** |
|
38 | + * @param int $id |
|
39 | + * @return ICollection |
|
40 | + * @throws CollectionException when the collection could not be found |
|
41 | + * @since 16.0.0 |
|
42 | + */ |
|
43 | + public function getCollection(int $id): ICollection; |
|
44 | + |
|
45 | + /** |
|
46 | + * @param int $id |
|
47 | + * @param IUser|null $user |
|
48 | + * @return ICollection |
|
49 | + * @throws CollectionException when the collection could not be found |
|
50 | + * @since 16.0.0 |
|
51 | + */ |
|
52 | + public function getCollectionForUser(int $id, ?IUser $user): ICollection; |
|
53 | + |
|
54 | + /** |
|
55 | + * @param string $name |
|
56 | + * @return ICollection |
|
57 | + * @since 16.0.0 |
|
58 | + */ |
|
59 | + public function newCollection(string $name): ICollection; |
|
60 | + |
|
61 | + /** |
|
62 | + * Can a user/guest access the collection |
|
63 | + * |
|
64 | + * @param ICollection $collection |
|
65 | + * @param IUser|null $user |
|
66 | + * @return bool |
|
67 | + * @since 16.0.0 |
|
68 | + */ |
|
69 | + public function canAccessCollection(ICollection $collection, ?IUser $user): bool; |
|
70 | + |
|
71 | + /** |
|
72 | + * @param IUser|null $user |
|
73 | + * @since 16.0.0 |
|
74 | + */ |
|
75 | + public function invalidateAccessCacheForUser(?IUser $user): void; |
|
76 | + |
|
77 | + /** |
|
78 | + * @param IResource $resource |
|
79 | + * @since 16.0.0 |
|
80 | + */ |
|
81 | + public function invalidateAccessCacheForResource(IResource $resource): void; |
|
82 | + |
|
83 | + /** |
|
84 | + * @param IResource $resource |
|
85 | + * @param IUser|null $user |
|
86 | + * @since 16.0.0 |
|
87 | + */ |
|
88 | + public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void; |
|
89 | + |
|
90 | + /** |
|
91 | + * @param IProvider $provider |
|
92 | + * @since 16.0.0 |
|
93 | + */ |
|
94 | + public function invalidateAccessCacheForProvider(IProvider $provider): void; |
|
95 | + |
|
96 | + /** |
|
97 | + * @param IProvider $provider |
|
98 | + * @param IUser|null $user |
|
99 | + * @since 16.0.0 |
|
100 | + */ |
|
101 | + public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void; |
|
102 | + |
|
103 | + /** |
|
104 | + * @param string $type |
|
105 | + * @param string $id |
|
106 | + * @return IResource |
|
107 | + * @since 16.0.0 |
|
108 | + */ |
|
109 | + public function createResource(string $type, string $id): IResource; |
|
110 | + |
|
111 | + /** |
|
112 | + * @param string $type |
|
113 | + * @param string $id |
|
114 | + * @param IUser|null $user |
|
115 | + * @return IResource |
|
116 | + * @throws ResourceException |
|
117 | + * @since 16.0.0 |
|
118 | + */ |
|
119 | + public function getResourceForUser(string $type, string $id, ?IUser $user): IResource; |
|
120 | + |
|
121 | + /** |
|
122 | + * @param string $provider |
|
123 | + * @since 16.0.0 |
|
124 | + * @deprecated 18.0.0 Use IProviderManager::registerResourceProvider instead |
|
125 | + */ |
|
126 | + public function registerResourceProvider(string $provider): void; |
|
127 | 127 | } |
@@ -27,15 +27,15 @@ |
||
27 | 27 | */ |
28 | 28 | interface IProviderManager { |
29 | 29 | |
30 | - /** |
|
31 | - * @return IProvider[] list of resource providers |
|
32 | - * @since 18.0.0 |
|
33 | - */ |
|
34 | - public function getResourceProviders(): array; |
|
30 | + /** |
|
31 | + * @return IProvider[] list of resource providers |
|
32 | + * @since 18.0.0 |
|
33 | + */ |
|
34 | + public function getResourceProviders(): array; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $provider provider's class name |
|
38 | - * @since 18.0.0 |
|
39 | - */ |
|
40 | - public function registerResourceProvider(string $provider): void; |
|
36 | + /** |
|
37 | + * @param string $provider provider's class name |
|
38 | + * @since 18.0.0 |
|
39 | + */ |
|
40 | + public function registerResourceProvider(string $provider): void; |
|
41 | 41 | } |
@@ -40,90 +40,90 @@ |
||
40 | 40 | use OCP\IUserManager; |
41 | 41 | |
42 | 42 | class LegacyVersionsBackend implements IVersionBackend { |
43 | - /** @var IRootFolder */ |
|
44 | - private $rootFolder; |
|
45 | - /** @var IUserManager */ |
|
46 | - private $userManager; |
|
47 | - |
|
48 | - public function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
49 | - $this->rootFolder = $rootFolder; |
|
50 | - $this->userManager = $userManager; |
|
51 | - } |
|
52 | - |
|
53 | - public function useBackendForStorage(IStorage $storage): bool { |
|
54 | - return true; |
|
55 | - } |
|
56 | - |
|
57 | - public function getVersionsForFile(IUser $user, FileInfo $file): array { |
|
58 | - $storage = $file->getStorage(); |
|
59 | - if ($storage->instanceOfStorage(SharedStorage::class)) { |
|
60 | - $owner = $storage->getOwner(''); |
|
61 | - $user = $this->userManager->get($owner); |
|
62 | - } |
|
63 | - |
|
64 | - $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
65 | - $nodes = $userFolder->getById($file->getId()); |
|
66 | - $file2 = array_pop($nodes); |
|
67 | - $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath())); |
|
68 | - |
|
69 | - return array_map(function (array $data) use ($file, $user) { |
|
70 | - return new Version( |
|
71 | - (int)$data['version'], |
|
72 | - (int)$data['version'], |
|
73 | - $data['name'], |
|
74 | - (int)$data['size'], |
|
75 | - $data['mimetype'], |
|
76 | - $data['path'], |
|
77 | - $file, |
|
78 | - $this, |
|
79 | - $user |
|
80 | - ); |
|
81 | - }, $versions); |
|
82 | - } |
|
83 | - |
|
84 | - public function createVersion(IUser $user, FileInfo $file) { |
|
85 | - $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
86 | - $relativePath = $userFolder->getRelativePath($file->getPath()); |
|
87 | - $userView = new View('/' . $user->getUID()); |
|
88 | - // create all parent folders |
|
89 | - Storage::createMissingDirectories($relativePath, $userView); |
|
90 | - |
|
91 | - Storage::scheduleExpire($user->getUID(), $relativePath); |
|
92 | - |
|
93 | - // store a new version of a file |
|
94 | - $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
95 | - // ensure the file is scanned |
|
96 | - $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
97 | - } |
|
98 | - |
|
99 | - public function rollback(IVersion $version) { |
|
100 | - return Storage::rollback($version->getVersionPath(), $version->getRevisionId(), $version->getUser()); |
|
101 | - } |
|
102 | - |
|
103 | - private function getVersionFolder(IUser $user): Folder { |
|
104 | - $userRoot = $this->rootFolder->getUserFolder($user->getUID()) |
|
105 | - ->getParent(); |
|
106 | - try { |
|
107 | - /** @var Folder $folder */ |
|
108 | - $folder = $userRoot->get('files_versions'); |
|
109 | - return $folder; |
|
110 | - } catch (NotFoundException $e) { |
|
111 | - return $userRoot->newFolder('files_versions'); |
|
112 | - } |
|
113 | - } |
|
114 | - |
|
115 | - public function read(IVersion $version) { |
|
116 | - $versions = $this->getVersionFolder($version->getUser()); |
|
117 | - /** @var File $file */ |
|
118 | - $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId()); |
|
119 | - return $file->fopen('r'); |
|
120 | - } |
|
121 | - |
|
122 | - public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File { |
|
123 | - $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
124 | - $versionFolder = $this->getVersionFolder($user); |
|
125 | - /** @var File $file */ |
|
126 | - $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision); |
|
127 | - return $file; |
|
128 | - } |
|
43 | + /** @var IRootFolder */ |
|
44 | + private $rootFolder; |
|
45 | + /** @var IUserManager */ |
|
46 | + private $userManager; |
|
47 | + |
|
48 | + public function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
49 | + $this->rootFolder = $rootFolder; |
|
50 | + $this->userManager = $userManager; |
|
51 | + } |
|
52 | + |
|
53 | + public function useBackendForStorage(IStorage $storage): bool { |
|
54 | + return true; |
|
55 | + } |
|
56 | + |
|
57 | + public function getVersionsForFile(IUser $user, FileInfo $file): array { |
|
58 | + $storage = $file->getStorage(); |
|
59 | + if ($storage->instanceOfStorage(SharedStorage::class)) { |
|
60 | + $owner = $storage->getOwner(''); |
|
61 | + $user = $this->userManager->get($owner); |
|
62 | + } |
|
63 | + |
|
64 | + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
65 | + $nodes = $userFolder->getById($file->getId()); |
|
66 | + $file2 = array_pop($nodes); |
|
67 | + $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath())); |
|
68 | + |
|
69 | + return array_map(function (array $data) use ($file, $user) { |
|
70 | + return new Version( |
|
71 | + (int)$data['version'], |
|
72 | + (int)$data['version'], |
|
73 | + $data['name'], |
|
74 | + (int)$data['size'], |
|
75 | + $data['mimetype'], |
|
76 | + $data['path'], |
|
77 | + $file, |
|
78 | + $this, |
|
79 | + $user |
|
80 | + ); |
|
81 | + }, $versions); |
|
82 | + } |
|
83 | + |
|
84 | + public function createVersion(IUser $user, FileInfo $file) { |
|
85 | + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
86 | + $relativePath = $userFolder->getRelativePath($file->getPath()); |
|
87 | + $userView = new View('/' . $user->getUID()); |
|
88 | + // create all parent folders |
|
89 | + Storage::createMissingDirectories($relativePath, $userView); |
|
90 | + |
|
91 | + Storage::scheduleExpire($user->getUID(), $relativePath); |
|
92 | + |
|
93 | + // store a new version of a file |
|
94 | + $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
95 | + // ensure the file is scanned |
|
96 | + $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime()); |
|
97 | + } |
|
98 | + |
|
99 | + public function rollback(IVersion $version) { |
|
100 | + return Storage::rollback($version->getVersionPath(), $version->getRevisionId(), $version->getUser()); |
|
101 | + } |
|
102 | + |
|
103 | + private function getVersionFolder(IUser $user): Folder { |
|
104 | + $userRoot = $this->rootFolder->getUserFolder($user->getUID()) |
|
105 | + ->getParent(); |
|
106 | + try { |
|
107 | + /** @var Folder $folder */ |
|
108 | + $folder = $userRoot->get('files_versions'); |
|
109 | + return $folder; |
|
110 | + } catch (NotFoundException $e) { |
|
111 | + return $userRoot->newFolder('files_versions'); |
|
112 | + } |
|
113 | + } |
|
114 | + |
|
115 | + public function read(IVersion $version) { |
|
116 | + $versions = $this->getVersionFolder($version->getUser()); |
|
117 | + /** @var File $file */ |
|
118 | + $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId()); |
|
119 | + return $file->fopen('r'); |
|
120 | + } |
|
121 | + |
|
122 | + public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File { |
|
123 | + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); |
|
124 | + $versionFolder = $this->getVersionFolder($user); |
|
125 | + /** @var File $file */ |
|
126 | + $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision); |
|
127 | + return $file; |
|
128 | + } |
|
129 | 129 | } |
@@ -35,11 +35,11 @@ |
||
35 | 35 | */ |
36 | 36 | interface IDismissableNotifier extends INotifier { |
37 | 37 | |
38 | - /** |
|
39 | - * @param INotification $notification |
|
40 | - * @throws \InvalidArgumentException In case the handler can't handle the notification |
|
41 | - * |
|
42 | - * @since 18.0.0 |
|
43 | - */ |
|
44 | - public function dismissNotification(INotification $notification): void; |
|
38 | + /** |
|
39 | + * @param INotification $notification |
|
40 | + * @throws \InvalidArgumentException In case the handler can't handle the notification |
|
41 | + * |
|
42 | + * @since 18.0.0 |
|
43 | + */ |
|
44 | + public function dismissNotification(INotification $notification): void; |
|
45 | 45 | } |
@@ -30,20 +30,20 @@ |
||
30 | 30 | use OCP\IDBConnection; |
31 | 31 | |
32 | 32 | class TransferOwnershipMapper extends QBMapper { |
33 | - public function __construct(IDBConnection $db) { |
|
34 | - parent::__construct($db, 'user_transfer_owner', TransferOwnership::class); |
|
35 | - } |
|
33 | + public function __construct(IDBConnection $db) { |
|
34 | + parent::__construct($db, 'user_transfer_owner', TransferOwnership::class); |
|
35 | + } |
|
36 | 36 | |
37 | - public function getById(int $id): TransferOwnership { |
|
38 | - $qb = $this->db->getQueryBuilder(); |
|
37 | + public function getById(int $id): TransferOwnership { |
|
38 | + $qb = $this->db->getQueryBuilder(); |
|
39 | 39 | |
40 | - $qb->select('*') |
|
41 | - ->from($this->getTableName()) |
|
42 | - ->where( |
|
43 | - $qb->expr()->eq('id', $qb->createNamedParameter($id)) |
|
44 | - ); |
|
40 | + $qb->select('*') |
|
41 | + ->from($this->getTableName()) |
|
42 | + ->where( |
|
43 | + $qb->expr()->eq('id', $qb->createNamedParameter($id)) |
|
44 | + ); |
|
45 | 45 | |
46 | - return $this->findEntity($qb); |
|
47 | - } |
|
46 | + return $this->findEntity($qb); |
|
47 | + } |
|
48 | 48 | |
49 | 49 | } |
@@ -31,47 +31,47 @@ |
||
31 | 31 | |
32 | 32 | class Version11301Date20191205150729 extends SimpleMigrationStep { |
33 | 33 | |
34 | - /** |
|
35 | - * @param IOutput $output |
|
36 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
37 | - * @param array $options |
|
38 | - * @return null|ISchemaWrapper |
|
39 | - */ |
|
40 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
41 | - /** @var ISchemaWrapper $schema */ |
|
42 | - $schema = $schemaClosure(); |
|
34 | + /** |
|
35 | + * @param IOutput $output |
|
36 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
37 | + * @param array $options |
|
38 | + * @return null|ISchemaWrapper |
|
39 | + */ |
|
40 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
41 | + /** @var ISchemaWrapper $schema */ |
|
42 | + $schema = $schemaClosure(); |
|
43 | 43 | |
44 | - $table = $schema->createTable('user_transfer_owner'); |
|
45 | - $table->addColumn('id', 'bigint', [ |
|
46 | - 'autoincrement' => true, |
|
47 | - 'notnull' => true, |
|
48 | - 'length' => 20, |
|
49 | - 'unsigned' => true, |
|
50 | - ]); |
|
51 | - $table->addColumn('source_user', 'string', [ |
|
52 | - 'notnull' => true, |
|
53 | - 'length' => 64, |
|
54 | - ]); |
|
55 | - $table->addColumn('target_user', 'string', [ |
|
56 | - 'notnull' => true, |
|
57 | - 'length' => 64, |
|
58 | - ]); |
|
59 | - $table->addColumn('file_id', 'bigint', [ |
|
60 | - 'notnull' => true, |
|
61 | - 'length' => 20, |
|
62 | - ]); |
|
63 | - $table->addColumn('node_name', 'string', [ |
|
64 | - 'notnull' => true, |
|
65 | - 'length' => 255, |
|
66 | - ]); |
|
67 | - $table->setPrimaryKey(['id']); |
|
44 | + $table = $schema->createTable('user_transfer_owner'); |
|
45 | + $table->addColumn('id', 'bigint', [ |
|
46 | + 'autoincrement' => true, |
|
47 | + 'notnull' => true, |
|
48 | + 'length' => 20, |
|
49 | + 'unsigned' => true, |
|
50 | + ]); |
|
51 | + $table->addColumn('source_user', 'string', [ |
|
52 | + 'notnull' => true, |
|
53 | + 'length' => 64, |
|
54 | + ]); |
|
55 | + $table->addColumn('target_user', 'string', [ |
|
56 | + 'notnull' => true, |
|
57 | + 'length' => 64, |
|
58 | + ]); |
|
59 | + $table->addColumn('file_id', 'bigint', [ |
|
60 | + 'notnull' => true, |
|
61 | + 'length' => 20, |
|
62 | + ]); |
|
63 | + $table->addColumn('node_name', 'string', [ |
|
64 | + 'notnull' => true, |
|
65 | + 'length' => 255, |
|
66 | + ]); |
|
67 | + $table->setPrimaryKey(['id']); |
|
68 | 68 | |
69 | - // Quite radical, we just assume no one updates cross beta with a pending request. |
|
70 | - // Do not try this at home |
|
71 | - if ($schema->hasTable('user_transfer_ownership')) { |
|
72 | - $schema->dropTable('user_transfer_ownership'); |
|
73 | - } |
|
69 | + // Quite radical, we just assume no one updates cross beta with a pending request. |
|
70 | + // Do not try this at home |
|
71 | + if ($schema->hasTable('user_transfer_ownership')) { |
|
72 | + $schema->dropTable('user_transfer_ownership'); |
|
73 | + } |
|
74 | 74 | |
75 | - return $schema; |
|
76 | - } |
|
75 | + return $schema; |
|
76 | + } |
|
77 | 77 | } |
@@ -31,52 +31,52 @@ |
||
31 | 31 | */ |
32 | 32 | class BeforePasswordUpdatedEvent extends Event { |
33 | 33 | |
34 | - /** @var IUser */ |
|
35 | - private $user; |
|
34 | + /** @var IUser */ |
|
35 | + private $user; |
|
36 | 36 | |
37 | - /** @var string */ |
|
38 | - private $password; |
|
37 | + /** @var string */ |
|
38 | + private $password; |
|
39 | 39 | |
40 | - /** @var string|null */ |
|
41 | - private $recoveryPassword; |
|
40 | + /** @var string|null */ |
|
41 | + private $recoveryPassword; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param IUser $user |
|
45 | - * @param string $password |
|
46 | - * @param string|null $recoveryPassword |
|
47 | - * @since 18.0.0 |
|
48 | - */ |
|
49 | - public function __construct(IUser $user, |
|
50 | - string $password, |
|
51 | - string $recoveryPassword = null) { |
|
52 | - parent::__construct(); |
|
53 | - $this->user = $user; |
|
54 | - $this->password = $password; |
|
55 | - $this->recoveryPassword = $recoveryPassword; |
|
56 | - } |
|
43 | + /** |
|
44 | + * @param IUser $user |
|
45 | + * @param string $password |
|
46 | + * @param string|null $recoveryPassword |
|
47 | + * @since 18.0.0 |
|
48 | + */ |
|
49 | + public function __construct(IUser $user, |
|
50 | + string $password, |
|
51 | + string $recoveryPassword = null) { |
|
52 | + parent::__construct(); |
|
53 | + $this->user = $user; |
|
54 | + $this->password = $password; |
|
55 | + $this->recoveryPassword = $recoveryPassword; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @return IUser |
|
60 | - * @since 18.0.0 |
|
61 | - */ |
|
62 | - public function getUser(): IUser { |
|
63 | - return $this->user; |
|
64 | - } |
|
58 | + /** |
|
59 | + * @return IUser |
|
60 | + * @since 18.0.0 |
|
61 | + */ |
|
62 | + public function getUser(): IUser { |
|
63 | + return $this->user; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return string |
|
68 | - * @since 18.0.0 |
|
69 | - */ |
|
70 | - public function getPassword(): string { |
|
71 | - return $this->password; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return string |
|
68 | + * @since 18.0.0 |
|
69 | + */ |
|
70 | + public function getPassword(): string { |
|
71 | + return $this->password; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return string|null |
|
76 | - * @since 18.0.0 |
|
77 | - */ |
|
78 | - public function getRecoveryPassword(): ?string { |
|
79 | - return $this->recoveryPassword; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return string|null |
|
76 | + * @since 18.0.0 |
|
77 | + */ |
|
78 | + public function getRecoveryPassword(): ?string { |
|
79 | + return $this->recoveryPassword; |
|
80 | + } |
|
81 | 81 | |
82 | 82 | } |
@@ -34,33 +34,33 @@ |
||
34 | 34 | */ |
35 | 35 | class UserLoggedInWithCookieEvent extends Event { |
36 | 36 | |
37 | - /** @var IUser */ |
|
38 | - private $user; |
|
37 | + /** @var IUser */ |
|
38 | + private $user; |
|
39 | 39 | |
40 | - /** @var string|null */ |
|
41 | - private $password; |
|
40 | + /** @var string|null */ |
|
41 | + private $password; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @since 18.0.0 |
|
45 | - */ |
|
46 | - public function __construct(IUser $user, ?string $password) { |
|
47 | - parent::__construct(); |
|
48 | - $this->user = $user; |
|
49 | - $this->password = $password; |
|
50 | - } |
|
43 | + /** |
|
44 | + * @since 18.0.0 |
|
45 | + */ |
|
46 | + public function __construct(IUser $user, ?string $password) { |
|
47 | + parent::__construct(); |
|
48 | + $this->user = $user; |
|
49 | + $this->password = $password; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @since 18.0.0 |
|
54 | - */ |
|
55 | - public function getUser(): IUser { |
|
56 | - return $this->user; |
|
57 | - } |
|
52 | + /** |
|
53 | + * @since 18.0.0 |
|
54 | + */ |
|
55 | + public function getUser(): IUser { |
|
56 | + return $this->user; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * @since 18.0.0 |
|
61 | - */ |
|
62 | - public function getPassword(): ?string { |
|
63 | - return $this->password; |
|
64 | - } |
|
59 | + /** |
|
60 | + * @since 18.0.0 |
|
61 | + */ |
|
62 | + public function getPassword(): ?string { |
|
63 | + return $this->password; |
|
64 | + } |
|
65 | 65 | |
66 | 66 | } |
@@ -31,52 +31,52 @@ |
||
31 | 31 | */ |
32 | 32 | class PasswordUpdatedEvent extends Event { |
33 | 33 | |
34 | - /** @var IUser */ |
|
35 | - private $user; |
|
34 | + /** @var IUser */ |
|
35 | + private $user; |
|
36 | 36 | |
37 | - /** @var string */ |
|
38 | - private $password; |
|
37 | + /** @var string */ |
|
38 | + private $password; |
|
39 | 39 | |
40 | - /** @var string|null */ |
|
41 | - private $recoveryPassword; |
|
40 | + /** @var string|null */ |
|
41 | + private $recoveryPassword; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param IUser $user |
|
45 | - * @param string $password |
|
46 | - * @param string|null $recoveryPassword |
|
47 | - * @since 18.0.0 |
|
48 | - */ |
|
49 | - public function __construct(IUser $user, |
|
50 | - string $password, |
|
51 | - string $recoveryPassword = null) { |
|
52 | - parent::__construct(); |
|
53 | - $this->user = $user; |
|
54 | - $this->password = $password; |
|
55 | - $this->recoveryPassword = $recoveryPassword; |
|
56 | - } |
|
43 | + /** |
|
44 | + * @param IUser $user |
|
45 | + * @param string $password |
|
46 | + * @param string|null $recoveryPassword |
|
47 | + * @since 18.0.0 |
|
48 | + */ |
|
49 | + public function __construct(IUser $user, |
|
50 | + string $password, |
|
51 | + string $recoveryPassword = null) { |
|
52 | + parent::__construct(); |
|
53 | + $this->user = $user; |
|
54 | + $this->password = $password; |
|
55 | + $this->recoveryPassword = $recoveryPassword; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @return IUser |
|
60 | - * @since 18.0.0 |
|
61 | - */ |
|
62 | - public function getUser(): IUser { |
|
63 | - return $this->user; |
|
64 | - } |
|
58 | + /** |
|
59 | + * @return IUser |
|
60 | + * @since 18.0.0 |
|
61 | + */ |
|
62 | + public function getUser(): IUser { |
|
63 | + return $this->user; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return string |
|
68 | - * @since 18.0.0 |
|
69 | - */ |
|
70 | - public function getPassword(): string { |
|
71 | - return $this->password; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return string |
|
68 | + * @since 18.0.0 |
|
69 | + */ |
|
70 | + public function getPassword(): string { |
|
71 | + return $this->password; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return string|null |
|
76 | - * @since 18.0.0 |
|
77 | - */ |
|
78 | - public function getRecoveryPassword(): ?string { |
|
79 | - return $this->recoveryPassword; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return string|null |
|
76 | + * @since 18.0.0 |
|
77 | + */ |
|
78 | + public function getRecoveryPassword(): ?string { |
|
79 | + return $this->recoveryPassword; |
|
80 | + } |
|
81 | 81 | |
82 | 82 | } |