@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSNotFoundException extends OCSException { |
35 | - /** |
|
36 | - * OCSNotFoundException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_NOT_FOUND, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSNotFoundException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_NOT_FOUND, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSForbiddenException extends OCSException { |
35 | - /** |
|
36 | - * OCSForbiddenException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_FORBIDDEN, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSForbiddenException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_FORBIDDEN, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSBadRequestException extends OCSException { |
35 | - /** |
|
36 | - * OCSBadRequestException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSBadRequestException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -30,200 +30,200 @@ |
||
30 | 30 | * @package OC\App |
31 | 31 | */ |
32 | 32 | class PlatformRepository { |
33 | - public function __construct() { |
|
34 | - $this->packages = $this->initialize(); |
|
35 | - } |
|
36 | - |
|
37 | - protected function initialize() { |
|
38 | - $loadedExtensions = get_loaded_extensions(); |
|
39 | - $packages = []; |
|
40 | - |
|
41 | - // Extensions scanning |
|
42 | - foreach ($loadedExtensions as $name) { |
|
43 | - if (in_array($name, ['standard', 'Core'])) { |
|
44 | - continue; |
|
45 | - } |
|
46 | - |
|
47 | - $ext = new \ReflectionExtension($name); |
|
48 | - try { |
|
49 | - $prettyVersion = $ext->getVersion(); |
|
50 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
51 | - } catch (\UnexpectedValueException $e) { |
|
52 | - $prettyVersion = '0'; |
|
53 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
54 | - } |
|
55 | - |
|
56 | - $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
57 | - } |
|
58 | - |
|
59 | - foreach ($loadedExtensions as $name) { |
|
60 | - $prettyVersion = null; |
|
61 | - switch ($name) { |
|
62 | - case 'curl': |
|
63 | - $curlVersion = curl_version(); |
|
64 | - $prettyVersion = $curlVersion['version']; |
|
65 | - break; |
|
66 | - |
|
67 | - case 'iconv': |
|
68 | - $prettyVersion = ICONV_VERSION; |
|
69 | - break; |
|
70 | - |
|
71 | - case 'intl': |
|
72 | - $name = 'ICU'; |
|
73 | - if (defined('INTL_ICU_VERSION')) { |
|
74 | - $prettyVersion = INTL_ICU_VERSION; |
|
75 | - } else { |
|
76 | - $reflector = new \ReflectionExtension('intl'); |
|
77 | - |
|
78 | - ob_start(); |
|
79 | - $reflector->info(); |
|
80 | - $output = ob_get_clean(); |
|
81 | - |
|
82 | - preg_match('/^ICU version => (.*)$/m', $output, $matches); |
|
83 | - $prettyVersion = $matches[1]; |
|
84 | - } |
|
85 | - |
|
86 | - break; |
|
87 | - |
|
88 | - case 'libxml': |
|
89 | - $prettyVersion = LIBXML_DOTTED_VERSION; |
|
90 | - break; |
|
91 | - |
|
92 | - case 'openssl': |
|
93 | - $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
94 | - return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
95 | - }, OPENSSL_VERSION_TEXT); |
|
96 | - break; |
|
97 | - |
|
98 | - case 'pcre': |
|
99 | - $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION); |
|
100 | - break; |
|
101 | - |
|
102 | - case 'uuid': |
|
103 | - $prettyVersion = phpversion('uuid'); |
|
104 | - break; |
|
105 | - |
|
106 | - case 'xsl': |
|
107 | - $prettyVersion = LIBXSLT_DOTTED_VERSION; |
|
108 | - break; |
|
109 | - |
|
110 | - default: |
|
111 | - // None handled extensions have no special cases, skip |
|
112 | - continue 2; |
|
113 | - } |
|
114 | - |
|
115 | - try { |
|
116 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
117 | - } catch (\UnexpectedValueException $e) { |
|
118 | - continue; |
|
119 | - } |
|
120 | - |
|
121 | - $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
122 | - } |
|
123 | - |
|
124 | - return $packages; |
|
125 | - } |
|
126 | - |
|
127 | - private function buildPackageName($name) { |
|
128 | - return str_replace(' ', '-', $name); |
|
129 | - } |
|
130 | - |
|
131 | - /** |
|
132 | - * @param $name |
|
133 | - * @return string |
|
134 | - */ |
|
135 | - public function findLibrary($name) { |
|
136 | - $extName = $this->buildPackageName($name); |
|
137 | - if (isset($this->packages[$extName])) { |
|
138 | - return $this->packages[$extName]; |
|
139 | - } |
|
140 | - return null; |
|
141 | - } |
|
142 | - |
|
143 | - private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?'; |
|
144 | - |
|
145 | - /** |
|
146 | - * Normalizes a version string to be able to perform comparisons on it |
|
147 | - * |
|
148 | - * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94 |
|
149 | - * |
|
150 | - * @param string $version |
|
151 | - * @param string $fullVersion optional complete version string to give more context |
|
152 | - * @throws \UnexpectedValueException |
|
153 | - * @return string |
|
154 | - */ |
|
155 | - public function normalizeVersion($version, $fullVersion = null) { |
|
156 | - $version = trim($version); |
|
157 | - if (null === $fullVersion) { |
|
158 | - $fullVersion = $version; |
|
159 | - } |
|
160 | - // ignore aliases and just assume the alias is required instead of the source |
|
161 | - if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) { |
|
162 | - $version = $match[1]; |
|
163 | - } |
|
164 | - // match master-like branches |
|
165 | - if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) { |
|
166 | - return '9999999-dev'; |
|
167 | - } |
|
168 | - if ('dev-' === strtolower(substr($version, 0, 4))) { |
|
169 | - return 'dev-' . substr($version, 4); |
|
170 | - } |
|
171 | - // match classical versioning |
|
172 | - if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
173 | - $version = $matches[1] |
|
174 | - . (!empty($matches[2]) ? $matches[2] : '.0') |
|
175 | - . (!empty($matches[3]) ? $matches[3] : '.0') |
|
176 | - . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
177 | - $index = 5; |
|
178 | - } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
179 | - $version = preg_replace('{\D}', '-', $matches[1]); |
|
180 | - $index = 2; |
|
181 | - } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
182 | - $version = $matches[1] |
|
183 | - . (!empty($matches[2]) ? $matches[2] : '.0') |
|
184 | - . (!empty($matches[3]) ? $matches[3] : '.0') |
|
185 | - . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
186 | - $index = 5; |
|
187 | - } |
|
188 | - // add version modifiers if a version was matched |
|
189 | - if (isset($index)) { |
|
190 | - if (!empty($matches[$index])) { |
|
191 | - if ('stable' === $matches[$index]) { |
|
192 | - return $version; |
|
193 | - } |
|
194 | - $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
195 | - } |
|
196 | - if (!empty($matches[$index + 2])) { |
|
197 | - $version .= '-dev'; |
|
198 | - } |
|
199 | - return $version; |
|
200 | - } |
|
201 | - $extraMessage = ''; |
|
202 | - if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
203 | - $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
204 | - } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
205 | - $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
206 | - } |
|
207 | - throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
208 | - } |
|
209 | - |
|
210 | - /** |
|
211 | - * @param string $stability |
|
212 | - */ |
|
213 | - private function expandStability($stability) { |
|
214 | - $stability = strtolower($stability); |
|
215 | - switch ($stability) { |
|
216 | - case 'a': |
|
217 | - return 'alpha'; |
|
218 | - case 'b': |
|
219 | - return 'beta'; |
|
220 | - case 'p': |
|
221 | - case 'pl': |
|
222 | - return 'patch'; |
|
223 | - case 'rc': |
|
224 | - return 'RC'; |
|
225 | - default: |
|
226 | - return $stability; |
|
227 | - } |
|
228 | - } |
|
33 | + public function __construct() { |
|
34 | + $this->packages = $this->initialize(); |
|
35 | + } |
|
36 | + |
|
37 | + protected function initialize() { |
|
38 | + $loadedExtensions = get_loaded_extensions(); |
|
39 | + $packages = []; |
|
40 | + |
|
41 | + // Extensions scanning |
|
42 | + foreach ($loadedExtensions as $name) { |
|
43 | + if (in_array($name, ['standard', 'Core'])) { |
|
44 | + continue; |
|
45 | + } |
|
46 | + |
|
47 | + $ext = new \ReflectionExtension($name); |
|
48 | + try { |
|
49 | + $prettyVersion = $ext->getVersion(); |
|
50 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
51 | + } catch (\UnexpectedValueException $e) { |
|
52 | + $prettyVersion = '0'; |
|
53 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
54 | + } |
|
55 | + |
|
56 | + $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
57 | + } |
|
58 | + |
|
59 | + foreach ($loadedExtensions as $name) { |
|
60 | + $prettyVersion = null; |
|
61 | + switch ($name) { |
|
62 | + case 'curl': |
|
63 | + $curlVersion = curl_version(); |
|
64 | + $prettyVersion = $curlVersion['version']; |
|
65 | + break; |
|
66 | + |
|
67 | + case 'iconv': |
|
68 | + $prettyVersion = ICONV_VERSION; |
|
69 | + break; |
|
70 | + |
|
71 | + case 'intl': |
|
72 | + $name = 'ICU'; |
|
73 | + if (defined('INTL_ICU_VERSION')) { |
|
74 | + $prettyVersion = INTL_ICU_VERSION; |
|
75 | + } else { |
|
76 | + $reflector = new \ReflectionExtension('intl'); |
|
77 | + |
|
78 | + ob_start(); |
|
79 | + $reflector->info(); |
|
80 | + $output = ob_get_clean(); |
|
81 | + |
|
82 | + preg_match('/^ICU version => (.*)$/m', $output, $matches); |
|
83 | + $prettyVersion = $matches[1]; |
|
84 | + } |
|
85 | + |
|
86 | + break; |
|
87 | + |
|
88 | + case 'libxml': |
|
89 | + $prettyVersion = LIBXML_DOTTED_VERSION; |
|
90 | + break; |
|
91 | + |
|
92 | + case 'openssl': |
|
93 | + $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
94 | + return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
95 | + }, OPENSSL_VERSION_TEXT); |
|
96 | + break; |
|
97 | + |
|
98 | + case 'pcre': |
|
99 | + $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION); |
|
100 | + break; |
|
101 | + |
|
102 | + case 'uuid': |
|
103 | + $prettyVersion = phpversion('uuid'); |
|
104 | + break; |
|
105 | + |
|
106 | + case 'xsl': |
|
107 | + $prettyVersion = LIBXSLT_DOTTED_VERSION; |
|
108 | + break; |
|
109 | + |
|
110 | + default: |
|
111 | + // None handled extensions have no special cases, skip |
|
112 | + continue 2; |
|
113 | + } |
|
114 | + |
|
115 | + try { |
|
116 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
117 | + } catch (\UnexpectedValueException $e) { |
|
118 | + continue; |
|
119 | + } |
|
120 | + |
|
121 | + $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
122 | + } |
|
123 | + |
|
124 | + return $packages; |
|
125 | + } |
|
126 | + |
|
127 | + private function buildPackageName($name) { |
|
128 | + return str_replace(' ', '-', $name); |
|
129 | + } |
|
130 | + |
|
131 | + /** |
|
132 | + * @param $name |
|
133 | + * @return string |
|
134 | + */ |
|
135 | + public function findLibrary($name) { |
|
136 | + $extName = $this->buildPackageName($name); |
|
137 | + if (isset($this->packages[$extName])) { |
|
138 | + return $this->packages[$extName]; |
|
139 | + } |
|
140 | + return null; |
|
141 | + } |
|
142 | + |
|
143 | + private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?'; |
|
144 | + |
|
145 | + /** |
|
146 | + * Normalizes a version string to be able to perform comparisons on it |
|
147 | + * |
|
148 | + * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94 |
|
149 | + * |
|
150 | + * @param string $version |
|
151 | + * @param string $fullVersion optional complete version string to give more context |
|
152 | + * @throws \UnexpectedValueException |
|
153 | + * @return string |
|
154 | + */ |
|
155 | + public function normalizeVersion($version, $fullVersion = null) { |
|
156 | + $version = trim($version); |
|
157 | + if (null === $fullVersion) { |
|
158 | + $fullVersion = $version; |
|
159 | + } |
|
160 | + // ignore aliases and just assume the alias is required instead of the source |
|
161 | + if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) { |
|
162 | + $version = $match[1]; |
|
163 | + } |
|
164 | + // match master-like branches |
|
165 | + if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) { |
|
166 | + return '9999999-dev'; |
|
167 | + } |
|
168 | + if ('dev-' === strtolower(substr($version, 0, 4))) { |
|
169 | + return 'dev-' . substr($version, 4); |
|
170 | + } |
|
171 | + // match classical versioning |
|
172 | + if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
173 | + $version = $matches[1] |
|
174 | + . (!empty($matches[2]) ? $matches[2] : '.0') |
|
175 | + . (!empty($matches[3]) ? $matches[3] : '.0') |
|
176 | + . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
177 | + $index = 5; |
|
178 | + } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
179 | + $version = preg_replace('{\D}', '-', $matches[1]); |
|
180 | + $index = 2; |
|
181 | + } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
182 | + $version = $matches[1] |
|
183 | + . (!empty($matches[2]) ? $matches[2] : '.0') |
|
184 | + . (!empty($matches[3]) ? $matches[3] : '.0') |
|
185 | + . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
186 | + $index = 5; |
|
187 | + } |
|
188 | + // add version modifiers if a version was matched |
|
189 | + if (isset($index)) { |
|
190 | + if (!empty($matches[$index])) { |
|
191 | + if ('stable' === $matches[$index]) { |
|
192 | + return $version; |
|
193 | + } |
|
194 | + $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
195 | + } |
|
196 | + if (!empty($matches[$index + 2])) { |
|
197 | + $version .= '-dev'; |
|
198 | + } |
|
199 | + return $version; |
|
200 | + } |
|
201 | + $extraMessage = ''; |
|
202 | + if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
203 | + $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
204 | + } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
205 | + $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
206 | + } |
|
207 | + throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
208 | + } |
|
209 | + |
|
210 | + /** |
|
211 | + * @param string $stability |
|
212 | + */ |
|
213 | + private function expandStability($stability) { |
|
214 | + $stability = strtolower($stability); |
|
215 | + switch ($stability) { |
|
216 | + case 'a': |
|
217 | + return 'alpha'; |
|
218 | + case 'b': |
|
219 | + return 'beta'; |
|
220 | + case 'p': |
|
221 | + case 'pl': |
|
222 | + return 'patch'; |
|
223 | + case 'rc': |
|
224 | + return 'RC'; |
|
225 | + default: |
|
226 | + return $stability; |
|
227 | + } |
|
228 | + } |
|
229 | 229 | } |
@@ -24,36 +24,36 @@ |
||
24 | 24 | use OCP\IL10N; |
25 | 25 | |
26 | 26 | abstract class Bundle { |
27 | - /** @var IL10N */ |
|
28 | - protected $l10n; |
|
27 | + /** @var IL10N */ |
|
28 | + protected $l10n; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param IL10N $l10n |
|
32 | - */ |
|
33 | - public function __construct(IL10N $l10n) { |
|
34 | - $this->l10n = $l10n; |
|
35 | - } |
|
30 | + /** |
|
31 | + * @param IL10N $l10n |
|
32 | + */ |
|
33 | + public function __construct(IL10N $l10n) { |
|
34 | + $this->l10n = $l10n; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * Get the identifier of the bundle |
|
39 | - * |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - final public function getIdentifier() { |
|
43 | - return substr(strrchr(get_class($this), '\\'), 1); |
|
44 | - } |
|
37 | + /** |
|
38 | + * Get the identifier of the bundle |
|
39 | + * |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + final public function getIdentifier() { |
|
43 | + return substr(strrchr(get_class($this), '\\'), 1); |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get the name of the bundle |
|
48 | - * |
|
49 | - * @return string |
|
50 | - */ |
|
51 | - abstract public function getName(); |
|
46 | + /** |
|
47 | + * Get the name of the bundle |
|
48 | + * |
|
49 | + * @return string |
|
50 | + */ |
|
51 | + abstract public function getName(); |
|
52 | 52 | |
53 | - /** |
|
54 | - * Get the list of app identifiers in the bundle |
|
55 | - * |
|
56 | - * @return array |
|
57 | - */ |
|
58 | - abstract public function getAppIdentifiers(); |
|
53 | + /** |
|
54 | + * Get the list of app identifiers in the bundle |
|
55 | + * |
|
56 | + * @return array |
|
57 | + */ |
|
58 | + abstract public function getAppIdentifiers(); |
|
59 | 59 | } |
@@ -28,51 +28,51 @@ |
||
28 | 28 | |
29 | 29 | class MoveUpdaterStepFile implements IRepairStep { |
30 | 30 | |
31 | - /** @var \OCP\IConfig */ |
|
32 | - protected $config; |
|
31 | + /** @var \OCP\IConfig */ |
|
32 | + protected $config; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param \OCP\IConfig $config |
|
36 | - */ |
|
37 | - public function __construct($config) { |
|
38 | - $this->config = $config; |
|
39 | - } |
|
34 | + /** |
|
35 | + * @param \OCP\IConfig $config |
|
36 | + */ |
|
37 | + public function __construct($config) { |
|
38 | + $this->config = $config; |
|
39 | + } |
|
40 | 40 | |
41 | - public function getName() { |
|
42 | - return 'Move .step file of updater to backup location'; |
|
43 | - } |
|
41 | + public function getName() { |
|
42 | + return 'Move .step file of updater to backup location'; |
|
43 | + } |
|
44 | 44 | |
45 | - public function run(IOutput $output) { |
|
46 | - $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data'); |
|
47 | - $instanceId = $this->config->getSystemValue('instanceid', null); |
|
45 | + public function run(IOutput $output) { |
|
46 | + $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data'); |
|
47 | + $instanceId = $this->config->getSystemValue('instanceid', null); |
|
48 | 48 | |
49 | - if (!is_string($instanceId) || empty($instanceId)) { |
|
50 | - return; |
|
51 | - } |
|
49 | + if (!is_string($instanceId) || empty($instanceId)) { |
|
50 | + return; |
|
51 | + } |
|
52 | 52 | |
53 | - $updaterFolderPath = $dataDir . '/updater-' . $instanceId; |
|
54 | - $stepFile = $updaterFolderPath . '/.step'; |
|
55 | - if (file_exists($stepFile)) { |
|
56 | - $output->info('.step file exists'); |
|
53 | + $updaterFolderPath = $dataDir . '/updater-' . $instanceId; |
|
54 | + $stepFile = $updaterFolderPath . '/.step'; |
|
55 | + if (file_exists($stepFile)) { |
|
56 | + $output->info('.step file exists'); |
|
57 | 57 | |
58 | - $previousStepFile = $updaterFolderPath . '/.step-previous-update'; |
|
58 | + $previousStepFile = $updaterFolderPath . '/.step-previous-update'; |
|
59 | 59 | |
60 | - // cleanup |
|
61 | - if (file_exists($previousStepFile)) { |
|
62 | - if (\OC_Helper::rmdirr($previousStepFile)) { |
|
63 | - $output->info('.step-previous-update removed'); |
|
64 | - } else { |
|
65 | - $output->info('.step-previous-update can\'t be removed - abort move of .step file'); |
|
66 | - return; |
|
67 | - } |
|
68 | - } |
|
60 | + // cleanup |
|
61 | + if (file_exists($previousStepFile)) { |
|
62 | + if (\OC_Helper::rmdirr($previousStepFile)) { |
|
63 | + $output->info('.step-previous-update removed'); |
|
64 | + } else { |
|
65 | + $output->info('.step-previous-update can\'t be removed - abort move of .step file'); |
|
66 | + return; |
|
67 | + } |
|
68 | + } |
|
69 | 69 | |
70 | - // move step file |
|
71 | - if (rename($stepFile, $previousStepFile)) { |
|
72 | - $output->info('.step file moved to .step-previous-update'); |
|
73 | - } else { |
|
74 | - $output->warning('.step file can\'t be moved'); |
|
75 | - } |
|
76 | - } |
|
77 | - } |
|
70 | + // move step file |
|
71 | + if (rename($stepFile, $previousStepFile)) { |
|
72 | + $output->info('.step file moved to .step-previous-update'); |
|
73 | + } else { |
|
74 | + $output->warning('.step file can\'t be moved'); |
|
75 | + } |
|
76 | + } |
|
77 | + } |
|
78 | 78 | } |
@@ -34,46 +34,46 @@ |
||
34 | 34 | * @package OC |
35 | 35 | */ |
36 | 36 | class HintException extends \Exception { |
37 | - private $hint; |
|
37 | + private $hint; |
|
38 | 38 | |
39 | - /** |
|
40 | - * HintException constructor. |
|
41 | - * |
|
42 | - * @param string $message The error message. It will be not revealed to the |
|
43 | - * the user (unless the hint is empty) and thus |
|
44 | - * should be not translated. |
|
45 | - * @param string $hint A useful message that is presented to the end |
|
46 | - * user. It should be translated, but must not |
|
47 | - * contain sensitive data. |
|
48 | - * @param int $code |
|
49 | - * @param \Exception|null $previous |
|
50 | - */ |
|
51 | - public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) { |
|
52 | - $this->hint = $hint; |
|
53 | - parent::__construct($message, $code, $previous); |
|
54 | - } |
|
39 | + /** |
|
40 | + * HintException constructor. |
|
41 | + * |
|
42 | + * @param string $message The error message. It will be not revealed to the |
|
43 | + * the user (unless the hint is empty) and thus |
|
44 | + * should be not translated. |
|
45 | + * @param string $hint A useful message that is presented to the end |
|
46 | + * user. It should be translated, but must not |
|
47 | + * contain sensitive data. |
|
48 | + * @param int $code |
|
49 | + * @param \Exception|null $previous |
|
50 | + */ |
|
51 | + public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) { |
|
52 | + $this->hint = $hint; |
|
53 | + parent::__construct($message, $code, $previous); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Returns a string representation of this Exception that includes the error |
|
58 | - * code, the message and the hint. |
|
59 | - * |
|
60 | - * @return string |
|
61 | - */ |
|
62 | - public function __toString() { |
|
63 | - return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n"; |
|
64 | - } |
|
56 | + /** |
|
57 | + * Returns a string representation of this Exception that includes the error |
|
58 | + * code, the message and the hint. |
|
59 | + * |
|
60 | + * @return string |
|
61 | + */ |
|
62 | + public function __toString() { |
|
63 | + return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n"; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Returns the hint with the intention to be presented to the end user. If |
|
68 | - * an empty hint was specified upon instatiation, the message is returned |
|
69 | - * instead. |
|
70 | - * |
|
71 | - * @return string |
|
72 | - */ |
|
73 | - public function getHint() { |
|
74 | - if (empty($this->hint)) { |
|
75 | - return $this->message; |
|
76 | - } |
|
77 | - return $this->hint; |
|
78 | - } |
|
66 | + /** |
|
67 | + * Returns the hint with the intention to be presented to the end user. If |
|
68 | + * an empty hint was specified upon instatiation, the message is returned |
|
69 | + * instead. |
|
70 | + * |
|
71 | + * @return string |
|
72 | + */ |
|
73 | + public function getHint() { |
|
74 | + if (empty($this->hint)) { |
|
75 | + return $this->message; |
|
76 | + } |
|
77 | + return $this->hint; |
|
78 | + } |
|
79 | 79 | } |
@@ -33,53 +33,53 @@ |
||
33 | 33 | namespace OC\Files\Storage; |
34 | 34 | |
35 | 35 | class CommonTest extends \OC\Files\Storage\Common { |
36 | - /** |
|
37 | - * underlying local storage used for missing functions |
|
38 | - * @var \OC\Files\Storage\Local |
|
39 | - */ |
|
40 | - private $storage; |
|
36 | + /** |
|
37 | + * underlying local storage used for missing functions |
|
38 | + * @var \OC\Files\Storage\Local |
|
39 | + */ |
|
40 | + private $storage; |
|
41 | 41 | |
42 | - public function __construct($params) { |
|
43 | - $this->storage = new \OC\Files\Storage\Local($params); |
|
44 | - } |
|
42 | + public function __construct($params) { |
|
43 | + $this->storage = new \OC\Files\Storage\Local($params); |
|
44 | + } |
|
45 | 45 | |
46 | - public function getId() { |
|
47 | - return 'test::'.$this->storage->getId(); |
|
48 | - } |
|
49 | - public function mkdir($path) { |
|
50 | - return $this->storage->mkdir($path); |
|
51 | - } |
|
52 | - public function rmdir($path) { |
|
53 | - return $this->storage->rmdir($path); |
|
54 | - } |
|
55 | - public function opendir($path) { |
|
56 | - return $this->storage->opendir($path); |
|
57 | - } |
|
58 | - public function stat($path) { |
|
59 | - return $this->storage->stat($path); |
|
60 | - } |
|
61 | - public function filetype($path) { |
|
62 | - return @$this->storage->filetype($path); |
|
63 | - } |
|
64 | - public function isReadable($path) { |
|
65 | - return $this->storage->isReadable($path); |
|
66 | - } |
|
67 | - public function isUpdatable($path) { |
|
68 | - return $this->storage->isUpdatable($path); |
|
69 | - } |
|
70 | - public function file_exists($path) { |
|
71 | - return $this->storage->file_exists($path); |
|
72 | - } |
|
73 | - public function unlink($path) { |
|
74 | - return $this->storage->unlink($path); |
|
75 | - } |
|
76 | - public function fopen($path, $mode) { |
|
77 | - return $this->storage->fopen($path, $mode); |
|
78 | - } |
|
79 | - public function free_space($path) { |
|
80 | - return $this->storage->free_space($path); |
|
81 | - } |
|
82 | - public function touch($path, $mtime = null) { |
|
83 | - return $this->storage->touch($path, $mtime); |
|
84 | - } |
|
46 | + public function getId() { |
|
47 | + return 'test::'.$this->storage->getId(); |
|
48 | + } |
|
49 | + public function mkdir($path) { |
|
50 | + return $this->storage->mkdir($path); |
|
51 | + } |
|
52 | + public function rmdir($path) { |
|
53 | + return $this->storage->rmdir($path); |
|
54 | + } |
|
55 | + public function opendir($path) { |
|
56 | + return $this->storage->opendir($path); |
|
57 | + } |
|
58 | + public function stat($path) { |
|
59 | + return $this->storage->stat($path); |
|
60 | + } |
|
61 | + public function filetype($path) { |
|
62 | + return @$this->storage->filetype($path); |
|
63 | + } |
|
64 | + public function isReadable($path) { |
|
65 | + return $this->storage->isReadable($path); |
|
66 | + } |
|
67 | + public function isUpdatable($path) { |
|
68 | + return $this->storage->isUpdatable($path); |
|
69 | + } |
|
70 | + public function file_exists($path) { |
|
71 | + return $this->storage->file_exists($path); |
|
72 | + } |
|
73 | + public function unlink($path) { |
|
74 | + return $this->storage->unlink($path); |
|
75 | + } |
|
76 | + public function fopen($path, $mode) { |
|
77 | + return $this->storage->fopen($path, $mode); |
|
78 | + } |
|
79 | + public function free_space($path) { |
|
80 | + return $this->storage->free_space($path); |
|
81 | + } |
|
82 | + public function touch($path, $mtime = null) { |
|
83 | + return $this->storage->touch($path, $mtime); |
|
84 | + } |
|
85 | 85 | } |
@@ -29,20 +29,20 @@ |
||
29 | 29 | * local storage backend in temporary folder for testing purpose |
30 | 30 | */ |
31 | 31 | class Temporary extends Local { |
32 | - public function __construct($arguments = null) { |
|
33 | - parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | - } |
|
32 | + public function __construct($arguments = null) { |
|
33 | + parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | + } |
|
35 | 35 | |
36 | - public function cleanUp() { |
|
37 | - \OC_Helper::rmdirr($this->datadir); |
|
38 | - } |
|
36 | + public function cleanUp() { |
|
37 | + \OC_Helper::rmdirr($this->datadir); |
|
38 | + } |
|
39 | 39 | |
40 | - public function __destruct() { |
|
41 | - parent::__destruct(); |
|
42 | - $this->cleanUp(); |
|
43 | - } |
|
40 | + public function __destruct() { |
|
41 | + parent::__destruct(); |
|
42 | + $this->cleanUp(); |
|
43 | + } |
|
44 | 44 | |
45 | - public function getDataDir() { |
|
46 | - return $this->datadir; |
|
47 | - } |
|
45 | + public function getDataDir() { |
|
46 | + return $this->datadir; |
|
47 | + } |
|
48 | 48 | } |