From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 9 Mar 2022 14:21:21 +0000 (+0100)
Subject: Merge branch '5.3' into 5.4
X-Git-Tag: 5.4.15_dev_1~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10f872c56e7403cc5d16da0a580c58377272f4ba;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Merge branch '5.3' into 5.4
---

10f872c56e7403cc5d16da0a580c58377272f4ba
diff --cc .github/workflows/codestyle.yml
index 471e07e,a0a49de..53ac290
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@@ -9,57 -8,9 +9,57 @@@ on
  
  jobs:
    php:
 -    name: PHP CodeSniffer
 +    name: PHP
      runs-on: ubuntu-latest
      steps:
-     - uses: actions/checkout@v2
+     - uses: actions/checkout@v3
 -    - run: git clone --branch=5.2 --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF
 -    - uses: chekalsky/phpcs-action@e269c2f264f400adcda7c6b24c8550302350d495
 +    - name: phpcs
 +      uses: chekalsky/phpcs-action@e269c2f264f400adcda7c6b24c8550302350d495
 +    - name: Setup PHP with tools
 +      uses: shivammathur/setup-php@v2
 +      with:
 +        php-version: '8.0'
 +        extensions: ctype, dom, exif, gd, gmp, hash, intl, json, libxml, mbstring, opcache, pcre, pdo, pdo_mysql, zlib
 +        tools: php-cs-fixer:2.19.0
 +    - name: php-cs-fixer
 +      run: php-cs-fixer fix --dry-run --diff-format udiff
 +  ts:
 +    name: TS Prettier
 +    runs-on: ubuntu-latest
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - name: Run prettier
 +      run: |
 +        shopt -s globstar
 +        npx prettier -w ts/**/*.ts
 +    - run: echo "::add-matcher::.github/diff.json"
 +    - name: Show diff
 +      run: |
 +        git checkout -- package-lock.json
 +        git diff --exit-code
 +  scss:
 +    name: SCSS Prettier
 +    runs-on: ubuntu-latest
 +    steps:
-       - uses: actions/checkout@v2
++      - uses: actions/checkout@v3
 +      - name: Set up node.js
 +        uses: actions/setup-node@v2
 +        with:
 +          node-version: "16"
 +          cache: "npm"
 +      - run: npm install
 +      - name: Run prettier
 +        run: |
 +          shopt -s globstar
 +          npx prettier -w files/style/*.scss
 +      - run: echo "::add-matcher::.github/diff.json"
 +      - name: Show diff
 +        run: |
 +          git checkout -- package-lock.json
 +          git diff --exit-code
diff --cc .github/workflows/javascript.yml
index 7d0cdfb,bd4a68f..4b0925d
--- a/.github/workflows/javascript.yml
+++ b/.github/workflows/javascript.yml
@@@ -16,11 -15,11 +16,11 @@@ jobs
      strategy:
        fail-fast: false
      steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
      - name: Set up node.js
 -      uses: actions/setup-node@v1
 +      uses: actions/setup-node@v2
        with:
 -        node-version: "12"
 -    - uses: actions/checkout@v3
 +        node-version: "16"
      - run: echo "::add-matcher::.github/javascript-syntax.json"
      - name: Remove files to be ignored
        run: |
diff --cc .github/workflows/typescript.yml
index 286dee9,0000000..77ef322
mode 100644,000000..100644
--- a/.github/workflows/typescript.yml
+++ b/.github/workflows/typescript.yml
@@@ -1,58 -1,0 +1,58 @@@
 +name: TypeScript
 +
 +on:
 +  push:
 +    branches:
 +    - "5.4"
 +    - master
 +  pull_request:
 +
 +jobs:
 +  tsc:
 +    name: "TSC"
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx tsc --noEmit
 +  eslint:
 +    name: "eslint"
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx eslint .
 +  javascript_sync:
 +    name: "Check for outdated JavaScript"
 +    needs: tsc
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx tsc
 +    - run: echo "::add-matcher::.github/diff.json"
 +    - name: Show diff
 +      run: |
 +        git checkout -- package-lock.json
 +        git diff --exit-code