Merge remote-tracking branch 'origin/main' into chore/update-feature-outbox

Author: ChristophWurst

.github/ISSUE_TEMPLATE/bug_report_form.yml

@@ -1,94 +1,94 @@
 name: "Bug"
 description: "Have you encountered a bug? Submit a report and help us improve Nextcloud Mail"
-labels: ["bug", "0. Needs triage"]
+labels: ["bug", "0. to triage"]
 body:
-    - type: textarea
-      id: Expected-behavior
-      attributes:
-          label: Expected behavior
-          description: |
-              Tell us what should happen
-      validations:
-          required: true
-    - type: textarea
-      id: actual-behavior
-      attributes:
-          label: Actual behavior
-          description: Describe what you expected to happen instead.
-      validations:
-          required: true
-    - type: textarea
-      id: reproduce
-      attributes:
-          label: Steps to reproduce
-          description: |
-              Describe the steps to reproduce the bug.
-              The better your description is _(go 'here', click 'there'...)_ the fastest you'll get an _(accurate)_ answer.
-          value: |
-              1.
-              2.
-              3.
-      validations:
-          required: true
-    - type: input
-      id: mail-app-version
-      attributes:
-          label: Mail app version
-          description: |
-              See apps admin page, e.g. 0.5.3
-    - type: input
-      id: mail-server-service
-      attributes:
-          label: Mailserver or service
-          description: |
-              e.g. Outlook, Yahoo, Gmail, Exchange...
-    - type: input
-      id: system
-      attributes:
-          label: Operating system
-          description: |
-              Write down the operating system where Nextcloud Mail app is installed.
-    - type: dropdown
-      id: php
-      attributes:
-          label: PHP engine version
-          description: |
-              Select PHP engine version serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "PHP 7.3"
-              - "PHP 7.4"
-              - "PHP 8.0"
-              - "PHP 8.1"
-              - "Other"
-    - type: dropdown
-      id: webserver
-      attributes:
-          label: Web server
-          description: |
-              Select Webserver serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "Apache (supported)"
-              - "Nginx"
-              - "Lighttpd"
-              - "Other"
-    - type: dropdown
-      id: database
-      attributes:
-          label: Database
-          description: |
-              Select Database engine serving Nextcloud Server.
-              _Describe in the "Additional info" section if you chose "Other"._
-          options:
-              - "MySQL"
-              - "MariaDB"
-              - "PostgreSQL"
-              - "SQLite"
-              - "Oracle"
-              - "Other"
-    - type: textarea
-      id: additional-info
-      attributes:
-          label: Additional info
-          description: Any additional information related to the issue (ex. browser console errors, software versions).
+- type: textarea
+  id: reproduce
+  attributes:
+      label: Steps to reproduce
+      description: |
+          Describe the steps to reproduce the bug.
+          The better your description is _(go 'here', click 'there'...)_ the fastest you'll get an _(accurate)_ answer.
+      value: |
+          1.
+          2.
+          3.
+  validations:
+      required: true
+- type: textarea
+  id: Expected-behavior
+  attributes:
+      label: Expected behavior
+      description: |
+          Tell us what should happen
+  validations:
+      required: true
+- type: textarea
+  id: actual-behavior
+  attributes:
+      label: Actual behavior
+      description: Tell us what happens instead
+  validations:
+      required: true
+- type: input
+  id: mail-app-version
+  attributes:
+      label: Mail app version
+      description: |
+          See apps admin page, e.g. 0.5.3
+- type: input
+  id: mail-server-service
+  attributes:
+      label: Mailserver or service
+      description: |
+          e.g. Outlook, Yahoo, Gmail, Exchange...
+- type: input
+  id: system
+  attributes:
+      label: Operating system
+      description: |
+          Write down the operating system where Nextcloud Mail app is installed.
+- type: dropdown
+  id: php
+  attributes:
+      label: PHP engine version
+      description: |
+          Select PHP engine version serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "PHP 7.3"
+          - "PHP 7.4"
+          - "PHP 8.0"
+          - "PHP 8.1"
+          - "Other"
+- type: dropdown
+  id: webserver
+  attributes:
+      label: Web server
+      description: |
+          Select Webserver serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "Apache (supported)"
+          - "Nginx"
+          - "Lighttpd"
+          - "Other"
+- type: dropdown
+  id: database
+  attributes:
+      label: Database
+      description: |
+          Select Database engine serving Nextcloud Server.
+          _Describe in the "Additional info" section if you chose "Other"._
+      options:
+          - "MySQL"
+          - "MariaDB"
+          - "PostgreSQL"
+          - "SQLite"
+          - "Oracle"
+          - "Other"
+- type: textarea
+  id: additional-info
+  attributes:
+      label: Additional info
+      description: Any additional information related to the issue (ex. browser console errors, software versions).

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,28 @@
+name: "Feature request"
+description: "You have a neat idea that should be implemented?"
+labels: ["enhancement", "0. to triage"]
+body:
+  - type: textarea
+    id: description-problem
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: |
+          A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  - type: textarea
+    id: description-solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+          A clear and concise description of what you want to happen.
+  - type: textarea
+    id: description-alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+          A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+          Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -27,7 +27,7 @@ jobs:
           echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ${{ env.APP_NAME }}
 
@@ -51,7 +51,7 @@ jobs:
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -107,7 +107,7 @@ jobs:
           unzip latest-$NCVERSION.zip
 
       - name: Checkout server master fallback
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         if: ${{ steps.server-checkout.outcome != 'success' }}
         with:
           repository: nextcloud/server

.github/workflows/appstore-build-publish.yml

@@ -1,13 +1,20 @@
-on: pull_request
+# 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
 
 name: Pull request checks
 
+on: pull_request
+
 jobs:
   commit-message-check:
     name: Block fixup and squash commits
+
     runs-on: ubuntu-latest
+
     steps:
       - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@main
+        uses: xt0rted/block-autosquash-commits-action@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/fixup.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Download schema
       run: wget https://apps.nextcloud.com/schema/apps/info.xsd
     - name: Lint info.xml
@@ -23,7 +23,7 @@ jobs:
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Set up php${{ matrix.php-versions }}
       uses: shivammathur/setup-php@master
       with:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Set up php
       uses: shivammathur/setup-php@master
       with:
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     name: ESLint
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: Set up Node
-      uses: actions/setup-node@v2.5.0
+      uses: actions/setup-node@v3
       with:
         node-version: 14.x
     - name: npm install

.github/workflows/lint.yml

@@ -13,9 +13,9 @@ jobs:
     name: Build release tarball
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
       - name: Set up Node
-        uses: actions/setup-node@v2.5.0
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
       - name: Set up php$

.github/workflows/package.yml

@@ -16,7 +16,7 @@ jobs:
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
-            uses: actions/checkout@master
+            uses: actions/checkout@v3
           - name: Set up php
             uses: shivammathur/setup-php@master
             with:
@@ -25,7 +25,11 @@ jobs:
                 coverage: none
           - name: Install dependencies
             run: composer i
-          - name: Install dependencies
+          - name: Install OCP package
+            if: ${{ matrix.ocp-version != 'dev-master' }}
             run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
+          - name: Install OCP package
+            if: ${{ matrix.ocp-version == 'dev-master' }}
+            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-reqs
           - name: Run coding standards check
             run: composer run psalm