diff options
Diffstat (limited to 'apps')
6 files changed, 70 insertions, 33 deletions
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php index 5c732816b8a..d455283dbaf 100644 --- a/apps/accessibility/lib/Controller/AccessibilityController.php +++ b/apps/accessibility/lib/Controller/AccessibilityController.php @@ -42,8 +42,6 @@ use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IRequest; -use OCP\IURLGenerator; -use OCP\IUserManager; use OCP\IUserSession; use ScssPhp\ScssPhp\Compiler; use ScssPhp\ScssPhp\Exception\ParserException; @@ -60,24 +58,15 @@ class AccessibilityController extends Controller { /** @var IConfig */ private $config; - /** @var IUserManager */ - private $userManager; - /** @var ILogger */ private $logger; - /** @var IURLGenerator */ - private $urlGenerator; - /** @var ITimeFactory */ protected $timeFactory; /** @var IUserSession */ private $userSession; - /** @var IAppManager */ - private $appManager; - /** @var IconsCacher */ protected $iconsCacher; @@ -87,26 +76,13 @@ class AccessibilityController extends Controller { /** @var null|string */ private $injectedVariables; - /** - * Account constructor. - * - * @param string $appName - * @param IRequest $request - * @param IConfig $config - * @param IUserManager $userManager - * @param ILogger $logger - * @param IURLGenerator $urlGenerator - * @param ITimeFactory $timeFactory - * @param IUserSession $userSession - * @param IAppManager $appManager - * @param \OC_Defaults $defaults - */ + /** @var string */ + private $appRoot; + public function __construct(string $appName, IRequest $request, IConfig $config, - IUserManager $userManager, ILogger $logger, - IURLGenerator $urlGenerator, ITimeFactory $timeFactory, IUserSession $userSession, IAppManager $appManager, @@ -115,17 +91,14 @@ class AccessibilityController extends Controller { parent::__construct($appName, $request); $this->appName = $appName; $this->config = $config; - $this->userManager = $userManager; $this->logger = $logger; - $this->urlGenerator = $urlGenerator; $this->timeFactory = $timeFactory; $this->userSession = $userSession; - $this->appManager = $appManager; $this->iconsCacher = $iconsCacher; $this->defaults = $defaults; $this->serverRoot = \OC::$SERVERROOT; - $this->appRoot = $this->appManager->getAppPath($this->appName); + $this->appRoot = $appManager->getAppPath($this->appName); } /** diff --git a/apps/user_status/appinfo/info.xml b/apps/user_status/appinfo/info.xml index 15d871b89b9..e2d79ba1fb4 100644 --- a/apps/user_status/appinfo/info.xml +++ b/apps/user_status/appinfo/info.xml @@ -5,7 +5,7 @@ <name>User status</name> <summary>User status</summary> <description><![CDATA[User status]]></description> - <version>1.1.0</version> + <version>1.1.1</version> <licence>agpl</licence> <author mail="oc.list@georgehrke.com" >Georg Ehrke</author> <namespace>UserStatus</namespace> diff --git a/apps/user_status/composer/composer/autoload_classmap.php b/apps/user_status/composer/composer/autoload_classmap.php index ba2ed1f1762..cd88b468c5e 100644 --- a/apps/user_status/composer/composer/autoload_classmap.php +++ b/apps/user_status/composer/composer/autoload_classmap.php @@ -28,6 +28,7 @@ return array( 'OCA\\UserStatus\\Listener\\UserLiveStatusListener' => $baseDir . '/../lib/Listener/UserLiveStatusListener.php', 'OCA\\UserStatus\\Migration\\Version0001Date20200602134824' => $baseDir . '/../lib/Migration/Version0001Date20200602134824.php', 'OCA\\UserStatus\\Migration\\Version0002Date20200902144824' => $baseDir . '/../lib/Migration/Version0002Date20200902144824.php', + 'OCA\\UserStatus\\Migration\\Version1000Date20201111130204' => $baseDir . '/../lib/Migration/Version1000Date20201111130204.php', 'OCA\\UserStatus\\Service\\EmojiService' => $baseDir . '/../lib/Service/EmojiService.php', 'OCA\\UserStatus\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php', 'OCA\\UserStatus\\Service\\PredefinedStatusService' => $baseDir . '/../lib/Service/PredefinedStatusService.php', diff --git a/apps/user_status/composer/composer/autoload_static.php b/apps/user_status/composer/composer/autoload_static.php index fd05c1c1627..1dc85767dbe 100644 --- a/apps/user_status/composer/composer/autoload_static.php +++ b/apps/user_status/composer/composer/autoload_static.php @@ -43,6 +43,7 @@ class ComposerStaticInitUserStatus 'OCA\\UserStatus\\Listener\\UserLiveStatusListener' => __DIR__ . '/..' . '/../lib/Listener/UserLiveStatusListener.php', 'OCA\\UserStatus\\Migration\\Version0001Date20200602134824' => __DIR__ . '/..' . '/../lib/Migration/Version0001Date20200602134824.php', 'OCA\\UserStatus\\Migration\\Version0002Date20200902144824' => __DIR__ . '/..' . '/../lib/Migration/Version0002Date20200902144824.php', + 'OCA\\UserStatus\\Migration\\Version1000Date20201111130204' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20201111130204.php', 'OCA\\UserStatus\\Service\\EmojiService' => __DIR__ . '/..' . '/../lib/Service/EmojiService.php', 'OCA\\UserStatus\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php', 'OCA\\UserStatus\\Service\\PredefinedStatusService' => __DIR__ . '/..' . '/../lib/Service/PredefinedStatusService.php', diff --git a/apps/user_status/lib/Migration/Version0001Date20200602134824.php b/apps/user_status/lib/Migration/Version0001Date20200602134824.php index 82b33f815b7..4ed8bfe8d65 100644 --- a/apps/user_status/lib/Migration/Version0001Date20200602134824.php +++ b/apps/user_status/lib/Migration/Version0001Date20200602134824.php @@ -69,7 +69,7 @@ class Version0001Date20200602134824 extends SimpleMigrationStep { 'unsigned' => true, ]); $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [ - 'notnull' => true, + 'notnull' => false, ]); $statusTable->addColumn('message_id', Types::STRING, [ 'notnull' => false, diff --git a/apps/user_status/lib/Migration/Version1000Date20201111130204.php b/apps/user_status/lib/Migration/Version1000Date20201111130204.php new file mode 100644 index 00000000000..53b35f2b3a6 --- /dev/null +++ b/apps/user_status/lib/Migration/Version1000Date20201111130204.php @@ -0,0 +1,62 @@ +<?php + +declare(strict_types=1); + +/** + * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com> + * + * @author Joas Schilling <coding@schilljs.com> + * + * @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\UserStatus\Migration; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version1000Date20201111130204 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(); + + $result = $this->ensureColumnIsNullable($schema, 'user_status', 'is_user_defined'); + + return $result ? $schema : null; + } + + protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool { + $table = $schema->getTable($tableName); + $column = $table->getColumn($columnName); + + if ($column->getNotnull()) { + $column->setNotnull(false); + return true; + } + + return false; + } +} |