Merge pull request #568 from nextcloud/dependabot/composer/vimeo/psal…

…m-5.1.0 Bump vimeo/psalm from 4.30.0 to 5.1.0
nextcloud · Dec 7, 2022 · 9fb1f84 · 9fb1f84
2 parents b0e7c6b + e64a29f
commit 9fb1f84
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 117 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
 	"require-dev": {
 		"nextcloud/coding-standard": "^1.0.0",
 		"phpunit/phpunit": "^9.5",
-		"vimeo/psalm": "^4.3.2",
+		"vimeo/psalm": "^5.1.0",
 		"nextcloud/ocp": "dev-master"
 	},
 	"autoload-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/BackgroundJob.php b/lib/BackgroundJob.php
@@ -108,8 +108,8 @@ public function run($argument): void {
 			return;
 		}
 
-		$guestsWhiteList = $this->config->getAppValue('guests', 'whitelist', null);
-		$this->enabledForGuestsUsers = $guestsWhiteList !== null && strpos($guestsWhiteList, 'announcementcenter') !== false;
+		$guestsWhiteList = $this->config->getAppValue('guests', 'whitelist');
+		$this->enabledForGuestsUsers = strpos($guestsWhiteList, 'announcementcenter') !== false;
 
 		$this->createPublicity($announcement, $argument);
 	}

diff --git a/lib/Listener/BeforeTemplateRenderedListener.php b/lib/Listener/BeforeTemplateRenderedListener.php
@@ -29,6 +29,9 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/**
+ * @template-implements IEventListener<Event>
+ */
 class BeforeTemplateRenderedListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!$event instanceof BeforeTemplateRenderedEvent) {

diff --git a/lib/Model/AnnouncementMapper.php b/lib/Model/AnnouncementMapper.php
@@ -29,6 +29,9 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/**
+ * @template-extends QBMapper<Announcement>
+ */
 class AnnouncementMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'announcements', Announcement::class);
@@ -55,6 +58,7 @@ public function getById(int $id): Announcement {
 	 * Deletes an entity from the table
 	 * @param Entity $entity the entity that should be deleted
 	 * @return Entity the deleted entity
+	 * @psalm-return Announcement the deleted entity
 	 * @since 14.0.0
 	 */
 	public function delete(Entity $entity): Entity {

diff --git a/lib/Model/GroupMapper.php b/lib/Model/GroupMapper.php
@@ -27,6 +27,9 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+/**
+ * @template-extends QBMapper<Group>
+ */
 class GroupMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'announcements_map', Group::class);