@@ -32,10 +32,10 @@ |
||
32 | 32 | */ |
33 | 33 | interface IRestorable { |
34 | 34 | |
35 | - /** |
|
36 | - * Restore this node |
|
37 | - * |
|
38 | - * @throws Exception |
|
39 | - */ |
|
40 | - public function restore(): void; |
|
35 | + /** |
|
36 | + * Restore this node |
|
37 | + * |
|
38 | + * @throws Exception |
|
39 | + */ |
|
40 | + public function restore(): void; |
|
41 | 41 | } |
@@ -33,50 +33,50 @@ |
||
33 | 33 | use Sabre\DAV\INode; |
34 | 34 | |
35 | 35 | class RestoreTarget implements ICollection, IMoveTarget { |
36 | - public const NAME = 'restore'; |
|
36 | + public const NAME = 'restore'; |
|
37 | 37 | |
38 | - public function createFile($name, $data = null) { |
|
39 | - throw new Forbidden(); |
|
40 | - } |
|
38 | + public function createFile($name, $data = null) { |
|
39 | + throw new Forbidden(); |
|
40 | + } |
|
41 | 41 | |
42 | - public function createDirectory($name) { |
|
43 | - throw new Forbidden(); |
|
44 | - } |
|
42 | + public function createDirectory($name) { |
|
43 | + throw new Forbidden(); |
|
44 | + } |
|
45 | 45 | |
46 | - public function getChild($name) { |
|
47 | - throw new NotFound(); |
|
48 | - } |
|
46 | + public function getChild($name) { |
|
47 | + throw new NotFound(); |
|
48 | + } |
|
49 | 49 | |
50 | - public function getChildren(): array { |
|
51 | - return []; |
|
52 | - } |
|
50 | + public function getChildren(): array { |
|
51 | + return []; |
|
52 | + } |
|
53 | 53 | |
54 | - public function childExists($name): bool { |
|
55 | - return false; |
|
56 | - } |
|
54 | + public function childExists($name): bool { |
|
55 | + return false; |
|
56 | + } |
|
57 | 57 | |
58 | - public function moveInto($targetName, $sourcePath, INode $sourceNode): bool { |
|
59 | - if ($sourceNode instanceof IRestorable) { |
|
60 | - $sourceNode->restore(); |
|
61 | - return true; |
|
62 | - } |
|
58 | + public function moveInto($targetName, $sourcePath, INode $sourceNode): bool { |
|
59 | + if ($sourceNode instanceof IRestorable) { |
|
60 | + $sourceNode->restore(); |
|
61 | + return true; |
|
62 | + } |
|
63 | 63 | |
64 | - return false; |
|
65 | - } |
|
64 | + return false; |
|
65 | + } |
|
66 | 66 | |
67 | - public function delete() { |
|
68 | - throw new Forbidden(); |
|
69 | - } |
|
67 | + public function delete() { |
|
68 | + throw new Forbidden(); |
|
69 | + } |
|
70 | 70 | |
71 | - public function getName(): string { |
|
72 | - return 'restore'; |
|
73 | - } |
|
71 | + public function getName(): string { |
|
72 | + return 'restore'; |
|
73 | + } |
|
74 | 74 | |
75 | - public function setName($name) { |
|
76 | - throw new Forbidden(); |
|
77 | - } |
|
75 | + public function setName($name) { |
|
76 | + throw new Forbidden(); |
|
77 | + } |
|
78 | 78 | |
79 | - public function getLastModified() { |
|
80 | - return 0; |
|
81 | - } |
|
79 | + public function getLastModified() { |
|
80 | + return 0; |
|
81 | + } |
|
82 | 82 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | $filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']); |
43 | 43 | |
44 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
44 | + $this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
45 | 45 | $this->addHeader('Content-Type', $contentType); |
46 | 46 | } |
47 | 47 | } |
@@ -18,20 +18,20 @@ |
||
18 | 18 | * @template-extends Response<Http::STATUS_*, array<string, mixed>> |
19 | 19 | */ |
20 | 20 | class DownloadResponse extends Response { |
21 | - /** |
|
22 | - * Creates a response that prompts the user to download the file |
|
23 | - * @param string $filename the name that the downloaded file should have |
|
24 | - * @param C $contentType the mimetype that the downloaded file should have |
|
25 | - * @param S $status |
|
26 | - * @param H $headers |
|
27 | - * @since 7.0.0 |
|
28 | - */ |
|
29 | - public function __construct(string $filename, string $contentType, int $status = Http::STATUS_OK, array $headers = []) { |
|
30 | - parent::__construct($status, $headers); |
|
21 | + /** |
|
22 | + * Creates a response that prompts the user to download the file |
|
23 | + * @param string $filename the name that the downloaded file should have |
|
24 | + * @param C $contentType the mimetype that the downloaded file should have |
|
25 | + * @param S $status |
|
26 | + * @param H $headers |
|
27 | + * @since 7.0.0 |
|
28 | + */ |
|
29 | + public function __construct(string $filename, string $contentType, int $status = Http::STATUS_OK, array $headers = []) { |
|
30 | + parent::__construct($status, $headers); |
|
31 | 31 | |
32 | - $filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']); |
|
32 | + $filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']); |
|
33 | 33 | |
34 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
35 | - $this->addHeader('Content-Type', $contentType); |
|
36 | - } |
|
34 | + $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
35 | + $this->addHeader('Content-Type', $contentType); |
|
36 | + } |
|
37 | 37 | } |
@@ -37,22 +37,22 @@ |
||
37 | 37 | |
38 | 38 | class Version1008Date20181030113700 extends SimpleMigrationStep { |
39 | 39 | |
40 | - /** |
|
41 | - * @param IOutput $output |
|
42 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
43 | - * @param array $options |
|
44 | - * @return null|ISchemaWrapper |
|
45 | - */ |
|
46 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
47 | - /** @var ISchemaWrapper $schema */ |
|
48 | - $schema = $schemaClosure(); |
|
49 | - |
|
50 | - $table = $schema->getTable('cards'); |
|
51 | - $table->addColumn('uid', Types::STRING, [ |
|
52 | - 'notnull' => false, |
|
53 | - 'length' => 255 |
|
54 | - ]); |
|
55 | - |
|
56 | - return $schema; |
|
57 | - } |
|
40 | + /** |
|
41 | + * @param IOutput $output |
|
42 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
43 | + * @param array $options |
|
44 | + * @return null|ISchemaWrapper |
|
45 | + */ |
|
46 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
47 | + /** @var ISchemaWrapper $schema */ |
|
48 | + $schema = $schemaClosure(); |
|
49 | + |
|
50 | + $table = $schema->getTable('cards'); |
|
51 | + $table->addColumn('uid', Types::STRING, [ |
|
52 | + 'notnull' => false, |
|
53 | + 'length' => 255 |
|
54 | + ]); |
|
55 | + |
|
56 | + return $schema; |
|
57 | + } |
|
58 | 58 | } |
@@ -33,20 +33,20 @@ |
||
33 | 33 | |
34 | 34 | class Version1002Date20180821043638 extends SimpleMigrationStep { |
35 | 35 | |
36 | - /** |
|
37 | - * @param IOutput $output |
|
38 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
39 | - * @param array $options |
|
40 | - * |
|
41 | - * @return ISchemaWrapper |
|
42 | - */ |
|
43 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
44 | - /** @var ISchemaWrapper $schema */ |
|
45 | - $schema = $schemaClosure(); |
|
46 | - $table = $schema->getTable('twofactor_backupcodes'); |
|
36 | + /** |
|
37 | + * @param IOutput $output |
|
38 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
39 | + * @param array $options |
|
40 | + * |
|
41 | + * @return ISchemaWrapper |
|
42 | + */ |
|
43 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
44 | + /** @var ISchemaWrapper $schema */ |
|
45 | + $schema = $schemaClosure(); |
|
46 | + $table = $schema->getTable('twofactor_backupcodes'); |
|
47 | 47 | |
48 | - $table->getColumn('code')->setLength(128); |
|
48 | + $table->getColumn('code')->setLength(128); |
|
49 | 49 | |
50 | - return $schema; |
|
51 | - } |
|
50 | + return $schema; |
|
51 | + } |
|
52 | 52 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public function getProperties(): array { |
69 | - return array_filter($this->properties, function ($obj) { |
|
69 | + return array_filter($this->properties, function($obj) { |
|
70 | 70 | return $obj instanceof IAccountProperty; |
71 | 71 | }); |
72 | 72 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $index = $obj->getName(); |
97 | 97 | if ($this->isCollection($index)) { |
98 | 98 | $incrementals[$index] = ($incrementals[$index] ?? -1) + 1; |
99 | - $index .= '#' . $incrementals[$index]; |
|
99 | + $index .= '#'.$incrementals[$index]; |
|
100 | 100 | } |
101 | 101 | $result[$index] = $obj; |
102 | 102 | } |
@@ -17,125 +17,125 @@ |
||
17 | 17 | use RuntimeException; |
18 | 18 | |
19 | 19 | class Account implements IAccount { |
20 | - use TAccountsHelper; |
|
21 | - |
|
22 | - /** @var IAccountPropertyCollection[]|IAccountProperty[] */ |
|
23 | - private array $properties = []; |
|
24 | - |
|
25 | - public function __construct( |
|
26 | - private IUser $user, |
|
27 | - ) { |
|
28 | - } |
|
29 | - |
|
30 | - public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount { |
|
31 | - if ($this->isCollection($property)) { |
|
32 | - throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection'); |
|
33 | - } |
|
34 | - $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData); |
|
35 | - return $this; |
|
36 | - } |
|
37 | - |
|
38 | - public function getProperty(string $property): IAccountProperty { |
|
39 | - if ($this->isCollection($property)) { |
|
40 | - throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection'); |
|
41 | - } |
|
42 | - if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) { |
|
43 | - throw new PropertyDoesNotExistException($property); |
|
44 | - } |
|
45 | - return $this->properties[$property]; |
|
46 | - } |
|
47 | - |
|
48 | - public function getProperties(): array { |
|
49 | - return array_filter($this->properties, function ($obj) { |
|
50 | - return $obj instanceof IAccountProperty; |
|
51 | - }); |
|
52 | - } |
|
53 | - |
|
54 | - public function setAllPropertiesFromJson(array $properties): IAccount { |
|
55 | - foreach ($properties as $propertyName => $propertyObject) { |
|
56 | - if ($this->isCollection($propertyName)) { |
|
57 | - $collection = new AccountPropertyCollection($propertyName); |
|
58 | - /** @var array<int, IAccountProperty> $collectionProperties */ |
|
59 | - $collectionProperties = []; |
|
60 | - /** @var array<int, array<string, string>> $propertyObject */ |
|
61 | - foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) { |
|
62 | - $collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData); |
|
63 | - } |
|
64 | - $collection->setProperties($collectionProperties); |
|
65 | - $this->setPropertyCollection($collection); |
|
66 | - } else { |
|
67 | - /** @var array<string, string> $propertyObject */ |
|
68 | - ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject; |
|
69 | - $this->setProperty($propertyName, $value, $scope, $verified, $verificationData); |
|
70 | - } |
|
71 | - } |
|
72 | - |
|
73 | - return $this; |
|
74 | - } |
|
75 | - |
|
76 | - public function getAllProperties(): Generator { |
|
77 | - foreach ($this->properties as $propertyObject) { |
|
78 | - if ($propertyObject instanceof IAccountProperty) { |
|
79 | - yield $propertyObject; |
|
80 | - } elseif ($propertyObject instanceof IAccountPropertyCollection) { |
|
81 | - foreach ($propertyObject->getProperties() as $property) { |
|
82 | - yield $property; |
|
83 | - } |
|
84 | - } |
|
85 | - } |
|
86 | - } |
|
87 | - |
|
88 | - public function getFilteredProperties(?string $scope = null, ?string $verified = null): array { |
|
89 | - $result = $incrementals = []; |
|
90 | - /** @var IAccountProperty $obj */ |
|
91 | - foreach ($this->getAllProperties() as $obj) { |
|
92 | - if ($scope !== null && $scope !== $obj->getScope()) { |
|
93 | - continue; |
|
94 | - } |
|
95 | - if ($verified !== null && $verified !== $obj->getVerified()) { |
|
96 | - continue; |
|
97 | - } |
|
98 | - $index = $obj->getName(); |
|
99 | - if ($this->isCollection($index)) { |
|
100 | - $incrementals[$index] = ($incrementals[$index] ?? -1) + 1; |
|
101 | - $index .= '#' . $incrementals[$index]; |
|
102 | - } |
|
103 | - $result[$index] = $obj; |
|
104 | - } |
|
105 | - return $result; |
|
106 | - } |
|
107 | - |
|
108 | - /** @return array<string, IAccountProperty|array<int, IAccountProperty>> */ |
|
109 | - public function jsonSerialize(): array { |
|
110 | - $properties = $this->properties; |
|
111 | - foreach ($properties as $propertyName => $propertyObject) { |
|
112 | - if ($propertyObject instanceof IAccountPropertyCollection) { |
|
113 | - // Override collection serialization to discard duplicate name |
|
114 | - $properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName]; |
|
115 | - } |
|
116 | - } |
|
117 | - return $properties; |
|
118 | - } |
|
119 | - |
|
120 | - public function getUser(): IUser { |
|
121 | - return $this->user; |
|
122 | - } |
|
123 | - |
|
124 | - public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount { |
|
125 | - $this->properties[$propertyCollection->getName()] = $propertyCollection; |
|
126 | - return $this; |
|
127 | - } |
|
128 | - |
|
129 | - public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection { |
|
130 | - if (!$this->isCollection($propertyCollectionName)) { |
|
131 | - throw new PropertyDoesNotExistException($propertyCollectionName); |
|
132 | - } |
|
133 | - if (!array_key_exists($propertyCollectionName, $this->properties)) { |
|
134 | - $this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName); |
|
135 | - } |
|
136 | - if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) { |
|
137 | - throw new RuntimeException('Requested collection is not an IAccountPropertyCollection'); |
|
138 | - } |
|
139 | - return $this->properties[$propertyCollectionName]; |
|
140 | - } |
|
20 | + use TAccountsHelper; |
|
21 | + |
|
22 | + /** @var IAccountPropertyCollection[]|IAccountProperty[] */ |
|
23 | + private array $properties = []; |
|
24 | + |
|
25 | + public function __construct( |
|
26 | + private IUser $user, |
|
27 | + ) { |
|
28 | + } |
|
29 | + |
|
30 | + public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount { |
|
31 | + if ($this->isCollection($property)) { |
|
32 | + throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection'); |
|
33 | + } |
|
34 | + $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData); |
|
35 | + return $this; |
|
36 | + } |
|
37 | + |
|
38 | + public function getProperty(string $property): IAccountProperty { |
|
39 | + if ($this->isCollection($property)) { |
|
40 | + throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection'); |
|
41 | + } |
|
42 | + if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) { |
|
43 | + throw new PropertyDoesNotExistException($property); |
|
44 | + } |
|
45 | + return $this->properties[$property]; |
|
46 | + } |
|
47 | + |
|
48 | + public function getProperties(): array { |
|
49 | + return array_filter($this->properties, function ($obj) { |
|
50 | + return $obj instanceof IAccountProperty; |
|
51 | + }); |
|
52 | + } |
|
53 | + |
|
54 | + public function setAllPropertiesFromJson(array $properties): IAccount { |
|
55 | + foreach ($properties as $propertyName => $propertyObject) { |
|
56 | + if ($this->isCollection($propertyName)) { |
|
57 | + $collection = new AccountPropertyCollection($propertyName); |
|
58 | + /** @var array<int, IAccountProperty> $collectionProperties */ |
|
59 | + $collectionProperties = []; |
|
60 | + /** @var array<int, array<string, string>> $propertyObject */ |
|
61 | + foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) { |
|
62 | + $collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData); |
|
63 | + } |
|
64 | + $collection->setProperties($collectionProperties); |
|
65 | + $this->setPropertyCollection($collection); |
|
66 | + } else { |
|
67 | + /** @var array<string, string> $propertyObject */ |
|
68 | + ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject; |
|
69 | + $this->setProperty($propertyName, $value, $scope, $verified, $verificationData); |
|
70 | + } |
|
71 | + } |
|
72 | + |
|
73 | + return $this; |
|
74 | + } |
|
75 | + |
|
76 | + public function getAllProperties(): Generator { |
|
77 | + foreach ($this->properties as $propertyObject) { |
|
78 | + if ($propertyObject instanceof IAccountProperty) { |
|
79 | + yield $propertyObject; |
|
80 | + } elseif ($propertyObject instanceof IAccountPropertyCollection) { |
|
81 | + foreach ($propertyObject->getProperties() as $property) { |
|
82 | + yield $property; |
|
83 | + } |
|
84 | + } |
|
85 | + } |
|
86 | + } |
|
87 | + |
|
88 | + public function getFilteredProperties(?string $scope = null, ?string $verified = null): array { |
|
89 | + $result = $incrementals = []; |
|
90 | + /** @var IAccountProperty $obj */ |
|
91 | + foreach ($this->getAllProperties() as $obj) { |
|
92 | + if ($scope !== null && $scope !== $obj->getScope()) { |
|
93 | + continue; |
|
94 | + } |
|
95 | + if ($verified !== null && $verified !== $obj->getVerified()) { |
|
96 | + continue; |
|
97 | + } |
|
98 | + $index = $obj->getName(); |
|
99 | + if ($this->isCollection($index)) { |
|
100 | + $incrementals[$index] = ($incrementals[$index] ?? -1) + 1; |
|
101 | + $index .= '#' . $incrementals[$index]; |
|
102 | + } |
|
103 | + $result[$index] = $obj; |
|
104 | + } |
|
105 | + return $result; |
|
106 | + } |
|
107 | + |
|
108 | + /** @return array<string, IAccountProperty|array<int, IAccountProperty>> */ |
|
109 | + public function jsonSerialize(): array { |
|
110 | + $properties = $this->properties; |
|
111 | + foreach ($properties as $propertyName => $propertyObject) { |
|
112 | + if ($propertyObject instanceof IAccountPropertyCollection) { |
|
113 | + // Override collection serialization to discard duplicate name |
|
114 | + $properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName]; |
|
115 | + } |
|
116 | + } |
|
117 | + return $properties; |
|
118 | + } |
|
119 | + |
|
120 | + public function getUser(): IUser { |
|
121 | + return $this->user; |
|
122 | + } |
|
123 | + |
|
124 | + public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount { |
|
125 | + $this->properties[$propertyCollection->getName()] = $propertyCollection; |
|
126 | + return $this; |
|
127 | + } |
|
128 | + |
|
129 | + public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection { |
|
130 | + if (!$this->isCollection($propertyCollectionName)) { |
|
131 | + throw new PropertyDoesNotExistException($propertyCollectionName); |
|
132 | + } |
|
133 | + if (!array_key_exists($propertyCollectionName, $this->properties)) { |
|
134 | + $this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName); |
|
135 | + } |
|
136 | + if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) { |
|
137 | + throw new RuntimeException('Requested collection is not an IAccountPropertyCollection'); |
|
138 | + } |
|
139 | + return $this->properties[$propertyCollectionName]; |
|
140 | + } |
|
141 | 141 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $user = $input->getArgument('uid'); |
97 | 97 | if (!$this->userManager->userExists($user)) { |
98 | 98 | throw new \InvalidArgumentException( |
99 | - 'User <' . $user . '> is unknown.'); |
|
99 | + 'User <'.$user.'> is unknown.'); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $birthday = $input->getOption('birthday'); |
@@ -112,11 +112,11 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | $calendarInfo = $this->calDav->getCalendarByUri( |
115 | - 'principals/users/' . $user, |
|
115 | + 'principals/users/'.$user, |
|
116 | 116 | $name); |
117 | 117 | if ($calendarInfo === null) { |
118 | 118 | throw new \InvalidArgumentException( |
119 | - 'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.'); |
|
119 | + 'User <'.$user.'> has no calendar named <'.$name.'>. You can run occ dav:list-calendars to list calendars URIs for this user.'); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | $calendar = new Calendar( |
@@ -22,82 +22,82 @@ |
||
22 | 22 | use Symfony\Component\Console\Output\OutputInterface; |
23 | 23 | |
24 | 24 | class DeleteCalendar extends Command { |
25 | - public function __construct( |
|
26 | - private CalDavBackend $calDav, |
|
27 | - private IConfig $config, |
|
28 | - private IL10N $l10n, |
|
29 | - private IUserManager $userManager, |
|
30 | - private LoggerInterface $logger, |
|
31 | - ) { |
|
32 | - parent::__construct(); |
|
33 | - } |
|
25 | + public function __construct( |
|
26 | + private CalDavBackend $calDav, |
|
27 | + private IConfig $config, |
|
28 | + private IL10N $l10n, |
|
29 | + private IUserManager $userManager, |
|
30 | + private LoggerInterface $logger, |
|
31 | + ) { |
|
32 | + parent::__construct(); |
|
33 | + } |
|
34 | 34 | |
35 | - protected function configure(): void { |
|
36 | - $this |
|
37 | - ->setName('dav:delete-calendar') |
|
38 | - ->setDescription('Delete a dav calendar') |
|
39 | - ->addArgument('uid', |
|
40 | - InputArgument::REQUIRED, |
|
41 | - 'User who owns the calendar') |
|
42 | - ->addArgument('name', |
|
43 | - InputArgument::OPTIONAL, |
|
44 | - 'Name of the calendar to delete') |
|
45 | - ->addOption('birthday', |
|
46 | - null, |
|
47 | - InputOption::VALUE_NONE, |
|
48 | - 'Delete the birthday calendar') |
|
49 | - ->addOption('force', |
|
50 | - 'f', |
|
51 | - InputOption::VALUE_NONE, |
|
52 | - 'Force delete skipping trashbin'); |
|
53 | - } |
|
35 | + protected function configure(): void { |
|
36 | + $this |
|
37 | + ->setName('dav:delete-calendar') |
|
38 | + ->setDescription('Delete a dav calendar') |
|
39 | + ->addArgument('uid', |
|
40 | + InputArgument::REQUIRED, |
|
41 | + 'User who owns the calendar') |
|
42 | + ->addArgument('name', |
|
43 | + InputArgument::OPTIONAL, |
|
44 | + 'Name of the calendar to delete') |
|
45 | + ->addOption('birthday', |
|
46 | + null, |
|
47 | + InputOption::VALUE_NONE, |
|
48 | + 'Delete the birthday calendar') |
|
49 | + ->addOption('force', |
|
50 | + 'f', |
|
51 | + InputOption::VALUE_NONE, |
|
52 | + 'Force delete skipping trashbin'); |
|
53 | + } |
|
54 | 54 | |
55 | - protected function execute( |
|
56 | - InputInterface $input, |
|
57 | - OutputInterface $output, |
|
58 | - ): int { |
|
59 | - /** @var string $user */ |
|
60 | - $user = $input->getArgument('uid'); |
|
61 | - if (!$this->userManager->userExists($user)) { |
|
62 | - throw new \InvalidArgumentException( |
|
63 | - 'User <' . $user . '> is unknown.'); |
|
64 | - } |
|
55 | + protected function execute( |
|
56 | + InputInterface $input, |
|
57 | + OutputInterface $output, |
|
58 | + ): int { |
|
59 | + /** @var string $user */ |
|
60 | + $user = $input->getArgument('uid'); |
|
61 | + if (!$this->userManager->userExists($user)) { |
|
62 | + throw new \InvalidArgumentException( |
|
63 | + 'User <' . $user . '> is unknown.'); |
|
64 | + } |
|
65 | 65 | |
66 | - $birthday = $input->getOption('birthday'); |
|
67 | - if ($birthday !== false) { |
|
68 | - $name = BirthdayService::BIRTHDAY_CALENDAR_URI; |
|
69 | - } else { |
|
70 | - /** @var string $name */ |
|
71 | - $name = $input->getArgument('name'); |
|
72 | - if (!$name) { |
|
73 | - throw new \InvalidArgumentException( |
|
74 | - 'Please specify a calendar name or --birthday'); |
|
75 | - } |
|
76 | - } |
|
66 | + $birthday = $input->getOption('birthday'); |
|
67 | + if ($birthday !== false) { |
|
68 | + $name = BirthdayService::BIRTHDAY_CALENDAR_URI; |
|
69 | + } else { |
|
70 | + /** @var string $name */ |
|
71 | + $name = $input->getArgument('name'); |
|
72 | + if (!$name) { |
|
73 | + throw new \InvalidArgumentException( |
|
74 | + 'Please specify a calendar name or --birthday'); |
|
75 | + } |
|
76 | + } |
|
77 | 77 | |
78 | - $calendarInfo = $this->calDav->getCalendarByUri( |
|
79 | - 'principals/users/' . $user, |
|
80 | - $name); |
|
81 | - if ($calendarInfo === null) { |
|
82 | - throw new \InvalidArgumentException( |
|
83 | - 'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.'); |
|
84 | - } |
|
78 | + $calendarInfo = $this->calDav->getCalendarByUri( |
|
79 | + 'principals/users/' . $user, |
|
80 | + $name); |
|
81 | + if ($calendarInfo === null) { |
|
82 | + throw new \InvalidArgumentException( |
|
83 | + 'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.'); |
|
84 | + } |
|
85 | 85 | |
86 | - $calendar = new Calendar( |
|
87 | - $this->calDav, |
|
88 | - $calendarInfo, |
|
89 | - $this->l10n, |
|
90 | - $this->config, |
|
91 | - $this->logger |
|
92 | - ); |
|
86 | + $calendar = new Calendar( |
|
87 | + $this->calDav, |
|
88 | + $calendarInfo, |
|
89 | + $this->l10n, |
|
90 | + $this->config, |
|
91 | + $this->logger |
|
92 | + ); |
|
93 | 93 | |
94 | - $force = $input->getOption('force'); |
|
95 | - if ($force) { |
|
96 | - $calendar->disableTrashbin(); |
|
97 | - } |
|
94 | + $force = $input->getOption('force'); |
|
95 | + if ($force) { |
|
96 | + $calendar->disableTrashbin(); |
|
97 | + } |
|
98 | 98 | |
99 | - $calendar->delete(); |
|
99 | + $calendar->delete(); |
|
100 | 100 | |
101 | - return self::SUCCESS; |
|
102 | - } |
|
101 | + return self::SUCCESS; |
|
102 | + } |
|
103 | 103 | } |
@@ -29,38 +29,38 @@ |
||
29 | 29 | |
30 | 30 | |
31 | 31 | $this->create('files_external_oauth1', 'apps/files_external/ajax/oauth1.php') |
32 | - ->actionInclude('files_external/ajax/oauth1.php'); |
|
32 | + ->actionInclude('files_external/ajax/oauth1.php'); |
|
33 | 33 | $this->create('files_external_oauth2', 'apps/files_external/ajax/oauth2.php') |
34 | - ->actionInclude('files_external/ajax/oauth2.php'); |
|
34 | + ->actionInclude('files_external/ajax/oauth2.php'); |
|
35 | 35 | |
36 | 36 | |
37 | 37 | $this->create('files_external_list_applicable', '/apps/files_external/applicable') |
38 | - ->actionInclude('files_external/ajax/applicable.php'); |
|
38 | + ->actionInclude('files_external/ajax/applicable.php'); |
|
39 | 39 | |
40 | 40 | return [ |
41 | - 'resources' => [ |
|
42 | - 'global_storages' => ['url' => '/globalstorages'], |
|
43 | - 'user_storages' => ['url' => '/userstorages'], |
|
44 | - 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
45 | - ], |
|
46 | - 'routes' => [ |
|
47 | - [ |
|
48 | - 'name' => 'Ajax#getSshKeys', |
|
49 | - 'url' => '/ajax/public_key.php', |
|
50 | - 'verb' => 'POST', |
|
51 | - 'requirements' => [], |
|
52 | - ], |
|
53 | - [ |
|
54 | - 'name' => 'Ajax#saveGlobalCredentials', |
|
55 | - 'url' => '/globalcredentials', |
|
56 | - 'verb' => 'POST', |
|
57 | - ], |
|
58 | - ], |
|
59 | - 'ocs' => [ |
|
60 | - [ |
|
61 | - 'name' => 'Api#getUserMounts', |
|
62 | - 'url' => '/api/v1/mounts', |
|
63 | - 'verb' => 'GET', |
|
64 | - ], |
|
65 | - ], |
|
41 | + 'resources' => [ |
|
42 | + 'global_storages' => ['url' => '/globalstorages'], |
|
43 | + 'user_storages' => ['url' => '/userstorages'], |
|
44 | + 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
45 | + ], |
|
46 | + 'routes' => [ |
|
47 | + [ |
|
48 | + 'name' => 'Ajax#getSshKeys', |
|
49 | + 'url' => '/ajax/public_key.php', |
|
50 | + 'verb' => 'POST', |
|
51 | + 'requirements' => [], |
|
52 | + ], |
|
53 | + [ |
|
54 | + 'name' => 'Ajax#saveGlobalCredentials', |
|
55 | + 'url' => '/globalcredentials', |
|
56 | + 'verb' => 'POST', |
|
57 | + ], |
|
58 | + ], |
|
59 | + 'ocs' => [ |
|
60 | + [ |
|
61 | + 'name' => 'Api#getUserMounts', |
|
62 | + 'url' => '/api/v1/mounts', |
|
63 | + 'verb' => 'GET', |
|
64 | + ], |
|
65 | + ], |
|
66 | 66 | ]; |
@@ -34,67 +34,67 @@ |
||
34 | 34 | * @template-extends QBMapper<PublicKeyCredentialEntity> |
35 | 35 | */ |
36 | 36 | class PublicKeyCredentialMapper extends QBMapper { |
37 | - public function __construct(IDBConnection $db) { |
|
38 | - parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class); |
|
39 | - } |
|
37 | + public function __construct(IDBConnection $db) { |
|
38 | + parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class); |
|
39 | + } |
|
40 | 40 | |
41 | - public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity { |
|
42 | - $qb = $this->db->getQueryBuilder(); |
|
41 | + public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity { |
|
42 | + $qb = $this->db->getQueryBuilder(); |
|
43 | 43 | |
44 | - $qb->select('*') |
|
45 | - ->from($this->getTableName()) |
|
46 | - ->where( |
|
47 | - $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId))) |
|
48 | - ); |
|
44 | + $qb->select('*') |
|
45 | + ->from($this->getTableName()) |
|
46 | + ->where( |
|
47 | + $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId))) |
|
48 | + ); |
|
49 | 49 | |
50 | - return $this->findEntity($qb); |
|
51 | - } |
|
50 | + return $this->findEntity($qb); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @return PublicKeyCredentialEntity[] |
|
55 | - */ |
|
56 | - public function findAllForUid(string $uid): array { |
|
57 | - $qb = $this->db->getQueryBuilder(); |
|
53 | + /** |
|
54 | + * @return PublicKeyCredentialEntity[] |
|
55 | + */ |
|
56 | + public function findAllForUid(string $uid): array { |
|
57 | + $qb = $this->db->getQueryBuilder(); |
|
58 | 58 | |
59 | - $qb->select('*') |
|
60 | - ->from($this->getTableName()) |
|
61 | - ->where( |
|
62 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
63 | - ); |
|
59 | + $qb->select('*') |
|
60 | + ->from($this->getTableName()) |
|
61 | + ->where( |
|
62 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
63 | + ); |
|
64 | 64 | |
65 | - return $this->findEntities($qb); |
|
66 | - } |
|
65 | + return $this->findEntities($qb); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param string $uid |
|
70 | - * @param int $id |
|
71 | - * |
|
72 | - * @return PublicKeyCredentialEntity |
|
73 | - * @throws DoesNotExistException |
|
74 | - */ |
|
75 | - public function findById(string $uid, int $id): PublicKeyCredentialEntity { |
|
76 | - $qb = $this->db->getQueryBuilder(); |
|
68 | + /** |
|
69 | + * @param string $uid |
|
70 | + * @param int $id |
|
71 | + * |
|
72 | + * @return PublicKeyCredentialEntity |
|
73 | + * @throws DoesNotExistException |
|
74 | + */ |
|
75 | + public function findById(string $uid, int $id): PublicKeyCredentialEntity { |
|
76 | + $qb = $this->db->getQueryBuilder(); |
|
77 | 77 | |
78 | - $qb->select('*') |
|
79 | - ->from($this->getTableName()) |
|
80 | - ->where($qb->expr()->andX( |
|
81 | - $qb->expr()->eq('id', $qb->createNamedParameter($id)), |
|
82 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
83 | - )); |
|
78 | + $qb->select('*') |
|
79 | + ->from($this->getTableName()) |
|
80 | + ->where($qb->expr()->andX( |
|
81 | + $qb->expr()->eq('id', $qb->createNamedParameter($id)), |
|
82 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
83 | + )); |
|
84 | 84 | |
85 | - return $this->findEntity($qb); |
|
86 | - } |
|
85 | + return $this->findEntity($qb); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @throws \OCP\DB\Exception |
|
90 | - */ |
|
91 | - public function deleteByUid(string $uid) { |
|
92 | - $qb = $this->db->getQueryBuilder(); |
|
88 | + /** |
|
89 | + * @throws \OCP\DB\Exception |
|
90 | + */ |
|
91 | + public function deleteByUid(string $uid) { |
|
92 | + $qb = $this->db->getQueryBuilder(); |
|
93 | 93 | |
94 | - $qb->delete($this->getTableName()) |
|
95 | - ->where( |
|
96 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
97 | - ); |
|
98 | - $qb->executeStatement(); |
|
99 | - } |
|
94 | + $qb->delete($this->getTableName()) |
|
95 | + ->where( |
|
96 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
97 | + ); |
|
98 | + $qb->executeStatement(); |
|
99 | + } |
|
100 | 100 | } |