Skip to content

fix(activity): allow string types for snowflake IDs #57645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miaulalala wants to merge 1 commit into from
+3 −3
Closed

fix(activity): allow string types for snowflake IDs #57645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Activity/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/** @var string */
protected $formattingObjectType;

/** @var int */
/** @var int|string */
protected $formattingObjectId;

/** @var bool */
Expand Down Expand Up @@ -299,7 +299,7 @@
* @param string $type
* @param int $id
*/
public function setFormattingObject(string $type, int $id): void {

Check failure on line 302 in lib/private/Activity/Manager.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

MoreSpecificImplementedParamType 

lib/private/Activity/Manager.php:302:56: MoreSpecificImplementedParamType: Argument 2 of OC\Activity\Manager::setFormattingObject has the more specific type 'int', expecting 'int|string' as defined by OCP\Activity\IManager::setFormattingObject (see https://psalm.dev/140)

Check failure on line 302 in lib/private/Activity/Manager.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

MethodSignatureMismatch 

lib/private/Activity/Manager.php:302:56: MethodSignatureMismatch: Argument 2 of OC\Activity\Manager::setFormattingObject has wrong type 'int', expecting 'int|string' as defined by OCP\Activity\IManager::setFormattingObject (see https://psalm.dev/042)
$this->formattingObjectType = $type;
$this->formattingObjectId = $id;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/public/Activity/IManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ public function getSettingById(string $id): ActivitySettings;

/**
* @param string $type
* @param int $id
* @param int|string $id
* @since 8.2.0
*/
public function setFormattingObject(string $type, int $id): void;
public function setFormattingObject(string $type, int|string $id): void;

/**
* @return bool
Expand Down
Loading