@@ -30,35 +30,35 @@ |
||
30 | 30 | * @since 12.0.0 |
31 | 31 | */ |
32 | 32 | interface ICloudId { |
33 | - /** |
|
34 | - * The remote cloud id |
|
35 | - * |
|
36 | - * @return string |
|
37 | - * @since 12.0.0 |
|
38 | - */ |
|
39 | - public function getId(): string; |
|
33 | + /** |
|
34 | + * The remote cloud id |
|
35 | + * |
|
36 | + * @return string |
|
37 | + * @since 12.0.0 |
|
38 | + */ |
|
39 | + public function getId(): string; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Get a clean representation of the cloud id for display |
|
43 | - * |
|
44 | - * @return string |
|
45 | - * @since 12.0.0 |
|
46 | - */ |
|
47 | - public function getDisplayId(): string; |
|
41 | + /** |
|
42 | + * Get a clean representation of the cloud id for display |
|
43 | + * |
|
44 | + * @return string |
|
45 | + * @since 12.0.0 |
|
46 | + */ |
|
47 | + public function getDisplayId(): string; |
|
48 | 48 | |
49 | - /** |
|
50 | - * The username on the remote server |
|
51 | - * |
|
52 | - * @return string |
|
53 | - * @since 12.0.0 |
|
54 | - */ |
|
55 | - public function getUser(): string; |
|
49 | + /** |
|
50 | + * The username on the remote server |
|
51 | + * |
|
52 | + * @return string |
|
53 | + * @since 12.0.0 |
|
54 | + */ |
|
55 | + public function getUser(): string; |
|
56 | 56 | |
57 | - /** |
|
58 | - * The base address of the remote server |
|
59 | - * |
|
60 | - * @return string |
|
61 | - * @since 12.0.0 |
|
62 | - */ |
|
63 | - public function getRemote(): string; |
|
57 | + /** |
|
58 | + * The base address of the remote server |
|
59 | + * |
|
60 | + * @return string |
|
61 | + * @since 12.0.0 |
|
62 | + */ |
|
63 | + public function getRemote(): string; |
|
64 | 64 | } |
@@ -31,33 +31,33 @@ |
||
31 | 31 | * @since 12.0.0 |
32 | 32 | */ |
33 | 33 | interface ICloudIdManager { |
34 | - /** |
|
35 | - * @param string $cloudId |
|
36 | - * @return ICloudId |
|
37 | - * @throws \InvalidArgumentException |
|
38 | - * |
|
39 | - * @since 12.0.0 |
|
40 | - */ |
|
41 | - public function resolveCloudId(string $cloudId): ICloudId; |
|
34 | + /** |
|
35 | + * @param string $cloudId |
|
36 | + * @return ICloudId |
|
37 | + * @throws \InvalidArgumentException |
|
38 | + * |
|
39 | + * @since 12.0.0 |
|
40 | + */ |
|
41 | + public function resolveCloudId(string $cloudId): ICloudId; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Get the cloud id for a remote user |
|
45 | - * |
|
46 | - * @param string $user |
|
47 | - * @param string $remote |
|
48 | - * @return ICloudId |
|
49 | - * |
|
50 | - * @since 12.0.0 |
|
51 | - */ |
|
52 | - public function getCloudId(string $user, string $remote): ICloudId; |
|
43 | + /** |
|
44 | + * Get the cloud id for a remote user |
|
45 | + * |
|
46 | + * @param string $user |
|
47 | + * @param string $remote |
|
48 | + * @return ICloudId |
|
49 | + * |
|
50 | + * @since 12.0.0 |
|
51 | + */ |
|
52 | + public function getCloudId(string $user, string $remote): ICloudId; |
|
53 | 53 | |
54 | - /** |
|
55 | - * Check if the input is a correctly formatted cloud id |
|
56 | - * |
|
57 | - * @param string $cloudId |
|
58 | - * @return bool |
|
59 | - * |
|
60 | - * @since 12.0.0 |
|
61 | - */ |
|
62 | - public function isValidCloudId(string $cloudId): bool; |
|
54 | + /** |
|
55 | + * Check if the input is a correctly formatted cloud id |
|
56 | + * |
|
57 | + * @param string $cloudId |
|
58 | + * @return bool |
|
59 | + * |
|
60 | + * @since 12.0.0 |
|
61 | + */ |
|
62 | + public function isValidCloudId(string $cloudId): bool; |
|
63 | 63 | } |
@@ -31,9 +31,9 @@ |
||
31 | 31 | * @since 8.1.0 |
32 | 32 | */ |
33 | 33 | interface IClientService { |
34 | - /** |
|
35 | - * @return IClient |
|
36 | - * @since 8.1.0 |
|
37 | - */ |
|
38 | - public function newClient(): IClient; |
|
34 | + /** |
|
35 | + * @return IClient |
|
36 | + * @since 8.1.0 |
|
37 | + */ |
|
38 | + public function newClient(): IClient; |
|
39 | 39 | } |
@@ -32,28 +32,28 @@ |
||
32 | 32 | * @since 8.1.0 |
33 | 33 | */ |
34 | 34 | interface IResponse { |
35 | - /** |
|
36 | - * @return string|resource |
|
37 | - * @since 8.1.0 |
|
38 | - */ |
|
39 | - public function getBody(); |
|
35 | + /** |
|
36 | + * @return string|resource |
|
37 | + * @since 8.1.0 |
|
38 | + */ |
|
39 | + public function getBody(); |
|
40 | 40 | |
41 | - /** |
|
42 | - * @return int |
|
43 | - * @since 8.1.0 |
|
44 | - */ |
|
45 | - public function getStatusCode(): int; |
|
41 | + /** |
|
42 | + * @return int |
|
43 | + * @since 8.1.0 |
|
44 | + */ |
|
45 | + public function getStatusCode(): int; |
|
46 | 46 | |
47 | - /** |
|
48 | - * @param string $key |
|
49 | - * @return string |
|
50 | - * @since 8.1.0 |
|
51 | - */ |
|
52 | - public function getHeader(string $key): string; |
|
47 | + /** |
|
48 | + * @param string $key |
|
49 | + * @return string |
|
50 | + * @since 8.1.0 |
|
51 | + */ |
|
52 | + public function getHeader(string $key): string; |
|
53 | 53 | |
54 | - /** |
|
55 | - * @return array |
|
56 | - * @since 8.1.0 |
|
57 | - */ |
|
58 | - public function getHeaders(): array; |
|
54 | + /** |
|
55 | + * @return array |
|
56 | + * @since 8.1.0 |
|
57 | + */ |
|
58 | + public function getHeaders(): array; |
|
59 | 59 | } |
@@ -45,23 +45,23 @@ |
||
45 | 45 | * @since 8.0.0 |
46 | 46 | */ |
47 | 47 | interface IHasher { |
48 | - /** |
|
49 | - * Hashes a message using PHP's `password_hash` functionality. |
|
50 | - * Please note that the size of the returned string is not guaranteed |
|
51 | - * and can be up to 255 characters. |
|
52 | - * |
|
53 | - * @param string $message Message to generate hash from |
|
54 | - * @return string Hash of the message with appended version parameter |
|
55 | - * @since 8.0.0 |
|
56 | - */ |
|
57 | - public function hash(string $message): string; |
|
48 | + /** |
|
49 | + * Hashes a message using PHP's `password_hash` functionality. |
|
50 | + * Please note that the size of the returned string is not guaranteed |
|
51 | + * and can be up to 255 characters. |
|
52 | + * |
|
53 | + * @param string $message Message to generate hash from |
|
54 | + * @return string Hash of the message with appended version parameter |
|
55 | + * @since 8.0.0 |
|
56 | + */ |
|
57 | + public function hash(string $message): string; |
|
58 | 58 | |
59 | - /** |
|
60 | - * @param string $message Message to verify |
|
61 | - * @param string $hash Assumed hash of the message |
|
62 | - * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one. |
|
63 | - * @return bool Whether $hash is a valid hash of $message |
|
64 | - * @since 8.0.0 |
|
65 | - */ |
|
66 | - public function verify(string $message, string $hash, &$newHash = null): bool ; |
|
59 | + /** |
|
60 | + * @param string $message Message to verify |
|
61 | + * @param string $hash Assumed hash of the message |
|
62 | + * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one. |
|
63 | + * @return bool Whether $hash is a valid hash of $message |
|
64 | + * @since 8.0.0 |
|
65 | + */ |
|
66 | + public function verify(string $message, string $hash, &$newHash = null): bool ; |
|
67 | 67 | } |
@@ -63,5 +63,5 @@ |
||
63 | 63 | * @return bool Whether $hash is a valid hash of $message |
64 | 64 | * @since 8.0.0 |
65 | 65 | */ |
66 | - public function verify(string $message, string $hash, &$newHash = null): bool ; |
|
66 | + public function verify(string $message, string $hash, &$newHash = null): bool; |
|
67 | 67 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @return IMemcache |
134 | 134 | */ |
135 | 135 | public function createLocking(string $prefix = ''): IMemcache { |
136 | - return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix); |
|
136 | + return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @return ICache |
144 | 144 | */ |
145 | 145 | public function createDistributed(string $prefix = ''): ICache { |
146 | - return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix); |
|
146 | + return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @return ICache |
154 | 154 | */ |
155 | 155 | public function createLocal(string $prefix = ''): ICache { |
156 | - return new $this->localCacheClass($this->globalPrefix . '/' . $prefix); |
|
156 | + return new $this->localCacheClass($this->globalPrefix.'/'.$prefix); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -36,158 +36,158 @@ |
||
36 | 36 | use OCP\IMemcache; |
37 | 37 | |
38 | 38 | class Factory implements ICacheFactory { |
39 | - public const NULL_CACHE = NullCache::class; |
|
40 | - |
|
41 | - /** |
|
42 | - * @var string $globalPrefix |
|
43 | - */ |
|
44 | - private $globalPrefix; |
|
45 | - |
|
46 | - /** |
|
47 | - * @var ILogger $logger |
|
48 | - */ |
|
49 | - private $logger; |
|
50 | - |
|
51 | - /** |
|
52 | - * @var string $localCacheClass |
|
53 | - */ |
|
54 | - private $localCacheClass; |
|
55 | - |
|
56 | - /** |
|
57 | - * @var string $distributedCacheClass |
|
58 | - */ |
|
59 | - private $distributedCacheClass; |
|
60 | - |
|
61 | - /** |
|
62 | - * @var string $lockingCacheClass |
|
63 | - */ |
|
64 | - private $lockingCacheClass; |
|
65 | - |
|
66 | - /** |
|
67 | - * @param string $globalPrefix |
|
68 | - * @param ILogger $logger |
|
69 | - * @param string|null $localCacheClass |
|
70 | - * @param string|null $distributedCacheClass |
|
71 | - * @param string|null $lockingCacheClass |
|
72 | - */ |
|
73 | - public function __construct(string $globalPrefix, ILogger $logger, |
|
74 | - $localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null) { |
|
75 | - $this->logger = $logger; |
|
76 | - $this->globalPrefix = $globalPrefix; |
|
77 | - |
|
78 | - if (!$localCacheClass) { |
|
79 | - $localCacheClass = self::NULL_CACHE; |
|
80 | - } |
|
81 | - if (!$distributedCacheClass) { |
|
82 | - $distributedCacheClass = $localCacheClass; |
|
83 | - } |
|
84 | - |
|
85 | - $missingCacheMessage = 'Memcache {class} not available for {use} cache'; |
|
86 | - $missingCacheHint = 'Is the matching PHP module installed and enabled?'; |
|
87 | - if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) { |
|
88 | - if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
89 | - // CLI should not hard-fail on broken memcache |
|
90 | - $this->logger->info($missingCacheMessage, [ |
|
91 | - 'class' => $localCacheClass, |
|
92 | - 'use' => 'local', |
|
93 | - 'app' => 'cli' |
|
94 | - ]); |
|
95 | - $localCacheClass = self::NULL_CACHE; |
|
96 | - } else { |
|
97 | - throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
98 | - '{class}' => $localCacheClass, '{use}' => 'local' |
|
99 | - ]), $missingCacheHint); |
|
100 | - } |
|
101 | - } |
|
102 | - if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) { |
|
103 | - if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
104 | - // CLI should not hard-fail on broken memcache |
|
105 | - $this->logger->info($missingCacheMessage, [ |
|
106 | - 'class' => $distributedCacheClass, |
|
107 | - 'use' => 'distributed', |
|
108 | - 'app' => 'cli' |
|
109 | - ]); |
|
110 | - $distributedCacheClass = self::NULL_CACHE; |
|
111 | - } else { |
|
112 | - throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
113 | - '{class}' => $distributedCacheClass, '{use}' => 'distributed' |
|
114 | - ]), $missingCacheHint); |
|
115 | - } |
|
116 | - } |
|
117 | - if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) { |
|
118 | - // don't fallback since the fallback might not be suitable for storing lock |
|
119 | - $lockingCacheClass = self::NULL_CACHE; |
|
120 | - } |
|
121 | - |
|
122 | - $this->localCacheClass = $localCacheClass; |
|
123 | - $this->distributedCacheClass = $distributedCacheClass; |
|
124 | - $this->lockingCacheClass = $lockingCacheClass; |
|
125 | - } |
|
126 | - |
|
127 | - /** |
|
128 | - * create a cache instance for storing locks |
|
129 | - * |
|
130 | - * @param string $prefix |
|
131 | - * @return IMemcache |
|
132 | - */ |
|
133 | - public function createLocking(string $prefix = ''): IMemcache { |
|
134 | - return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix); |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * create a distributed cache instance |
|
139 | - * |
|
140 | - * @param string $prefix |
|
141 | - * @return ICache |
|
142 | - */ |
|
143 | - public function createDistributed(string $prefix = ''): ICache { |
|
144 | - return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix); |
|
145 | - } |
|
146 | - |
|
147 | - /** |
|
148 | - * create a local cache instance |
|
149 | - * |
|
150 | - * @param string $prefix |
|
151 | - * @return ICache |
|
152 | - */ |
|
153 | - public function createLocal(string $prefix = ''): ICache { |
|
154 | - return new $this->localCacheClass($this->globalPrefix . '/' . $prefix); |
|
155 | - } |
|
156 | - |
|
157 | - /** |
|
158 | - * @see \OC\Memcache\Factory::createDistributed() |
|
159 | - * @param string $prefix |
|
160 | - * @return ICache |
|
161 | - * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal |
|
162 | - */ |
|
163 | - public function create(string $prefix = ''): ICache { |
|
164 | - return $this->createDistributed($prefix); |
|
165 | - } |
|
166 | - |
|
167 | - /** |
|
168 | - * check memcache availability |
|
169 | - * |
|
170 | - * @return bool |
|
171 | - */ |
|
172 | - public function isAvailable(): bool { |
|
173 | - return ($this->distributedCacheClass !== self::NULL_CACHE); |
|
174 | - } |
|
175 | - |
|
176 | - /** |
|
177 | - * @see \OC\Memcache\Factory::createLocal() |
|
178 | - * @param string $prefix |
|
179 | - * @return ICache |
|
180 | - */ |
|
181 | - public function createLowLatency(string $prefix = ''): ICache { |
|
182 | - return $this->createLocal($prefix); |
|
183 | - } |
|
184 | - |
|
185 | - /** |
|
186 | - * Check if a local memory cache backend is available |
|
187 | - * |
|
188 | - * @return bool |
|
189 | - */ |
|
190 | - public function isLocalCacheAvailable(): bool { |
|
191 | - return ($this->localCacheClass !== self::NULL_CACHE); |
|
192 | - } |
|
39 | + public const NULL_CACHE = NullCache::class; |
|
40 | + |
|
41 | + /** |
|
42 | + * @var string $globalPrefix |
|
43 | + */ |
|
44 | + private $globalPrefix; |
|
45 | + |
|
46 | + /** |
|
47 | + * @var ILogger $logger |
|
48 | + */ |
|
49 | + private $logger; |
|
50 | + |
|
51 | + /** |
|
52 | + * @var string $localCacheClass |
|
53 | + */ |
|
54 | + private $localCacheClass; |
|
55 | + |
|
56 | + /** |
|
57 | + * @var string $distributedCacheClass |
|
58 | + */ |
|
59 | + private $distributedCacheClass; |
|
60 | + |
|
61 | + /** |
|
62 | + * @var string $lockingCacheClass |
|
63 | + */ |
|
64 | + private $lockingCacheClass; |
|
65 | + |
|
66 | + /** |
|
67 | + * @param string $globalPrefix |
|
68 | + * @param ILogger $logger |
|
69 | + * @param string|null $localCacheClass |
|
70 | + * @param string|null $distributedCacheClass |
|
71 | + * @param string|null $lockingCacheClass |
|
72 | + */ |
|
73 | + public function __construct(string $globalPrefix, ILogger $logger, |
|
74 | + $localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null) { |
|
75 | + $this->logger = $logger; |
|
76 | + $this->globalPrefix = $globalPrefix; |
|
77 | + |
|
78 | + if (!$localCacheClass) { |
|
79 | + $localCacheClass = self::NULL_CACHE; |
|
80 | + } |
|
81 | + if (!$distributedCacheClass) { |
|
82 | + $distributedCacheClass = $localCacheClass; |
|
83 | + } |
|
84 | + |
|
85 | + $missingCacheMessage = 'Memcache {class} not available for {use} cache'; |
|
86 | + $missingCacheHint = 'Is the matching PHP module installed and enabled?'; |
|
87 | + if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) { |
|
88 | + if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
89 | + // CLI should not hard-fail on broken memcache |
|
90 | + $this->logger->info($missingCacheMessage, [ |
|
91 | + 'class' => $localCacheClass, |
|
92 | + 'use' => 'local', |
|
93 | + 'app' => 'cli' |
|
94 | + ]); |
|
95 | + $localCacheClass = self::NULL_CACHE; |
|
96 | + } else { |
|
97 | + throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
98 | + '{class}' => $localCacheClass, '{use}' => 'local' |
|
99 | + ]), $missingCacheHint); |
|
100 | + } |
|
101 | + } |
|
102 | + if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) { |
|
103 | + if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
104 | + // CLI should not hard-fail on broken memcache |
|
105 | + $this->logger->info($missingCacheMessage, [ |
|
106 | + 'class' => $distributedCacheClass, |
|
107 | + 'use' => 'distributed', |
|
108 | + 'app' => 'cli' |
|
109 | + ]); |
|
110 | + $distributedCacheClass = self::NULL_CACHE; |
|
111 | + } else { |
|
112 | + throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
113 | + '{class}' => $distributedCacheClass, '{use}' => 'distributed' |
|
114 | + ]), $missingCacheHint); |
|
115 | + } |
|
116 | + } |
|
117 | + if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) { |
|
118 | + // don't fallback since the fallback might not be suitable for storing lock |
|
119 | + $lockingCacheClass = self::NULL_CACHE; |
|
120 | + } |
|
121 | + |
|
122 | + $this->localCacheClass = $localCacheClass; |
|
123 | + $this->distributedCacheClass = $distributedCacheClass; |
|
124 | + $this->lockingCacheClass = $lockingCacheClass; |
|
125 | + } |
|
126 | + |
|
127 | + /** |
|
128 | + * create a cache instance for storing locks |
|
129 | + * |
|
130 | + * @param string $prefix |
|
131 | + * @return IMemcache |
|
132 | + */ |
|
133 | + public function createLocking(string $prefix = ''): IMemcache { |
|
134 | + return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix); |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * create a distributed cache instance |
|
139 | + * |
|
140 | + * @param string $prefix |
|
141 | + * @return ICache |
|
142 | + */ |
|
143 | + public function createDistributed(string $prefix = ''): ICache { |
|
144 | + return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix); |
|
145 | + } |
|
146 | + |
|
147 | + /** |
|
148 | + * create a local cache instance |
|
149 | + * |
|
150 | + * @param string $prefix |
|
151 | + * @return ICache |
|
152 | + */ |
|
153 | + public function createLocal(string $prefix = ''): ICache { |
|
154 | + return new $this->localCacheClass($this->globalPrefix . '/' . $prefix); |
|
155 | + } |
|
156 | + |
|
157 | + /** |
|
158 | + * @see \OC\Memcache\Factory::createDistributed() |
|
159 | + * @param string $prefix |
|
160 | + * @return ICache |
|
161 | + * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal |
|
162 | + */ |
|
163 | + public function create(string $prefix = ''): ICache { |
|
164 | + return $this->createDistributed($prefix); |
|
165 | + } |
|
166 | + |
|
167 | + /** |
|
168 | + * check memcache availability |
|
169 | + * |
|
170 | + * @return bool |
|
171 | + */ |
|
172 | + public function isAvailable(): bool { |
|
173 | + return ($this->distributedCacheClass !== self::NULL_CACHE); |
|
174 | + } |
|
175 | + |
|
176 | + /** |
|
177 | + * @see \OC\Memcache\Factory::createLocal() |
|
178 | + * @param string $prefix |
|
179 | + * @return ICache |
|
180 | + */ |
|
181 | + public function createLowLatency(string $prefix = ''): ICache { |
|
182 | + return $this->createLocal($prefix); |
|
183 | + } |
|
184 | + |
|
185 | + /** |
|
186 | + * Check if a local memory cache backend is available |
|
187 | + * |
|
188 | + * @return bool |
|
189 | + */ |
|
190 | + public function isLocalCacheAvailable(): bool { |
|
191 | + return ($this->localCacheClass !== self::NULL_CACHE); |
|
192 | + } |
|
193 | 193 | } |
@@ -29,50 +29,50 @@ |
||
29 | 29 | |
30 | 30 | class Version13000Date20170814074715 extends SimpleMigrationStep { |
31 | 31 | |
32 | - /** |
|
33 | - * @param IOutput $output |
|
34 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
35 | - * @param array $options |
|
36 | - * @since 13.0.0 |
|
37 | - */ |
|
38 | - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
39 | - } |
|
32 | + /** |
|
33 | + * @param IOutput $output |
|
34 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
35 | + * @param array $options |
|
36 | + * @since 13.0.0 |
|
37 | + */ |
|
38 | + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IOutput $output |
|
43 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | - * @param array $options |
|
45 | - * @return null|ISchemaWrapper |
|
46 | - * @since 13.0.0 |
|
47 | - */ |
|
48 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
49 | - /** @var ISchemaWrapper $schema */ |
|
50 | - $schema = $schemaClosure(); |
|
41 | + /** |
|
42 | + * @param IOutput $output |
|
43 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | + * @param array $options |
|
45 | + * @return null|ISchemaWrapper |
|
46 | + * @since 13.0.0 |
|
47 | + */ |
|
48 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
49 | + /** @var ISchemaWrapper $schema */ |
|
50 | + $schema = $schemaClosure(); |
|
51 | 51 | |
52 | 52 | |
53 | - if (!$schema->hasTable('accounts')) { |
|
54 | - $table = $schema->createTable('accounts'); |
|
55 | - $table->addColumn('uid', 'string', [ |
|
56 | - 'notnull' => true, |
|
57 | - 'length' => 64, |
|
58 | - 'default' => '', |
|
59 | - ]); |
|
60 | - $table->addColumn('data', 'text', [ |
|
61 | - 'notnull' => true, |
|
62 | - 'default' => '', |
|
63 | - ]); |
|
64 | - $table->setPrimaryKey(['uid']); |
|
65 | - } |
|
53 | + if (!$schema->hasTable('accounts')) { |
|
54 | + $table = $schema->createTable('accounts'); |
|
55 | + $table->addColumn('uid', 'string', [ |
|
56 | + 'notnull' => true, |
|
57 | + 'length' => 64, |
|
58 | + 'default' => '', |
|
59 | + ]); |
|
60 | + $table->addColumn('data', 'text', [ |
|
61 | + 'notnull' => true, |
|
62 | + 'default' => '', |
|
63 | + ]); |
|
64 | + $table->setPrimaryKey(['uid']); |
|
65 | + } |
|
66 | 66 | |
67 | - return $schema; |
|
68 | - } |
|
67 | + return $schema; |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * @param IOutput $output |
|
72 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
73 | - * @param array $options |
|
74 | - * @since 13.0.0 |
|
75 | - */ |
|
76 | - public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
77 | - } |
|
70 | + /** |
|
71 | + * @param IOutput $output |
|
72 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
73 | + * @param array $options |
|
74 | + * @since 13.0.0 |
|
75 | + */ |
|
76 | + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
77 | + } |
|
78 | 78 | } |
@@ -31,75 +31,75 @@ |
||
31 | 31 | |
32 | 32 | class Version1002Date20170607113030 extends SimpleMigrationStep { |
33 | 33 | |
34 | - /** @var IDBConnection */ |
|
35 | - protected $connection; |
|
34 | + /** @var IDBConnection */ |
|
35 | + protected $connection; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @param IDBConnection $connection |
|
39 | - */ |
|
40 | - public function __construct(IDBConnection $connection) { |
|
41 | - $this->connection = $connection; |
|
42 | - } |
|
37 | + /** |
|
38 | + * @param IDBConnection $connection |
|
39 | + */ |
|
40 | + public function __construct(IDBConnection $connection) { |
|
41 | + $this->connection = $connection; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param IOutput $output |
|
46 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
47 | - * @param array $options |
|
48 | - * @since 13.0.0 |
|
49 | - */ |
|
50 | - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
51 | - /** @var ISchemaWrapper $schema */ |
|
52 | - $schema = $schemaClosure(); |
|
44 | + /** |
|
45 | + * @param IOutput $output |
|
46 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
47 | + * @param array $options |
|
48 | + * @since 13.0.0 |
|
49 | + */ |
|
50 | + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
51 | + /** @var ISchemaWrapper $schema */ |
|
52 | + $schema = $schemaClosure(); |
|
53 | 53 | |
54 | - if (!$schema->hasTable('twofactor_backup_codes')) { |
|
55 | - // Legacy table does not exist |
|
56 | - return; |
|
57 | - } |
|
54 | + if (!$schema->hasTable('twofactor_backup_codes')) { |
|
55 | + // Legacy table does not exist |
|
56 | + return; |
|
57 | + } |
|
58 | 58 | |
59 | - $insert = $this->connection->getQueryBuilder(); |
|
60 | - $insert->insert('twofactor_backupcodes') |
|
61 | - ->values([ |
|
62 | - // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
63 | - 'user_id' => $insert->createParameter('user_id'), |
|
64 | - 'code' => $insert->createParameter('code'), |
|
65 | - 'used' => $insert->createParameter('used'), |
|
66 | - ]); |
|
59 | + $insert = $this->connection->getQueryBuilder(); |
|
60 | + $insert->insert('twofactor_backupcodes') |
|
61 | + ->values([ |
|
62 | + // Inserting with id might fail: 'id' => $insert->createParameter('id'), |
|
63 | + 'user_id' => $insert->createParameter('user_id'), |
|
64 | + 'code' => $insert->createParameter('code'), |
|
65 | + 'used' => $insert->createParameter('used'), |
|
66 | + ]); |
|
67 | 67 | |
68 | - $query = $this->connection->getQueryBuilder(); |
|
69 | - $query->select('*') |
|
70 | - ->from('twofactor_backup_codes') |
|
71 | - ->orderBy('id', 'ASC'); |
|
72 | - $result = $query->execute(); |
|
68 | + $query = $this->connection->getQueryBuilder(); |
|
69 | + $query->select('*') |
|
70 | + ->from('twofactor_backup_codes') |
|
71 | + ->orderBy('id', 'ASC'); |
|
72 | + $result = $query->execute(); |
|
73 | 73 | |
74 | - $output->startProgress(); |
|
75 | - while ($row = $result->fetch()) { |
|
76 | - $output->advance(); |
|
74 | + $output->startProgress(); |
|
75 | + while ($row = $result->fetch()) { |
|
76 | + $output->advance(); |
|
77 | 77 | |
78 | - $insert |
|
79 | - // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
80 | - ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
81 | - ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
82 | - ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
83 | - ->execute(); |
|
84 | - } |
|
85 | - $output->finishProgress(); |
|
86 | - } |
|
78 | + $insert |
|
79 | + // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) |
|
80 | + ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) |
|
81 | + ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) |
|
82 | + ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) |
|
83 | + ->execute(); |
|
84 | + } |
|
85 | + $output->finishProgress(); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @param IOutput $output |
|
90 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
91 | - * @param array $options |
|
92 | - * @return null|ISchemaWrapper |
|
93 | - * @since 13.0.0 |
|
94 | - */ |
|
95 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
96 | - /** @var ISchemaWrapper $schema */ |
|
97 | - $schema = $schemaClosure(); |
|
88 | + /** |
|
89 | + * @param IOutput $output |
|
90 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
91 | + * @param array $options |
|
92 | + * @return null|ISchemaWrapper |
|
93 | + * @since 13.0.0 |
|
94 | + */ |
|
95 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
96 | + /** @var ISchemaWrapper $schema */ |
|
97 | + $schema = $schemaClosure(); |
|
98 | 98 | |
99 | - if ($schema->hasTable('twofactor_backup_codes')) { |
|
100 | - $schema->dropTable('twofactor_backup_codes'); |
|
101 | - return $schema; |
|
102 | - } |
|
103 | - return null; |
|
104 | - } |
|
99 | + if ($schema->hasTable('twofactor_backup_codes')) { |
|
100 | + $schema->dropTable('twofactor_backup_codes'); |
|
101 | + return $schema; |
|
102 | + } |
|
103 | + return null; |
|
104 | + } |
|
105 | 105 | } |
@@ -29,30 +29,30 @@ |
||
29 | 29 | |
30 | 30 | class Version1004Date20170919104507 extends SimpleMigrationStep { |
31 | 31 | |
32 | - /** |
|
33 | - * @param IOutput $output |
|
34 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
35 | - * @param array $options |
|
36 | - * @return null|ISchemaWrapper |
|
37 | - * @since 13.0.0 |
|
38 | - */ |
|
39 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
40 | - /** @var ISchemaWrapper $schema */ |
|
41 | - $schema = $schemaClosure(); |
|
42 | - |
|
43 | - $table = $schema->getTable('addressbooks'); |
|
44 | - $column = $table->getColumn('id'); |
|
45 | - $column->setUnsigned(true); |
|
46 | - |
|
47 | - $table = $schema->getTable('calendarobjects'); |
|
48 | - $column = $table->getColumn('id'); |
|
49 | - $column->setUnsigned(true); |
|
50 | - |
|
51 | - $table = $schema->getTable('calendarchanges'); |
|
52 | - $column = $table->getColumn('id'); |
|
53 | - $column->setUnsigned(true); |
|
54 | - |
|
55 | - return $schema; |
|
56 | - } |
|
32 | + /** |
|
33 | + * @param IOutput $output |
|
34 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
35 | + * @param array $options |
|
36 | + * @return null|ISchemaWrapper |
|
37 | + * @since 13.0.0 |
|
38 | + */ |
|
39 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
40 | + /** @var ISchemaWrapper $schema */ |
|
41 | + $schema = $schemaClosure(); |
|
42 | + |
|
43 | + $table = $schema->getTable('addressbooks'); |
|
44 | + $column = $table->getColumn('id'); |
|
45 | + $column->setUnsigned(true); |
|
46 | + |
|
47 | + $table = $schema->getTable('calendarobjects'); |
|
48 | + $column = $table->getColumn('id'); |
|
49 | + $column->setUnsigned(true); |
|
50 | + |
|
51 | + $table = $schema->getTable('calendarchanges'); |
|
52 | + $column = $table->getColumn('id'); |
|
53 | + $column->setUnsigned(true); |
|
54 | + |
|
55 | + return $schema; |
|
56 | + } |
|
57 | 57 | |
58 | 58 | } |