Change to release packaging

Action doesnt work :(
Patch cards to be draggable
2025-10-11 15:07:29 +02:00 · 2025-10-09 13:14:07 +02:00 · 2025-10-09 12:22:08 +02:00 · 2025-10-09 12:20:29 +02:00 · 2025-10-09 00:49:32 +00:00 · 2025-10-08 22:50:44 +02:00
161 changed files with 6076 additions and 4315 deletions
@@ -2,10 +2,11 @@ name: Package build
 on:
  push:
-    branches:
+    tags:
-      - main
+      - 'mod*'
-      - master
+
-      - stable*
+permissions:
  contents: write
 jobs:
  build:
@@ -18,26 +19,35 @@ jobs:
    steps:
    - uses: actions/checkout@v4.2.2
    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.4.0
      with:
        node-version: ${{ matrix.node-version }}
    - name: Set up npm7
      run: npm i -g npm@7
    - name: Setup PHP
-      uses: shivammathur/setup-php@2.31.1
+      uses: shivammathur/setup-php@2.34.1
      with:
        php-version: '7.4'
        tools: composer
    - name: install dependencies
      run: |
-        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.14.0/krankerl_0.14.0_amd64.deb
+        wget https://github.com/ChristophWurst/krankerl/releases/download/v0.13.3/krankerl_0.13.3_amd64.deb
-        sudo dpkg -i krankerl_0.14.0_amd64.deb
+        sudo dpkg -i krankerl_0.13.3_amd64.deb
    - name: package
      run: |
        uname -a
        RUST_BACKTRACE=1 krankerl --version
        RUST_BACKTRACE=1 krankerl package
-    - uses: actions/upload-artifact@v4
+    - uses: https://data.forgejo.org/forgejo/upload-artifact@v4
      with:
        name: Deck app tarball
        path: build/artifacts/deck.tar.gz
    - name: Attach tarball to release
      uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
      id: attach_to_release
      with:
        repo_token: ${{ secrets.GITHUB_TOKEN }}
        file: build/artifacts/deck.tar.gz
        asset_name: deck.tar.gz
        tag: ${{ github.ref }}
        overwrite: true
@@ -1,2 +0,0 @@
 # App maintainers
 * @luka-nextcloud @grnd-alt @elzody
@@ -1,120 +0,0 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 ---
 <!--
 Thanks for reporting issues back!
 Guidelines for submitting issues:
 * Please search the existing issues first, it's likely that your issue was already reported or even fixed.
 * SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
 * The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
 * You can also use the Issue Template app to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
 -->
 <!--- Please keep this note for other contributors -->
 ### How to use GitHub
 * Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
 * Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
 * Subscribe to receive notifications on status change and new comments. 
 **Describe the bug**
 A clear and concise description of what the bug is.
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 **Client details:**
 - OS: [e.g. iOS]
 - Browser [e.g. chrome, safari]
 - Version [e.g. 22]
 - Device: [e.g. iPhone6, desktop]
 <details>
 <summary>Server details</summary>
 <!--
 You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
 -->
 **Operating system**:
 **Web server:**
 **Database:**
 **PHP version:**
 **Nextcloud version:** (see Nextcloud admin page)
 **Where did you install Nextcloud from:**
 **Signing status:**
 ```
 Login as admin user into your Nextcloud and access
 http://example.com/index.php/settings/integrity/failed
 paste the results here.
 ```
 **List of activated apps:**
 ```
 If you have access to your command line run e.g.:
 sudo -u www-data php occ app:list
 from within your Nextcloud installation folder
 ```
 **Nextcloud configuration:**
 ```
 If you have access to your command line run e.g.:
 sudo -u www-data php occ config:list system
 from within your Nextcloud installation folder
 or
 Insert your config.php content here
 Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
 ```
 **Are you using an external user-backend, if yes which one:** LDAP/ActiveDirectory/Webdav/...
 </details>
 <details>
 <summary>Logs</summary>
 #### Nextcloud log (data/nextcloud.log)
 ```
 Insert your Nextcloud log here
 ```
 #### Browser log
 ```
 Insert your browser log here, this could for example include:
 a) The javascript console log
 b) The network log
 c) ...
 ```
 </details>
@@ -1,39 +0,0 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
 ---
 <!--
 Thanks for reporting issues back!
 Guidelines for submitting issues:
 * Please search the existing issues first, it's likely that your issue was already reported or even fixed.
 * SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
 * The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
 * You can also use the Issue Template app to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
 -->
 <!--- Please keep this note for other contributors -->
 ### How to use GitHub
 * Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
 * Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
 * Subscribe to receive notifications on status change and new comments. 
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 **Additional context**
 Add any other context or screenshots about the feature request here.
@@ -1,101 +0,0 @@
 version: 2
 updates:
 - package-ecosystem: npm
  directory: "/"
  target-branch: "main"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  open-pull-requests-limit: 10
  reviewers:
  - juliushaertl
  - luka-nextcloud
 - package-ecosystem: npm
  target-branch: stable30
  versioning-strategy: lockfile-only
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  ignore:
    - dependency-name: "*"
      update-types: ["version-update:semver-major"]
  open-pull-requests-limit: 30
  labels:
  - 3. to review
  - dependencies
 - package-ecosystem: npm
  target-branch: stable29
  versioning-strategy: lockfile-only
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  ignore:
    - dependency-name: "*"
      update-types: ["version-update:semver-major"]
  open-pull-requests-limit: 30
  labels:
  - 3. to review
  - dependencies
 - package-ecosystem: npm
  target-branch: stable28
  versioning-strategy: lockfile-only
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  ignore:
    - dependency-name: "*"
      update-types: ["version-update:semver-major"]
  open-pull-requests-limit: 30
  labels:
  - 3. to review
  - dependencies
 - package-ecosystem: composer
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  open-pull-requests-limit: 10
  reviewers:
  - juliushaertl
  - luka-nextcloud
 - package-ecosystem: composer
  directory: "/tests/integration"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  open-pull-requests-limit: 10
  reviewers:
  - juliushaertl
  - luka-nextcloud
 - package-ecosystem: github-actions
  directory: "/"
  schedule:
    interval: weekly
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
  open-pull-requests-limit: 10
  reviewers:
  - juliushaertl
  - luka-nextcloud
@@ -1,17 +0,0 @@
 * Resolves: # <!-- related github issue -->
 * Target version: main
 ### Summary
 ### TODO
 - [ ] ...
 ### Checklist
 - [ ] Code is properly formatted
 - [ ] Sign-off message is added to all commits
 - [ ] Tests (unit, integration, api and/or acceptance) are included
 - [ ] Documentation (manuals or wiki) has been updated or is not required
@@ -1,191 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Build and publish app release
 on:
  release:
    types: [published]
 permissions:
  contents: write
 jobs:
  build_and_publish:
    runs-on: ubuntu-latest
    # Only allowed to be run on nextcloud-releases repositories
    if: ${{ github.repository_owner == 'nextcloud-releases' }}
    steps:
      - name: Check actor permission
        uses: skjnldsv/check-actor-permission@69e92a3c4711150929bca9fcf34448c5bf5526e7 # v3.0
        with:
          require: write
      - name: Set app env
        run: |
          # Split and keep last
          echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
          echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          path: ${{ env.APP_NAME }}
      - name: Get app version number
        id: app-version
        uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
        with:
          filename: ${{ env.APP_NAME }}/appinfo/info.xml
          expression: "//info//version/text()"
      - name: Validate app version against tag
        run: |
          [ "${{ env.APP_VERSION }}" = "v${{ fromJSON(steps.app-version.outputs.result).version }}" ]
      - name: Get appinfo data
        id: appinfo
        uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
        with:
          filename: ${{ env.APP_NAME }}/appinfo/info.xml
          expression: "//info//dependencies//nextcloud/@min-version"
      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
        id: versions
        # Continue if no package.json
        continue-on-error: true
        with:
          path: ${{ env.APP_NAME }}
          fallbackNode: '^20'
          fallbackNpm: '^10'
      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
        # Skip if no package.json
        if: ${{ steps.versions.outputs.nodeVersion }}
        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}
      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
        # Skip if no package.json
        if: ${{ steps.versions.outputs.npmVersion }}
        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
      - name: Get php version
        id: php-versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
        with:
          filename: ${{ env.APP_NAME }}/appinfo/info.xml
      - name: Set up php ${{ steps.php-versions.outputs.php-min }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: ${{ steps.php-versions.outputs.php-min }}
          coverage: none
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Check composer.json
        id: check_composer
        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
        with:
          files: "${{ env.APP_NAME }}/composer.json"
      - name: Install composer dependencies
        if: steps.check_composer.outputs.files_exists == 'true'
        run: |
          cd ${{ env.APP_NAME }}
          composer install --no-dev
      - name: Build ${{ env.APP_NAME }}
        # Skip if no package.json
        if: ${{ steps.versions.outputs.nodeVersion }}
        env:
          CYPRESS_INSTALL_BINARY: 0
        run: |
          cd ${{ env.APP_NAME }}
          npm ci
          npm run build --if-present
      - name: Check Krankerl config
        id: krankerl
        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
        with:
          files: ${{ env.APP_NAME }}/krankerl.toml
      - name: Install Krankerl
        if: steps.krankerl.outputs.files_exists == 'true'
        run: |
          wget https://github.com/ChristophWurst/krankerl/releases/download/v0.14.0/krankerl_0.14.0_amd64.deb
          sudo dpkg -i krankerl_0.14.0_amd64.deb
      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with krankerl
        if: steps.krankerl.outputs.files_exists == 'true'
        run: |
          cd ${{ env.APP_NAME }}
          krankerl package
      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with makefile
        if: steps.krankerl.outputs.files_exists != 'true'
        run: |
          cd ${{ env.APP_NAME }}
          make appstore
      - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
        continue-on-error: true
        id: server-checkout
        run: |
          NCVERSION='${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}'
          wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
          unzip latest-$NCVERSION.zip
      - name: Checkout server master fallback
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        if: ${{ steps.server-checkout.outcome != 'success' }}
        with:
          persist-credentials: false
          submodules: true
          repository: nextcloud/server
          path: nextcloud
      - name: Sign app
        run: |
          # Extracting release
          cd ${{ env.APP_NAME }}/build/artifacts
          tar -xvf ${{ env.APP_NAME }}.tar.gz
          cd ../../../
          # Setting up keys
          echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
          wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
          # Signing
          php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
          # Rebuilding archive
          cd ${{ env.APP_NAME }}/build/artifacts
          tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
      - name: Attach tarball to github release
        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2
        id: attach_to_release
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
          file: ${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}.tar.gz
          asset_name: ${{ env.APP_NAME }}-${{ env.APP_VERSION }}.tar.gz
          tag: ${{ github.ref }}
          overwrite: true
      - name: Upload app to Nextcloud appstore
        uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1
        with:
          app_name: ${{ env.APP_NAME }}
          appstore_token: ${{ secrets.APPSTORE_TOKEN }}
          download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
          app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
@@ -1,153 +0,0 @@
 name: Cypress
 on:
  pull_request:
  push:
    branches:
      - main
      - stable*
 env:
  APP_NAME: deck
  CYPRESS_baseUrl: http://localhost:8081/index.php
 jobs:
  cypress:
    runs-on: 'ubuntu-latest'
    strategy:
      fail-fast: false
      matrix:
        node-version: [20.x]
        # containers: [1, 2, 3]
        php-versions: [ '8.2' ]
        server-versions: [ 'stable31' ]
    env:
      extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
      key: cache-v1
    services:
      postgres:
        image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
        ports:
          - 4444:5432/tcp
        env:
          POSTGRES_USER: root
          POSTGRES_PASSWORD: rootpassword
          POSTGRES_DB: nextcloud
        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
    steps:
      - name: Use Node.js ${{ matrix.node-version }}
        uses: actions/setup-node@v4.1.0
        with:
          node-version: ${{ matrix.node-version }}
      - name: Register text Git reference
        run: |
          text_app_ref="$(if [ "${{ matrix.server-versions }}" = "master" ]; then echo -n "main"; else echo -n "${{ matrix.server-versions }}"; fi)"
          echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
      - name: Checkout server
        uses: actions/checkout@v4.2.2
        with:
          repository: nextcloud/server
          ref: ${{ matrix.server-versions }}
      - name: Checkout submodules
        shell: bash
        run: |
          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
          git submodule sync --recursive
          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
      - name: Checkout ${{ env.APP_NAME }}
        uses: actions/checkout@v4.2.2
        with:
          path: apps/${{ env.APP_NAME }}
      - name: Checkout text
        uses: actions/checkout@v4.2.2
        with:
          repository: nextcloud/text
          ref: ${{ env.text_app_ref }}
          path: apps/text
      - name: Setup cache environment
        id: extcache
        uses: shivammathur/cache-extensions@v1
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: ${{ env.extensions }}
          key: ${{ env.key }}
      - name: Cache extensions
        uses: actions/cache@v4
        with:
          path: ${{ steps.extcache.outputs.dir }}
          key: ${{ steps.extcache.outputs.key }}
          restore-keys: ${{ steps.extcache.outputs.key }}
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: ${{ env.extensions }}
          ini-values:
            apc.enable_cli=on
          coverage: none
      - name: Install composer dependencies
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer install --no-dev
      - name: Set up Nextcloud
        env:
          DB_PORT: 4444
          PHP_CLI_SERVER_WORKERS: 20
        run: |
          mkdir data
          echo '<?php $CONFIG=["memcache.local"=>"\OC\Memcache\APCu","hashing_default_password"=>true];' > config/config.php
          php occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
          php occ background:cron
          php -f index.php
          php -S 0.0.0.0:8081 &
          export OC_PASS=1234561
          php occ user:add --password-from-env user1
          php occ user:add --password-from-env user2
          php occ app:enable deck
          php occ app:list
          curl -v http://localhost:8081/index.php/login
      - name: Cypress run
        uses: cypress-io/github-action@v6
        with:
          build: npm run dev
          record: false
          parallel: false
          browser: chrome
          wait-on: '${{ env.CYPRESS_baseUrl }}'
          working-directory: 'apps/${{ env.APP_NAME }}'
          config: defaultCommandTimeout=10000,video=false
        env:
          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          npm_package_name: ${{ env.APP_NAME }}
      - name: Upload test failure screenshots
        uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: Upload screenshots
          path: apps/${{ env.APP_NAME }}/cypress/screenshots/
          retention-days: 5
      - name: Upload nextcloud logs
        uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: Upload nextcloud log
          path: data/nextcloud.log
          retention-days: 5
@@ -1,49 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Dependabot
 on:
  pull_request_target: # zizmor: ignore[dangerous-triggers]
    branches:
      - main
      - master
      - stable*
 permissions:
  contents: read
 concurrency:
  group: dependabot-approve-merge-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  auto-approve-merge:
    if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]'
    runs-on: ubuntu-latest-low
    permissions:
      # for hmarr/auto-approve-action to approve PRs
      pull-requests: write
    steps:
      - name: Disabled on forks
        if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
        run: |
          echo 'Can not approve PRs from forks'
          exit 1
      # GitHub actions bot approve
      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
      # Nextcloud bot approve and merge request
      - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
        with:
          target: minor
          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
@@ -1,36 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Block fixup and squash commits
 on:
  pull_request:
    types: [opened, ready_for_review, reopened, synchronize]
 permissions:
  contents: read
 concurrency:
  group: fixup-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  commit-message-check:
    if: github.event.pull_request.draft == false
    permissions:
      pull-requests: write
    name: Block fixup and squash commits
    runs-on: ubuntu-latest-low
    steps:
      - name: Run check
        uses: skjnldsv/block-fixup-merge-action@c138ea99e45e186567b64cf065ce90f7158c236a # v2
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,165 +0,0 @@
 name: Integration tests
 on:
  pull_request:
    paths:
      - '.github/workflows/integration.yml'
      - 'appinfo/**'
      - 'lib/**'
      - 'templates/**'
      - 'tests/**'
      - 'composer.json'
      - 'composer.lock'
  push:
    branches:
      - main
      - master
      - stable*
 env:
  APP_NAME: deck
 jobs:
  integration:
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
        php-versions: ['8.1']
        databases: ['sqlite', 'mysql', 'pgsql']
        server-versions: ['master']
    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
    services:
      postgres:
        image: postgres:14
        ports:
          - 4445:5432/tcp
        env:
          POSTGRES_USER: root
          POSTGRES_PASSWORD: rootpassword
          POSTGRES_DB: nextcloud
        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
      mysql:
        image: mariadb:10.5
        ports:
          - 4444:3306/tcp
        env:
          MYSQL_ROOT_PASSWORD: rootpassword
        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
    steps:
      - name: Checkout server
        uses: actions/checkout@v4.2.2
        with:
          repository: nextcloud/server
          ref: ${{ matrix.server-versions }}
      - name: Checkout submodules
        shell: bash
        run: |
          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
          git submodule sync --recursive
          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
          cd build/integration && composer require --dev phpunit/phpunit:~9
      - name: Checkout app
        uses: actions/checkout@v4.2.2
        with:
          path: apps/${{ env.APP_NAME }}
      -   name: Checkout activity
          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
          with:
              repository: nextcloud/activity
              ref: ${{ matrix.server-versions }}
              path: apps/activity
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, apcu, gd
          ini-values:
            apc.enable_cli=on
          coverage: none
      - name: Set up dependencies
        working-directory: apps/${{ env.APP_NAME }}
        run: composer i --no-dev
      - name: Set up Nextcloud
        run: |
          if [ "${{ matrix.databases }}" = "mysql" ]; then
            export DB_PORT=4444
          elif [ "${{ matrix.databases }}" = "pgsql" ]; then
            export DB_PORT=4445
          fi
          mkdir data
          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
          ./occ config:system:set hashing_default_password --value=true --type=boolean
          ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
          cat config/config.php
          ./occ user:list
          ./occ app:enable --force ${{ env.APP_NAME }}
          ./occ config:system:set query_log_file --value "$PWD/query.log"
          php -S localhost:8080 &
      - name: Run behat
        working-directory: apps/${{ env.APP_NAME }}/tests/integration
        run: ./run.sh
      - name: Print log
        if: always()
        run: cat data/nextcloud.log
      - name: Query count
        if: ${{ matrix.databases == 'mysql' }}
        uses: actions/github-script@v7
        with:
          github-token: ${{secrets.GITHUB_TOKEN}}
          script: |
            let myOutput = ''
            let myError = ''
            const options = {}
            options.listeners = {
              stdout: (data) => {
                myOutput += data.toString()
              },
              stderr: (data) => {
                myError += data.toString()
              }
            }
            await exec.exec(`/bin/bash -c "cat query.log | wc -l"`, [], options)
            msg = myOutput
            const queryCount = parseInt(myOutput, 10)
            myOutput = ''
            await exec.exec('cat', ['apps/${{ env.APP_NAME }}/tests/integration/base-query-count.txt'], options)
            const baseCount = parseInt(myOutput, 10)
            const absoluteIncrease = queryCount - baseCount
            const relativeIncrease = baseCount <= 0 ? 100 : (parseInt((absoluteIncrease / baseCount * 10000), 10) / 100)
            if (absoluteIncrease >= 100 || relativeIncrease > 5) {
              const comment = `🐢 Performance warning.\nIt looks like the query count of the integration tests increased with this PR.\nDatabase query count is now ` + queryCount + ' was ' + baseCount + ' (+' + relativeIncrease + '%)\nPlease check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.'
              github.rest.issues.createComment({
                issue_number: context.issue.number,
                owner: context.repo.owner,
                repo: context.repo.repo,
                body: comment
              })
            }
            if (queryCount < 100) {
              const comment = `🐈 Performance messuring seems broken. Failed to get query count.`
              github.rest.issues.createComment({
                issue_number: context.issue.number,
                owner: context.repo.owner,
                repo: context.repo.repo,
                body: comment
              })
            }
@@ -1,100 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Lint eslint
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: lint-eslint-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  changes:
    runs-on: ubuntu-latest-low
    permissions:
      contents: read
      pull-requests: read
    outputs:
      src: ${{ steps.changes.outputs.src}}
    steps:
      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: changes
        continue-on-error: true
        with:
          filters: |
            src:
              - '.github/workflows/**'
              - 'src/**'
              - 'appinfo/info.xml'
              - 'package.json'
              - 'package-lock.json'
              - 'tsconfig.json'
              - '.eslintrc.*'
              - '.eslintignore'
              - '**.js'
              - '**.ts'
              - '**.vue'
  lint:
    runs-on: ubuntu-latest
    needs: changes
    if: needs.changes.outputs.src != 'false'
    name: NPM lint
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
        id: versions
        with:
          fallbackNode: '^20'
          fallbackNpm: '^10'
      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}
      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
      - name: Install dependencies
        env:
          CYPRESS_INSTALL_BINARY: 0
          PUPPETEER_SKIP_DOWNLOAD: true
        run: npm ci
      - name: Lint
        run: npm run lint
  summary:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
    needs: [changes, lint]
    if: always()
    # This is the summary, we just avoid to rename it so that branch protection rules still match
    name: eslint
    steps:
      - name: Summary status
        run: if ${{ needs.changes.outputs.src != 'false' && needs.lint.result != 'success' }}; then exit 1; fi
@@ -1,52 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Lint php-cs
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: lint-php-cs-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  lint:
    runs-on: ubuntu-latest
    name: php-cs
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get php version
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
      - name: Set up php${{ steps.versions.outputs.php-available }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          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
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Install dependencies
        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 )
@@ -1,75 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Lint php
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: lint-php-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  matrix:
    runs-on: ubuntu-latest-low
    outputs:
      php-versions: ${{ steps.versions.outputs.php-versions }}
    steps:
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get version matrix
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.0.0
  php-lint:
    runs-on: ubuntu-latest
    needs: matrix
    strategy:
      matrix:
        php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}}
    name: php-lint
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          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
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Lint
        run: composer run lint
  summary:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
    needs: php-lint
    if: always()
    name: php-lint-summary
    steps:
      - name: Summary status
        run: if ${{ needs.php-lint.result != 'success' && needs.php-lint.result != 'skipped' }}; then exit 1; fi
@@ -1,53 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Lint stylelint
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: lint-stylelint-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  lint:
    runs-on: ubuntu-latest
    name: stylelint
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
        id: versions
        with:
          fallbackNode: '^20'
          fallbackNpm: '^10'
      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}
      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
      - name: Install dependencies
        env:
          CYPRESS_INSTALL_BINARY: 0
        run: npm ci
      - name: Lint
        run: npm run stylelint
@@ -1,34 +0,0 @@
 name: Node CI
 on: [push]
 jobs:
  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
        node-version: [14.x]
    steps:
    - uses: actions/checkout@v4.2.2
    - name: Use Node.js ${{ matrix.node-version }}
      uses: actions/setup-node@v4.1.0
      with:
        node-version: ${{ matrix.node-version }}
    - name: Set up npm7
      run: npm i -g npm@7
    - name: install dependencies
      run: |
        npm ci
    - name: build
      env:
        RELATIVE_CI_KEY: ${{ secrets.RELATIVE_CI_KEY }}
        RELATIVE_CI_SLUG: nextcloud/deck
      run: |
        mkdir -p js
        npm run build --if-present -- --profile --json | tail -n +6 > js/webpack-stats.json
        npx relative-ci-agent
@@ -1,75 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Npm audit fix and compile
 on:
  workflow_dispatch:
  schedule:
    # At 2:30 on Sundays
    - cron: '30 2 * * 0'
 jobs:
  build:
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
    name: npm-audit-fix-${{ matrix.branches }}
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          ref: ${{ matrix.branches }}
      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
        id: versions
        with:
          fallbackNode: '^20'
          fallbackNpm: '^10'
      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
        with:
          node-version: ${{ steps.versions.outputs.nodeVersion }}
      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
        run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
      - name: Fix npm audit
        id: npm-audit
        uses: nextcloud-libraries/npm-audit-action@2a60bd2e79cc77f2cc4d9a3fe40f1a69896f3a87 # v0.1.0
      - name: Run npm ci and npm run build
        if: always()
        env:
          CYPRESS_INSTALL_BINARY: 0
        run: |
          npm ci
          npm run build --if-present
      - name: Create Pull Request
        if: always()
        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: 'fix(deps): Fix npm audit'
          committer: GitHub <noreply@github.com>
          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
          signoff: true
          branch: automated/noid/${{ matrix.branches }}-fix-npm-audit
          title: '[${{ matrix.branches }}] Fix npm audit'
          body: ${{ steps.npm-audit.outputs.markdown }}
          labels: |
            dependencies
            3. to review
@@ -1,200 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: PHPUnit MySQL
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: phpunit-mysql-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  matrix:
    runs-on: ubuntu-latest-low
    outputs:
      matrix: ${{ steps.versions.outputs.sparse-matrix }}
    steps:
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get version matrix
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
        with:
          matrix: '{"mysql-versions": ["8.4"]}'
  changes:
    runs-on: ubuntu-latest-low
    permissions:
      contents: read
      pull-requests: read
    outputs:
      src: ${{ steps.changes.outputs.src}}
    steps:
      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: changes
        continue-on-error: true
        with:
          filters: |
            src:
              - '.github/workflows/**'
              - 'appinfo/**'
              - 'lib/**'
              - 'templates/**'
              - 'tests/**'
              - 'vendor/**'
              - 'vendor-bin/**'
              - '.php-cs-fixer.dist.php'
              - 'composer.json'
              - 'composer.lock'
  phpunit-mysql:
    runs-on: ubuntu-latest
    needs: [changes, matrix]
    if: needs.changes.outputs.src != 'false'
    strategy:
      matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
    name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
    services:
      mysql:
        image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest
        ports:
          - 4444:3306/tcp
        env:
          MYSQL_ROOT_PASSWORD: rootpassword
        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
    steps:
      - name: Set app env
        if: ${{ env.APP_NAME == '' }}
        run: |
          # Split and keep last
          echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
      - name: Checkout server
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
          repository: nextcloud/server
          ref: ${{ matrix.server-versions }}
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          path: apps/${{ env.APP_NAME }}
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
          coverage: none
          ini-file: development
          # Temporary workaround for missing pcntl_* in PHP 8.3
          ini-values: disable_functions=
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Enable ONLY_FULL_GROUP_BY MySQL option
        run: |
          echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
          echo 'SELECT @@sql_mode;' | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
      - name: Check composer file existence
        id: check_composer
        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
        with:
          files: apps/${{ env.APP_NAME }}/composer.json
      - name: Set up dependencies
        # Only run if phpunit config file exists
        if: steps.check_composer.outputs.files_exists == 'true'
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer remove nextcloud/ocp --dev
          composer i
      - name: Set up Nextcloud
        env:
          DB_PORT: 4444
        run: |
          mkdir data
          ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
          ./occ app:enable --force ${{ env.APP_NAME }}
      - name: Check PHPUnit script is defined
        id: check_phpunit
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:unit ' | wc -l | grep 1
      - name: PHPUnit
        # Only run if phpunit config file exists
        if: steps.check_phpunit.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:unit
      - name: Check PHPUnit integration script is defined
        id: check_integration
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:integration ' | wc -l | grep 1
      - name: Run Nextcloud
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        run: php -S localhost:8080 &
      - name: PHPUnit integration
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:integration
      - name: Print logs
        if: always()
        run: |
          cat data/nextcloud.log
      - name: Skipped
        # Fail the action when neither unit nor integration tests ran
        if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
        run: |
          echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
          exit 1
  summary:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
    needs: [changes, phpunit-mysql]
    if: always()
    name: phpunit-mysql-summary
    steps:
      - name: Summary status
        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
@@ -1,198 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: PHPUnit PostgreSQL
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: phpunit-pgsql-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  matrix:
    runs-on: ubuntu-latest-low
    outputs:
      php-version: ${{ steps.versions.outputs.php-available-list }}
      server-max: ${{ steps.versions.outputs.branches-max-list }}
    steps:
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get version matrix
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
  changes:
    runs-on: ubuntu-latest-low
    permissions:
      contents: read
      pull-requests: read
    outputs:
      src: ${{ steps.changes.outputs.src }}
    steps:
      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: changes
        continue-on-error: true
        with:
          filters: |
            src:
              - '.github/workflows/**'
              - 'appinfo/**'
              - 'lib/**'
              - 'templates/**'
              - 'tests/**'
              - 'vendor/**'
              - 'vendor-bin/**'
              - '.php-cs-fixer.dist.php'
              - 'composer.json'
              - 'composer.lock'
  phpunit-pgsql:
    runs-on: ubuntu-latest
    needs: [changes, matrix]
    if: needs.changes.outputs.src != 'false'
    strategy:
      matrix:
        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
    name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
    services:
      postgres:
        image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
        ports:
          - 4444:5432/tcp
        env:
          POSTGRES_USER: root
          POSTGRES_PASSWORD: rootpassword
          POSTGRES_DB: nextcloud
        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
    steps:
      - name: Set app env
        if: ${{ env.APP_NAME == '' }}
        run: |
          # Split and keep last
          echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
      - name: Checkout server
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
          repository: nextcloud/server
          ref: ${{ matrix.server-versions }}
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          path: apps/${{ env.APP_NAME }}
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql
          coverage: none
          ini-file: development
          # Temporary workaround for missing pcntl_* in PHP 8.3
          ini-values: disable_functions=
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Check composer file existence
        id: check_composer
        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
        with:
          files: apps/${{ env.APP_NAME }}/composer.json
      - name: Set up dependencies
        # Only run if phpunit config file exists
        if: steps.check_composer.outputs.files_exists == 'true'
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer remove nextcloud/ocp --dev
          composer i
      - name: Set up Nextcloud
        env:
          DB_PORT: 4444
        run: |
          mkdir data
          ./occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
          ./occ app:enable --force ${{ env.APP_NAME }}
      - name: Check PHPUnit script is defined
        id: check_phpunit
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:unit ' | wc -l | grep 1
      - name: PHPUnit
        # Only run if phpunit config file exists
        if: steps.check_phpunit.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:unit
      - name: Check PHPUnit integration script is defined
        id: check_integration
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:integration ' | wc -l | grep 1
      - name: Run Nextcloud
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        run: php -S localhost:8080 &
      - name: PHPUnit integration
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:integration
      - name: Print logs
        if: always()
        run: |
          cat data/nextcloud.log
      - name: Skipped
        # Fail the action when neither unit nor integration tests ran
        if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
        run: |
          echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
          exit 1
  summary:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
    needs: [changes, phpunit-pgsql]
    if: always()
    name: phpunit-pgsql-summary
    steps:
      - name: Summary status
        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
@@ -1,187 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: PHPUnit SQLite
 on: pull_request
 permissions:
  contents: read
 concurrency:
  group: phpunit-sqlite-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  matrix:
    runs-on: ubuntu-latest-low
    outputs:
      php-version: ${{ steps.versions.outputs.php-available-list }}
      server-max: ${{ steps.versions.outputs.branches-max-list }}
    steps:
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get version matrix
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
  changes:
    runs-on: ubuntu-latest-low
    permissions:
      contents: read
      pull-requests: read
    outputs:
      src: ${{ steps.changes.outputs.src}}
    steps:
      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: changes
        continue-on-error: true
        with:
          filters: |
            src:
              - '.github/workflows/**'
              - 'appinfo/**'
              - 'lib/**'
              - 'templates/**'
              - 'tests/**'
              - 'vendor/**'
              - 'vendor-bin/**'
              - '.php-cs-fixer.dist.php'
              - 'composer.json'
              - 'composer.lock'
  phpunit-sqlite:
    runs-on: ubuntu-latest
    needs: [changes, matrix]
    if: needs.changes.outputs.src != 'false'
    strategy:
      matrix:
        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
    name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
    steps:
      - name: Set app env
        if: ${{ env.APP_NAME == '' }}
        run: |
          # Split and keep last
          echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
      - name: Checkout server
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          submodules: true
          repository: nextcloud/server
          ref: ${{ matrix.server-versions }}
      - name: Checkout app
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          path: apps/${{ env.APP_NAME }}
      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
          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
          # Temporary workaround for missing pcntl_* in PHP 8.3
          ini-values: disable_functions=
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Check composer file existence
        id: check_composer
        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
        with:
          files: apps/${{ env.APP_NAME }}/composer.json
      - name: Set up dependencies
        # Only run if phpunit config file exists
        if: steps.check_composer.outputs.files_exists == 'true'
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer remove nextcloud/ocp --dev
          composer i
      - name: Set up Nextcloud
        env:
          DB_PORT: 4444
        run: |
          mkdir data
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
          ./occ app:enable --force ${{ env.APP_NAME }}
      - name: Check PHPUnit script is defined
        id: check_phpunit
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:unit ' | wc -l | grep 1
      - name: PHPUnit
        # Only run if phpunit config file exists
        if: steps.check_phpunit.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:unit
      - name: Check PHPUnit integration script is defined
        id: check_integration
        continue-on-error: true
        working-directory: apps/${{ env.APP_NAME }}
        run: |
          composer run --list | grep '^  test:integration ' | wc -l | grep 1
      - name: Run Nextcloud
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        run: php -S localhost:8080 &
      - name: PHPUnit integration
        # Only run if phpunit integration config file exists
        if: steps.check_integration.outcome == 'success'
        working-directory: apps/${{ env.APP_NAME }}
        run: composer run test:integration
      - name: Print logs
        if: always()
        run: |
          cat data/nextcloud.log
      - name: Skipped
        # Fail the action when neither unit nor integration tests ran
        if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
        run: |
          echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
          exit 1
  summary:
    permissions:
      contents: none
    runs-on: ubuntu-latest-low
    needs: [changes, phpunit-sqlite]
    if: always()
    name: phpunit-sqlite-summary
    steps:
      - name: Summary status
        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi
@@ -1,50 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 # SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2023 Marcel Klehr <mklehr@gmx.net>
 # SPDX-FileCopyrightText: 2023 Joas Schilling <213943+nickvergessen@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2023 Daniel Kesselberg <mail@danielkesselberg.de>
 # SPDX-FileCopyrightText: 2023 Florian Steffens <florian.steffens@nextcloud.com>
 # SPDX-License-Identifier: MIT
 name: 'Ask for feedback on PRs'
 on:
  schedule:
    - cron: '30 1 * * *'
 jobs:
  pr-feedback:
    runs-on: ubuntu-latest
    steps:
      - name: The get-github-handles-from-website action
        uses: marcelklehr/get-github-handles-from-website-action@06b2239db0a48fe1484ba0bfd966a3ab81a08308 # v1.0.1
        id: scrape
        with:
          website: 'https://nextcloud.com/team/'
      - name: Get blocklist
        id: blocklist
        run: |
          blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
          echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
      - uses: nextcloud/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4 # main
        with:
          feedback-message: |
            Hello there,
            Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
            We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
            Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6
            Thank you for contributing to Nextcloud and we hope to hear from you soon!
            (If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
          days-before-feedback: 14
          start-date: '2024-04-30'
          exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
          exempt-bots: true
@@ -1,59 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Static analysis
 on: pull_request
 concurrency:
  group: psalm-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 permissions:
  contents: read
 jobs:
  static-analysis:
    runs-on: ubuntu-latest
    name: static-psalm-analysis
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: Get php version
        id: versions
        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
      - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
        run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
      - name: Set up php${{ steps.versions.outputs.php-available }}
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          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
          # Temporary workaround for missing pcntl_* in PHP 8.3
          ini-values: disable_functions=
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Install dependencies
        run: |
          composer remove nextcloud/ocp --dev
          composer i
      - name: Install nextcloud/ocp
        run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
      - name: Run coding standards check
        run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
@@ -1,27 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 # SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. <https://fsfe.org>
 #
 # SPDX-License-Identifier: CC0-1.0
 name: REUSE Compliance Check
 on: [pull_request]
 permissions:
  contents: read
 jobs:
  reuse-compliance-check:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: REUSE Compliance Check
        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
@@ -1,58 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Auto approve nextcloud/ocp
 on:
  pull_request_target:  # zizmor: ignore[dangerous-triggers]
    branches:
      - main
      - master
      - stable*
 permissions:
  contents: read
 concurrency:
  group: update-nextcloud-ocp-approve-merge-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  auto-approve-merge:
    if: github.actor == 'nextcloud-command'
    runs-on: ubuntu-latest-low
    permissions:
      # for hmarr/auto-approve-action to approve PRs
      pull-requests: write
      # for alexwilson/enable-github-automerge-action to approve PRs
      contents: write
    steps:
      - name: Disabled on forks
        if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
        run: |
          echo 'Can not approve PRs from forks'
          exit 1
      - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
        id: branchname
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      # GitHub actions bot approve
      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
        if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
      # Enable GitHub auto merge
      - name: Auto merge
        uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
        if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,123 +0,0 @@
 # This workflow is provided via the organization template repository
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 name: Update nextcloud/ocp
 on:
  workflow_dispatch:
  schedule:
    - cron: "5 2 * * 0"
 permissions:
  contents: read
 jobs:
  update-nextcloud-ocp:
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
    name: update-nextcloud-ocp-${{ matrix.branches }}
    steps:
      - id: checkout
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
          ref: ${{ matrix.branches }}
          submodules: true
        continue-on-error: true
      - name: Set up php8.2
        if: steps.checkout.outcome == 'success'
        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
        with:
          php-version: 8.2
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
          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
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Read codeowners
        if: steps.checkout.outcome == 'success'
        id: codeowners
        run: |
          grep '/appinfo/info.xml' .github/CODEOWNERS | cut -f 2- -d ' ' | xargs | awk '{ print "codeowners="$0 }' >> $GITHUB_OUTPUT
        continue-on-error: true
      - name: Composer install
        if: steps.checkout.outcome == 'success'
        run: composer install
      - name: Composer update nextcloud/ocp
        id: update_branch
        if: ${{ steps.checkout.outcome == 'success' && matrix.branches != 'main' }}
        run: composer require --dev 'nextcloud/ocp:dev-${{ matrix.branches }}'
      - name: Raise on issue on failure
        uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
        if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
          body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
      - name: Composer update nextcloud/ocp
        id: update_main
        if: ${{ steps.checkout.outcome == 'success' && matrix.branches == 'main' }}
        run: composer require --dev nextcloud/ocp:dev-master
      - name: Raise on issue on failure
        uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
        if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_main.conclusion == 'failure' }}
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
          body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
      - name: Reset checkout 3rdparty
        if: steps.checkout.outcome == 'success'
        run: |
          git clean -f 3rdparty
          git checkout 3rdparty
        continue-on-error: true
      - name: Reset checkout vendor
        if: steps.checkout.outcome == 'success'
        run: |
          git clean -f vendor
          git checkout vendor
        continue-on-error: true
      - name: Reset checkout vendor-bin
        if: steps.checkout.outcome == 'success'
        run: |
          git clean -f vendor-bin
          git checkout vendor-bin
        continue-on-error: true
      - name: Create Pull Request
        if: steps.checkout.outcome == 'success'
        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: 'chore(dev-deps): Bump nextcloud/ocp package'
          committer: GitHub <noreply@github.com>
          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
          signoff: true
          branch: 'automated/noid/${{ matrix.branches }}-update-nextcloud-ocp'
          title: '[${{ matrix.branches }}] Update nextcloud/ocp dependency'
          body: |
            Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
          labels: |
            dependencies
            3. to review
@@ -6,6 +6,7 @@
 - Adrian Missy <adrian.missy@onewavestudios.com>
 - Alexandru Puiu <alexpuiu20@yahoo.com>
 - Arne Bartelt <arne.bartelt@gmail.com>
 - Chandi Langecker <git@chandi.it>
 - Christoph Wurst <christoph@winzerhof-wurst.at>
 - Gary Kim <gary@garykim.dev>
@@ -5,64 +5,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
-# 1.15.3
+## 1.16.0-beta.1
 ### Fixed
 * [stable31] fix: Use getId() method for card ID retrieval by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7144
 * [stable31]fix: ensure correct type when filtering events by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7148
 * [stable31] fix: do not change focus when card id stays the same by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7173
 * [stable31] fix(darkmode): Fix activity icon colors by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7240
 * [stable31] fix: make comments with mention editable @backportbot[bot] in https://github.com/nextcloud/deck/pull/7198
 * [stable31] fix: redirect to cleaner URL if RewriteBase is enabled by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7267
 * [stable31] fix: missing push notifications by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7269
 * [stable31] fix: use text cursor for card title on dashboard by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7274
 * [stable31] fix: parse arguments to CardService.reorder correctly to int by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7275
 ### Improvements
 * [stable31] Clean attachment sharing records after permanent deleted by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7180
 * Chore(deps): Bump @nextcloud/vue from 8.22.0 to 8.31.0 by @luka-nextcloud in https://github.com/nextcloud/deck/pull/7272
 # 1.15.2
 ### Fixed
 * [stable31] fix: update DeleteCron to remove deleted lists by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7029
 * [stable31] fix: not show Share with a Deck card for unauthorized users by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7061
 * [stable31] fix: unstable cypress test by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7063
 * [stable31] fix: add retry and show warning on description saving error by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7091
 * [stable31] fix: styling for new stack input field by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7113
 * [stable31] fix:allow foreign label deletion by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7130
 * [stable31] fix: acl check when delete, update board acl by @backportbot[bot] in https://github.com/nextcloud/deck/pull/7132
 ### Improvements
 * [stable31] perf: don't enrich cards when finding calendar entries by @backportbot[bot] in https://github.com/nextcloud/deck/pull/6959
 ## 1.15.1
 ### Fixed
 * [stable31] fix: Properly show attachment extension by @backportbot in https://github.com/nextcloud/deck/pull/6701
 * [stable31] Clear selected stack when selected board changed by @backportbot in https://github.com/nextcloud/deck/pull/6915
 * [stable31] fix: Use strings as rich object ids by @backportbot in https://github.com/nextcloud/deck/pull/6951
 * [stable31] fix: Limit label actions to labels of the cards board by @backportbot in https://github.com/nextcloud/deck/pull/6954
 * [stable31] fix: only delete assignments on unshared board by @grnd-alt in https://github.com/nextcloud/deck/pull/6934
 ### Improvements
 * [stable31] perf: Skip doing a query just to check if a board is deleted by @backportbot in https://github.com/nextcloud/deck/pull/6894
 ## 1.15.0
 ### Fixed
 - Fix: Adapt URLs generated in the backend to new routes #6743
 - Fix npm audit #6719
 - Fix: skip exporting a deleted card #6723
 ## 1.15.0-beta.2
 ### Added
 - feat: update default content @luka-nextcloud [#6740](https://github.com/nextcloud/deck/pull/6740)
 - feat: add board import and export @luka-nextcloud [#6872](https://github.com/nextcloud/deck/pull/6872)
 - feat: use outline icons @luka-nextcloud [#7114](https://github.com/nextcloud/deck/pull/7114)
 - Add OCC commands for global calendar feature opt-in and opt-out in Deck @Fledermaus-20 [#7080](https://github.com/nextcloud/deck/pull/7080)
- feat: Implement reference resolving for cards that have a link in the title @juliusknorr [#6286](https://github.com/nextcloud/deck/pull/6286)
+### Fixed
-
+- CSV export fixes @gidan80 [#6800](https://github.com/nextcloud/deck/pull/6800)
 ### Other
 - Remove old project from README @edent [#6658](https://github.com/nextcloud/deck/pull/6658)
 - devcontainer(image): Fix package path @niclasheinz [#6653](https://github.com/nextcloud/deck/pull/6653)
 - remove deprecated nextcloud-vue-collections @grnd-alt [#6664](https://github.com/nextcloud/deck/pull/6664)
 - fix: set cypress ci server version to stable31 @grnd-alt [#6705](https://github.com/nextcloud/deck/pull/6705)
 ## 1.15.0-beta.1
 ### Fixed
@@ -24,7 +24,7 @@ Deck is a kanban style organization tool aimed at personal planning and project
 ### Mobile apps
 - [Nextcloud Deck app for Android](https://github.com/stefan-niedermann/nextcloud-deck) - It is available in [F-Droid](https://f-droid.org/de/packages/it.niedermann.nextcloud.deck/) and the [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.nextcloud.deck.play)
- [Nextcloud Deck app for iOS](https://github.com/StCyr/deck-react-native) - It is available in [Apple App store](https://apps.apple.com/ml/app/nextcloud-deck/id1570892788)
+- Nextcloud Deck app for iOS - It is available in [Apple App store](https://apps.apple.com/de/app/next-deck/id6752478755)
 ### 3rd-Party Integrations
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "none"
 SPDX-License-Identifier = "CC0-1.0"
 [[annotations]]
-path = ["l10n/**.js", "l10n/**.json", "js/**.js.map", "js/**.js", "js/**.mjs", "js/**.mjs.map", "js/templates/**.handlebars", "lib/Service/Importer/fixtures/config-deckJson-schema.json", "lib/Service/Importer/fixtures/config-trelloApi-schema.json", "lib/Service/Importer/fixtures/config-trelloJson-schema.json", "screenshots/screenshot1.png", "src/assets/file-placeholder.svg", "img/favicon.ico", "img/favicon.png", "img/favicon.svg", "img/activity.svg", "img/activity-dark.svg", "img/deck.svg", "img/deck-current.svg", "img/deck-dark.svg", "img/details-white.svg", "img/card.svg"]
+path = ["l10n/**.js", "l10n/**.json", "js/**.js.map", "js/**.js", "js/**.mjs", "js/**.mjs.map", "js/templates/**.handlebars", "lib/Service/Importer/fixtures/config-deckJson-schema.json", "lib/Service/Importer/fixtures/config-trelloApi-schema.json", "lib/Service/Importer/fixtures/config-trelloJson-schema.json", "lib/Service/fixtures/default-board.json", "screenshots/screenshot1.png", "src/assets/file-placeholder.svg", "img/favicon.ico", "img/favicon.png", "img/favicon.svg", "img/activity.svg", "img/activity-dark.svg", "img/deck.svg", "img/deck-current.svg", "img/deck-dark.svg", "img/details-white.svg", "img/card.svg", "img/sample-image.jpg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2019 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -20,7 +20,7 @@
 - 🚀 Get your project organized
 </description>
-    <version>1.15.3</version>
+    <version>2.0.0-dev.0</version>
    <licence>agpl</licence>
    <author>Julius Härtl</author>
    <namespace>Deck</namespace>
@@ -42,7 +42,7 @@
        <database min-version="9.4">pgsql</database>
        <database>sqlite</database>
        <database min-version="8.0">mysql</database>
-        <nextcloud min-version="31" max-version="31"/>
+        <nextcloud min-version="33" max-version="33"/>
    </dependencies>
    <background-jobs>
        <job>OCA\Deck\Cron\DeleteCron</job>
@@ -54,11 +54,15 @@
        <live-migration>
            <step>OCA\Deck\Migration\DeletedCircleCleanup</step>
        </live-migration>
        <post-migration>
            <step>OCA\Deck\Migration\LabelMismatchCleanup</step>
        </post-migration>
    </repair-steps>
    <commands>
        <command>OCA\Deck\Command\UserExport</command>
        <command>OCA\Deck\Command\BoardImport</command>
        <command>OCA\Deck\Command\TransferOwnership</command>
        <command>OCA\Deck\Command\CalendarToggle</command>
    </commands>
    <activity>
        <settings>
@@ -29,6 +29,7 @@ return [
 		['name' => 'board#clone', 'url' => '/boards/{boardId}/clone', 'verb' => 'POST'],
 		['name' => 'board#transferOwner', 'url' => '/boards/{boardId}/transferOwner', 'verb' => 'PUT'],
 		['name' => 'board#export', 'url' => '/boards/{boardId}/export', 'verb' => 'GET'],
 		['name' => 'board#import', 'url' => '/boards/import', 'verb' => 'POST'],
 		// stacks
 		['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
@@ -9,31 +9,35 @@
 		}
 	],
 	"require": {
-		"justinrainbow/json-schema": "^6.0"
+		"justinrainbow/json-schema": "^6.0",
 		"bamarni/composer-bin-plugin": "^1.8"
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
 		"phpunit/phpunit": "^9",
 		"nextcloud/coding-standard": "^1.1",
-		"nextcloud/ocp": "dev-stable31",
+		"nextcloud/ocp": "dev-master"
 		"psalm/phar": "^5.13"
 	},
 	"config": {
 		"optimize-autoloader": true,
 		"allow-plugins": {
-			"composer/package-versions-deprecated": true
+			"composer/package-versions-deprecated": true,
 			"bamarni/composer-bin-plugin": true
 		},
 		"platform": {
 			"php": "8.1"
 		}
 	},
 	"scripts": {
 		"post-install-cmd": [
 			"@composer bin all install --ansi"
 		],
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
-		"psalm": "psalm.phar",
+		"psalm": "psalm",
-		"psalm:update-baseline": "psalm.phar --update-baseline",
+		"psalm:update-baseline": "psalm --threads=$(nproc) --no-cache --update-baseline",
-		"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
+		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"test": [
 			"@test:unit",
 			"@test:integration"
@@ -4,146 +4,91 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "c89537a172cee5c19093b4ea0cb5365c",
+    "content-hash": "263f9ff9e6a13d50ab09bc9f4e06b749",
    "packages": [
        {
-            "name": "icecave/parity",
+            "name": "bamarni/composer-bin-plugin",
-            "version": "1.0.0",
+            "version": "1.8.2",
            "source": {
                "type": "git",
-                "url": "https://github.com/icecave/parity.git",
+                "url": "https://github.com/bamarni/composer-bin-plugin.git",
-                "reference": "0109fef58b3230d23b20b2ac52ecdf477218d300"
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/icecave/parity/zipball/0109fef58b3230d23b20b2ac52ecdf477218d300",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
-                "reference": "0109fef58b3230d23b20b2ac52ecdf477218d300",
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
                "shasum": ""
            },
            "require": {
-                "icecave/repr": "~1",
+                "composer-plugin-api": "^2.0",
-                "php": ">=5.3"
+                "php": "^7.2.5 || ^8.0"
            },
            "require-dev": {
-                "eloquent/liberator": "~1",
+                "composer/composer": "^2.0",
-                "icecave/archer": "~1"
+                "ext-json": "*",
                "phpstan/extension-installer": "^1.1",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpunit/phpunit": "^8.5 || ^9.5",
                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
            },
-            "suggest": {
+            "type": "composer-plugin",
-                "eloquent/asplode": "Drop-in exception-based error handling."
+            "extra": {
                "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin"
            },
            "type": "library",
            "autoload": {
                "psr-0": {
                    "Icecave\\Parity": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
            "authors": [
                {
                    "name": "James Harris",
                    "email": "james.harris@icecave.com.au",
                    "homepage": "https://github.com/jmalloc"
                }
            ],
            "description": "A customizable deep comparison library.",
            "homepage": "https://github.com/IcecaveStudios/parity",
            "keywords": [
                "compare",
                "comparison",
                "equal",
                "equality",
                "greater",
                "less",
                "sort",
                "sorting"
            ],
            "support": {
                "issues": "https://github.com/icecave/parity/issues",
                "source": "https://github.com/icecave/parity/tree/1.0.0"
            },
            "time": "2014-01-17T05:56:27+00:00"
        },
        {
            "name": "icecave/repr",
            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/icecave/repr.git",
                "reference": "8a3d2953adf5f464a06e3e2587aeacc97e2bed07"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/icecave/repr/zipball/8a3d2953adf5f464a06e3e2587aeacc97e2bed07",
                "reference": "8a3d2953adf5f464a06e3e2587aeacc97e2bed07",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3"
            },
            "require-dev": {
                "icecave/archer": "~1"
            },
            "suggest": {
                "eloquent/asplode": "Drop-in exception-based error handling."
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "Icecave\\Repr\\": "src"
+                    "Bamarni\\Composer\\Bin\\": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
-            "authors": [
+            "description": "No conflicts for your bin dependencies",
                {
                    "name": "James Harris",
                    "email": "james.harris@icecave.com.au",
                    "homepage": "https://github.com/jmalloc"
                }
            ],
            "description": "A library for generating string representations of any value, inspired by Python's reprlib library.",
            "homepage": "https://github.com/IcecaveStudios/repr",
            "keywords": [
-                "human",
+                "composer",
-                "readable",
+                "conflict",
-                "repr",
+                "dependency",
-                "representation",
+                "executable",
-                "string"
+                "isolation",
                "tool"
            ],
            "support": {
-                "issues": "https://github.com/icecave/repr/issues",
+                "issues": "https://github.com/bamarni/composer-bin-plugin/issues",
-                "source": "https://github.com/icecave/repr/tree/1.0.1"
+                "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2"
            },
-            "time": "2014-07-25T05:44:41+00:00"
+            "time": "2022-10-31T08:38:03+00:00"
        },
        {
            "name": "justinrainbow/json-schema",
-            "version": "6.0.0",
+            "version": "6.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "a38c6198d53b09c0702f440585a4f4a5d9137bd9"
+                "reference": "ce1fd2d47799bb60668643bc6220f6278a4c1d02"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/a38c6198d53b09c0702f440585a4f4a5d9137bd9",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/ce1fd2d47799bb60668643bc6220f6278a4c1d02",
-                "reference": "a38c6198d53b09c0702f440585a4f4a5d9137bd9",
+                "reference": "ce1fd2d47799bb60668643bc6220f6278a4c1d02",
                "shasum": ""
            },
            "require": {
-                "icecave/parity": "1.0.0",
+                "ext-json": "*",
-                "marc-mabe/php-enum": "^2.0 || ^3.0 || ^4.0",
+                "marc-mabe/php-enum": "^4.0",
-                "php": ">=5.3.3"
+                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.2.20 || ~2.19.0",
+                "friendsofphp/php-cs-fixer": "3.3.0",
                "json-schema/json-schema-test-suite": "1.2.0",
-                "phpunit/phpunit": "^4.8.35"
+                "marc-mabe/php-enum-phpstan": "^2.0",
                "phpspec/prophecy": "^1.19",
                "phpstan/phpstan": "^1.12",
                "phpunit/phpunit": "^8.5"
            },
            "bin": [
                "bin/validate-json"
@@ -189,9 +134,9 @@
            ],
            "support": {
                "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/6.0.0"
+                "source": "https://github.com/jsonrainbow/json-schema/tree/6.4.2"
            },
-            "time": "2024-07-30T17:49:21+00:00"
+            "time": "2025-06-03T18:27:04+00:00"
        },
        {
            "name": "marc-mabe/php-enum",
@@ -488,16 +433,16 @@
        },
        {
            "name": "nextcloud/ocp",
-            "version": "dev-stable31",
+            "version": "dev-master",
            "source": {
                "type": "git",
                "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "abd32429d794ede1d92b7b0a88a1070371c907b5"
+                "reference": "9a2e6c0bf6f2d87e1db8d18063a5bedf85040bb2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/abd32429d794ede1d92b7b0a88a1070371c907b5",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/9a2e6c0bf6f2d87e1db8d18063a5bedf85040bb2",
-                "reference": "abd32429d794ede1d92b7b0a88a1070371c907b5",
+                "reference": "9a2e6c0bf6f2d87e1db8d18063a5bedf85040bb2",
                "shasum": ""
            },
            "require": {
@@ -507,10 +452,11 @@
                "psr/event-dispatcher": "^1.0",
                "psr/log": "^3.0.2"
            },
            "default-branch": true,
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-stable31": "31.0.0-dev"
+                    "dev-master": "33.0.0-dev"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -530,9 +476,9 @@
            "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API",
            "support": {
                "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/stable31"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
            },
-            "time": "2025-07-31T00:57:37+00:00"
+            "time": "2025-09-27T00:45:05+00:00"
        },
        {
            "name": "nikic/php-parser",
@@ -1184,41 +1130,6 @@
            ],
            "time": "2024-12-05T13:48:26+00:00"
        },
        {
            "name": "psalm/phar",
            "version": "5.26.1",
            "source": {
                "type": "git",
                "url": "https://github.com/psalm/phar.git",
                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/psalm/phar/zipball/8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0"
            },
            "conflict": {
                "vimeo/psalm": "*"
            },
            "bin": [
                "psalm.phar"
            ],
            "type": "library",
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
            "description": "Composer-based Psalm Phar",
            "support": {
                "issues": "https://github.com/psalm/phar/issues",
                "source": "https://github.com/psalm/phar/tree/5.26.1"
            },
            "time": "2024-09-09T16:22:43+00:00"
        },
        {
            "name": "psr/clock",
            "version": "1.0.0",
@@ -14,6 +14,7 @@
 input[type=submit].icon-confirm {
 	border-color: var(--color-border-maxcontrast) !important;
 	border-style: solid;
 	border-left: none;
 }
@@ -129,3 +129,81 @@ describe('Board cloning', function() {
 		})
 	})
 })
 describe('Board export', function() {
 	before(function() {
 		cy.createUser(user)
 	})
 	it('Exports a board as JSON', function() {
 		const boardName = 'Export JSON board'
 		const board = sampleBoard(boardName)
 		cy.createExampleBoard({ user, board }).then((board) => {
 			const boardId = board.id
 			cy.visit(`/apps/deck/board/${boardId}`)
 			cy.get('.app-navigation__list .app-navigation-entry:contains("' + boardName + '")')
 				.parent()
 				.find('button[aria-label="Actions"]')
 				.click()
 			cy.get('button:contains("Export board")')
 				.click()
 			cy.get('.modal-container .checkbox-radio-switch__text:contains("Export as JSON")')
 				.click()
 			cy.get('.modal-container button:contains("Export")')
 				.click()
 			const downloadsFolder = Cypress.config('downloadsFolder')
 			cy.readFile(`${downloadsFolder}/${boardName}.json`)
 		})
 	})
 	it('Exports a board as CSV', function() {
 		const boardName = 'Export CSV board'
 		const board = sampleBoard(boardName)
 		cy.createExampleBoard({ user, board }).then((board) => {
 			const boardId = board.id
 			cy.visit(`/apps/deck/board/${boardId}`)
 			cy.get('.app-navigation__list .app-navigation-entry:contains("' + boardName + '")')
 				.parent()
 				.find('button[aria-label="Actions"]')
 				.click()
 			cy.get('button:contains("Export board")')
 				.click()
 			cy.get('.modal-container .checkbox-radio-switch__text:contains("Export as CSV")')
 				.click()
 			cy.get('.modal-container button:contains("Export")')
 				.click()
 			const downloadsFolder = Cypress.config('downloadsFolder')
 			cy.readFile(`${downloadsFolder}/${boardName}.csv`)
 		})
 	})
 })
 describe('Board import', function() {
 	before(function () {
 		cy.createUser(user)
 	})
 	beforeEach(function() {
 		cy.login(user)
 		cy.visit('/apps/deck')
 	})
 	it('Imports a board from JSON', function() {
 		cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry:contains("Import board")')
 			.should('be.visible')
 			.click()
 		// Upload a JSON file
 		cy.get('input[type="file"]')
 			.selectFile([
 				{
 					contents: 'cypress/fixtures/import-board.json',
 					fileName: 'import-board.json',
 				},
 			], { force: true })
 		cy.get('.app-navigation__list .app-navigation-entry:contains("Imported board")')
 			.should('be.visible')
 	})
 })
@@ -302,6 +302,9 @@ describe('Card', function () {
 				.first().click()
 			cy.get(`.card:contains("${newCardTitle}")`).should('be.visible').click()
 			// Add delay to ensure the events are bound
 			cy.wait(1000)
 			cy.get('#app-sidebar-vue [data-test="tag-selector"]  .vs__dropdown-toggle').should('be.visible').click()
 			cy.get('.vs__dropdown-menu .tag:contains("Action needed")').should('be.visible').click()
 			cy.get('.vs__dropdown-menu .tag:contains("Later")').should('be.visible').click()
@@ -22,10 +22,10 @@ describe('Deck dashboard', function() {
 			.should($el => expect($el.text().trim()).to.equal('Upcoming cards'))
 	})
-	it('Can see the default "Personal Board" created for user by default', function() {
+	it('Can see the default "Welcome Board" created for user by default', function() {
 		cy.visit('/apps/deck')
-		const defaultBoard = 'Personal'
+		const defaultBoard = 'Welcome to Nextcloud Deck!'
 		cy.get('.app-navigation-entry-wrapper[icon=icon-deck]')
 			.find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + defaultBoard + ')')
@@ -0,0 +1,102 @@
 {
  "boards": [
    {
      "id": 70,
      "title": "Imported board",
      "owner": "unvjrmwuag",
      "color": "00ff00",
      "archived": false,
      "labels": [
        {
          "id": 293,
          "title": "Finished",
          "color": "31CC7C",
          "boardId": 70,
          "cardId": null,
          "lastModified": 0,
          "ETag": "cfcd208495d565ef66e7dff9f98764da"
        },
        {
          "id": 294,
          "title": "To review",
          "color": "317CCC",
          "boardId": 70,
          "cardId": null,
          "lastModified": 0,
          "ETag": "cfcd208495d565ef66e7dff9f98764da"
        },
        {
          "id": 295,
          "title": "Action needed",
          "color": "FF7A66",
          "boardId": 70,
          "cardId": null,
          "lastModified": 0,
          "ETag": "cfcd208495d565ef66e7dff9f98764da"
        },
        {
          "id": 296,
          "title": "Later",
          "color": "F1DB50",
          "boardId": 70,
          "cardId": null,
          "lastModified": 0,
          "ETag": "cfcd208495d565ef66e7dff9f98764da"
        }
      ],
      "acl": [],
      "permissions": [],
      "users": [],
      "stacks": {
        "114": {
          "id": 114,
          "title": "TestList",
          "boardId": 70,
          "deletedAt": 0,
          "lastModified": 1743495533,
          "cards": [
            {
              "id": 124,
              "title": "Hello world",
              "description": "# Hello world",
              "descriptionPrev": null,
              "stackId": 114,
              "type": "plain",
              "lastModified": 1743495533,
              "lastEditor": null,
              "createdAt": 1743495533,
              "labels": [],
              "assignedUsers": null,
              "attachments": null,
              "attachmentCount": null,
              "owner": {
                "primaryKey": "unvjrmwuag",
                "uid": "unvjrmwuag",
                "displayname": "unvjrmwuag",
                "type": 0
              },
              "order": 999,
              "archived": false,
              "done": null,
              "duedate": null,
              "notified": false,
              "deletedAt": 0,
              "commentsUnread": 0,
              "commentsCount": 0,
              "relatedStack": null,
              "relatedBoard": null,
              "ETag": "aa85bb973089e7fbc0bbf122e926c23f"
            }
          ],
          "order": 0,
          "ETag": "aa85bb973089e7fbc0bbf122e926c23f"
        }
      },
      "activeSessions": [],
      "deletedAt": 0,
      "lastModified": 1743495533,
      "settings": [],
      "ETag": "aa85bb973089e7fbc0bbf122e926c23f"
    }
  ]
 }
@@ -102,7 +102,11 @@ Cypress.Commands.add('shareBoardWithUi', (query, userId=query) => {
 	cy.intercept({ method: 'GET', url: `**/ocs/v2.php/apps/files_sharing/api/v1/sharees?search=${query}*` }).as('fetchRecipients')
 	cy.get('[aria-label="Open details"]').click()
 	cy.get('.app-sidebar').should('be.visible')
-	cy.get('.select input').type(`${query}`)
+
 	// Add delay to ensure the events are bound
 	cy.wait(1000)
 	cy.get('.select input').click().type(`${query}`)
 	cy.wait('@fetchRecipients', { timeout: 7000 })
 	cy.get('.vs__dropdown-menu .option').first().contains(query)
@@ -6,7 +6,7 @@ The REST API provides access for authenticated users to their data inside the De
 # Prerequisites
- All requests require a `OCS-APIRequest` HTTP header to be set to `true` and a `Content-Type` of `application/json`.
+- All requests require a `OCS-APIRequest` HTTP header to be set to `true` and a `Content-Type` of `application/json`. This does not apply to the endpoint for uploading attachments, which consumes `multipart/form-data`.
 - The API is located at https://nextcloud.local/index.php/apps/deck/api/v1.0
 - All request parameters are required, unless otherwise specified
@@ -733,6 +733,7 @@ The board list endpoint supports setting an `If-Modified-Since` header to limit
 | Parameter | Type    | Description                             |
 | --------- | ------- | --------------------------------------- |
 | labelId   | Integer | The label id to assign to the card      |
 #### Response
 ##### 200 Success
@@ -997,10 +998,12 @@ The request can fail with a bad request response for the following reasons:
 #### Request data
-| Parameter | Type    | Description                                   |
+The request is performed as `multipart/form-data`.
-| --------- | ------- | --------------------------------------------- |
+
-| type      | String  | The type of the attachement                   |
+| Parameter | Type    | Description                                                                                     |
-| file      | Binary  | File data to add as an attachment             |
+| --------- | ------- | ----------------------------------------------------------------------------------------------- |
 | type      | String  | The type of the attachement. Use `file` or `deck_file`.                                         |
 | file      | Binary  | File data to add as an attachment together with the `filename` parameter according to RFC 7578. |
 - Prior to Deck version v1.3.0 (API v1.0), attachments were stored within deck. For this type of attachments `deck_file` was used as the default type of attachments
 - Starting with Deck version 1.3.0 (API v1.1) files are stored within the users regular Nextcloud files and the type `file` has been introduced for that
@@ -1022,12 +1025,13 @@ The request can fail with a bad request response for the following reasons:
 #### Request data
-| Parameter | Type    | Description                                   |
+The request is performed as `multipart/form-data`.
-| --------- | ------- | --------------------------------------------- |
+
-| type      | String  | The type of the attachement                   |
+| Parameter | Type    | Description                                                                                     |
-| file      | Binary  | File data to add as an attachment             |
+| --------- | ------- | ----------------------------------------------------------------------------------------------- |
 | type      | String  | The type of the attachement. For now only `deck_file` is supported as an attachment type.       |
 | file      | Binary  | File data to add as an attachment together with the `filename` parameter according to RFC 7578. |
 For now only `deck_file` is supported as an attachment type.
 #### Response
@@ -84,6 +84,9 @@ OC.L10N.register(
    "Failed to upload {name}" : "Не ўдалося запампаваць {name}",
    "Share" : "Абагуліць",
    "Personal" : "Асабістыя",
    "Example Task 3" : "Прыклад задання 3",
    "Example Task 2" : "Прыклад задання 2",
    "Example Task 1" : "Прыклад задання 1",
    "Today" : "Сёння",
    "Tomorrow" : "Заўтра"
 },
@@ -82,6 +82,9 @@
    "Failed to upload {name}" : "Не ўдалося запампаваць {name}",
    "Share" : "Абагуліць",
    "Personal" : "Асабістыя",
    "Example Task 3" : "Прыклад задання 3",
    "Example Task 2" : "Прыклад задання 2",
    "Example Task 1" : "Прыклад задання 1",
    "Today" : "Сёння",
    "Tomorrow" : "Заўтра"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
@@ -288,7 +288,7 @@ OC.L10N.register(
    "Create a new tag:" : "Направи нова ознака:",
    "(group)" : "(group)",
    "{count} comments, {unread} unread" : "{count} коментари, {unread} непрочитани",
-    "Todo items" : "Работи за правење",
+    "Todo items" : "Задачи",
    "Edit card title" : "Измени наслов на картица",
    "Open link" : "Отвори линк",
    "Card deleted" : "Картицата е избришана",
@@ -286,7 +286,7 @@
    "Create a new tag:" : "Направи нова ознака:",
    "(group)" : "(group)",
    "{count} comments, {unread} unread" : "{count} коментари, {unread} непрочитани",
-    "Todo items" : "Работи за правење",
+    "Todo items" : "Задачи",
    "Edit card title" : "Измени наслов на картица",
    "Open link" : "Отвори линк",
    "Card deleted" : "Картицата е избришана",
@@ -516,7 +516,7 @@ class ActivityManager {
 		];
 	}
-	private function findDetailsForCard($cardId, $subject = null) {
+	private function findDetailsForCard(int $cardId, ?string $subject = null): array {
 		$card = $this->cardMapper->find($cardId);
 		$stack = $this->stackMapper->find($card->getStackId());
 		$board = $this->boardMapper->find($stack->getBoardId());
@@ -7,6 +7,9 @@
 namespace OCA\Deck\Activity;
 /**
 * @psalm-api SettingComment
 */
 class SettingComment extends SettingBase {
 	/**
@@ -0,0 +1,67 @@
 <?php
 /**
 * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
 namespace OCA\Deck\Command;
 use OCP\IConfig;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 class CalendarToggle extends Command {
 	private IUserManager $userManager;
 	private IConfig $config;
 	public function __construct(IUserManager $userManager, IConfig $config) {
 		parent::__construct();
 		$this->userManager = $userManager;
 		$this->config = $config;
 	}
 	protected function configure() {
 		$this
 			->setName('deck:calendar-toggle')
 			->setDescription('Enable or disable Deck calendar/tasks integration for all existing users. Users can still change their own setting afterwards. Only affects users that already exist at the time of execution.')
 			->addOption(
 				'on',
 				null,
 				InputOption::VALUE_NONE,
 				'Enable calendar/tasks integration for all existing users (users can opt-out later)'
 			)
 			->addOption(
 				'off',
 				null,
 				InputOption::VALUE_NONE,
 				'Disable calendar/tasks integration for all existing users (users can opt-in later)'
 			);
 	}
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$enable = $input->getOption('on');
 		$disable = $input->getOption('off');
 		if ($enable && $disable) {
 			$output->writeln('<error>Cannot use --on and --off together.</error>');
 			return 1;
 		}
 		if (!$enable && !$disable) {
 			$output->writeln('<error>Please specify either --on or --off.</error>');
 			return 1;
 		}
 		$value = $enable ? 'yes' : '';
 		$users = $this->userManager->search('');
 		$count = 0;
 		foreach ($users as $user) {
 			$uid = $user->getUID();
 			$this->config->setUserValue($uid, 'deck', 'calendar', $value);
 			$output->writeln("Set calendar integration to '" . ($enable ? 'on' : 'off') . "' for user: $uid");
 			$count++;
 		}
 		$output->writeln("Done. Updated $count existing users.");
 		return 0;
 	}
 }
@@ -6,9 +6,13 @@
 */
 namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Attachment;
 use OCA\Deck\Service\AttachmentService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
@@ -21,72 +25,52 @@ class AttachmentApiController extends ApiController {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function getAll(string $apiVersion): DataResponse {
 	 *
 	 */
 	public function getAll($apiVersion) {
 		$attachment = $this->attachmentService->findAll($this->request->getParam('cardId'), true);
 		if ($apiVersion === '1.0') {
-			$attachment = array_filter($attachment, function ($attachment) {
+			$attachment = array_filter($attachment, fn (Attachment $attachment): bool => $attachment->getType() === 'deck_file');
 				return $attachment->getType() === 'deck_file';
 			});
 		}
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function display(int $cardId, int $attachmentId, string $type = 'deck_file') {
 	 *
 	 */
 	public function display($cardId, $attachmentId, $type = 'deck_file') {
 		return $this->attachmentService->display($cardId, $attachmentId, $type);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function create(int $cardId, string $type, string $data): DataResponse {
 	 *
 	 */
 	public function create($cardId, $type, $data) {
 		$attachment = $this->attachmentService->create($cardId, $type, $data);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function update(int $cardId, int $attachmentId, string $data, string $type = 'deck_file'): DataResponse {
 	 *
 	 */
 	public function update($cardId, $attachmentId, $data, $type = 'deck_file') {
 		$attachment = $this->attachmentService->update($cardId, $attachmentId, $data, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function delete(int $cardId, int $attachmentId, string $type = 'deck_file'): DataResponse {
 	 *
 	 */
 	public function delete($cardId, $attachmentId, $type = 'deck_file') {
 		$attachment = $this->attachmentService->delete($cardId, $attachmentId, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
-	 * @NoCSRFRequired
+	public function restore(int $cardId, int $attachmentId, string $type = 'deck_file'): DataResponse {
 	 *
 	 */
 	public function restore($cardId, $attachmentId, $type = 'deck_file') {
 		$attachment = $this->attachmentService->restore($cardId, $attachmentId, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
@@ -7,8 +7,13 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\BadRequestException;
 use OCA\Deck\Db\Attachment;
 use OCA\Deck\Service\AttachmentService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Response;
 use OCP\IRequest;
 class AttachmentController extends Controller {
@@ -20,74 +25,66 @@ class AttachmentController extends Controller {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function getAll(int $cardId): array {
 	 */
 	public function getAll($cardId) {
 		return $this->attachmentService->findAll($cardId, true);
 	}
 	/**
 	 * @param $cardId
 	 * @param $attachmentId
 	 * @NoCSRFRequired
 	 * @NoAdminRequired
 	 * @return \OCP\AppFramework\Http\Response
 	 * @throws \OCA\Deck\NotFoundException
 	 */
-	public function display($cardId, $attachmentId) {
+	#[NoAdminRequired]
-		if (!str_contains($attachmentId, ':')) {
+	#[NoCSRFRequired]
-			$type = 'deck_file';
+	public function display(int $cardId, string $attachmentId): Response {
-		} else {
+		['type' => $type, 'attachmentId' => $attachmentId] = $this->extractTypeAndAttachmentId($attachmentId);
 			[$type, $attachmentId] = explode(':', $attachmentId);
 		}
 		return $this->attachmentService->display($cardId, $attachmentId, $type);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function create(int $cardId): Attachment {
 	 */
 	public function create($cardId) {
 		return $this->attachmentService->create(
 			$cardId,
 			$this->request->getParam('type'),
-			$this->request->getParam('data')
+			$this->request->getParam('data') ?? '',
 		);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function update(int $cardId, string $attachmentId): Attachment {
-	 */
+		['type' => $type, 'attachmentId' => $attachmentId] = $this->extractTypeAndAttachmentId($attachmentId);
-	public function update($cardId, $attachmentId) {
+		return $this->attachmentService->update($cardId, $attachmentId, $this->request->getParam('data') ?? '', $type);
 		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);
 		}
 		return $this->attachmentService->update($cardId, $attachmentId, $this->request->getParam('data'), $type);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function delete(int $cardId, string $attachmentId): Attachment {
-	 */
+		['type' => $type, 'attachmentId' => $attachmentId] = $this->extractTypeAndAttachmentId($attachmentId);
 	public function delete($cardId, $attachmentId) {
 		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);
 		}
 		return $this->attachmentService->delete($cardId, $attachmentId, $type);
 	}
 	#[NoAdminRequired]
 	public function restore(int $cardId, string $attachmentId): Attachment {
 		['type' => $type, 'attachmentId' => $attachmentId] = $this->extractTypeAndAttachmentId($attachmentId);
 		return $this->attachmentService->restore($cardId, $attachmentId, $type);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return array{type: string, attachmentId: int}
 	 * @throws BadRequestException
 	 */
-	public function restore($cardId, $attachmentId) {
+	private function extractTypeAndAttachmentId(string $attachmentId): array {
 		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
-			[$type, $attachmentId] = explode(':', $attachmentId);
+			[$type, $attachmentId] = [...explode(':', $attachmentId), '', ''];
 		}
-		return $this->attachmentService->restore($cardId, $attachmentId, $type);
+
 		if ($type === '' || !is_numeric($attachmentId)) {
 			throw new BadRequestException('Invalid attachment id');
 		}
 		return [
 			'type' => $type,
 			'attachmentId' => (int)$attachmentId,
 		];
 	}
 }
@@ -12,10 +12,13 @@ use OCA\Deck\Service\BoardService;
 use OCA\Deck\StatusException;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
-use Sabre\HTTP\Util;
+
 use function Sabre\HTTP\parseDate;
 /**
 * Class BoardApiController
@@ -36,21 +39,18 @@ class BoardApiController extends ApiController {
 	}
 	/**
-	 * @NoAdminRequired
+	 * Return all the boards that the current user has access to.
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Return all of the boards that the current user has access to.
 	 *
 	 * @param bool $details
 	 * @throws StatusException
 	 */
-	public function index(bool $details = false) {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function index(bool $details = false): DataResponse {
 		$modified = $this->request->getHeader('If-Modified-Since');
-		if ($modified === null || $modified === '') {
+		if ($modified === '') {
 			$boards = $this->boardService->findAll(0, $details === true);
 		} else {
-			$date = Util::parseHTTPDate($modified);
+			$date = parseDate($modified);
 			if (!$date) {
 				throw new StatusException('Invalid If-Modified-Since header provided.');
 			}
@@ -64,14 +64,12 @@ class BoardApiController extends ApiController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 *
 	 * Return the board specified by $this->request->getParam('boardId').
 	 */
-	public function get() {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function get(): DataResponse {
 		$board = $this->boardService->find($this->request->getParam('boardId'));
 		$response = new DataResponse($board, HTTP::STATUS_OK);
 		$response->setETag($board->getEtag());
@@ -79,68 +77,53 @@ class BoardApiController extends ApiController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $color
 	 *
 	 * Create a board with the specified title and color.
 	 */
-	public function create($title, $color) {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function create(string $title, string $color): DataResponse {
 		$board = $this->boardService->create($title, $this->userId, $color);
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $color
 	 * @params $archived
 	 *
 	 * Update a board with the specified boardId, title and color, and archived state.
 	 */
-	public function update($title, $color, $archived = false) {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function update(string $title, string $color, bool $archived = false): DataResponse {
 		$board = $this->boardService->update($this->request->getParam('boardId'), $title, $color, $archived);
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 *
 	 * Delete the board specified by $boardId.  Return the board that was deleted.
 	 */
-	public function delete() {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function delete(): DataResponse {
 		$board = $this->boardService->delete($this->request->getParam('boardId'));
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 *
 	 * Undo the deletion of the board specified by $boardId.
 	 */
-	public function undoDelete() {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function undoDelete(): DataResponse {
 		$board = $this->boardService->deleteUndo($this->request->getParam('boardId'));
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[NoCSRFRequired]
-	 * @CORS
+	#[CORS]
-	 * @NoCSRFRequired
+	public function addAcl(int $boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage) {
 	 */
 	public function addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage) {
 		$acl = $this->boardService->addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage);
 		return new DataResponse($acl, HTTP::STATUS_OK);
 	}
@@ -10,10 +10,13 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Service\BoardService;
 use OCA\Deck\Service\Importer\BoardImportService;
 use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IL10N;
 use OCP\IRequest;
 class BoardController extends ApiController {
@@ -22,73 +25,45 @@ class BoardController extends ApiController {
 		IRequest $request,
 		private BoardService $boardService,
 		private PermissionService $permissionService,
 		private BoardImportService $boardImportService,
 		private IL10N $l10n,
 		private $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
 	 * @NoAdminRequired
 	 */
 	public function index() {
 		return $this->boardService->findAll();
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function read(int $boardId): Board {
 	 * @param $boardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function read(int $boardId) {
 		return $this->boardService->find($boardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function create(string $title, string $color): Board {
 	 * @param $title
 	 * @param $color
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function create($title, $color) {
 		return $this->boardService->create($title, $this->userId, $color);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function update(int $id, string $title, string $color, bool $archived): Board {
 	 * @param $id
 	 * @param $title
 	 * @param $color
 	 * @param $archived
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function update($id, $title, $color, $archived) {
 		return $this->boardService->update($id, $title, $color, $archived);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function delete(int $boardId): Board {
 	 * @param $boardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function delete($boardId) {
 		return $this->boardService->delete($boardId);
 	}
-	/**
+
-	 * @NoAdminRequired
+	#[NoAdminRequired]
-	 * @param $boardId
+	public function deleteUndo(int $boardId): Board {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function deleteUndo($boardId) {
 		return $this->boardService->deleteUndo($boardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function getUserPermissions(int $boardId): array {
 	 * @param $boardId
 	 * @return array|bool
 	 * @internal param $userId
 	 */
 	public function getUserPermissions($boardId) {
 		$permissions = $this->permissionService->getPermissions($boardId);
 		return [
 			'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ],
@@ -99,16 +74,10 @@ class BoardController extends ApiController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @param $boardId
 	 * @param $type
 	 * @param $participant
 	 * @param $permissionEdit
 	 * @param $permissionShare
 	 * @param $permissionManage
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage) {
+	#[NoAdminRequired]
 	public function addAcl(int $boardId, int $type, $participant, bool $permissionEdit, bool $permissionShare, bool $permissionManage): Acl {
 		return $this->boardService->addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage);
 	}
@@ -163,4 +132,62 @@ class BoardController extends ApiController {
 	public function export($boardId) {
 		return $this->boardService->export($boardId);
 	}
 	/**
 	 * @NoAdminRequired
 	 */
 	public function import(): DataResponse {
 		$file = $this->request->getUploadedFile('file');
 		$error = null;
 		$phpFileUploadErrors = [
 			UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
 			UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
 			UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
 			UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
 			UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
 			UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
 			UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
 			UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
 		];
 		if (empty($file)) {
 			$error = $this->l10n->t('No file uploaded or file size exceeds maximum of %s', [\OCP\Util::humanFileSize(\OCP\Util::uploadLimit())]);
 		}
 		if (!empty($file) && array_key_exists('error', $file) && $file['error'] !== UPLOAD_ERR_OK) {
 			$error = $phpFileUploadErrors[$file['error']];
 		}
 		if (!empty($file) && $file['error'] === UPLOAD_ERR_OK && !in_array($file['type'], ['application/json', 'text/plain'])) {
 			$error = $this->l10n->t('Invalid file type. Only JSON files are allowed.');
 		}
 		if ($error !== null) {
 			return new DataResponse([
 				'status' => 'error',
 				'message' => $error,
 			], Http::STATUS_BAD_REQUEST);
 		}
 		try {
 			$fileContent = file_get_contents($file['tmp_name']);
 			$this->boardImportService->setSystem('DeckJson');
 			$config = new \stdClass();
 			$config->owner = $this->userId;
 			$this->boardImportService->setConfigInstance($config);
 			$this->boardImportService->setData(json_decode($fileContent));
 			$this->boardImportService->import();
 			$importedBoard = $this->boardImportService->getBoard();
 			$board = $this->boardService->find($importedBoard->getId());
 			return new DataResponse($board, Http::STATUS_OK);
 		} catch (\TypeError $e) {
 			return new DataResponse([
 				'status' => 'error',
 				'message' => $this->l10n->t('Invalid JSON data'),
 			], Http::STATUS_BAD_REQUEST);
 		} catch (\Exception $e) {
 			return new DataResponse([
 				'status' => 'error',
 				'message' => $this->l10n->t('Failed to import board'),
 			], Http::STATUS_BAD_REQUEST);
 		}
 	}
 }
@@ -9,6 +9,9 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\Importer\BoardImportService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
@@ -23,11 +26,9 @@ class BoardImportApiController extends OCSController {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
 	 * @NoCSRFRequired
 	 */
 	public function import(string $system, array $config, array $data): DataResponse {
 		$this->boardImportService->setSystem($system);
 		$config = json_decode(json_encode($config));
@@ -38,21 +39,17 @@ class BoardImportApiController extends OCSController {
 		return new DataResponse($this->boardImportService->getBoard(), Http::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
 	 * @NoCSRFRequired
 	 */
 	public function getAllowedSystems(): DataResponse {
 		$allowedSystems = $this->boardImportService->getAllowedImportSystems();
 		return new DataResponse($allowedSystems, Http::STATUS_OK);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	#[CORS]
-	 * @CORS
+	#[NoCSRFRequired]
 	 * @NoCSRFRequired
 	 */
 	public function getConfigSchema(string $name): DataResponse {
 		$this->boardImportService->setSystem($name);
 		$this->boardImportService->validateSystem();
@@ -12,6 +12,9 @@ use OCA\Deck\Service\AssignmentService;
 use OCA\Deck\Service\CardService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
@@ -27,7 +30,7 @@ class CardApiController extends ApiController {
 	 * @param IRequest $request
 	 * @param CardService $cardService
 	 * @param AssignmentService $assignmentService
-	 * @param $userId
+	 * @param string $userId
 	 */
 	public function __construct(
 		string $appName,
@@ -80,112 +83,102 @@ class CardApiController extends ApiController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 *
 	 * Update a card
 	 */
-	public function update($title, $type, $owner, $description = '', $order = 0, $duedate = null, $archived = null) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function update(string $title, $type, string $owner, string $description = '', int $order = 0, $duedate = null, $archived = null): DataResponse {
 		$done = array_key_exists('done', $this->request->getParams()) ? new OptionalNullableValue($this->request->getParam('done', null)) : null;
 		$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $owner, $description, $order, $duedate, 0, $archived, $done);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Delete a specific card.
 	 */
-	public function delete() {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function delete(): DataResponse {
 		$card = $this->cardService->delete($this->request->getParam('cardId'));
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Assign a label to a card.
 	 */
-	public function assignLabel($labelId) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function assignLabel(int $labelId): DataResponse {
 		$card = $this->cardService->assignLabel($this->request->getParam('cardId'), $labelId);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Assign a label to a card.
 	 */
-	public function removeLabel($labelId) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function removeLabel(int $labelId): DataResponse {
 		$card = $this->cardService->removeLabel($this->request->getParam('cardId'), $labelId);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Assign a user to a card
 	 */
-	public function assignUser($cardId, $userId, $type = 0) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function assignUser(int $cardId, string $userId, int $type = 0): DataResponse {
 		$card = $this->assignmentService->assignUser($cardId, $userId, $type);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Unassign a user from a card
 	 */
-	public function unassignUser($cardId, $userId, $type = 0) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function unassignUser(int $cardId, string $userId, int $type = 0): DataResponse {
 		$card = $this->assignmentService->unassignUser($cardId, $userId, $type);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Archive card
 	 */
-	public function archive($cardId) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function archive(int $cardId): DataResponse {
 		$card = $this->cardService->archive($cardId);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Unarchive card
 	 */
-	public function unarchive($cardId) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function unarchive(int $cardId): DataResponse {
 		$card = $this->cardService->unarchive($cardId);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Reorder cards
 	 */
-	public function reorder($stackId, $order) {
+	#[NoAdminRequired]
-		$card = $this->cardService->reorder((int)$this->request->getParam('cardId'), (int)$stackId, (int)$order);
+	#[CORS]
 	#[NoCSRFRequired]
 	public function reorder(int $stackId, int $order): DataResponse {
 		$card = $this->cardService->reorder((int)$this->request->getParam('cardId'), $stackId, $order);
 		return new DataResponse($card, HTTP::STATUS_OK);
 	}
 }
@@ -7,9 +7,12 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Service\AssignmentService;
 use OCA\Deck\Service\CardService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\IRequest;
 class CardController extends Controller {
@@ -23,45 +26,26 @@ class CardController extends Controller {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function read(int $cardId): Card {
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function read($cardId) {
 		return $this->cardService->find($cardId);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return Card[]
 	 * @param $cardId
 	 * @param $stackId
 	 * @param $order
 	 * @return array
 	 */
-	public function reorder($cardId, $stackId, $order) {
+	#[NoAdminRequired]
-		return $this->cardService->reorder((int)$cardId, (int)$stackId, (int)$order);
+	public function reorder(int $cardId, int $stackId, int $order): array {
 		return $this->cardService->reorder($cardId, $stackId, $order);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function rename(int $cardId, string $title): Card {
 	 * @param $cardId
 	 * @param $title
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function rename($cardId, $title) {
 		return $this->cardService->rename($cardId, $title);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function create(string $title, int $stackId, string $type = 'plain', int $order = 999, string $description = '', $duedate = null, array $labels = [], array $users = []): Card {
 	 * @param $title
 	 * @param $stackId
 	 * @param $type
 	 * @param int $order
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function create($title, $stackId, $type = 'plain', $order = 999, string $description = '', $duedate = null, $labels = [], $users = []) {
 		$card = $this->cardService->create($title, $stackId, $type, $order, $this->userId, $description, $duedate);
 		foreach ($labels as $label) {
@@ -76,113 +60,68 @@ class CardController extends Controller {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @param $id
 	 * @param $title
 	 * @param $stackId
 	 * @param $type
 	 * @param $order
 	 * @param $description
 	 * @param $duedate
 	 * @param $deletedAt
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function update($id, $title, $stackId, $type, $order, $description, $duedate, $deletedAt) {
+	#[NoAdminRequired]
 	public function update(int $id, string $title, int $stackId, string $type, int $order, string $description, $duedate, $deletedAt): Card {
 		return $this->cardService->update($id, $title, $stackId, $type, $this->userId, $description, $order, $duedate, $deletedAt);
 	}
-	/**
+
-	 * @NoAdminRequired
+	#[NoAdminRequired]
-	 * @param $cardId
+	public function clone(int $cardId, ?int $targetStackId = null): Card {
 	 * @param $targetStackId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function clone(int $cardId, ?int $targetStackId = null) {
 		return $this->cardService->cloneCard($cardId, $targetStackId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function delete(int $cardId): Card {
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function delete($cardId) {
 		return $this->cardService->delete($cardId);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return Card[]
 	 * @param $boardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleted($boardId) {
+	#[NoAdminRequired]
 	public function deleted(int $boardId): array {
 		return $this->cardService->fetchDeleted($boardId);
 	}
-	/**
+	#[NoAdminRequired]
 	 * @NoAdminRequired
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function archive($cardId) {
 		return $this->cardService->archive($cardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function unarchive(int $cardId): Card {
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function unarchive($cardId) {
 		return $this->cardService->unarchive($cardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function done(int $cardId): Card {
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function done(int $cardId) {
 		return $this->cardService->done($cardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function undone(int $cardId): Card {
 	 * @param $cardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function undone(int $cardId) {
 		return $this->cardService->undone($cardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function assignLabel(int $cardId, int $labelId): void {
 	 * @param $cardId
 	 * @param $labelId
 	 */
 	public function assignLabel($cardId, $labelId) {
 		$this->cardService->assignLabel($cardId, $labelId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function removeLabel(int $cardId, int $labelId): void {
 	 * @param $cardId
 	 * @param $labelId
 	 */
 	public function removeLabel($cardId, $labelId) {
 		$this->cardService->removeLabel($cardId, $labelId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function assignUser(int $cardId, string $userId, int $type = 0): Assignment {
 	 */
 	public function assignUser($cardId, $userId, $type = 0) {
 		return $this->assignmentService->assignUser($cardId, $userId, $type);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function unassignUser(int $cardId, string $userId, int $type = 0): Assignment {
 	 */
 	public function unassignUser($cardId, $userId, $type = 0) {
 		return $this->assignmentService->unassignUser($cardId, $userId, $type);
 	}
 }
@@ -9,11 +9,15 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\CommentService;
 use OCA\Deck\StatusException;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
 /**
 * @psalm-api
 */
 class CommentsApiController extends OCSController {
 	public function __construct(
 		string $appName,
@@ -27,33 +31,33 @@ class CommentsApiController extends OCSController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @throws StatusException
 	 */
-	public function list(string $cardId, int $limit = 20, int $offset = 0): DataResponse {
+	#[NoAdminRequired]
 	public function list(int $cardId, int $limit = 20, int $offset = 0): DataResponse {
 		return $this->commentService->list($cardId, $limit, $offset);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @throws StatusException
 	 */
 	#[NoAdminRequired]
 	public function create(int $cardId, string $message, int $parentId = 0): DataResponse {
 		return $this->commentService->create($cardId, $message, $parentId);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @throws StatusException
 	 */
 	#[NoAdminRequired]
 	public function update(int $cardId, int $commentId, string $message): DataResponse {
 		return $this->commentService->update($cardId, $commentId, $message);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @throws StatusException
 	 */
 	#[NoAdminRequired]
 	public function delete(int $cardId, int $commentId): DataResponse {
 		return $this->commentService->delete($cardId, $commentId);
 	}
@@ -8,6 +8,8 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\Service\ConfigService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\OCSController;
@@ -22,19 +24,15 @@ class ConfigController extends OCSController {
 		parent::__construct($AppName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoCSRFRequired
+	#[NoCSRFRequired]
 	 * @NoAdminRequired
 	 */
 	public function get(): DataResponse {
 		return new DataResponse($this->configService->getAll());
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoCSRFRequired
+	#[NoCSRFRequired]
-	 * @NoAdminRequired
+	public function setValue(string $key, mixed $value): DataResponse|NotFoundResponse {
 	 */
 	public function setValue(string $key, $value) {
 		$result = $this->configService->set($key, $value);
 		if ($result === null) {
 			return new NotFoundResponse();
@@ -10,6 +10,9 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\LabelService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
@@ -26,59 +29,50 @@ class LabelApiController extends ApiController {
 		$appName,
 		IRequest $request,
 		private LabelService $labelService,
 		private $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Get a specific label.
 	 */
-	public function get() {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function get(): DataResponse {
 		$label = $this->labelService->find($this->request->getParam('labelId'));
 		return new DataResponse($label, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $color
 	 * Create a new label
 	 */
-	public function create($title, $color) {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function create(string $title, string $color): DataResponse {
 		$label = $this->labelService->create($title, $color, $this->request->getParam('boardId'));
 		return new DataResponse($label, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $color
 	 * Update a specific label
 	 */
-	public function update($title, $color) {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function update(string $title, string $color): DataResponse {
 		$label = $this->labelService->update($this->request->getParam('labelId'), $title, $color);
 		return new DataResponse($label, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Delete a specific label
 	 */
-	public function delete() {
+	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[CORS]
 	public function delete(): DataResponse {
 		$label = $this->labelService->delete($this->request->getParam('labelId'));
 		return new DataResponse($label, HTTP::STATUS_OK);
 	}
@@ -7,8 +7,10 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Label;
 use OCA\Deck\Service\LabelService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\IRequest;
 class LabelController extends Controller {
@@ -20,34 +22,18 @@ class LabelController extends Controller {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function create(string $title, string $color, int $boardId): Label {
 	 * @param $title
 	 * @param $color
 	 * @param $boardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function create($title, $color, $boardId) {
 		return $this->labelService->create($title, $color, $boardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function update(int $id, string $title, string $color): Label {
 	 * @param $id
 	 * @param $title
 	 * @param $color
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function update($id, $title, $color) {
 		return $this->labelService->update($id, $title, $color);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function delete(int $labelId): Label {
 	 * @param $labelId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function delete($labelId) {
 		return $this->labelService->delete($labelId);
 	}
 }
@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace OCA\Deck\Controller;
 use OCA\Deck\Service\OverviewService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
@@ -24,9 +25,7 @@ class OverviewApiController extends OCSController {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
 	 * @NoAdminRequired
 	 */
 	public function upcomingCards(): DataResponse {
 		return new DataResponse($this->dashboardService->findUpcomingCards($this->userId));
 	}
@@ -13,6 +13,7 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Model\CardDetails;
 use OCA\Deck\Service\SearchService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
@@ -26,9 +27,7 @@ class SearchController extends OCSController {
 		parent::__construct($appName, $request);
 	}
-	/**
+	#[NoAdminRequired]
 	 * @NoAdminRequired
 	 */
 	public function search(string $term, ?int $limit = null, ?int $cursor = null): DataResponse {
 		$cards = $this->searchService->searchCards($term, $limit, $cursor);
 		return new DataResponse(array_map(function (Card $card) {
@@ -7,14 +7,16 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\Service\BoardService;
 use OCA\Deck\Service\StackService;
 use OCA\Deck\StatusException;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\CORS;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
-use Sabre\HTTP\Util;
+use function Sabre\HTTP\parseDate;
 /**
 * Class StackApiController
@@ -29,23 +31,21 @@ class StackApiController extends ApiController {
 		$appName,
 		IRequest $request,
 		private StackService $stackService,
 		private BoardService $boardService,
 	) {
 		parent::__construct($appName, $request);
 	}
 	/**
-	 * @NoAdminRequired
+	 * Return all the stacks in the specified board.
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Return all of the stacks in the specified board.
 	 */
-	public function index() {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function index(): DataResponse {
 		$since = 0;
 		$modified = $this->request->getHeader('If-Modified-Since');
-		if ($modified !== null && $modified !== '') {
+		if ($modified !== '') {
-			$date = Util::parseHTTPDate($modified);
+			$date = parseDate($modified);
 			if (!$date) {
 				throw new StatusException('Invalid If-Modified-Since header provided.');
 			}
@@ -56,13 +56,12 @@ class StackApiController extends ApiController {
 	}
 	/**
-	 * @NoAdminRequired
+	 * Return all the stacks in the specified board.
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Return all of the stacks in the specified board.
 	 */
-	public function get() {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function get(): DataResponse {
 		$stack = $this->stackService->find($this->request->getParam('stackId'));
 		$response = new DataResponse($stack, HTTP::STATUS_OK);
 		$response->setETag($stack->getETag());
@@ -70,55 +69,45 @@ class StackApiController extends ApiController {
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $order
 	 *
 	 * Create a stack with the specified title and order.
 	 */
-	public function create($title, $order) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function create(string $title, int $order): DataResponse {
 		$stack = $this->stackService->create($title, $this->request->getParam('boardId'), $order);
 		return new DataResponse($stack, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * @params $title
 	 * @params $order
 	 *
 	 * Update a stack by the specified stackId and boardId with the values that were put.
 	 */
-	public function update($title, $order) {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function update(string $title, int $order) {
 		$stack = $this->stackService->update($this->request->getParam('stackId'), $title, $this->request->getParam('boardId'), $order, 0);
 		return new DataResponse($stack, HTTP::STATUS_OK);
 	}
 	/**
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * Delete the stack specified by $this->request->getParam('stackId').
 	 */
-	public function delete() {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function delete(): DataResponse {
 		$stack = $this->stackService->delete($this->request->getParam('stackId'));
 		return new DataResponse($stack, HTTP::STATUS_OK);
 	}
 	/**
-	 * @NoAdminRequired
+	 * Get the stacks that have been archived.
 	 * @CORS
 	 * @NoCSRFRequired
 	 *
 	 * get the stacks that have been archived.
 	 */
-	public function getArchived() {
+	#[NoAdminRequired]
 	#[CORS]
 	#[NoCSRFRequired]
 	public function getArchived(): DataResponse {
 		$stacks = $this->stackService->findAllArchived($this->request->getParam('boardId'));
 		return new DataResponse($stacks, HTTP::STATUS_OK);
 	}
@@ -7,10 +7,12 @@
 namespace OCA\Deck\Controller;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Service\StackService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\IRequest;
 class StackController extends Controller {
@@ -18,78 +20,54 @@ class StackController extends Controller {
 		string $appName,
 		IRequest $request,
 		private StackService $stackService,
 		private $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return Stack[]
 	 * @param $boardId
 	 * @return array
 	 */
-	public function index($boardId) {
+	#[NoAdminRequired]
 	public function index(int $boardId): array {
 		return $this->stackService->findAll($boardId);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return Stack[]
 	 * @param $boardId
 	 * @return array
 	 */
-	public function archived($boardId) {
+	#[NoAdminRequired]
 	public function archived(int $boardId): array {
 		return $this->stackService->findAllArchived($boardId);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function create(string $title, int $boardId, int $order = 999): Stack {
 	 * @param $title
 	 * @param $boardId
 	 * @param int $order
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function create($title, $boardId, $order = 999) {
 		return $this->stackService->create($title, $boardId, $order);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function update(int $id, string $title, int $boardId, int $order, ?int $deletedAt = null): Stack {
 	 * @param $id
 	 * @param $title
 	 * @param $boardId
 	 * @param $order
 	 * @param $deletedAt
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function update($id, $title, $boardId, $order, $deletedAt) {
 		return $this->stackService->update($id, $title, $boardId, $order, $deletedAt);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return array<int, Stack>
 	 * @param $stackId
 	 * @param $order
 	 * @return array
 	 */
-	public function reorder($stackId, $order) {
+	#[NoAdminRequired]
-		return $this->stackService->reorder((int)$stackId, (int)$order);
+	public function reorder(int $stackId, int $order): array {
 		return $this->stackService->reorder($stackId, $order);
 	}
-	/**
+	#[NoAdminRequired]
-	 * @NoAdminRequired
+	public function delete(int $stackId): Stack {
 	 * @param $stackId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
 	public function delete($stackId) {
 		return $this->stackService->delete($stackId);
 	}
 	/**
-	 * @NoAdminRequired
+	 * @return Stack[]
 	 * @param $boardId
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleted($boardId) {
+	#[NoAdminRequired]
 	public function deleted(int $boardId): array {
 		return $this->stackService->fetchDeleted($boardId);
 	}
 }
@@ -7,6 +7,20 @@
 namespace OCA\Deck\Db;
 /**
 * @method int getBoardId()
 * @method bool isPermissionEdit()
 * @method void setPermissionEdit(bool $permissionEdit)
 * @method bool isPermissionShare()
 * @method void setPermissionShare(bool $permissionShare)
 * @method bool isPermissionManage()
 * @method void setPermissionManage(bool $permissionManage)
 * @method int getType()
 * @method void setType(int $type)
 * @method bool isOwner()
 * @method void setOwner(int $owner)
 *
 */
 class Acl extends RelationalEntity {
 	public const PERMISSION_READ = 0;
 	public const PERMISSION_EDIT = 1;
@@ -37,17 +51,13 @@ class Acl extends RelationalEntity {
 		$this->addResolvable('participant');
 	}
-	public function getPermission($permission) {
+	public function getPermission(int $permission): bool {
-		switch ($permission) {
+		return match ($permission) {
-			case self::PERMISSION_READ:
+			self::PERMISSION_READ => true,
-				return true;
+			self::PERMISSION_EDIT => $this->getPermissionEdit(),
-			case self::PERMISSION_EDIT:
+			self::PERMISSION_SHARE => $this->getPermissionShare(),
-				return $this->getPermissionEdit();
+			self::PERMISSION_MANAGE => $this->getPermissionManage(),
-			case self::PERMISSION_SHARE:
+			default => false,
-				return $this->getPermissionShare();
+		};
 			case self::PERMISSION_MANAGE:
 				return $this->getPermissionManage();
 		}
 		return false;
 	}
 }
@@ -19,13 +19,10 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Acl[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAll($boardId, $limit = null, $offset = null) {
+	public function findAll(int $boardId, ?int $limit = null, ?int $offset = null) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('id', 'board_id', 'type', 'participant', 'permission_edit', 'permission_share', 'permission_manage')
 			->from('deck_board_acl')
@@ -51,12 +48,9 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $userId
 	 * @param numeric $id
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		$aclId = $id;
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('acl.id')
@@ -68,11 +62,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
-	/**
+	public function findBoardId(int $id): ?int {
 	 * @param numeric $id
 	 * @return int|null
 	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);
 			return $entity->getBoardId();
@@ -87,7 +77,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	 * @return Acl[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findByParticipant($type, $participant): array {
+	public function findByParticipant(int $type, string $participant): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
@@ -77,26 +77,41 @@ class AssignmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 	public function deleteByParticipantOnBoard(string $participant, int $boardId, $type = Assignment::TYPE_USER) {
-		$qb = $this->db->getQueryBuilder();
+		// Step 1: Get all card IDs for the board that have assignments for this participant
 		// This avoids MySQL Error 1093 by separating the SELECT from the DELETE operation
 		$cardIdQuery = $this->db->getQueryBuilder();
 		$cardIdQuery->select('a.card_id')
 			->from('deck_assigned_users', 'a')
 			->innerJoin('a', 'deck_cards', 'c', 'c.id = a.card_id')
 			->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
-			->where($cardIdQuery->expr()->eq('a.participant', $qb->createNamedParameter($participant, IQueryBuilder::PARAM_STR)))
+			->where($cardIdQuery->expr()->eq('a.participant', $cardIdQuery->createNamedParameter($participant, IQueryBuilder::PARAM_STR)))
-			->andWhere($cardIdQuery->expr()->eq('s.board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($cardIdQuery->expr()->eq('s.board_id', $cardIdQuery->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
-			->andWhere($cardIdQuery->expr()->eq('a.type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+			->andWhere($cardIdQuery->expr()->eq('a.type', $cardIdQuery->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-		$qb->delete('deck_assigned_users')
+
-			->where($qb->expr()->in('card_id', $qb->createFunction($cardIdQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
+		$result = $cardIdQuery->executeQuery();
-		$qb->executeStatement();
+		$cardIds = [];
 		while ($row = $result->fetch()) {
 			$cardIds[] = $row['card_id'];
 		}
 		$result->closeCursor();
 		// Step 2: If we have card IDs, delete the assignments
 		if (!empty($cardIds)) {
 			$deleteQuery = $this->db->getQueryBuilder();
 			$deleteQuery->delete('deck_assigned_users')
 				->where($deleteQuery->expr()->eq('participant', $deleteQuery->createNamedParameter($participant, IQueryBuilder::PARAM_STR)))
 				->andWhere($deleteQuery->expr()->eq('type', $deleteQuery->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
 				->andWhere($deleteQuery->expr()->in('card_id', $deleteQuery->createNamedParameter($cardIds, IQueryBuilder::PARAM_INT_ARRAY)));
 			$deleteQuery->executeStatement();
 		}
 	}
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		return $this->cardMapper->isOwner($userId, $id);
 	}
-	public function findBoardId($id): ?int {
+	public function findBoardId(int $id): ?int {
 		return $this->cardMapper->findBoardId($id);
 	}
@@ -108,6 +123,9 @@ class AssignmentMapper extends DeckMapper implements IPermissionMapper {
 	 * @throws NotFoundException
 	 */
 	public function insert(Entity $entity): Entity {
 		if (!($entity instanceof Assignment)) {
 			throw new \LogicException('Trying to insert a ' . get_class($entity) . ' in the assignment mapper');
 		}
 		$origin = $this->getOrigin($entity);
 		if ($origin === null) {
 			throw new NotFoundException('No origin found for assignment');
@@ -126,7 +144,7 @@ class AssignmentMapper extends DeckMapper implements IPermissionMapper {
 		});
 	}
-	public function isUserAssigned($cardId, $userId): bool {
+	public function isUserAssigned(int $cardId, string $userId): bool {
 		$assignments = $this->findAll($cardId);
 		foreach ($assignments as $assignment) {
 			$origin = $this->getOrigin($assignment);
@@ -36,13 +36,11 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param int $id
 	 * @return Attachment
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
 	 * @throws \OCP\DB\Exception
 	 */
-	public function find($id) {
+	public function find(int $id): Attachment {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -52,14 +50,11 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param int $cardId
 	 * @param string $data
 	 * @return Attachment
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findByData($cardId, $data) {
+	public function findByData(int $cardId, string $data): Attachment {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -70,11 +65,10 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param $cardId
 	 * @return Entity[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAll($cardId) {
+	public function findAll(int $cardId): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -86,11 +80,9 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
-	 * @param null $cardId
+	 * @return Attachment[]
 	 * @param bool $withOffset
 	 * @return array
 	 */
-	public function findToDelete($cardId = null, $withOffset = true) {
+	public function findToDelete(?int $cardId = null, bool $withOffset = true): array {
 		// add buffer of 5 min
 		$timeLimit = time() - (60 * 5);
 		$qb = $this->db->getQueryBuilder();
@@ -112,12 +104,8 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	/**
 	 * Check if $userId is owner of Entity with $id
 	 *
 	 * @param $userId string userId
 	 * @param $id int|string unique entity identifier
 	 * @return boolean
 	 */
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		try {
 			$attachment = $this->find($id);
 			return $this->cardMapper->isOwner($userId, $attachment->getCardId());
@@ -130,10 +118,10 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 	/**
 	 * Query boardId for Entity of given $id
 	 *
-	 * @param $id int|string unique entity identifier
+	 * @param $id int unique entity identifier
 	 * @return int|null id of Board
 	 */
-	public function findBoardId($id): ?int {
+	public function findBoardId(int $id): ?int {
 		try {
 			$attachment = $this->find($id);
 		} catch (\Exception $e) {
@@ -10,10 +10,20 @@ namespace OCA\Deck\Db;
 /**
 * @method int getId()
 * @method string getTitle()
 * @method void setTitle(string $title)
 * @method int getShared()
 * @method void setShared(int $shared)
 * @method bool isArchived()
 * @method bool getArchived()
 * @method void setArchived(bool $archived)
 * @method int getDeletedAt()
 * @method void setDeletedAt(int $deletedAt)
 * @method int getLastModified()
 * @method void setLastModified(int $lastModified)
 * @method string getOwner()
 * @method void setOwner(string $owner)
 * @method string getColor()
 * @method void setColor(string $color)
 */
 class Board extends RelationalEntity {
 	protected $title;
@@ -469,16 +469,16 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 		return parent::delete($entity);
 	}
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		$board = $this->find($id);
 		return ($board->getOwner() === $userId);
 	}
-	public function findBoardId($id): ?int {
+	public function findBoardId(int $id): ?int {
 		return $id;
 	}
-	public function mapAcl(Acl &$acl) {
+	public function mapAcl(Acl &$acl): void {
 		$acl->resolveRelation('participant', function ($participant) use (&$acl) {
 			if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {
 				if ($this->userManager->userExists($acl->getParticipant())) {
@@ -15,13 +15,18 @@ use Sabre\VObject\Component\VCalendar;
 /**
 * @method string getTitle()
 * @method void setTitle(string $title)
 * @method string getDescription()
 * @method string getDescriptionPrev()
 * @method int getStackId()
 * @method void setStackId(int $stackId)
 * @method int getOrder()
 * @method void setOrder(int $order)
 * @method int getLastModified()
 * @method int getCreatedAt()
 * @method bool getArchived()
 * @method string getType()
 * @method void setType(string $type)
 * @method int getDeletedAt()
 * @method void setDeletedAt(int $deletedAt)
 * @method bool getNotified()
@@ -68,8 +73,8 @@ class Card extends RelationalEntity {
 	protected $createdAt;
 	protected $labels;
 	protected $assignedUsers;
-	protected $attachments;
+	protected array $attachments = [];
-	protected $attachmentCount;
+	protected int $attachmentCount = 0;
 	protected $owner;
 	protected $order;
 	protected $archived = false;
@@ -86,16 +86,15 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		$updatedFields = $entity->getUpdatedFields();
 		if (isset($updatedFields['duedate']) && $updatedFields['duedate']) {
 			try {
 				/** @var Card $existing */
 				$existing = $this->find($entity->getId());
-				if ($existing && $entity->getDuedate() !== $existing->getDuedate()) {
+				if ($entity->getDueDate() !== $existing->getDueDate()) {
 					$entity->setNotified(false);
 				}
 				// remove pending notifications
 				$notification = $this->notificationManager->createNotification();
 				$notification
 					->setApp('deck')
-					->setObject('card', $entity->getId());
+					->setObject('card', (string)$entity->getId());
 				$this->notificationManager->markProcessed($notification);
 			} catch (Exception $e) {
 			}
@@ -131,7 +130,11 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $card;
 	}
-	public function findAll($stackId, $limit = null, $offset = null, $since = -1) {
+	/**
 	 * @return Card[]
 	 * @throws \OCP\DB\Exception
 	 */
 	public function findAll($stackId, ?int $limit = null, int $offset = 0, int $since = -1) {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('deck_cards')
@@ -146,6 +149,32 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 	/**
 	 * @param int[] $stackIds
 	 * @return array<int, null|Card[]>
 	 * @throws \OCP\DB\Exception
 	 */
 	public function findAllForStacks(array $stackIds, ?int $limit = null, int $offset = 0, int $since = -1): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('deck_cards')
 			->where($qb->expr()->in('stack_id', $qb->createNamedParameter($stackIds, IQueryBuilder::PARAM_INT_ARRAY)))
 			->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
 			->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)))
 			->setMaxResults($limit)
 			->setFirstResult($offset)
 			->orderBy('order')
 			->addOrderBy('id');
 		$rawCards = $this->findEntities($qb);
 		$cards = array_fill_keys($stackIds, null);
 		foreach ($rawCards as $card) {
 			$cards[$card->getStackId()][] = $card;
 		}
 		return $cards;
 	}
 	public function queryCardsByBoard(int $boardId): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
@@ -164,7 +193,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $qb;
 	}
-	public function findToDelete($timeLimit, $limit = null) {
+	/**
 	 * @return Card[]
 	 */
 	public function findToDelete(int $timeLimit, ?int $limit = null): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('id', 'title', 'owner', 'archived', 'deleted_at', 'last_modified')
 			->from('deck_cards')
@@ -175,7 +207,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findDeleted($boardId, $limit = null, $offset = null) {
+	/**
 	 * @return Card[]
 	 */
 	public function findDeleted(int $boardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->queryCardsByBoard($boardId);
 		$qb->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
 			->setMaxResults($limit)
@@ -185,7 +220,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findCalendarEntries($boardId, $limit = null, $offset = null) {
+	/**
 	 * @return Card[]
 	 */
 	public function findCalendarEntries(int $boardId, ?int $limit = null, $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
 			->from('deck_cards', 'c')
@@ -240,7 +278,11 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findAllWithDue(array $boardIds) {
+	/**
 	 * @param int[] $boardIds
 	 * @return Card[]
 	 */
 	public function findAllWithDue(array $boardIds): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
 			->from('deck_cards', 'c')
@@ -257,7 +299,11 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findToMeOrNotAssignedCards(array $boardIds, string $username) {
+	/**
 	 * @param int[] $boardIds
 	 * @return Card[]
 	 */
 	public function findToMeOrNotAssignedCards(array $boardIds, string $username): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.*')
 			->from('deck_cards', 'c')
@@ -279,7 +325,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findOverdue() {
+	/**
 	 * @return Card[]
 	 */
 	public function findOverdue(): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('id', 'title', 'duedate', 'notified')
 			->from('deck_cards')
@@ -291,6 +340,9 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 	/**
 	 * @return Card[]
 	 */
 	public function findUnexposedDescriptionChances() {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('id', 'title', 'duedate', 'notified', 'description_prev', 'last_editor', 'description')
@@ -299,6 +351,9 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
 	/**
 	 * @return Card[]
 	 */
 	public function search(array $boardIds, SearchQuery $query, ?int $limit = null, ?int $offset = null): array {
 		$qb = $this->queryCardsByBoards($boardIds);
 		$this->extendQueryByFilter($qb, $query);
@@ -333,7 +388,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			$qb->andWhere($qb->expr()->lt('c.last_modified', $qb->createNamedParameter($offset, IQueryBuilder::PARAM_INT)));
 		}
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$entities = [];
 		while ($row = $result->fetch()) {
 			$entities[] = Card::fromRow($row);
@@ -376,7 +431,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 			$qb->andWhere($qb->expr()->lt('comments.id', $qb->createNamedParameter($offset, IQueryBuilder::PARAM_INT)));
 		}
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$entities = $result->fetchAll();
 		$result->closeCursor();
 		return $entities;
@@ -472,7 +527,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 				});
 				$groups = $this->groupManager->search($assignment->getValue());
 				foreach ($searchUsers as $user) {
-					$groups = array_merge($groups, $this->groupManager->getUserIdGroups($user->getUID()));
+					$groups = array_merge($groups, $this->groupManager->getUserGroups($user));
 				}
 				$assignmentSearches = [];
@@ -525,7 +580,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		if ($offset !== null) {
 			$qb->setFirstResult($offset);
 		}
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$all = $result->fetchAll();
 		$result->closeCursor();
 		return $all;
@@ -537,32 +592,32 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return parent::delete($entity);
 	}
-	public function deleteByStack($stackId) {
+	public function deleteByStack($stackId): void {
 		$cards = $this->findAllByStack($stackId);
 		foreach ($cards as $card) {
 			$this->delete($card);
 		}
 	}
-	public function assignLabel($card, $label) {
+	public function assignLabel(int $card, int $label): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->insert('deck_assigned_labels')
 			->values([
 				'label_id' => $qb->createNamedParameter($label, IQueryBuilder::PARAM_INT),
 				'card_id' => $qb->createNamedParameter($card, IQueryBuilder::PARAM_INT),
 			]);
-		$qb->execute();
+		$qb->executeStatement();
 	}
-	public function removeLabel($card, $label) {
+	public function removeLabel(int $card, int $label): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('deck_assigned_labels')
 			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($card, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('label_id', $qb->createNamedParameter($label, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
+		$qb->executeStatement();
 	}
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('c.id')
 			->from($this->getTableName(), 'c')
@@ -574,7 +629,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
-	public function findBoardId($id): ?int {
+	public function findBoardId(int $id): ?int {
 		$result = $this->cache->get('findBoardId:' . $id);
 		if ($result === null) {
 			try {
@@ -604,13 +659,11 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	}
 	public function transferOwnership(string $ownerId, string $newOwnerId, ?int $boardId = null): void {
-		$params = [
+		$qb = $this->db->getQueryBuilder();
-			'owner' => $ownerId,
+		$qb->update($this->getTableName())
-			'newOwner' => $newOwnerId
+			->set('owner', $qb->createNamedParameter($newOwnerId, IQueryBuilder::PARAM_STR))
-		];
+			->where('owner', $qb->createNamedParameter($ownerId, IQueryBuilder::PARAM_STR))
-		$sql = "UPDATE `*PREFIX*{$this->tableName}`  SET `owner` = :newOwner WHERE `owner` = :owner";
+			->executeStatement();
 		$stmt = $this->db->executeQuery($sql, $params);
 		$stmt->closeCursor();
 	}
 	public function remapCardOwner(int $boardId, string $userId, string $newUserId): void {
@@ -19,12 +19,11 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 abstract class DeckMapper extends QBMapper {
 	/**
 	 * @param $id
 	 * @return T
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 */
-	public function find($id) {
+	public function find(int $id): Entity {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -37,7 +36,7 @@ abstract class DeckMapper extends QBMapper {
 	 * Helper function to split passed array into chunks of 1000 elements and
 	 * call a given callback for fetching query results
 	 *
-	 * Can be useful to limit to 1000 results per query for oracle compatiblity
+	 * Can be useful to limit to 1000 results per query for oracle compatibility
 	 * but still iterate over all results
 	 */
 	public function chunkQuery(array $ids, callable $callback): Generator {
@@ -8,22 +8,25 @@
 namespace OCA\Deck\Db;
 /**
 *
 */
 interface IPermissionMapper {
 	/**
 	 * Check if $userId is owner of Entity with $id
 	 *
 	 * @param $userId string userId
-	 * @param $id int|string unique entity identifier
+	 * @param $id int unique entity identifier
 	 * @return boolean
 	 */
-	public function isOwner($userId, $id): bool;
+	public function isOwner(string $userId, int $id): bool;
 	/**
 	 * Query boardId for Entity of given $id
 	 *
-	 * @param $id int|string unique entity identifier
+	 * @param $id int unique entity identifier
-	 * @return int|null id of Board
+	 * @return ?int id of Board
 	 */
-	public function findBoardId($id): ?int;
+	public function findBoardId(int $id): ?int;
 }
@@ -8,7 +8,16 @@
 namespace OCA\Deck\Db;
 /**
- * @method getTitle(): string
+ * @method string getTitle()
 * @method void setTitle(string $title)
 * @method string getColor()
 * @method void setColor(string $color)
 * @method int getBoardId()
 * @method void setBoardId(int $boardId)
 * @method int getCardId()
 * @method void setCardId(int $cardId)
 * @method int getLastModified()
 * @method void setLastModified(int $lastModified)
 */
 class Label extends RelationalEntity {
 	protected $title;
@@ -24,7 +33,7 @@ class Label extends RelationalEntity {
 		$this->addType('lastModified', 'integer');
 	}
-	public function getETag() {
+	public function getETag(): string {
 		return md5((string)$this->getLastModified());
 	}
 }
@@ -20,13 +20,10 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAll($boardId, $limit = null, $offset = null): array {
+	public function findAll(int $boardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -44,13 +41,10 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $cardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null): array {
+	public function findAssignedLabelsForCard(int $cardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('l.*', 'card_id')
 			->from($this->getTableName(), 'l')
@@ -63,7 +57,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($qb);
 	}
-	public function findAssignedLabelsForCards($cardIds, $limit = null, $offset = null): array {
+	public function findAssignedLabelsForCards(array $cardIds, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('l.*', 'card_id')
 			->from($this->getTableName(), 'l')
@@ -77,13 +71,10 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null): array {
+	public function findAssignedLabelsForBoard(int $boardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('l.id as id', 'l.title as title', 'l.color as color')
 			->selectAlias('c.id', 'card_id')
@@ -113,11 +104,10 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
-	 * @param numeric $boardId
+	 * @return array<int, list<Label>>
 	 * @return array
 	 * @throws \OCP\DB\Exception
 	 */
-	public function getAssignedLabelsForBoard($boardId) {
+	public function getAssignedLabelsForBoard(int $boardId): array {
 		$labels = $this->findAssignedLabelsForBoard($boardId);
 		$result = [];
 		foreach ($labels as $label) {
@@ -130,11 +120,9 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $labelId
 	 * @return void
 	 * @throws \OCP\DB\Exception
 	 */
-	public function deleteLabelAssignments($labelId) {
+	public function deleteLabelAssignments(int $labelId): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('deck_assigned_labels')
 			->where($qb->expr()->eq('label_id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)));
@@ -142,11 +130,9 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $cardId
 	 * @return void
 	 * @throws \OCP\DB\Exception
 	 */
-	public function deleteLabelAssignmentsForCard($cardId) {
+	public function deleteLabelAssignmentsForCard(int $cardId): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('deck_assigned_labels')
 			->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
@@ -154,33 +140,25 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param string $userId
 	 * @param numeric $labelId
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
-	public function isOwner($userId, $labelId): bool {
+	public function isOwner(string $userId, int $id): bool {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('l.id')
 			->from($this->getTableName(), 'l')
 			->innerJoin('l', 'deck_boards', 'b', 'l.board_id = b.id')
-			->where($qb->expr()->eq('l.id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT)))
+			->where($qb->expr()->eq('l.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
 		return count($qb->executeQuery()->fetchAll()) > 0;
 	}
-	/**
+	public function findBoardId(int $id): ?int {
 	 * @param numeric $id
 	 * @return int|null
 	 */
 	public function findBoardId($id): ?int {
 		try {
 			$entity = $this->find($id);
 			return $entity->getBoardId();
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException|MultipleObjectsReturnedException) {
-		} catch (MultipleObjectsReturnedException $e) {
+			return null;
 		}
 		return null;
 	}
 }
@@ -11,10 +11,17 @@ use Sabre\VObject\Component\VCalendar;
 /**
 * @method int getId()
 * @method string getTitle()
 * @method void setTitle(string $title)
 * @method int getBoardId()
 * @method void setBoardId(int $boardId)
 * @method int getDeletedAt()
 * @method void setDeletedAt(int $deletedAt)
 * @method int getLastModified()
- * @method int getOrder()
+ * @method void setLastModified(int $lastModified)
 * @method \int getOrder()
 * @method void setOrder(int $order)
 * @method Card[] getCards()
 */
 class Stack extends RelationalEntity {
 	protected $title;
@@ -35,13 +35,11 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	/**
 	 * @param numeric $id
 	 * @return Stack
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
 	 * @throws \OCP\DB\Exception
 	 */
-	public function find($id): Stack {
+	public function find(int $id): Stack {
 		if (isset($this->stackCache[(string)$id])) {
 			return $this->stackCache[(string)$id];
 		}
@@ -56,11 +54,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param $cardId
 	 * @return Stack|null
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findStackFromCardId($cardId): ?Stack {
+	public function findStackFromCardId(int $cardId): ?Stack {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('s.*')
 			->from($this->getTableName(), 's')
@@ -76,13 +72,10 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Stack[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findAll($boardId, $limit = null, $offset = null): array {
+	public function findAll(int $boardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -95,13 +88,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Stack[]
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findDeleted($boardId, $limit = null, $offset = null) {
+	public function findDeleted(int $boardId, ?int $limit = null, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->getTableName())
@@ -127,12 +116,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $userId
 	 * @param numeric $stackId
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
-	public function isOwner($userId, $id): bool {
+	public function isOwner(string $userId, int $id): bool {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('s.id')
 			->from($this->getTableName(), 's')
@@ -144,11 +130,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 	/**
 	 * @param numeric $id
 	 * @return int|null
 	 * @throws \OCP\DB\Exception
 	 */
-	public function findBoardId($id): ?int {
+	public function findBoardId(int $id): ?int {
 		$result = $this->cache->get('findBoardId:' . $id);
 		if ($result !== null) {
 			return $result !== false ? $result : null;
@@ -165,6 +149,10 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 		return $result !== false ? $result : null;
 	}
 	/**
 	 * @return array<Stack>
 	 * @throws \OCP\DB\Exception
 	 */
 	public function findToDelete(): array {
 		// add buffer of 5 min
 		$timeLimit = time() - (60 * 5);
@@ -35,6 +35,10 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		Util::addStyle('deck', 'deck');
 		$pathInfo = $this->request->getPathInfo();
 		if (!$pathInfo) {
 			return;
 		}
 		if (str_starts_with($pathInfo, '/apps/calendar')) {
 			Util::addScript('deck', 'deck-calendar');
 		}
@@ -18,14 +18,10 @@ use OCP\EventDispatcher\IEventListener;
 /** @template-implements IEventListener<Event|AclDeletedEvent|AclCreatedEvent> */
 class ResourceListener implements IEventListener {
-	/** @var IManager */
+	public function __construct(
-	private $resourceManager;
+		private readonly IManager $resourceManager,
-	/** @var ResourceProviderCard */
+		private readonly ResourceProviderCard $resourceProviderCard,
-	private $resourceProviderCard;
+	) {
 	public function __construct(IManager $resourceManager, ResourceProviderCard $resourceProviderCard) {
 		$this->resourceManager = $resourceManager;
 		$this->resourceProviderCard = $resourceProviderCard;
 	}
 	public function handle(Event $event): void {
@@ -38,10 +34,10 @@ class ResourceListener implements IEventListener {
 		$this->resourceManager->invalidateAccessCacheForProvider($this->resourceProviderCard);
 		try {
-			$resource = $this->resourceManager->getResourceForUser(ResourceProvider::RESOURCE_TYPE, $boardId, null);
+			$resource = $this->resourceManager->getResourceForUser(ResourceProvider::RESOURCE_TYPE, (string)$boardId, null);
 			$this->resourceManager->invalidateAccessCacheForResource($resource);
 		} catch (ResourceException $e) {
-			// If there is no resource we don't need to invalidate anything, but this should not happen anyways
+			// If there is no resource we don't need to invalidate anything, but this should not happen anyway
 		}
 	}
 }
@@ -27,7 +27,7 @@ class DefaultBoardMiddleware extends Middleware {
 	public function beforeController($controller, $methodName) {
 		try {
 			if ($this->userId !== null && $this->defaultBoardService->checkFirstRun($this->userId) && $this->permissionService->canCreate()) {
-				$this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '0087C5');
+				$this->defaultBoardService->createDefaultBoard($this->l10n->t('Welcome to Nextcloud Deck!'), $this->userId, 'bf678b');
 			}
 		} catch (\Throwable $e) {
 			$this->logger->error('Could not create default board', ['exception' => $e]);
@@ -0,0 +1,78 @@
 <?php
 /**
 * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
 namespace OCA\Deck\Migration;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 class LabelMismatchCleanup implements IRepairStep {
 	public function __construct(
 		private IDBConnection $db,
 	) {
 	}
 	public function getName() {
 		return 'Migrate labels with wrong board mapping';
 	}
 	public function run(IOutput $output) {
 		// Find assingments where a label of another (wrong) board is used
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('al.id', 'al.label_id', 'al.card_id', 's.board_id as actual_board_id', 'l.board_id as wrong_id', 'l.color', 'l.title')
 			->from('deck_assigned_labels', 'al')
 			->innerJoin('al', 'deck_cards', 'c', 'c.id = al.card_id')
 			->innerJoin('c', 'deck_stacks', 's', 'c.stack_id = s.id')
 			->innerJoin('al', 'deck_labels', 'l', 'l.id = al.label_id')
 			->where($qb->expr()->neq('l.board_id', 's.board_id'));
 		$labels = $qb->executeQUery()->fetchAll();
 		if (count($labels) === 0) {
 			return;
 		}
 		$output->info('Found ' . count($labels) . ' labels with wrong board mapping');
 		foreach ($labels as $label) {
 			// Select existing label on the correct board
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('id')
 				->from('deck_labels')
 				->where($qb->expr()->eq('title', $qb->createNamedParameter($label['title'])))
 				->andWhere($qb->expr()->eq('color', $qb->createNamedParameter($label['color'])))
 				->andWhere($qb->expr()->eq('board_id', $qb->createNamedParameter($label['actual_board_id'])));
 			$result = $qb->executeQuery();
 			$newLabel = $result->fetchOne();
 			$result->closeCursor();
 			if (!$newLabel) {
 				// Create a new label with the same title and color on the correct board
 				$qb = $this->db->getQueryBuilder();
 				$qb->insert('deck_labels')
 					->values([
 						'title' => $qb->createNamedParameter($label['title']),
 						'color' => $qb->createNamedParameter($label['color']),
 						'board_id' => $qb->createNamedParameter($label['actual_board_id']),
 					]);
 				$qb->executeStatement();
 				$newLabel = $qb->getLastInsertId();
 				$output->debug('Created new label ' . $label['title'] . ' on board ' . $label['actual_board_id']);
 			} else {
 				$output->debug('Found existing label ' . $label['title'] . ' on board ' . $label['actual_board_id']);
 			}
 			// Update the assignment to use the new label
 			$qb = $this->db->getQueryBuilder();
 			$qb->update('deck_assigned_labels')
 				->set('label_id', $qb->createNamedParameter($newLabel))
 				->where($qb->expr()->eq('id', $qb->createNamedParameter($label['id'])));
 			$qb->executeStatement();
 			$output->debug('Updated label assignment ' . $label['id'] . ' to use label ' . $newLabel);
 		}
 	}
 }
@@ -11,6 +11,7 @@ use OCA\Deck\Db\Board;
 class BoardSummary extends Board {
 	private Board $board;
 	/** @psalm-suppress ConstructorSignatureMismatch */
 	public function __construct(Board $board) {
 		parent::__construct();
 		$this->board = $board;
@@ -27,7 +28,7 @@ class BoardSummary extends Board {
 		return $this->board->getter($name);
 	}
-	public function __call($name, $arguments) {
+	public function __call($methodName, $args) {
-		return $this->board->__call($name, $arguments);
+		return $this->board->__call($methodName, $args);
 	}
 }
@@ -15,6 +15,7 @@ class CardDetails extends Card {
 	private ?Board $board;
 	private ?Reference $referenceData = null;
 	/** @psalm-suppress ConstructorSignatureMismatch */
 	public function __construct(Card $card, ?Board $board = null) {
 		parent::__construct();
 		$this->card = $card;
@@ -95,7 +95,7 @@ class NotificationHelper {
 			$shouldNotify = $notificationSetting === ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ALL;
-			if ($user->getUID() === $board->getOwner() && count($board->getAcl()) === 0) {
+			if ($user->getUID() === $board->getOwner() && count($board->getAcl() ?? []) === 0) {
 				// Notify if all or assigned is configured for unshared boards
 				$shouldNotify = true;
 			} elseif ($notificationSetting === ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED && $this->assignmentMapper->isUserAssigned($card->getId(), $user->getUID())) {
@@ -64,6 +64,7 @@ class BoardReferenceProvider implements IReferenceProvider {
 				$reference = new Reference($referenceText);
 				$reference->setTitle($this->l10n->t('Deck board') . ': ' . $board['title']);
 				$ownerDisplayName = $board['owner']['displayname'] ?? $board['owner']['uid'] ?? '???';
 				// TRANSLATORS Owned by {boardOwnerName}
 				$reference->setDescription($this->l10n->t('Owned by %1$s', [$ownerDisplayName]));
 				$imageUrl = $this->urlGenerator->getAbsoluteURL(
 					$this->urlGenerator->imagePath(Application::APP_ID, 'deck-dark.svg')
@@ -90,6 +90,7 @@ class CommentReferenceProvider implements IReferenceProvider {
 				$reference->setTitle($comment['message']);
 				$boardOwnerDisplayName = $board['owner']['displayname'] ?? $board['owner']['uid'] ?? '???';
 				$reference->setDescription(
 					// TRANSLATORS From {userName}, in {boardTitle}/{stackTitle}, owned by {boardOwnerName}
 					$this->l10n->t('From %1$s, in %2$s/%3$s, owned by %4$s', [
 						$comment['actorDisplayName'],
 						$board['title'],
@@ -21,7 +21,6 @@ use OCA\Deck\NotFoundException;
 use OCA\Deck\Notification\NotificationHelper;
 use OCA\Deck\Validators\AssignmentServiceValidator;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -92,15 +91,12 @@ class AssignmentService {
 	}
 	/**
 	 * @param $cardId
 	 * @param $userId
 	 * @return bool|null|Entity
 	 * @throws BadRequestException
 	 * @throws NoPermissionException
 	 * @throws MultipleObjectsReturnedException
 	 * @throws DoesNotExistException
 	 */
-	public function assignUser($cardId, $userId, int $type = Assignment::TYPE_USER) {
+	public function assignUser(int $cardId, string $userId, int $type = Assignment::TYPE_USER): Assignment {
 		$this->assignmentServiceValidator->check(compact('cardId', 'userId'));
 		if ($type !== Assignment::TYPE_USER && $type !== Assignment::TYPE_GROUP) {
@@ -144,16 +140,13 @@ class AssignmentService {
 	}
 	/**
 	 * @param $cardId
 	 * @param $userId
 	 * @return Entity
 	 * @throws BadRequestException
 	 * @throws NotFoundException
 	 * @throws NoPermissionException
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
 	 */
-	public function unassignUser($cardId, $userId, $type = 0) {
+	public function unassignUser(int $cardId, string $userId, int $type = 0): Assignment {
 		$this->assignmentServiceValidator->check(compact('cardId', 'userId'));
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
@@ -25,6 +25,7 @@ use OCP\AppFramework\Db\IMapperException;
 use OCP\AppFramework\Http\Response;
 use OCP\IL10N;
 use OCP\IUserManager;
 use Psr\Container\ContainerExceptionInterface;
 class AttachmentService {
 	private $attachmentMapper;
@@ -80,20 +81,16 @@ class AttachmentService {
 	}
 	/**
-	 * @param string $type
+	 * @throws ContainerExceptionInterface
 	 * @param string $class
 	 * @throws \OCP\AppFramework\QueryException
 	 */
-	public function registerAttachmentService($type, $class) {
+	public function registerAttachmentService(string $type, string $class): void {
-		$this->services[$type] = $this->application->getContainer()->query($class);
+		$this->services[$type] = $this->application->getContainer()->get($class);
 	}
 	/**
 	 * @param string $type
 	 * @return IAttachmentService
 	 * @throws InvalidAttachmentType
 	 */
-	public function getService($type) {
+	public function getService(string $type): IAttachmentService {
 		if (isset($this->services[$type])) {
 			return $this->services[$type];
 		}
@@ -101,16 +98,11 @@ class AttachmentService {
 	}
 	/**
-	 * @param $cardId
+	 * @return Attachment[]
 	 * @return array
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws BadRequestException
 	 */
-	public function findAll($cardId, $withDeleted = false) {
+	public function findAll(int $cardId, bool $withDeleted = false): array {
 		if (is_numeric($cardId) === false) {
 			throw new BadRequestException('card id must be a number');
 		}
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		$attachments = $this->attachmentMapper->findAll($cardId);
@@ -122,7 +114,7 @@ class AttachmentService {
 			/** @var IAttachmentService $service */
 			$service = $this->getService($attachmentType);
 			if ($service instanceof ICustomAttachmentService) {
-				$attachments = array_merge($attachments, $service->listAttachments((int)$cardId));
+				$attachments = array_merge($attachments, $service->listAttachments($cardId));
 			}
 		}
@@ -140,49 +132,40 @@ class AttachmentService {
 	}
 	/**
 	 * @param $cardId
 	 * @return int|mixed
 	 * @throws BadRequestException
 	 * @throws InvalidAttachmentType
 	 * @throws \OCP\DB\Exception
 	 */
-	public function count($cardId) {
+	public function count(int $cardId): int {
-		if (is_numeric($cardId) === false) {
+		$count = $this->attachmentCacheHelper->getAttachmentCount($cardId);
 			throw new BadRequestException('card id must be a number');
 		}
 		$count = $this->attachmentCacheHelper->getAttachmentCount((int)$cardId);
 		if ($count === null) {
 			$count = count($this->attachmentMapper->findAll($cardId));
 			foreach (array_keys($this->services) as $attachmentType) {
 				$service = $this->getService($attachmentType);
 				if ($service instanceof ICustomAttachmentService) {
-					$count += $service->getAttachmentCount((int)$cardId);
+					$count += $service->getAttachmentCount($cardId);
 				}
 			}
-			$this->attachmentCacheHelper->setAttachmentCount((int)$cardId, $count);
+			$this->attachmentCacheHelper->setAttachmentCount($cardId, $count);
 		}
 		return $count;
 	}
 	/**
 	 * @param $cardId
 	 * @param $type
 	 * @param $data
 	 * @return Attachment|\OCP\AppFramework\Db\Entity
 	 * @throws NoPermissionException
 	 * @throws StatusException
 	 * @throws BadRequestException
 	 */
-	public function create($cardId, $type, $data) {
+	public function create(int $cardId, string $type, string $data) {
 		$this->attachmentServiceValidator->check(compact('cardId', 'type'));
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
-		$this->attachmentCacheHelper->clearAttachmentCount((int)$cardId);
+		$this->attachmentCacheHelper->clearAttachmentCount($cardId);
 		$attachment = new Attachment();
 		$attachment->setCardId($cardId);
 		$attachment->setType($type);
@@ -218,12 +201,10 @@ class AttachmentService {
 	/**
 	 * Display the attachment
 	 *
 	 * @param $attachmentId
 	 * @return Response
 	 * @throws NoPermissionException
 	 * @throws NotFoundException
 	 */
-	public function display($cardId, $attachmentId, $type = 'deck_file') {
+	public function display(int $cardId, int $attachmentId, string $type = 'deck_file'): Response {
 		try {
 			$service = $this->getService($type);
 		} catch (InvalidAttachmentType $e) {
@@ -257,13 +238,10 @@ class AttachmentService {
 	/**
 	 * Update an attachment with custom data
 	 *
 	 * @param $attachmentId
 	 * @param $data
 	 * @return mixed
 	 * @throws BadRequestException
 	 * @throws NoPermissionException
 	 */
-	public function update($cardId, $attachmentId, $data, $type = 'deck_file') {
+	public function update(int $cardId, int $attachmentId, string $data, string $type = 'deck_file'): Attachment {
 		$this->attachmentServiceValidator->check(compact('cardId', 'type', 'data'));
 		try {
@@ -384,8 +362,6 @@ class AttachmentService {
 	}
 	/**
 	 * @param Attachment $attachment
 	 * @return Attachment
 	 * @throws \ReflectionException
 	 */
 	private function addCreator(Attachment $attachment): Attachment {
@@ -75,8 +75,6 @@ class BoardService {
 	/**
 	 * Set a different user than the current one, e.g. when no user is available in occ
 	 *
 	 * @param string $userId
 	 */
 	public function setUserId(string $userId): void {
 		$this->userId = $userId;
@@ -117,22 +115,18 @@ class BoardService {
 		}
 		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		/** @var Board $board */
 		$board = $this->boardMapper->find($boardId, true, true, $allowDeleted);
 		[$board] = $this->enrichBoards([$board], $fullDetails);
 		return $board;
 	}
 	/**
 	 * @param $mapper
 	 * @param $id
 	 * @return bool
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function isArchived($mapper, $id) {
+	public function isArchived($mapper, int $id): bool {
 		$this->boardServiceValidator->check(compact('id'));
 		try {
@@ -151,15 +145,12 @@ class BoardService {
 	}
 	/**
 	 * @param $mapper
 	 * @param $id
 	 * @return bool
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function isDeleted($mapper, $id) {
+	public function isDeleted($mapper, int $id): bool {
 		$this->boardServiceValidator->check(compact('mapper', 'id'));
 		try {
@@ -179,13 +170,9 @@ class BoardService {
 	/**
 	 * @param $title
 	 * @param $userId
 	 * @param $color
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws BadRequestException
 	 */
-	public function create($title, $userId, $color) {
+	public function create(string $title, string $userId, string $color): Board {
 		$this->boardServiceValidator->check(compact('title', 'userId', 'color'));
 		if (!$this->permissionService->canCreate()) {
@@ -196,7 +183,8 @@ class BoardService {
 		$board->setTitle($title);
 		$board->setOwner($userId);
 		$board->setColor($color);
-		$new_board = $this->boardMapper->insert($board);
+		/** @var Board $board */
 		$board = $this->boardMapper->insert($board);
 		// create new labels
 		$default_labels = [
@@ -210,33 +198,31 @@ class BoardService {
 			$label = new Label();
 			$label->setColor($labelColor);
 			$label->setTitle($labelTitle);
-			$label->setBoardId($new_board->getId());
+			$label->setBoardId($board->getId());
 			$labels[] = $this->labelMapper->insert($label);
 		}
-		$new_board->setLabels($labels);
+		$board->setLabels($labels);
-		$this->boardMapper->mapOwner($new_board);
+		$this->boardMapper->mapOwner($board);
-		$permissions = $this->permissionService->matchPermissions($new_board);
+		$permissions = $this->permissionService->matchPermissions($board);
-		$new_board->setPermissions([
+		$board->setPermissions([
 			'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ] ?? false,
 			'PERMISSION_EDIT' => $permissions[Acl::PERMISSION_EDIT] ?? false,
 			'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE] ?? false,
 			'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE] ?? false
 		]);
-		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $new_board, ActivityManager::SUBJECT_BOARD_CREATE, [], $userId);
+		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $board, ActivityManager::SUBJECT_BOARD_CREATE, [], $userId);
-		$this->changeHelper->boardChanged($new_board->getId());
+		$this->changeHelper->boardChanged($board->getId());
-		return $new_board;
+		return $board;
 	}
 	/**
 	 * @param $id
 	 * @return Board
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function delete($id) {
+	public function delete(int $id): Board {
 		$this->boardServiceValidator->check(compact('id'));
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
@@ -253,13 +239,11 @@ class BoardService {
 	}
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
-	public function deleteUndo($id) {
+	public function deleteUndo(int $id): Board {
 		$this->boardServiceValidator->check(compact('id'));
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
@@ -273,14 +257,12 @@ class BoardService {
 	}
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function deleteForce($id) {
+	public function deleteForce(int $id): Board {
 		$this->boardServiceValidator->check(compact('id'));
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
@@ -291,17 +273,12 @@ class BoardService {
 	}
 	/**
 	 * @param $id
 	 * @param $title
 	 * @param $color
 	 * @param $archived
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function update($id, $title, $color, $archived) {
+	public function update(int $id, string $title, string $color, bool $archived): Board {
 		$this->boardServiceValidator->check(compact('id', 'title', 'color', 'archived'));
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
@@ -320,7 +297,7 @@ class BoardService {
 		return $board;
 	}
-	private function applyPermissions($boardId, $edit, $share, $manage, $oldAcl = null) {
+	private function applyPermissions(int $boardId, bool $edit, bool $share, bool $manage, ?Acl $oldAcl = null): array {
 		try {
 			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_MANAGE);
 		} catch (NoPermissionException $e) {
@@ -332,7 +309,7 @@ class BoardService {
 		return [$edit, $share, $manage];
 	}
-	public function enrichWithBoardSettings(Board $board) {
+	public function enrichWithBoardSettings(Board $board): void {
 		$globalCalendarConfig = (bool)$this->config->getUserValue($this->userId, Application::APP_ID, 'calendar', true);
 		$settings = [
 			'notify-due' => $this->config->getUserValue($this->userId, Application::APP_ID, 'board:' . $board->getId() . ':notify-due', ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED),
@@ -341,7 +318,7 @@ class BoardService {
 		$board->setSettings($settings);
 	}
-	public function enrichWithActiveSessions(Board $board) {
+	public function enrichWithActiveSessions(Board $board): void {
 		$sessions = $this->sessionMapper->findAllActive($board->getId());
 		$board->setActiveSessions(array_values(
@@ -354,17 +331,11 @@ class BoardService {
 	}
 	/**
-	 * @param $boardId
+	 * @param Acl::PERMISSION_TYPE_* $type
 	 * @param $type
 	 * @param $participant
 	 * @param $edit
 	 * @param $share
 	 * @param $manage
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws BadRequestException
 	 * @throws NoPermissionException
 	 */
-	public function addAcl($boardId, $type, $participant, $edit, $share, $manage) {
+	public function addAcl(int $boardId, int $type, $participant, bool $edit, bool $share, bool $manage): Acl {
 		$this->boardServiceValidator->check(compact('boardId', 'type', 'participant', 'edit', 'share', 'manage'));
 		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_SHARE);
@@ -400,17 +371,12 @@ class BoardService {
 	}
 	/**
 	 * @param $id
 	 * @param $edit
 	 * @param $share
 	 * @param $manage
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function updateAcl($id, $edit, $share, $manage) {
+	public function updateAcl(int $id, bool $edit, bool $share, bool $manage): Acl {
 		$this->boardServiceValidator->check(compact('id', 'edit', 'share', 'manage'));
 		$this->permissionService->checkPermission($this->aclMapper, $id, Acl::PERMISSION_SHARE);
@@ -422,12 +388,12 @@ class BoardService {
 		$acl->setPermissionShare($share);
 		$acl->setPermissionManage($manage);
 		$this->boardMapper->mapAcl($acl);
-		$board = $this->aclMapper->update($acl);
+		$acl = $this->aclMapper->update($acl);
 		$this->changeHelper->boardChanged($acl->getBoardId());
 		$this->eventDispatcher->dispatchTyped(new AclUpdatedEvent($acl));
-		return $board;
+		return $acl;
 	}
 	/**
@@ -579,27 +545,23 @@ class BoardService {
 	}
 	/**
 	 * @param $id
 	 * @return Board
 	 * @throws DoesNotExistException
 	 * @throws NoPermissionException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function export($id) : Board {
+	public function export(int $id): Board {
 		if (is_numeric($id) === false) {
 			throw new BadRequestException('board id must be a number');
 		}
 		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_READ);
-		$board = $this->boardMapper->find((int)$id);
+		$board = $this->boardMapper->find($id);
 		$this->enrichWithCards($board);
 		$this->enrichWithLabels($board);
 		return $board;
 	}
-	/** @param Board[] $boards */
+	/**
 	 * @param Board[] $boards
 	 * @return Board[]
 	 */
 	private function enrichBoards(array $boards, bool $fullDetails = true): array {
 		$result = [];
 		foreach ($boards as $board) {
@@ -715,8 +677,8 @@ class BoardService {
 		}
 	}
-	private function enrichWithStacks($board, $since = -1) {
+	private function enrichWithStacks(Board $board): void {
-		$stacks = $this->stackMapper->findAll($board->getId(), null, null, $since);
+		$stacks = $this->stackMapper->findAll($board->getId());
 		if (\count($stacks) === 0) {
 			return;
@@ -725,8 +687,8 @@ class BoardService {
 		$board->setStacks($stacks);
 	}
-	private function enrichWithLabels($board, $since = -1) {
+	private function enrichWithLabels(Board $board): void {
-		$labels = $this->labelMapper->findAll($board->getId(), null, null, $since);
+		$labels = $this->labelMapper->findAll($board->getId());
 		if (\count($labels) === 0) {
 			return;
@@ -735,7 +697,7 @@ class BoardService {
 		$board->setLabels($labels);
 	}
-	private function enrichWithUsers($board, $since = -1) {
+	private function enrichWithUsers(Board $board): void {
 		$boardUsers = $this->permissionService->findUsers($board->getId());
 		if ($boardUsers === null || \count($boardUsers) === 0) {
 			return;
@@ -746,7 +708,7 @@ class BoardService {
 	/**
 	 * Clean a given board data from the Cache
 	 */
-	private function clearBoardFromCache(Board $board) {
+	private function clearBoardFromCache(Board $board): void {
 		$boardId = $board->getId();
 		$boardOwnerId = $board->getOwner();
@@ -755,13 +717,15 @@ class BoardService {
 		unset($this->boardsCachePartial[$boardId]);
 	}
-	private function enrichWithCards($board) {
+	private function enrichWithCards(Board $board): void {
 		$stacks = $this->stackMapper->findAll($board->getId());
 		foreach ($stacks as $stack) {
 			$cards = $this->cardMapper->findAllByStack($stack->getId());
 			$fullCards = [];
 			foreach ($cards as $card) {
 				$fullCard = $this->cardMapper->find($card->getId());
 				$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 				$fullCard->setAssignedUsers($assignedUsers);
 				array_push($fullCards, $fullCard);
 			}
 			$stack->setCards($fullCards);
@@ -64,10 +64,14 @@ class CardService {
 	) {
 	}
-	public function enrichCards($cards) {
+	/**
 	 * @param Card[] $cards
 	 * @return CardDetails[]
 	 */
 	public function enrichCards(array $cards): array {
 		$user = $this->userManager->get($this->userId);
-		$cardIds = array_map(function (Card $card) use ($user) {
+		$cardIds = array_map(function (Card $card) use ($user): int {
 			// Everything done in here might be heavy as it is executed for every card
 			$cardId = $card->getId();
 			$this->cardMapper->mapOwner($card);
@@ -120,7 +124,8 @@ class CardService {
 		);
 	}
-	public function fetchDeleted($boardId) {
+	/** @return Card[] */
 	public function fetchDeleted($boardId): array {
 		$this->cardServiceValidator->check(compact('boardId'));
 		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		$cards = $this->cardMapper->findDeleted($boardId);
@@ -129,13 +134,12 @@ class CardService {
 	}
 	/**
 	 * @return \OCA\Deck\Db\RelationalEntity
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function find(int $cardId) {
+	public function find(int $cardId): Card {
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		$card = $this->cardMapper->find($cardId);
 		[$card] = $this->enrichCards([$card]);
@@ -152,7 +156,10 @@ class CardService {
 		return $card;
 	}
-	public function findCalendarEntries($boardId) {
+	/**
 	 * @return Card[]
 	 */
 	public function findCalendarEntries(int $boardId): array {
 		try {
 			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		} catch (NoPermissionException $e) {
@@ -163,20 +170,13 @@ class CardService {
 	}
 	/**
 	 * @param $title
 	 * @param $stackId
 	 * @param $type
 	 * @param integer $order
 	 * @param $description
 	 * @param $owner
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadrequestException
 	 */
-	public function create($title, $stackId, $type, $order, $owner, $description = '', $duedate = null) {
+	public function create(string $title, int $stackId, string $type, int $order, string $owner, string $description = '', $duedate = null): Card {
 		$this->cardServiceValidator->check(compact('title', 'stackId', 'type', 'order', 'owner'));
 		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
@@ -203,19 +203,13 @@ class CardService {
 	}
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function delete($id) {
+	public function delete(int $id): Card {
 		if (is_numeric($id) === false) {
 			throw new BadRequestException('card id must be a number');
 		}
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
 			throw new StatusException('Operation not allowed. This board is archived.');
@@ -233,25 +227,13 @@ class CardService {
 	}
 	/**
 	 * @param $id
 	 * @param $title
 	 * @param $stackId
 	 * @param $type
 	 * @param $owner
 	 * @param $description
 	 * @param $order
 	 * @param $duedate
 	 * @param $deletedAt
 	 * @param $archived
 	 * @param $done
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function update($id, $title, $stackId, $type, $owner, $description = '', $order = 0, $duedate = null, $deletedAt = null, $archived = null, ?OptionalNullableValue $done = null) {
+	public function update(int $id, string $title, int $stackId, string $type, string $owner, string $description = '', int $order = 0, ?string $duedate = null, ?int $deletedAt = null, ?bool $archived = null, ?OptionalNullableValue $done = null): Card {
 		$this->cardServiceValidator->check(compact('id', 'title', 'stackId', 'type', 'owner', 'order'));
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT, allowDeletedCard: true);
@@ -356,7 +338,7 @@ class CardService {
 		if ($resetDuedateNotification) {
 			$this->notificationHelper->markDuedateAsRead($card);
 		}
-		$this->changeHelper->cardChanged($card->getId(), true);
+		$this->changeHelper->cardChanged($card->getId());
 		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
@@ -398,16 +380,13 @@ class CardService {
 	}
 	/**
 	 * @param $id
 	 * @param $title
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function rename($id, $title) {
+	public function rename(int $id, string $title): Card {
 		$this->cardServiceValidator->check(compact('id', 'title'));
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
@@ -418,30 +397,27 @@ class CardService {
 		if ($card->getArchived()) {
 			throw new StatusException('Operation not allowed. This card is archived.');
 		}
 		$changes = new ChangeSet($card);
 		$card->setTitle($title);
 		$this->changeHelper->cardChanged($card->getId(), false);
 		$update = $this->cardMapper->update($card);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return $update;
 	}
 	/**
-	 * @param $id
+	 * @return list<Card>
 	 * @param $stackId
 	 * @param $order
 	 * @return array
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function reorder(int $id, int $stackId, int $order) {
+	public function reorder(int $id, int $stackId, int $order): array {
 		$this->cardServiceValidator->check(compact('id', 'stackId', 'order'));
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
@@ -459,73 +435,69 @@ class CardService {
 		$changes->setAfter($card);
 		$this->activityManager->triggerUpdateEvents(ActivityManager::DECK_OBJECT_CARD, $changes, ActivityManager::SUBJECT_CARD_UPDATE);
-		$cards = $this->cardMapper->findAll($stackId);
+		$cardsToReorder = $this->cardMapper->findAll($stackId);
 		$result = [];
 		$i = 0;
-		foreach ($cards as $card) {
+		foreach ($cardsToReorder as $cardToReorder) {
-			if ($card->getArchived()) {
+			if ($cardToReorder->getArchived()) {
 				throw new StatusException('Operation not allowed. This card is archived.');
 			}
-			if ($card->id === $id) {
+			if ($cardToReorder->id === $id) {
-				$card->setOrder($order);
+				$cardToReorder->setOrder($order);
-				$card->setLastModified(time());
+				$cardToReorder->setLastModified(time());
 			}
 			if ($i === $order) {
 				$i++;
 			}
-			if ($card->id !== $id) {
+			if ($cardToReorder->id !== $id) {
-				$card->setOrder($i++);
+				$cardToReorder->setOrder($i++);
 			}
-			$this->cardMapper->update($card);
+			$this->cardMapper->update($cardToReorder);
-			$result[$card->getOrder()] = $card;
+			$result[$cardToReorder->getOrder()] = $cardToReorder;
 		}
 		$this->changeHelper->cardChanged($id, false);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return array_values($result);
 	}
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function archive($id) {
+	public function archive(int $id): Card {
 		$this->cardServiceValidator->check(compact('id'));
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
 		if ($this->boardService->isArchived($this->cardMapper, $id)) {
 			throw new StatusException('Operation not allowed. This board is archived.');
 		}
 		$card = $this->cardMapper->find($id);
 		$changes = new ChangeSet($card);
 		$card->setArchived(true);
 		$newCard = $this->cardMapper->update($card);
 		$this->notificationHelper->markDuedateAsRead($card);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE);
 		$this->changeHelper->cardChanged($id, false);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return $newCard;
 	}
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function unarchive($id) {
+	public function unarchive(int $id): Card {
 		$this->cardServiceValidator->check(compact('id'));
@@ -534,19 +506,18 @@ class CardService {
 			throw new StatusException('Operation not allowed. This board is archived.');
 		}
 		$card = $this->cardMapper->find($id);
 		$changes = new ChangeSet($card);
 		$card->setArchived(false);
 		$newCard = $this->cardMapper->update($card);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_UNARCHIVE);
 		$this->changeHelper->cardChanged($id, false);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return $newCard;
 	}
 	/**
 	 * @param $id
 	 * @return \OCA\Deck\Db\Card
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
@@ -559,13 +530,14 @@ class CardService {
 			throw new StatusException('Operation not allowed. This board is archived.');
 		}
 		$card = $this->cardMapper->find($id);
 		$changes = new ChangeSet($card);
 		$card->setDone(new \DateTime());
 		$newCard = $this->cardMapper->update($card);
 		$this->notificationHelper->markDuedateAsRead($card);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_DONE);
 		$this->changeHelper->cardChanged($id, false);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return $newCard;
 	}
@@ -585,26 +557,25 @@ class CardService {
 			throw new StatusException('Operation not allowed. This board is archived.');
 		}
 		$card = $this->cardMapper->find($id);
 		$changes = new ChangeSet($card);
 		$card->setDone(null);
 		$newCard = $this->cardMapper->update($card);
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $newCard, ActivityManager::SUBJECT_CARD_UPDATE_UNDONE);
 		$this->changeHelper->cardChanged($id, false);
-		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
+		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card, $changes->getBefore()));
 		return $newCard;
 	}
 	/**
 	 * @param $cardId
 	 * @param $labelId
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function assignLabel($cardId, $labelId) {
+	public function assignLabel(int $cardId, int $labelId): Card {
 		$this->cardServiceValidator->check(compact('cardId', 'labelId'));
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
@@ -626,18 +597,16 @@ class CardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_LABEL_ASSIGN, ['label' => $label]);
 		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 		return $card;
 	}
 	/**
 	 * @param $cardId
 	 * @param $labelId
 	 * @throws StatusException
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 * @throws BadRequestException
 	 */
-	public function removeLabel($cardId, $labelId) {
+	public function removeLabel(int $cardId, int $labelId): Card {
 		$this->cardServiceValidator->check(compact('cardId', 'labelId'));
@@ -657,6 +626,7 @@ class CardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_LABEL_UNASSING, ['label' => $label]);
 		$this->eventDispatcher->dispatchTyped(new CardUpdatedEvent($card));
 		return $card;
 	}
 	public function getCardUrl(int $cardId): string {
@@ -66,7 +66,7 @@ class CirclesService {
 			$circlesManager->startSession($federatedUser);
 			$circle = $circlesManager->getCircle($circleId);
 			$member = $circle->getInitiator();
-			$isUserInCircle = $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
+			$isUserInCircle = $member->getLevel() >= Member::LEVEL_MEMBER;
 			if (!isset($this->userCircleCache[$circleId])) {
 				$this->userCircleCache[$circleId] = [];
@@ -22,8 +22,6 @@ use OCP\IUserManager;
 use OutOfBoundsException;
 use Psr\Log\LoggerInterface;
 use function is_numeric;
 class CommentService {
 	public function __construct(
@@ -36,12 +34,9 @@ class CommentService {
 	) {
 	}
-	public function list(string $cardId, int $limit = 20, int $offset = 0): DataResponse {
+	public function list(int $cardId, int $limit = 20, int $offset = 0): DataResponse {
 		if (!is_numeric($cardId)) {
 			throw new BadRequestException('A valid card id must be provided');
 		}
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
-		$comments = $this->commentsManager->getForObject(Application::COMMENT_ENTITY_TYPE, $cardId, $limit, $offset);
+		$comments = $this->commentsManager->getForObject(Application::COMMENT_ENTITY_TYPE, (string)$cardId, $limit, $offset);
 		$result = [];
 		foreach ($comments as $comment) {
 			$formattedComment = $this->formatComment($comment);
@@ -96,13 +91,13 @@ class CommentService {
 	 * @throws BadRequestException
 	 * @throws NotFoundException|NoPermissionException
 	 */
-	public function create(int $cardId, string $message, string $replyTo = '0'): DataResponse {
+	public function create(int $cardId, string $message, int $replyTo = 0): DataResponse {
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		// Check if parent is a comment on the same card
-		if ($replyTo !== '0') {
+		if ($replyTo !== 0) {
 			try {
-				$comment = $this->commentsManager->get($replyTo);
+				$comment = $this->commentsManager->get((string)$replyTo);
 				if ($comment->getObjectType() !== Application::COMMENT_ENTITY_TYPE || (int)$comment->getObjectId() !== $cardId) {
 					throw new CommentNotFoundException();
 				}
@@ -115,7 +110,7 @@ class CommentService {
 			$comment = $this->commentsManager->create('users', $this->userId, Application::COMMENT_ENTITY_TYPE, (string)$cardId);
 			$comment->setMessage($message);
 			$comment->setVerb('comment');
-			$comment->setParentId($replyTo);
+			$comment->setParentId((string)$replyTo);
 			$this->commentsManager->save($comment);
 			return new DataResponse($this->formatComment($comment, true));
 		} catch (\InvalidArgumentException $e) {
@@ -128,14 +123,8 @@ class CommentService {
 		}
 	}
-	public function update(string $cardId, string $commentId, string $message): DataResponse {
+	public function update(int $cardId, int $commentId, string $message): DataResponse {
-		if (!is_numeric($cardId)) {
+		$comment = $this->get($cardId, $commentId);
 			throw new BadRequestException('A valid card id must be provided');
 		}
 		if (!is_numeric($commentId)) {
 			throw new BadRequestException('A valid comment id must be provided');
 		}
 		$comment = $this->get((int)$cardId, (int)$commentId);
 		if ($comment->getActorType() !== 'users' || $comment->getActorId() !== $this->userId) {
 			throw new NoPermissionException('Only authors are allowed to edit their comment.');
 		}
@@ -145,18 +134,12 @@ class CommentService {
 		return new DataResponse($this->formatComment($comment));
 	}
-	public function delete(string $cardId, string $commentId): DataResponse {
+	public function delete(int $cardId, int $commentId): DataResponse {
 		if (!is_numeric($cardId)) {
 			throw new BadRequestException('A valid card id must be provided');
 		}
 		if (!is_numeric($commentId)) {
 			throw new BadRequestException('A valid comment id must be provided');
 		}
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
 		try {
-			$comment = $this->commentsManager->get($commentId);
+			$comment = $this->commentsManager->get((string)$commentId);
-			if ($comment->getObjectType() !== Application::COMMENT_ENTITY_TYPE || $comment->getObjectId() !== $cardId) {
+			if ($comment->getObjectType() !== Application::COMMENT_ENTITY_TYPE || (int)$comment->getObjectId() !== $cardId) {
 				throw new CommentNotFoundException();
 			}
 		} catch (CommentNotFoundException $e) {
@@ -165,11 +148,11 @@ class CommentService {
 		if ($comment->getActorType() !== 'users' || $comment->getActorId() !== $this->userId) {
 			throw new NoPermissionException('Only authors are allowed to edit their comment.');
 		}
-		$this->commentsManager->delete($commentId);
+		$this->commentsManager->delete((string)$commentId);
 		return new DataResponse([]);
 	}
-	private function formatComment(IComment $comment, $addReplyTo = false): array {
+	private function formatComment(IComment $comment, bool $addReplyTo = false): array {
 		$actorDisplayName = $this->userManager->getDisplayName($comment->getActorId()) ?? $comment->getActorId();
 		$formattedComment = [
@@ -48,7 +48,8 @@ class ConfigService {
 	}
 	public function getAll(): array {
-		if ($this->getUserId() === null) {
+		$userId = $this->getUserId();
 		if ($userId === null) {
 			return [];
 		}
@@ -57,7 +58,7 @@ class ConfigService {
 			'cardDetailsInModal' => $this->isCardDetailsInModal(),
 			'cardIdBadge' => $this->isCardIdBadgeEnabled()
 		];
-		if ($this->groupManager->isAdmin($this->getUserId())) {
+		if ($this->groupManager->isAdmin($userId)) {
 			$data['groupLimit'] = $this->get('groupLimit');
 		}
 		return $data;
@@ -95,44 +96,48 @@ class ConfigService {
 	}
 	public function isCalendarEnabled(?int $boardId = null): bool {
-		if ($this->getUserId() === null) {
+		$userId = $this->getUserId();
 		if ($userId === null) {
 			return false;
 		}
 		$appConfigState = $this->config->getAppValue(Application::APP_ID, 'calendar', 'yes') === 'yes';
-		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', $appConfigState);
+		$defaultState = (bool)$this->config->getUserValue($userId, Application::APP_ID, 'calendar', $appConfigState);
 		if ($boardId === null) {
 			return $defaultState;
 		}
-		return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'board:' . $boardId . ':calendar', $defaultState);
+		return (bool)$this->config->getUserValue($userId, Application::APP_ID, 'board:' . $boardId . ':calendar', $defaultState);
 	}
 	public function isCardDetailsInModal(?int $boardId = null): bool {
-		if ($this->getUserId() === null) {
+		$userId = $this->getUserId();
 		if ($userId === null) {
 			return false;
 		}
-		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardDetailsInModal', true);
+		$defaultState = (bool)$this->config->getUserValue($userId, Application::APP_ID, 'cardDetailsInModal', true);
 		if ($boardId === null) {
 			return $defaultState;
 		}
-		return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'board:' . $boardId . ':cardDetailsInModal', $defaultState);
+		return (bool)$this->config->getUserValue($userId, Application::APP_ID, 'board:' . $boardId . ':cardDetailsInModal', $defaultState);
 	}
 	public function isCardIdBadgeEnabled(): bool {
-		if ($this->getUserId() === null) {
+		$userId = $this->getUserId();
 		if ($userId === null) {
 			return false;
 		}
 		$appConfigState = $this->config->getAppValue(Application::APP_ID, 'cardIdBadge', 'yes') === 'no';
-		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardIdBadge', $appConfigState);
+		$defaultState = (bool)$this->config->getUserValue($userId, Application::APP_ID, 'cardIdBadge', $appConfigState);
-		return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardIdBadge', $defaultState);
+		return (bool)$this->config->getUserValue($userId, Application::APP_ID, 'cardIdBadge', $defaultState);
 	}
 	public function set($key, $value) {
-		if ($this->getUserId() === null) {
+		$userId = $this->getUserId();
 		if ($userId === null) {
 			throw new NoPermissionException('Must be logged in to set user config');
 		}
@@ -140,21 +145,21 @@ class ConfigService {
 		[$scope] = explode(':', $key, 2);
 		switch ($scope) {
 			case 'groupLimit':
-				if (!$this->groupManager->isAdmin($this->getUserId())) {
+				if (!$this->groupManager->isAdmin($userId)) {
 					throw new NoPermissionException('You must be admin to set the group limit');
 				}
 				$result = $this->setGroupLimit($value);
 				break;
 			case 'calendar':
-				$this->config->setUserValue($this->getUserId(), Application::APP_ID, 'calendar', (string)$value);
+				$this->config->setUserValue($userId, Application::APP_ID, 'calendar', (string)$value);
 				$result = $value;
 				break;
 			case 'cardDetailsInModal':
-				$this->config->setUserValue($this->getUserId(), Application::APP_ID, 'cardDetailsInModal', (string)$value);
+				$this->config->setUserValue($userId, Application::APP_ID, 'cardDetailsInModal', (string)$value);
 				$result = $value;
 				break;
 			case 'cardIdBadge':
-				$this->config->setUserValue($this->getUserId(), Application::APP_ID, 'cardIdBadge', (string)$value);
+				$this->config->setUserValue($userId, Application::APP_ID, 'cardIdBadge', (string)$value);
 				$result = $value;
 				break;
 			case 'board':
@@ -162,7 +167,7 @@ class ConfigService {
 				if ($boardConfigKey === 'notify-due' && !in_array($value, [self::SETTING_BOARD_NOTIFICATION_DUE_ALL, self::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED, self::SETTING_BOARD_NOTIFICATION_DUE_OFF], true)) {
 					throw new BadRequestException('Board notification option must be one of: off, assigned, all');
 				}
-				$this->config->setUserValue($this->getUserId(), Application::APP_ID, $key, (string)$value);
+				$this->config->setUserValue($userId, Application::APP_ID, $key, (string)$value);
 				$result = $value;
 		}
 		return $result;
@@ -9,6 +9,7 @@ namespace OCA\Deck\Service;
 use OCA\Deck\AppInfo\Application;
 use OCA\Deck\BadRequestException;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -21,6 +22,8 @@ class DefaultBoardService {
 	private $cardService;
 	private $config;
 	private $l10n;
 	private LabelService $labelService;
 	private AttachmentService $attachmentService;
 	public function __construct(
 		IL10N $l10n,
@@ -29,6 +32,8 @@ class DefaultBoardService {
 		StackService $stackService,
 		CardService $cardService,
 		IConfig $config,
 		LabelService $labelService,
 		AttachmentService $attachmentService,
 	) {
 		$this->boardService = $boardService;
 		$this->stackService = $stackService;
@@ -36,6 +41,8 @@ class DefaultBoardService {
 		$this->config = $config;
 		$this->boardMapper = $boardMapper;
 		$this->l10n = $l10n;
 		$this->labelService = $labelService;
 		$this->attachmentService = $attachmentService;
 	}
 	/**
@@ -59,10 +66,13 @@ class DefaultBoardService {
 		return false;
 	}
 	private function getDefaultBoardData(): array {
 		$defaultBoardDataJson = file_get_contents(__DIR__ . '/fixtures/default-board.json');
 		return json_decode($defaultBoardDataJson, true);
 	}
 	/**
 	 * @param $title
 	 * @param $userId
 	 * @param $color
 	 * @return \OCP\AppFramework\Db\Entity
 	 * @throws \OCA\Deck\NoPermissionException
 	 * @throws \OCA\Deck\StatusException
@@ -71,19 +81,71 @@ class DefaultBoardService {
 	 * @throws BadRequestException
 	 */
 	public function createDefaultBoard(string $title, string $userId, string $color) {
-		$defaultBoard = $this->boardService->create($title, $userId, $color);
+		$boardData = $this->getDefaultBoardData();
 		$defaultStacks = [];
 		$defaultCards = [];
 		/** @var Board $defaultBoard */
 		$defaultBoard = $this->boardService->create(
 			$boardData['title'] ?? $title,
 			$userId,
 			$boardData['color'] ?? $color,
 		);
 		$boardId = $defaultBoard->getId();
 		$additionLabels = [];
 		$translatedLabelTitles = [
 			'Read more inside' => $this->l10n->t('Read more inside'),
 		];
 		$translatedStackTitles = [
 			'Custom lists - click to rename!' => $this->l10n->t('Custom lists - click to rename!'),
 			'To Do' => $this->l10n->t('To Do'),
 			'In Progress' => $this->l10n->t('In Progress'),
 			'Done' => $this->l10n->t('Done'),
 		];
 		$translatedCardTitles = [
 			'1. Open to learn more about boards and cards' => $this->l10n->t('1. Open to learn more about boards and cards'),
 			'2. Drag cards left and right, up and down' => $this->l10n->t('2. Drag cards left and right, up and down'),
 			'3. Apply rich formatting and link content' => $this->l10n->t('3. Apply rich formatting and link content'),
 			'4. Share, comment and collaborate!' => $this->l10n->t('4. Share, comment and collaborate!'),
 			'Create your first card!' => $this->l10n->t('Create your first card!'),
 		];
-		$defaultStacks[] = $this->stackService->create($this->l10n->t('To do'), $boardId, 1);
+		foreach ($boardData['addition_labels'] as $labelData) {
-		$defaultStacks[] = $this->stackService->create($this->l10n->t('Doing'), $boardId, 1);
+			$additionLabels[] = $this->labelService->create(
-		$defaultStacks[] = $this->stackService->create($this->l10n->t('Done'), $boardId, 1);
+				$translatedLabelTitles[$labelData['title']] ?? $labelData['title'],
 				$labelData['color'],
 				$boardId
 			);
 		}
-		$defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 3'), $defaultStacks[0]->getId(), 'text', 0, $userId);
+		$defaultLabels = array_merge($defaultBoard->getLabels() ?? [], $additionLabels);
-		$defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 2'), $defaultStacks[1]->getId(), 'text', 0, $userId);
+
-		$defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 1'), $defaultStacks[2]->getId(), 'text', 0, $userId);
+		foreach ($boardData['stacks'] as $stackData) {
 			$stack = $this->stackService->create(
 				$translatedStackTitles[$stackData['title']] ?? $stackData['title'],
 				$boardId,
 				$stackData['order']
 			);
 			foreach ($stackData['cards'] as $cardData) {
 				$card = $this->cardService->create(
 					$translatedCardTitles[$cardData['title']] ?? $cardData['title'],
 					$stack->getId(),
 					$cardData['type'],
 					$cardData['order'],
 					$userId,
 					$cardData['description'],
 				);
 				foreach ($defaultLabels as $defaultLabel) {
 					if ($defaultLabel && in_array($defaultLabel->getTitle(), $cardData['labels'])) {
 						$this->cardService->assignLabel($card->getId(), $defaultLabel->getId());
 					}
 				}
 				if (!empty($cardData['has_example_attachment'])) {
 					$this->attachmentService->create($card->getId(), 'file', 'DEFAULT_SAMPLE_FILE');
 				}
 			}
 		}
 		return $defaultBoard;
 	}
@@ -162,7 +162,15 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
 	}
 	public function create(Attachment $attachment) {
-		$file = $this->getUploadedFile();
+		if ($attachment->getData() === 'DEFAULT_SAMPLE_FILE' && !$this->request->getUploadedFile('file')) {
 			$file = [
 				'name' => 'Nextcloud sample image - add your image here!.jpg',
 				'tmp_name' => __DIR__ . '/../../img/sample-image.jpg',
 			];
 		} else {
 			$file = $this->getUploadedFile();
 		}
 		$fileName = $file['name'];
 		// get shares for current card
@@ -124,18 +124,15 @@ class FullTextSearchService {
 	/**
 	 * @param int $cardId
 	 *
 	 * @return Board
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
 	 */
 	public function getBoardFromCardId(int $cardId): Board {
-		$boardId = (int)$this->cardMapper->findBoardId($cardId);
+		$boardId = $this->cardMapper->findBoardId($cardId);
-		/** @var Board $board */
+		if ($boardId === null) {
-		$board = $this->boardMapper->find($boardId);
+			throw new DoesNotExistException("Board '$cardId' does not exist");
-
+		}
-		return $board;
+		return $this->boardMapper->find($boardId);
 	}
@@ -145,7 +142,7 @@ class FullTextSearchService {
 	 * @return Card[]
 	 */
 	private function getCardsFromStack(int $stackId): array {
-		return $this->cardMapper->findAll($stackId, null, null);
+		return $this->cardMapper->findAll($stackId);
 	}
@@ -155,7 +152,7 @@ class FullTextSearchService {
 	 * @return Stack[]
 	 */
 	private function getStacksFromBoard(int $boardId): array {
-		return $this->stackMapper->findAll($boardId, null, null);
+		return $this->stackMapper->findAll($boardId);
 	}
@@ -165,6 +162,6 @@ class FullTextSearchService {
 	 * @return Board[]
 	 */
 	private function getBoardsFromUser(string $userId): array {
-		return $this->boardMapper->findAllByUser($userId, null, null, null);
+		return $this->boardMapper->findAllByUser($userId);
 	}
 }
@@ -19,29 +19,25 @@ use OCP\Comments\IComment;
 abstract class ABoardImportService {
 	/** @var string */
 	public static $name = '';
-	/** @var BoardImportService */
+	private BoardImportService $boardImportService;
-	private $boardImportService;
+	protected bool $needValidateData = true;
 	/** @var bool */
 	protected $needValidateData = true;
 	/** @var Stack[] */
-	protected $stacks = [];
+	protected array $stacks = [];
 	/** @var Label[] */
-	protected $labels = [];
+	protected array $labels = [];
 	/** @var Card[] */
-	protected $cards = [];
+	protected array $cards = [];
 	/** @var Acl[] */
-	protected $acls = [];
+	protected array $acls = [];
 	/** @var IComment[][] */
-	protected $comments = [];
+	protected array $comments = [];
 	/** @var Assignment[] */
-	protected $assignments = [];
+	protected array $assignments = [];
-	/** @var string[][] */
+	/** @var int[][] */
-	protected $labelCardAssignments = [];
+	protected array $labelCardAssignments = [];
 	/**
 	 * Configure import service
 	 *
 	 * @return void
 	 */
 	abstract public function bootstrap(): void;
@@ -68,10 +64,13 @@ abstract class ABoardImportService {
 	abstract public function getCardAssignments(): array;
 	/**
 	 * @return array<int, array<int, int>>
 	 */
 	abstract public function getCardLabelAssignment(): array;
 	/**
-	 * @return IComment[][]|array
+	 * @return array<int, array<string, IComment>>
 	 */
 	abstract public function getComments(): array;
@@ -98,16 +97,16 @@ abstract class ABoardImportService {
 		$this->acls[$code] = $acl;
 	}
-	public function updateComment(string $cardId, string $commentId, IComment $comment): void {
+	public function updateComment(int $cardId, string $commentId, IComment $comment): void {
 		$this->comments[$cardId][$commentId] = $comment;
 	}
-	public function updateCardAssignment(string $cardId, string $assignmentId, Entity $assignment): void {
+	public function updateCardAssignment(int $cardId, int $assignmentId, Entity $assignment): void {
 		$this->assignments[$cardId][$assignmentId] = $assignment;
 	}
-	public function updateCardLabelsAssignment(string $cardId, string $assignmentId, string $assignment): void {
+	public function updateCardLabelsAssignment(int $cardId, int $assignmentId, int $labelId): void {
-		$this->labelCardAssignments[$cardId][$assignmentId] = $assignment;
+		$this->labelCardAssignments[$cardId][$assignmentId] = $labelId;
 	}
 	public function setImportService(BoardImportService $service): void {
@@ -209,14 +209,15 @@ class BoardImportService {
 	public function importBoard(): void {
 		$board = $this->getImportSystem()->getBoard();
 		if ($board === null) {
 			throw new \LogicException('Import board not found');
 		}
 		if (!$this->userManager->userExists($board->getOwner())) {
 			throw new \Exception('Target owner ' . $board->getOwner() . ' not found. Please provide a mapping through the import config.');
 		}
-		if ($board) {
+		$this->boardMapper->insert($board);
-			$this->boardMapper->insert($board);
+		$this->board = $board;
 			$this->board = $board;
 		}
 	}
 	public function getBoard(bool $reset = false): Board {
@@ -292,12 +293,7 @@ class BoardImportService {
 		}
 	}
-	/**
+	public function assignCardToLabel(int $cardId, int $labelId): self {
 	 * @param mixed $cardId
 	 * @param mixed $labelId
 	 * @return self
 	 */
 	public function assignCardToLabel($cardId, $labelId): self {
 		$this->cardMapper->assignLabel(
 			$cardId,
 			$labelId
@@ -307,14 +303,14 @@ class BoardImportService {
 	public function assignCardsToLabels(): void {
 		$data = $this->getImportSystem()->getCardLabelAssignment();
-		foreach ($data as $cardId => $assignemnt) {
+		foreach ($data as $cardId => $assignment) {
-			foreach ($assignemnt as $assignmentId => $labelId) {
+			foreach ($assignment as $assignmentId => $labelId) {
 				try {
 					$this->assignCardToLabel(
-						$cardId,
+						(int)$cardId,
 						$labelId
 					);
-					$this->getImportSystem()->updateCardLabelsAssignment($cardId, $assignmentId, $labelId);
+					$this->getImportSystem()->updateCardLabelsAssignment((int)$cardId, (int)$assignmentId, $labelId);
 				} catch (\Exception $e) {
 					$this->addError('Failed to assign label ' . $labelId . ' to ' . $cardId, $e);
 				}
@@ -326,20 +322,20 @@ class BoardImportService {
 		$allComments = $this->getImportSystem()->getComments();
 		foreach ($allComments as $cardId => $comments) {
 			foreach ($comments as $commentId => $comment) {
-				$this->insertComment($cardId, $comment);
+				$this->insertComment((int)$cardId, $comment);
-				$this->getImportSystem()->updateComment($cardId, $commentId, $comment);
+				$this->getImportSystem()->updateComment((int)$cardId, $commentId, $comment);
 			}
 		}
 	}
-	private function insertComment(string $cardId, IComment $comment): void {
+	private function insertComment(int $cardId, IComment $comment): void {
-		$comment->setObject('deckCard', $cardId);
+		$comment->setObject('deckCard', (string)$cardId);
 		$comment->setVerb('comment');
 		// Check if parent is a comment on the same card
 		if ($comment->getParentId() !== '0') {
 			try {
 				$parent = $this->commentsManager->get($comment->getParentId());
-				if ($parent->getObjectType() !== Application::COMMENT_ENTITY_TYPE || $parent->getObjectId() !== $cardId) {
+				if ($parent->getObjectType() !== Application::COMMENT_ENTITY_TYPE || (int)$parent->getObjectId() !== $cardId) {
 					throw new CommentNotFoundException();
 				}
 			} catch (CommentNotFoundException $e) {
@@ -362,7 +358,7 @@ class BoardImportService {
 			foreach ($assignments as $assignment) {
 				try {
 					$assignment = $this->assignmentMapper->insert($assignment);
-					$this->getImportSystem()->updateCardAssignment($cardId, (string)$assignment->getId(), $assignment);
+					$this->getImportSystem()->updateCardAssignment((int)$cardId, $assignment->getId(), $assignment);
 					$this->addOutput('Assignment ' . $assignment->getParticipant() . ' added');
 				} catch (NotFoundException $e) {
 					$this->addError('No origin or mapping found for card "' . $cardId . '" and ' . $assignment->getTypeString() . ' assignment "' . $assignment->getParticipant(), $e);
@@ -16,6 +16,7 @@ use OCA\Deck\Db\Card;
 use OCA\Deck\Db\Label;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Service\Importer\ABoardImportService;
 use OCP\Comments\IComment;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -118,6 +119,7 @@ class DeckJsonService extends ABoardImportService {
 				$comments[$this->cards[$sourceCard->id]->getId()][$commentOriginal->id] = $comment;
 			}
 		}
 		/** @var array<int, array<string, IComment>> */
 		return $comments;
 	}
@@ -17,7 +17,7 @@ use Psr\Log\LoggerInterface;
 class TrelloApiService extends TrelloJsonService {
 	/** @var string */
 	public static $name = 'Trello API';
-	protected $needValidateData = false;
+	protected bool $needValidateData = false;
 	/** @var IClient */
 	private $httpClient;
 	/** @var LoggerInterface */
@@ -176,7 +176,7 @@ class TrelloApiService extends TrelloJsonService {
 		if (empty($queryString['limit'])) {
 			return [];
 		}
-		if (count($data) < $queryString['limit']) {
+		if ((count($data) < $queryString['limit']) || (count($data) === 0)) {
 			return [];
 		}
 		$queryString['before'] = end($data)->id;
--- a/Show More
+++ b/Show More
		`@@ -1,2 +0,0 @@`
			`# App maintainers`
			`* @luka-nextcloud @grnd-alt @elzody`