@@ -36,22 +36,22 @@ |
||
36 | 36 | */ |
37 | 37 | class Version0002Date20200902144824 extends SimpleMigrationStep { |
38 | 38 | |
39 | - /** |
|
40 | - * @param IOutput $output |
|
41 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
42 | - * @param array $options |
|
43 | - * @return null|ISchemaWrapper |
|
44 | - * @since 20.0.0 |
|
45 | - */ |
|
46 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
47 | - /** @var ISchemaWrapper $schema */ |
|
48 | - $schema = $schemaClosure(); |
|
49 | - |
|
50 | - $statusTable = $schema->getTable('user_status'); |
|
51 | - |
|
52 | - $statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix'); |
|
53 | - $statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix'); |
|
54 | - |
|
55 | - return $schema; |
|
56 | - } |
|
39 | + /** |
|
40 | + * @param IOutput $output |
|
41 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
42 | + * @param array $options |
|
43 | + * @return null|ISchemaWrapper |
|
44 | + * @since 20.0.0 |
|
45 | + */ |
|
46 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
47 | + /** @var ISchemaWrapper $schema */ |
|
48 | + $schema = $schemaClosure(); |
|
49 | + |
|
50 | + $statusTable = $schema->getTable('user_status'); |
|
51 | + |
|
52 | + $statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix'); |
|
53 | + $statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix'); |
|
54 | + |
|
55 | + return $schema; |
|
56 | + } |
|
57 | 57 | } |
@@ -24,30 +24,30 @@ |
||
24 | 24 | namespace OC\Files\Cache; |
25 | 25 | |
26 | 26 | class NullWatcher extends Watcher { |
27 | - private $policy; |
|
27 | + private $policy; |
|
28 | 28 | |
29 | - public function __construct() { |
|
30 | - } |
|
29 | + public function __construct() { |
|
30 | + } |
|
31 | 31 | |
32 | - public function setPolicy($policy) { |
|
33 | - $this->policy = $policy; |
|
34 | - } |
|
32 | + public function setPolicy($policy) { |
|
33 | + $this->policy = $policy; |
|
34 | + } |
|
35 | 35 | |
36 | - public function getPolicy() { |
|
37 | - return $this->policy; |
|
38 | - } |
|
36 | + public function getPolicy() { |
|
37 | + return $this->policy; |
|
38 | + } |
|
39 | 39 | |
40 | - public function checkUpdate($path, $cachedEntry = null) { |
|
41 | - return false; |
|
42 | - } |
|
40 | + public function checkUpdate($path, $cachedEntry = null) { |
|
41 | + return false; |
|
42 | + } |
|
43 | 43 | |
44 | - public function update($path, $cachedData) { |
|
45 | - } |
|
44 | + public function update($path, $cachedData) { |
|
45 | + } |
|
46 | 46 | |
47 | - public function needsUpdate($path, $cachedData) { |
|
48 | - return false; |
|
49 | - } |
|
47 | + public function needsUpdate($path, $cachedData) { |
|
48 | + return false; |
|
49 | + } |
|
50 | 50 | |
51 | - public function cleanFolder($path) { |
|
52 | - } |
|
51 | + public function cleanFolder($path) { |
|
52 | + } |
|
53 | 53 | } |
@@ -30,13 +30,13 @@ |
||
30 | 30 | * @since 14.0.0 |
31 | 31 | */ |
32 | 32 | interface IFileBased { |
33 | - /** |
|
34 | - * @since 14.0.0 |
|
35 | - */ |
|
36 | - public function getLogFilePath():string; |
|
33 | + /** |
|
34 | + * @since 14.0.0 |
|
35 | + */ |
|
36 | + public function getLogFilePath():string; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @since 14.0.0 |
|
40 | - */ |
|
41 | - public function getEntries(int $limit = 50, int $offset = 0): array; |
|
38 | + /** |
|
39 | + * @since 14.0.0 |
|
40 | + */ |
|
41 | + public function getEntries(int $limit = 50, int $offset = 0): array; |
|
42 | 42 | } |
@@ -29,15 +29,15 @@ |
||
29 | 29 | * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service |
30 | 30 | */ |
31 | 31 | class PublicEmitter extends BasicEmitter { |
32 | - /** |
|
33 | - * @param string $scope |
|
34 | - * @param string $method |
|
35 | - * @param array $arguments optional |
|
36 | - * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped |
|
37 | - * |
|
38 | - * @suppress PhanAccessMethodProtected |
|
39 | - */ |
|
40 | - public function emit($scope, $method, array $arguments = []) { |
|
41 | - parent::emit($scope, $method, $arguments); |
|
42 | - } |
|
32 | + /** |
|
33 | + * @param string $scope |
|
34 | + * @param string $method |
|
35 | + * @param array $arguments optional |
|
36 | + * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped |
|
37 | + * |
|
38 | + * @suppress PhanAccessMethodProtected |
|
39 | + */ |
|
40 | + public function emit($scope, $method, array $arguments = []) { |
|
41 | + parent::emit($scope, $method, $arguments); |
|
42 | + } |
|
43 | 43 | } |
@@ -32,77 +32,77 @@ |
||
32 | 32 | * Very thin wrapper class to make output testable |
33 | 33 | */ |
34 | 34 | class Output implements IOutput { |
35 | - /** @var string */ |
|
36 | - private $webRoot; |
|
35 | + /** @var string */ |
|
36 | + private $webRoot; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param $webRoot |
|
40 | - */ |
|
41 | - public function __construct($webRoot) { |
|
42 | - $this->webRoot = $webRoot; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @param $webRoot |
|
40 | + */ |
|
41 | + public function __construct($webRoot) { |
|
42 | + $this->webRoot = $webRoot; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @param string $out |
|
47 | - */ |
|
48 | - public function setOutput($out) { |
|
49 | - print($out); |
|
50 | - } |
|
45 | + /** |
|
46 | + * @param string $out |
|
47 | + */ |
|
48 | + public function setOutput($out) { |
|
49 | + print($out); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @param string|resource $path or file handle |
|
54 | - * |
|
55 | - * @return bool false if an error occurred |
|
56 | - */ |
|
57 | - public function setReadfile($path) { |
|
58 | - if (is_resource($path)) { |
|
59 | - $output = fopen('php://output', 'w'); |
|
60 | - return stream_copy_to_stream($path, $output) > 0; |
|
61 | - } else { |
|
62 | - return @readfile($path); |
|
63 | - } |
|
64 | - } |
|
52 | + /** |
|
53 | + * @param string|resource $path or file handle |
|
54 | + * |
|
55 | + * @return bool false if an error occurred |
|
56 | + */ |
|
57 | + public function setReadfile($path) { |
|
58 | + if (is_resource($path)) { |
|
59 | + $output = fopen('php://output', 'w'); |
|
60 | + return stream_copy_to_stream($path, $output) > 0; |
|
61 | + } else { |
|
62 | + return @readfile($path); |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @param string $header |
|
68 | - */ |
|
69 | - public function setHeader($header) { |
|
70 | - header($header); |
|
71 | - } |
|
66 | + /** |
|
67 | + * @param string $header |
|
68 | + */ |
|
69 | + public function setHeader($header) { |
|
70 | + header($header); |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * @param int $code sets the http status code |
|
75 | - */ |
|
76 | - public function setHttpResponseCode($code) { |
|
77 | - http_response_code($code); |
|
78 | - } |
|
73 | + /** |
|
74 | + * @param int $code sets the http status code |
|
75 | + */ |
|
76 | + public function setHttpResponseCode($code) { |
|
77 | + http_response_code($code); |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * @return int returns the current http response code |
|
82 | - */ |
|
83 | - public function getHttpResponseCode() { |
|
84 | - return http_response_code(); |
|
85 | - } |
|
80 | + /** |
|
81 | + * @return int returns the current http response code |
|
82 | + */ |
|
83 | + public function getHttpResponseCode() { |
|
84 | + return http_response_code(); |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * @param string $name |
|
89 | - * @param string $value |
|
90 | - * @param int $expire |
|
91 | - * @param string $path |
|
92 | - * @param string $domain |
|
93 | - * @param bool $secure |
|
94 | - * @param bool $httpOnly |
|
95 | - */ |
|
96 | - public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') { |
|
97 | - $path = $this->webRoot ? : '/'; |
|
87 | + /** |
|
88 | + * @param string $name |
|
89 | + * @param string $value |
|
90 | + * @param int $expire |
|
91 | + * @param string $path |
|
92 | + * @param string $domain |
|
93 | + * @param bool $secure |
|
94 | + * @param bool $httpOnly |
|
95 | + */ |
|
96 | + public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') { |
|
97 | + $path = $this->webRoot ? : '/'; |
|
98 | 98 | |
99 | - setcookie($name, $value, [ |
|
100 | - 'expires' => $expire, |
|
101 | - 'path' => $path, |
|
102 | - 'domain' => $domain, |
|
103 | - 'secure' => $secure, |
|
104 | - 'httponly' => $httpOnly, |
|
105 | - 'samesite' => $sameSite |
|
106 | - ]); |
|
107 | - } |
|
99 | + setcookie($name, $value, [ |
|
100 | + 'expires' => $expire, |
|
101 | + 'path' => $path, |
|
102 | + 'domain' => $domain, |
|
103 | + 'secure' => $secure, |
|
104 | + 'httponly' => $httpOnly, |
|
105 | + 'samesite' => $sameSite |
|
106 | + ]); |
|
107 | + } |
|
108 | 108 | } |
@@ -34,19 +34,19 @@ |
||
34 | 34 | use OCP\Migration\SimpleMigrationStep; |
35 | 35 | |
36 | 36 | class Version14000Date20180710092004 extends SimpleMigrationStep { |
37 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
38 | - /** @var ISchemaWrapper $schema */ |
|
39 | - $schema = $schemaClosure(); |
|
37 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
38 | + /** @var ISchemaWrapper $schema */ |
|
39 | + $schema = $schemaClosure(); |
|
40 | 40 | |
41 | - $table = $schema->getTable('share'); |
|
41 | + $table = $schema->getTable('share'); |
|
42 | 42 | |
43 | - if (!$table->hasColumn('password_by_talk')) { |
|
44 | - $table->addColumn('password_by_talk', Types::BOOLEAN, [ |
|
45 | - 'default' => 0, |
|
46 | - 'notnull' => false, |
|
47 | - ]); |
|
48 | - } |
|
43 | + if (!$table->hasColumn('password_by_talk')) { |
|
44 | + $table->addColumn('password_by_talk', Types::BOOLEAN, [ |
|
45 | + 'default' => 0, |
|
46 | + 'notnull' => false, |
|
47 | + ]); |
|
48 | + } |
|
49 | 49 | |
50 | - return $schema; |
|
51 | - } |
|
50 | + return $schema; |
|
51 | + } |
|
52 | 52 | } |
@@ -32,30 +32,30 @@ |
||
32 | 32 | use OCP\Migration\SimpleMigrationStep; |
33 | 33 | |
34 | 34 | class Version1016Date20201109085907 extends SimpleMigrationStep { |
35 | - /** |
|
36 | - * @param IOutput $output |
|
37 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
38 | - * @param array $options |
|
39 | - * @return null|ISchemaWrapper |
|
40 | - */ |
|
41 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
42 | - /** @var ISchemaWrapper $schema */ |
|
43 | - $schema = $schemaClosure(); |
|
44 | - |
|
45 | - $result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring'); |
|
46 | - |
|
47 | - return $result ? $schema : null; |
|
48 | - } |
|
49 | - |
|
50 | - protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool { |
|
51 | - $table = $schema->getTable($tableName); |
|
52 | - $column = $table->getColumn($columnName); |
|
53 | - |
|
54 | - if ($column->getNotnull()) { |
|
55 | - $column->setNotnull(false); |
|
56 | - return true; |
|
57 | - } |
|
58 | - |
|
59 | - return false; |
|
60 | - } |
|
35 | + /** |
|
36 | + * @param IOutput $output |
|
37 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
38 | + * @param array $options |
|
39 | + * @return null|ISchemaWrapper |
|
40 | + */ |
|
41 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
42 | + /** @var ISchemaWrapper $schema */ |
|
43 | + $schema = $schemaClosure(); |
|
44 | + |
|
45 | + $result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring'); |
|
46 | + |
|
47 | + return $result ? $schema : null; |
|
48 | + } |
|
49 | + |
|
50 | + protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool { |
|
51 | + $table = $schema->getTable($tableName); |
|
52 | + $column = $table->getColumn($columnName); |
|
53 | + |
|
54 | + if ($column->getNotnull()) { |
|
55 | + $column->setNotnull(false); |
|
56 | + return true; |
|
57 | + } |
|
58 | + |
|
59 | + return false; |
|
60 | + } |
|
61 | 61 | } |
@@ -32,30 +32,30 @@ |
||
32 | 32 | use OCP\Migration\SimpleMigrationStep; |
33 | 33 | |
34 | 34 | class Version20000Date20201111081915 extends SimpleMigrationStep { |
35 | - /** |
|
36 | - * @param IOutput $output |
|
37 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
38 | - * @param array $options |
|
39 | - * @return null|ISchemaWrapper |
|
40 | - */ |
|
41 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
42 | - /** @var ISchemaWrapper $schema */ |
|
43 | - $schema = $schemaClosure(); |
|
44 | - |
|
45 | - $result = $this->ensureColumnIsNullable($schema, 'direct_edit', 'accessed'); |
|
46 | - |
|
47 | - return $result ? $schema : null; |
|
48 | - } |
|
49 | - |
|
50 | - protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool { |
|
51 | - $table = $schema->getTable($tableName); |
|
52 | - $column = $table->getColumn($columnName); |
|
53 | - |
|
54 | - if ($column->getNotnull()) { |
|
55 | - $column->setNotnull(false); |
|
56 | - return true; |
|
57 | - } |
|
58 | - |
|
59 | - return false; |
|
60 | - } |
|
35 | + /** |
|
36 | + * @param IOutput $output |
|
37 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
38 | + * @param array $options |
|
39 | + * @return null|ISchemaWrapper |
|
40 | + */ |
|
41 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
42 | + /** @var ISchemaWrapper $schema */ |
|
43 | + $schema = $schemaClosure(); |
|
44 | + |
|
45 | + $result = $this->ensureColumnIsNullable($schema, 'direct_edit', 'accessed'); |
|
46 | + |
|
47 | + return $result ? $schema : null; |
|
48 | + } |
|
49 | + |
|
50 | + protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool { |
|
51 | + $table = $schema->getTable($tableName); |
|
52 | + $column = $table->getColumn($columnName); |
|
53 | + |
|
54 | + if ($column->getNotnull()) { |
|
55 | + $column->setNotnull(false); |
|
56 | + return true; |
|
57 | + } |
|
58 | + |
|
59 | + return false; |
|
60 | + } |
|
61 | 61 | } |
@@ -37,61 +37,61 @@ |
||
37 | 37 | */ |
38 | 38 | class Version0001Date20200602134824 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 | - * @since 20.0.0 |
|
46 | - */ |
|
47 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
48 | - /** @var ISchemaWrapper $schema */ |
|
49 | - $schema = $schemaClosure(); |
|
40 | + /** |
|
41 | + * @param IOutput $output |
|
42 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
43 | + * @param array $options |
|
44 | + * @return null|ISchemaWrapper |
|
45 | + * @since 20.0.0 |
|
46 | + */ |
|
47 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
48 | + /** @var ISchemaWrapper $schema */ |
|
49 | + $schema = $schemaClosure(); |
|
50 | 50 | |
51 | - $statusTable = $schema->createTable('user_status'); |
|
52 | - $statusTable->addColumn('id', Types::BIGINT, [ |
|
53 | - 'autoincrement' => true, |
|
54 | - 'notnull' => true, |
|
55 | - 'length' => 20, |
|
56 | - 'unsigned' => true, |
|
57 | - ]); |
|
58 | - $statusTable->addColumn('user_id', Types::STRING, [ |
|
59 | - 'notnull' => true, |
|
60 | - 'length' => 255, |
|
61 | - ]); |
|
62 | - $statusTable->addColumn('status', Types::STRING, [ |
|
63 | - 'notnull' => true, |
|
64 | - 'length' => 255, |
|
65 | - ]); |
|
66 | - $statusTable->addColumn('status_timestamp', Types::INTEGER, [ |
|
67 | - 'notnull' => true, |
|
68 | - 'length' => 11, |
|
69 | - 'unsigned' => true, |
|
70 | - ]); |
|
71 | - $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [ |
|
72 | - 'notnull' => false, |
|
73 | - ]); |
|
74 | - $statusTable->addColumn('message_id', Types::STRING, [ |
|
75 | - 'notnull' => false, |
|
76 | - 'length' => 255, |
|
77 | - ]); |
|
78 | - $statusTable->addColumn('custom_icon', Types::STRING, [ |
|
79 | - 'notnull' => false, |
|
80 | - 'length' => 255, |
|
81 | - ]); |
|
82 | - $statusTable->addColumn('custom_message', Types::TEXT, [ |
|
83 | - 'notnull' => false, |
|
84 | - ]); |
|
85 | - $statusTable->addColumn('clear_at', Types::INTEGER, [ |
|
86 | - 'notnull' => false, |
|
87 | - 'length' => 11, |
|
88 | - 'unsigned' => true, |
|
89 | - ]); |
|
51 | + $statusTable = $schema->createTable('user_status'); |
|
52 | + $statusTable->addColumn('id', Types::BIGINT, [ |
|
53 | + 'autoincrement' => true, |
|
54 | + 'notnull' => true, |
|
55 | + 'length' => 20, |
|
56 | + 'unsigned' => true, |
|
57 | + ]); |
|
58 | + $statusTable->addColumn('user_id', Types::STRING, [ |
|
59 | + 'notnull' => true, |
|
60 | + 'length' => 255, |
|
61 | + ]); |
|
62 | + $statusTable->addColumn('status', Types::STRING, [ |
|
63 | + 'notnull' => true, |
|
64 | + 'length' => 255, |
|
65 | + ]); |
|
66 | + $statusTable->addColumn('status_timestamp', Types::INTEGER, [ |
|
67 | + 'notnull' => true, |
|
68 | + 'length' => 11, |
|
69 | + 'unsigned' => true, |
|
70 | + ]); |
|
71 | + $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [ |
|
72 | + 'notnull' => false, |
|
73 | + ]); |
|
74 | + $statusTable->addColumn('message_id', Types::STRING, [ |
|
75 | + 'notnull' => false, |
|
76 | + 'length' => 255, |
|
77 | + ]); |
|
78 | + $statusTable->addColumn('custom_icon', Types::STRING, [ |
|
79 | + 'notnull' => false, |
|
80 | + 'length' => 255, |
|
81 | + ]); |
|
82 | + $statusTable->addColumn('custom_message', Types::TEXT, [ |
|
83 | + 'notnull' => false, |
|
84 | + ]); |
|
85 | + $statusTable->addColumn('clear_at', Types::INTEGER, [ |
|
86 | + 'notnull' => false, |
|
87 | + 'length' => 11, |
|
88 | + 'unsigned' => true, |
|
89 | + ]); |
|
90 | 90 | |
91 | - $statusTable->setPrimaryKey(['id']); |
|
92 | - $statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix'); |
|
93 | - $statusTable->addIndex(['clear_at'], 'user_status_clr_ix'); |
|
91 | + $statusTable->setPrimaryKey(['id']); |
|
92 | + $statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix'); |
|
93 | + $statusTable->addIndex(['clear_at'], 'user_status_clr_ix'); |
|
94 | 94 | |
95 | - return $schema; |
|
96 | - } |
|
95 | + return $schema; |
|
96 | + } |
|
97 | 97 | } |