diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index ade123af6..4abb8dc0c 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -5,12 +5,8 @@ on: branches: - "v[0-9]+.[0-9]+" -permissions: - contents: write - pull-requests: write - env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }} jobs: merge-up: @@ -24,6 +20,7 @@ jobs: with: # fetch-depth 0 is required to fetch all branches, not just the branch being built fetch-depth: 0 + token: ${{ secrets.MERGE_UP_TOKEN }} - name: Create pull request id: create-pull-request diff --git a/src/GridFS/ReadableStream.php b/src/GridFS/ReadableStream.php index a0664e821..f0e433140 100644 --- a/src/GridFS/ReadableStream.php +++ b/src/GridFS/ReadableStream.php @@ -98,7 +98,6 @@ public function __construct(CollectionWrapper $collectionWrapper, object $file) * Return internal properties for debugging purposes. * * @see https://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.debuginfo - * @return array */ public function __debugInfo(): array { diff --git a/src/Model/SearchIndexInput.php b/src/Model/SearchIndexInput.php index c6d87b094..e28aea9b0 100644 --- a/src/Model/SearchIndexInput.php +++ b/src/Model/SearchIndexInput.php @@ -36,7 +36,6 @@ */ class SearchIndexInput implements Serializable { - /** @var array */ private array $index; /**