From 2b9267d04a6b91eda50b6135dc5864bfb56ee0b0 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Fri, 25 Oct 2024 16:57:57 +0200 Subject: [PATCH] chore: psalm bump 5.0 (warning webmozart/path-util is abandoned) Signed-off-by: Sebastien Marinier --- .github/workflows/static.yml | 2 +- composer.json | 3 ++- lib/Activity/MeetingListener.php | 4 ++++ lib/Activity/RoomListener.php | 4 ++++ lib/Activity/RoomShareListener.php | 4 ++++ lib/Db/RestrictionMapper.php | 3 +++ lib/Db/RoomMapper.php | 3 +++ lib/Db/RoomShareMapper.php | 3 +++ lib/Listener/UserDeletedListener.php | 3 +++ psalm.xml | 2 ++ 10 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 0dbbe8c5..c9f357d1 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: composer i - name: Install dependencies - run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} psr/container symfony/service-contracts + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} symfony/service-contracts - name: Run coding standards check run: composer run psalm diff --git a/composer.json b/composer.json index 250c520e..fd0ca52c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "nextcloud/coding-standard": "^1.0.0", "phpstan/phpstan": "^0.12.29", "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0", - "vimeo/psalm": "^4.5" + "vimeo/psalm": "^5.0", + "psr/container": "^1.1.2" }, "config": { "optimize-autoloader": true, diff --git a/lib/Activity/MeetingListener.php b/lib/Activity/MeetingListener.php index 1134d8ad..fa37d566 100644 --- a/lib/Activity/MeetingListener.php +++ b/lib/Activity/MeetingListener.php @@ -6,11 +6,15 @@ use OCA\BigBlueButton\Event\MeetingEndedEvent; use OCA\BigBlueButton\Event\MeetingStartedEvent; use OCA\BigBlueButton\Event\RecordingReadyEvent; +use OCA\BigBlueButton\Event\RoomEvent; use OCP\Activity\IManager as IActivityManager; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\IUserSession; +/** + * @template-implements IEventListener + */ class MeetingListener implements IEventListener { /** @var IActivityManager */ private $activityManager; diff --git a/lib/Activity/RoomListener.php b/lib/Activity/RoomListener.php index 41b7ee1d..a74ce813 100644 --- a/lib/Activity/RoomListener.php +++ b/lib/Activity/RoomListener.php @@ -5,10 +5,14 @@ use OCA\BigBlueButton\AppInfo\Application; use OCA\BigBlueButton\Event\RoomCreatedEvent; use OCA\BigBlueButton\Event\RoomDeletedEvent; +use OCA\BigBlueButton\Event\RoomEvent; use OCP\Activity\IManager as IActivityManager; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; +/** + * @template-implements IEventListener + */ class RoomListener implements IEventListener { /** @var IActivityManager */ private $activityManager; diff --git a/lib/Activity/RoomShareListener.php b/lib/Activity/RoomShareListener.php index 7f7abe4a..6f77f926 100644 --- a/lib/Activity/RoomShareListener.php +++ b/lib/Activity/RoomShareListener.php @@ -5,6 +5,7 @@ use OCA\BigBlueButton\AppInfo\Application; use OCA\BigBlueButton\Db\Room; use OCA\BigBlueButton\Db\RoomShare; +use OCA\BigBlueButton\Event\RoomEvent; use OCA\BigBlueButton\Event\RoomShareCreatedEvent; use OCA\BigBlueButton\Event\RoomShareDeletedEvent; use OCA\BigBlueButton\Service\RoomService; @@ -13,6 +14,9 @@ use OCP\EventDispatcher\IEventListener; use OCP\IGroupManager; +/** + * @template-implements IEventListener + */ class RoomShareListener implements IEventListener { /** @var IActivityManager */ private $activityManager; diff --git a/lib/Db/RestrictionMapper.php b/lib/Db/RestrictionMapper.php index 0bf49fe5..94b422fb 100644 --- a/lib/Db/RestrictionMapper.php +++ b/lib/Db/RestrictionMapper.php @@ -7,6 +7,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class RestrictionMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'bbb_restrictions', Restriction::class); diff --git a/lib/Db/RoomMapper.php b/lib/Db/RoomMapper.php index 8567ef32..b1b3be07 100644 --- a/lib/Db/RoomMapper.php +++ b/lib/Db/RoomMapper.php @@ -7,6 +7,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class RoomMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'bbb_rooms', Room::class); diff --git a/lib/Db/RoomShareMapper.php b/lib/Db/RoomShareMapper.php index 511bbfd1..68c65b63 100644 --- a/lib/Db/RoomShareMapper.php +++ b/lib/Db/RoomShareMapper.php @@ -7,6 +7,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class RoomShareMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'bbb_room_shares', RoomShare::class); diff --git a/lib/Listener/UserDeletedListener.php b/lib/Listener/UserDeletedListener.php index fddfc808..38a5e66c 100644 --- a/lib/Listener/UserDeletedListener.php +++ b/lib/Listener/UserDeletedListener.php @@ -9,6 +9,9 @@ use OCP\EventDispatcher\IEventListener; use OCP\User\Events\UserDeletedEvent; +/** + * @template-implements IEventListener + */ class UserDeletedListener implements IEventListener { /** @var IActivityManager */ private $activityManager; diff --git a/psalm.xml b/psalm.xml index 33a0f2ba..be99b577 100644 --- a/psalm.xml +++ b/psalm.xml @@ -6,6 +6,8 @@ xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" errorBaseline="tests/psalm-baseline.xml" + findUnusedCode="false" + findUnusedBaselineEntry="false" >