diff options
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/package.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/static-analysis.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | appinfo/info.xml | 8 | ||||
| -rw-r--r-- | composer.lock | 12 | ||||
| -rw-r--r-- | lib/Migration/Version1115Date20211216144446.php | 57 |
7 files changed, 71 insertions, 14 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 6c5d73739..53ccf2ca9 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -8,7 +8,7 @@ name: Dependabot on: pull_request_target: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6be814d85..f7b46f281 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index ab3ce587f..c8c2862c4 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b00a81c16..55e1d1b4c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/appinfo/info.xml b/appinfo/info.xml index 13b37d48e..521e48887 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -12,7 +12,7 @@ - **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries. - **📬 Want to host your own mail server?** We don’t have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)! ]]></description> - <version>1.12.0-alpha.1</version> + <version>1.12.0-alpha.2</version> <licence>agpl</licence> <author>Christoph Wurst</author> <author>Greta Doçi</author> @@ -22,9 +22,9 @@ <author>Jan-Christoph Borchardt</author> <namespace>Mail</namespace> <documentation> - <user>https://github.com/nextcloud/mail/blob/master/doc/user.md</user> - <admin>https://github.com/nextcloud/mail/blob/master/doc/admin.md</admin> - <developer>https://github.com/nextcloud/mail/blob/master/doc/developer.md</developer> + <user>https://github.com/nextcloud/mail/blob/main/doc/user.md</user> + <admin>https://github.com/nextcloud/mail/blob/main/doc/admin.md</admin> + <developer>https://github.com/nextcloud/mail/blob/main/doc/developer.md</developer> </documentation> <category>social</category> <category>office</category> diff --git a/composer.lock b/composer.lock index dd832ff8d..9f0045278 100644 --- a/composer.lock +++ b/composer.lock @@ -1451,16 +1451,16 @@ }, { "name": "pear-pear.horde.org/Horde_Stream_Wrapper", - "version": "2.1.4", + "version": "2.1.5", "dist": { "type": "file", - "url": "https://pear.horde.org/get/Horde_Stream_Wrapper-2.1.4.tgz" + "url": "https://pear.horde.org/get/Horde_Stream_Wrapper-2.1.5.tgz" }, "require": { "php": "<8.0.0.0" }, "replace": { - "pear-horde/horde_stream_wrapper": "== 2.1.4.0" + "pear-horde/horde_stream_wrapper": "== 2.1.5.0" }, "type": "pear-library", "autoload": { @@ -1507,10 +1507,10 @@ }, { "name": "pear-pear.horde.org/Horde_Support", - "version": "2.2.0", + "version": "2.2.1", "dist": { "type": "file", - "url": "https://pear.horde.org/get/Horde_Support-2.2.0.tgz" + "url": "https://pear.horde.org/get/Horde_Support-2.2.1.tgz" }, "require": { "pear-pear.horde.org/horde_exception": "<3.0.0.0", @@ -1519,7 +1519,7 @@ "php": "<8.0.0.0" }, "replace": { - "pear-horde/horde_support": "== 2.2.0.0" + "pear-horde/horde_support": "== 2.2.1.0" }, "type": "pear-library", "autoload": { diff --git a/lib/Migration/Version1115Date20211216144446.php b/lib/Migration/Version1115Date20211216144446.php new file mode 100644 index 000000000..34d12eaae --- /dev/null +++ b/lib/Migration/Version1115Date20211216144446.php @@ -0,0 +1,57 @@ +<?php + +declare(strict_types=1); + +/** + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Mail\Migration; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +/** + * Make the mail_accounts.name column wider + */ +class Version1115Date20211216144446 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + $accountsTable = $schema->getTable('mail_accounts'); + $accountsNameColumn = $accountsTable->getColumn('name'); + $accountsNameColumn->setLength(255); + + $aliasesTable = $schema->getTable('mail_aliases'); + $aliasesNameColumn = $aliasesTable->getColumn('name'); + $aliasesNameColumn->setLength(255); + + return $schema; + } +} |