From 0c0f9171e6273629c820207a86c282618ed3c940 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Tue, 18 Mar 2025 15:52:59 -0100 Subject: [PATCH] composer cs:fix Signed-off-by: Maxence Lange [skip ci] --- .github/workflows/lint-php-cs.yml | 10 +++++++--- files/list.php | 1 + lib/Activity/SettingAsMember.php | 1 + lib/Api/v1/Circles.php | 1 + lib/Circles/FileSharingBroadcaster.php | 1 + lib/Controller/DeprecatedController.php | 1 + lib/Controller/RemoteController.php | 3 ++- lib/Dashboard/TeamDashboardWidget.php | 1 + lib/Db/AccountsRequest.php | 1 + lib/Db/FileSharesRequest.php | 1 + lib/Db/GSSharesRequest.php | 1 + lib/Db/TokensRequest.php | 1 + lib/Exceptions/ApiVersionIncompatibleException.php | 1 + lib/Exceptions/BroadcasterIsNotCompatibleException.php | 1 + lib/Exceptions/CircleAlreadyExistsException.php | 1 + lib/Exceptions/CircleDoesNotExistException.php | 1 + lib/Exceptions/CircleNameFirstCharException.php | 1 + lib/Exceptions/CircleTypeDisabledException.php | 1 + lib/Exceptions/CircleTypeIsEmptyException.php | 1 + lib/Exceptions/CircleTypeNotValidException.php | 1 + lib/Exceptions/CommandMissingArgumentException.php | 1 + lib/Exceptions/ConfigNoCircleAvailableException.php | 1 + lib/Exceptions/EmailAccountInvalidFormatException.php | 1 + lib/Exceptions/FakeException.php | 1 + lib/Exceptions/FederatedCircleLinkFormatException.php | 1 + lib/Exceptions/FederatedCircleNotAllowedException.php | 1 + .../FederatedCircleStatusUpdateException.php | 1 + .../FederatedLinkCircleNotFoundException.php | 1 + lib/Exceptions/FederatedLinkCreationException.php | 1 + lib/Exceptions/FederatedLinkDoesNotExistException.php | 1 + lib/Exceptions/FederatedLinkUpdateException.php | 1 + .../FederatedRemoteCircleDoesNotExistException.php | 1 + .../FederatedRemoteDoesNotAllowException.php | 1 + lib/Exceptions/FederatedRemoteIsDownException.php | 1 + lib/Exceptions/GSKeyException.php | 1 + lib/Exceptions/GSStatusException.php | 1 + lib/Exceptions/GlobalScaleDSyncException.php | 1 + lib/Exceptions/GlobalScaleEventException.php | 1 + lib/Exceptions/GroupCannotBeOwnerException.php | 1 + lib/Exceptions/GroupDoesNotExistException.php | 1 + lib/Exceptions/JsonException.php | 1 + lib/Exceptions/LinkedGroupNotAllowedException.php | 1 + lib/Exceptions/MemberCantJoinCircleException.php | 1 + lib/Exceptions/MemberDoesNotExistException.php | 1 + lib/Exceptions/MemberIsBlockedException.php | 1 + lib/Exceptions/MemberIsNotAdminException.php | 1 + lib/Exceptions/MemberIsNotModeratorException.php | 1 + lib/Exceptions/MemberIsNotOwnerException.php | 1 + lib/Exceptions/MemberIsOwnerException.php | 1 + lib/Exceptions/MemberTypeCantEditLevelException.php | 1 + lib/Exceptions/MembersLimitException.php | 1 + lib/Exceptions/MissingKeyInArrayException.php | 1 + lib/Exceptions/ModelException.php | 1 + lib/Exceptions/ModeratorIsNotHighEnoughException.php | 1 + lib/Exceptions/NotContactAddressException.php | 1 + lib/Exceptions/NotLocalMemberException.php | 1 + lib/Exceptions/PayloadDeliveryException.php | 1 + .../SharingFrameAlreadyDeliveredException.php | 1 + lib/Exceptions/SharingFrameAlreadyExistException.php | 1 + lib/Exceptions/SharingFrameDoesNotExistException.php | 1 + .../SharingFrameSourceCannotBeAppCirclesException.php | 1 + lib/Exceptions/TokenDoesNotExistException.php | 1 + lib/Model/BaseCircle.php | 1 + lib/Model/BaseMember.php | 1 + lib/Model/DeprecatedCircle.php | 1 + lib/Model/DeprecatedMember.php | 1 + lib/Model/FederatedLink.php | 1 + lib/Model/SharesToken.php | 1 + lib/Model/SharingFrame.php | 1 + lib/Search/Contacts.php | 1 + lib/Search/GlobalScaleUsers.php | 1 + lib/Search/LocalGroups.php | 1 + lib/Search/LocalUsers.php | 1 + lib/Service/MiscService.php | 1 + lib/Tools/ActivityPub/NCSignature.php | 1 + lib/Tools/Model/NCWebfinger.php | 1 + lib/Tools/Model/NCWellKnownLink.php | 1 + tests/bootstrap.php | 1 + tests/unit/CirclesManagerTest.php | 1 + tests/unit/lib/Controller/AdminControllerTest.php | 1 + tests/unit/lib/Controller/LocalControllerTest.php | 1 + 81 files changed, 88 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index b6f12320d..133a9feff 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -25,7 +25,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + persist-credentials: false - name: Get php version id: versions @@ -34,7 +36,7 @@ jobs: - name: Set up php${{ steps.versions.outputs.php-available }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 with: - php-version: ${{ steps.versions.outputs.php-available }} + php-version: ${{ steps.versions.outputs.php-min }} extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development @@ -42,7 +44,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Lint run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) diff --git a/files/list.php b/files/list.php index 9dfea8c47..666f93b1c 100644 --- a/files/list.php +++ b/files/list.php @@ -1,4 +1,5 @@ serialize($e), $e->getStatus()); } + $errorCode = (int)$e->getCode(); return new DataResponse( [ 'message' => $e->getMessage(), 'code' => $e->getCode() ], - ($e->getCode() > 0) ? $e->getCode() : $httpErrorCode + ($errorCode > 0) ? $errorCode : $httpErrorCode ); } diff --git a/lib/Dashboard/TeamDashboardWidget.php b/lib/Dashboard/TeamDashboardWidget.php index 6102433ea..a5d8fc24b 100644 --- a/lib/Dashboard/TeamDashboardWidget.php +++ b/lib/Dashboard/TeamDashboardWidget.php @@ -1,4 +1,5 @@