diff --git a/composer.json b/composer.json index 994ba193a..52196b1f1 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "cs:fix": "php-cs-fixer fix", "psalm": "psalm.phar --threads=1", "psalm:update-baseline": "psalm.phar --threads=1 --update-baseline", - "psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache", + "psalm:clear": "psalm.phar --clear-cache && psalm.phar --clear-global-cache", "psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType", "test:unit": "vendor/bin/phpunit -c tests/phpunit.xml" }, diff --git a/lib/Versions/GroupVersionsExpireManager.php b/lib/Versions/GroupVersionsExpireManager.php index 12b8f5595..1b7a4ad5c 100644 --- a/lib/Versions/GroupVersionsExpireManager.php +++ b/lib/Versions/GroupVersionsExpireManager.php @@ -29,7 +29,7 @@ use OC\User\User; use OCA\GroupFolders\Folder\FolderManager; use OCP\AppFramework\Utility\ITimeFactory; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use OCP\EventDispatcher\IEventDispatcher; class GroupVersionsExpireManager extends BasicEmitter { private $folderManager; @@ -43,7 +43,7 @@ public function __construct( ExpireManager $expireManager, VersionsBackend $versionsBackend, ITimeFactory $timeFactory, - EventDispatcherInterface $dispatcher + IEventDispatcher $dispatcher ) { $this->folderManager = $folderManager; $this->expireManager = $expireManager; diff --git a/tests/stub.phpstub b/tests/stub.phpstub index 6181930bd..8eab93f5f 100644 --- a/tests/stub.phpstub +++ b/tests/stub.phpstub @@ -547,11 +547,12 @@ namespace OC\Files { } namespace OC\User { - use OCP\UserInterface; + use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; - use Symfony\Component\EventDispatcher\EventDispatcherInterface; + use OCP\UserInterface; + class User implements IUser { - public function __construct(string $uid, ?UserInterface $backend, EventDispatcherInterface $dispatcher, $emitter = null, IConfig $config = null, $urlGenerator = null) {} + public function __construct(string $uid, ?UserInterface $backend, IEventDispatcher $dispatcher, $emitter = null, IConfig $config = null, $urlGenerator = null) {} } }