diff options
author | Joas Schilling <coding@schilljs.com> | 2024-03-25 15:15:13 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2024-03-25 15:15:48 +0100 |
commit | 1f71244d825d5a651dd7f7d3c98b8cfb5e09d1d5 (patch) | |
tree | 1d2b03b48c20696c62ebf48bd7d2d5ff7f6c7cce | |
parent | 38a03ec45042936ef60bb8c6fa6dd01d70c41fc7 (diff) |
fix(openapi): Remove long int-lists now that OpenAPI understands int<min,max>
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | lib/Controller/BreakoutRoomController.php | 3 | ||||
-rw-r--r-- | lib/Controller/CallController.php | 6 | ||||
-rw-r--r-- | lib/Controller/ChatController.php | 12 | ||||
-rw-r--r-- | lib/Controller/RoomController.php | 6 | ||||
-rw-r--r-- | vendor-bin/openapi-extractor/composer.lock | 8 |
5 files changed, 15 insertions, 20 deletions
diff --git a/lib/Controller/BreakoutRoomController.php b/lib/Controller/BreakoutRoomController.php index 31a82754f..898cc81d0 100644 --- a/lib/Controller/BreakoutRoomController.php +++ b/lib/Controller/BreakoutRoomController.php @@ -61,8 +61,7 @@ class BreakoutRoomController extends AEnvironmentAwareController { * * @param 0|1|2|3 $mode Mode of the breakout rooms * @psalm-param BreakoutRoom::MODE_* $mode - * @param 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20 $amount Number of breakout rooms - * @psalm-param int<1, 20> $amount Number of breakout rooms - Constants {@see BreakoutRoom::MINIMUM_ROOM_AMOUNT} and {@see BreakoutRoom::MAXIMUM_ROOM_AMOUNT} + * @param int<1, 20> $amount Number of breakout rooms - Constants {@see BreakoutRoom::MINIMUM_ROOM_AMOUNT} and {@see BreakoutRoom::MAXIMUM_ROOM_AMOUNT} * @param string $attendeeMap Mapping of the attendees to breakout rooms * @return DataResponse<Http::STATUS_OK, TalkRoom[], array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{error: string}, array{}> * diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php index d669e90ae..301f871ab 100644 --- a/lib/Controller/CallController.php +++ b/lib/Controller/CallController.php @@ -120,9 +120,9 @@ class CallController extends AEnvironmentAwareController { /** * Join a call * - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|null $flags In-Call flags + * @param int<0, 15>|null $flags In-Call flags * @psalm-param int-mask-of<Participant::FLAG_*>|null $flags - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|134|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|234|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255|null $forcePermissions In-call permissions + * @param int<0, 255>|null $forcePermissions In-call permissions * @psalm-param int-mask-of<Attendee::PERMISSIONS_*>|null $forcePermissions * @param bool $silent Join the call silently * @param bool $recordingConsent When the user ticked a checkbox and agreed with being recorded @@ -255,7 +255,7 @@ class CallController extends AEnvironmentAwareController { /** * Update the in-call flags * - * @param int $flags New flags + * @param int<0, 15> $flags New flags * @psalm-param int-mask-of<Participant::FLAG_*> $flags New flags * @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, array<empty>, array{}> * diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php index 896a45031..6619b7bbf 100644 --- a/lib/Controller/ChatController.php +++ b/lib/Controller/ChatController.php @@ -407,8 +407,7 @@ class ChatController extends AEnvironmentAwareController { * (so the response is 200 instead of 304 when * it changes even when there are no messages) * @psalm-param non-negative-int $lastCommonReadId - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30 $timeout Number of seconds to wait for new messages (30 by default, 30 at most) - * @psalm-param int<0, 30> $timeout + * @param int<0, 30> $timeout Number of seconds to wait for new messages (30 by default, 30 at most) * @param 0|1 $setReadMarker Automatically set the last read marker when 1, * if your client does this itself via chat/{token}/read set to 0 * @param 0|1 $includeLastKnown Include the $lastKnownMessageId in the messages when 1 (default 0) @@ -642,8 +641,7 @@ class ChatController extends AEnvironmentAwareController { * * @param int $messageId The focused message which should be in the "middle" of the returned context * @psalm-param non-negative-int $messageId - * @param 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100 $limit Number of chat messages to receive in both directions (50 by default, 100 at most, might return 201 messages) - * @psalm-param int<1, 100> $limit + * @param int<1, 100> $limit Number of chat messages to receive in both directions (50 by default, 100 at most, might return 201 messages) * @return DataResponse<Http::STATUS_OK, TalkChatMessageWithParent[], array{'X-Chat-Last-Common-Read'?: numeric-string, X-Chat-Last-Given?: numeric-string}>|DataResponse<Http::STATUS_NOT_MODIFIED, array<empty>, array<empty>> * * 200: Message context returned @@ -1158,8 +1156,7 @@ class ChatController extends AEnvironmentAwareController { /** * Get objects that are shared in the room overview * - * @param 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20 $limit Maximum number of objects - * @psalm-param int<1, 20> $limit + * @param int<1, 20> $limit Maximum number of objects * @return DataResponse<Http::STATUS_OK, array<string, TalkChatMessage[]>, array{}> * * 200: List of shared objects messages of each type returned @@ -1212,8 +1209,7 @@ class ChatController extends AEnvironmentAwareController { * @param string $objectType Type of the objects * @param int $lastKnownMessageId ID of the last known message * @psalm-param non-negative-int $lastKnownMessageId - * @param 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|134|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200 $limit Maximum number of objects - * @psalm-param int<1, 200> $limit + * @param int<1, 200> $limit Maximum number of objects * @return DataResponse<Http::STATUS_OK, TalkChatMessage[], array{X-Chat-Last-Given?: numeric-string}> * * 200: List of shared objects messages returned diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index ee7fbd14d..3f5cbaa53 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -1986,7 +1986,7 @@ class RoomController extends AEnvironmentAwareController { * Update the permissions of a room * * @param 'call'|'default' $mode Level of the permissions ('call', 'default') - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|134|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|234|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255 $permissions New permissions + * @param int<0, 255> $permissions New permissions * @psalm-param int-mask-of<Attendee::PERMISSIONS_*> $permissions * @return DataResponse<Http::STATUS_OK, TalkRoom, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array<empty>, array{}> * @@ -2009,7 +2009,7 @@ class RoomController extends AEnvironmentAwareController { * @param int $attendeeId ID of the attendee * @psalm-param non-negative-int $attendeeId * @param 'set'|'remove'|'add' $method Method of updating permissions ('set', 'remove', 'add') - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|134|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|234|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255 $permissions New permissions + * @param int<0, 255> $permissions New permissions * @psalm-param int-mask-of<Attendee::PERMISSIONS_*> $permissions * @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}> * @@ -2045,7 +2045,7 @@ class RoomController extends AEnvironmentAwareController { * * @param 'set'|'remove'|'add' $method Method of updating permissions ('set', 'remove', 'add') * @psalm-param Attendee::PERMISSIONS_MODIFY_* $method - * @param 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|134|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|234|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255 $permissions New permissions + * @param int<0, 255> $permissions New permissions * @psalm-param int-mask-of<Attendee::PERMISSIONS_*> $permissions * @return DataResponse<Http::STATUS_OK, TalkRoom, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array<empty>, array{}> * diff --git a/vendor-bin/openapi-extractor/composer.lock b/vendor-bin/openapi-extractor/composer.lock index 7c522a25b..bd9f17ce6 100644 --- a/vendor-bin/openapi-extractor/composer.lock +++ b/vendor-bin/openapi-extractor/composer.lock @@ -83,12 +83,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud/openapi-extractor.git", - "reference": "c69ac976c236e13b8063d069917190f910545dff" + "reference": "1d8b0eee87a72bad4e23ba02100fc69f4d68afb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/openapi-extractor/zipball/c69ac976c236e13b8063d069917190f910545dff", - "reference": "c69ac976c236e13b8063d069917190f910545dff", + "url": "https://api.github.com/repos/nextcloud/openapi-extractor/zipball/1d8b0eee87a72bad4e23ba02100fc69f4d68afb6", + "reference": "1d8b0eee87a72bad4e23ba02100fc69f4d68afb6", "shasum": "" }, "require": { @@ -130,7 +130,7 @@ "source": "https://github.com/nextcloud/openapi-extractor/tree/main", "issues": "https://github.com/nextcloud/openapi-extractor/issues" }, - "time": "2024-01-18T14:30:25+00:00" + "time": "2024-03-15T12:57:21+00:00" }, { "name": "nikic/php-parser", |