diff --git a/lib/Model/BotServer.php b/lib/Model/BotServer.php index 1bebf557c93..f54e067050a 100644 --- a/lib/Model/BotServer.php +++ b/lib/Model/BotServer.php @@ -34,7 +34,7 @@ * @method void setFeatures(int $features) * @method int getFeatures() * - * @psalm-import-type TalkBotWithDetailsAndSecret from ResponseDefinitions + * @psalm-import-type TalkBotWithDetails from ResponseDefinitions as BotWithDetails */ class BotServer extends Entity implements \JsonSerializable { protected string $name = ''; @@ -62,7 +62,9 @@ public function __construct() { } /** - * @return TalkBotWithDetailsAndSecret + * @return BotWithDetails&array{ + * secret: string, + * } */ public function jsonSerialize(): array { return [ diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php index 60da06cf6cb..f3e04023de3 100644 --- a/lib/ResponseDefinitions.php +++ b/lib/ResponseDefinitions.php @@ -40,10 +40,6 @@ * url_hash: string, * } * - * @psalm-type TalkBotWithDetailsAndSecret = TalkBotWithDetails&array{ - * secret: string, - * } - * * @psalm-type TalkCallPeer = array{ * actorId: string, * actorType: string, diff --git a/openapi-full.json b/openapi-full.json index eccc60c132b..b609e45f551 100644 --- a/openapi-full.json +++ b/openapi-full.json @@ -189,24 +189,6 @@ } ] }, - "BotWithDetailsAndSecret": { - "allOf": [ - { - "$ref": "#/components/schemas/BotWithDetails" - }, - { - "type": "object", - "required": [ - "secret" - ], - "properties": { - "secret": { - "type": "string" - } - } - } - ] - }, "CallPeer": { "type": "object", "required": [ diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts index eafe8a13943..f4e658a405c 100644 --- a/src/types/openapi/openapi-full.ts +++ b/src/types/openapi/openapi-full.ts @@ -1962,9 +1962,6 @@ export type components = { url: string; url_hash: string; }; - BotWithDetailsAndSecret: components["schemas"]["BotWithDetails"] & { - secret: string; - }; CallPeer: { actorId: string; actorType: string;