[Vue Rewrite] Upmerge Recent Changes

.editorconfig

@@ -5,7 +5,7 @@ trim_trailing_whitespace = true
 end_of_line = lf
 insert_final_newline = true
 
-[*.{php,html}]
+[*.{php,html,css}]
 indent_style = space
 indent_size = 4
 charset = utf-8

.github/dependabot.yml

@@ -13,6 +13,7 @@ updates:
     labels:
       - "dependencies"
       - "Skip-Changelog"
+    versioning-strategy: increase
 
   # Maintain dependencies for Composer
   - package-ecosystem: "composer"
@@ -22,6 +23,7 @@ updates:
     labels:
       - "dependencies"
       - "Skip-Changelog"
+    versioning-strategy: increase
 
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"

.github/workflows/api-integration-tests.yml

@@ -16,7 +16,7 @@ jobs:
     name: "Integration: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
     services:
       postgres:
-        image: postgres
+        image: postgres:14
         env:
           POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
         options: >-
@@ -29,25 +29,27 @@ jobs:
     strategy:
       matrix:
         php-versions: ['7.4', '8.0']
-        nextcloud: ['stable22', 'stable23']
+        nextcloud: ['stable23', 'stable24', 'stable25']
         database: ['sqlite', 'pgsql', 'mysql']
         experimental: [false]
         include:
-          - php-versions: 8.0
+          - php-versions: '8.0'
             nextcloud: pre-release
             database: sqlite
             experimental: true
-          - php-versions: 8.1
+          - php-versions: '8.2'
             nextcloud: pre-release
             database: sqlite
             experimental: true
           - php-versions: 8.1
-            nextcloud: stable24
+            nextcloud: stable25
             database: sqlite
             experimental: false
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -56,8 +58,8 @@ jobs:
           extensions: pdo_sqlite,pdo_mysql,pdo_pgsql,gd,zip
           coverage: none
 
-      - name: Setup BATS
-        uses: mig4/setup-bats@v1.2.0
+      - name: Setup BATS & httpie
+        run: sudo apt-get install -y httpie && npm install -g bats@1.7.0
 
       ### MySQL specific setup
       - name: Setup mysql
@@ -108,6 +110,22 @@ jobs:
           check-code: false
           force: ${{ matrix.experimental }}
 
+      - name: Run API tests
+        working-directory: ../server
+        run: |
+          php -S localhost:8080 &> /tmp/webserver.log &
+          cd apps/news/tests/test_helper/feeds && php -S localhost:8090 &> /tmp/feedserver.log &
+
+          sleep 2
+
+          cd ${{ github.workspace }}/../server
+
+          bats apps/news/tests/api
+
+          # Kill php server
+          kill %1
+          kill %2
+
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
@@ -118,7 +136,16 @@ jobs:
 
       - name: Functional tests
         working-directory: ../server
-        run: bats apps/news/tests/integration
+        run: |
+          cd apps/news/tests/test_helper/feeds && php -S localhost:8090 &> /tmp/feedserver.log &
+
+          sleep 2
+
+          cd ${{ github.workspace }}/../server
+
+          bats apps/news/tests/command
+
+          kill %1
 
       - name: Prep PHP tests
         working-directory: ../server/apps/news
@@ -127,3 +154,4 @@ jobs:
       - name: Feed tests
         working-directory: ../server/apps/news
         run: make feed-test
+

.github/workflows/api-php-static-code-check.yml

@@ -7,15 +7,11 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        php-versions: [ '7.4', '8.0' ]
-        nextcloud: [ 'stable24' ]
+        php-versions: [ '7.4', '8.0', '8.1' ]
+        nextcloud: [ 'stable25' ]
         database: [ 'sqlite' ]
         include:
-          - php-versions: 8.1
-            nextcloud: stable24
-            database: sqlite
-            experimental: false
-          - php-versions: 8.1
+          - php-versions: '8.2'
             nextcloud: pre-release
             database: sqlite
             experimental: true

.github/workflows/api-php-tests.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        nextcloud: ['stable24']
+        nextcloud: ['stable25']
         database: ['sqlite']
         experimental: [false]
         codecoverage: [false]

.github/workflows/build-release.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        nextcloud: ['stable24']
+        nextcloud: ['stable25']
         database: ['sqlite']
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
           app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}
 
       - name: Upload app tarball to release
-        uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
+        uses: svenstaro/upload-release-action@133984371c30d34e38222a64855679a414cb7575
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint-eslint.yml

@@ -0,0 +1,46 @@
+# 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: Lint
+
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency: 
+  group: lint-eslint-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: eslint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Read package.json node and npm engines version
+        uses: skjnldsv/[email protected]
+        id: versions
+        with:
+          fallbackNode: '^12'
+          fallbackNpm: '^6'
+
+      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@v3
+        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
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint

.github/workflows/post-merge-tasks.yml

@@ -10,7 +10,7 @@ jobs:
     name: "Coverage: Nextcloud PHP ${{ matrix.php-versions }}"
     strategy:
       matrix:
-        nextcloud: ['stable24']
+        nextcloud: ['stable25']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.gitignore

@@ -11,6 +11,9 @@ js/
 site/
 coverage
 
+#bats
+tests/api/helpers/settings-override.bash
+
 # python
 PKG-INFO
 *pyc

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "tests/test_helper/bats-support"]
+	path = tests/test_helper/bats-support
+	url = https://github.com/bats-core/bats-support.git
+[submodule "tests/test_helper/bats-assert"]
+	path = tests/test_helper/bats-assert
+	url = https://github.com/bats-core/bats-assert.git

.tx/config

@@ -1,10 +1,10 @@
 [main]
-host = https://www.transifex.com
-lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
+host     = https://www.transifex.com
+lang_map = sk_SK: sk, th_TH: th, ja_JP: ja, bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb
 
-[nextcloud.news]
+[o:nextcloud:p:nextcloud:r:news]
 file_filter = translationfiles/<lang>/news.po
 source_file = translationfiles/templates/news.pot
 source_lang = en
-type = PO
+type        = PO
 

AUTHORS.md

@@ -1,18 +1,18 @@
 # Authors
 * [Bernhard Posselt](mailto:[email protected])
-* [Alessandro Cosentino](mailto:[email protected])
 * [Benjamin Brahmer](mailto:[email protected])
+* [Alessandro Cosentino](mailto:[email protected])
 * [Marco Nassabain](mailto:[email protected])
 * [Robin Appelman](mailto:[email protected])
 * [Sean Molenaar](mailto:[email protected])
 * [Gregor Tätzner](mailto:[email protected])
 * [Sean Molenaar](mailto:[email protected])
 * [anoy](mailto:[email protected])
 * [Morris Jobke](mailto:[email protected])
+* [Paul Tirk](mailto:[email protected])
 * [Jimmy Huynh](mailto:[email protected])
 * [Aurélien](mailto:[email protected])
 * [Jan-Christoph Borchardt](mailto:[email protected])
-* [Paul Tirk](mailto:[email protected])
 * [Daniel Schaal](mailto:[email protected])
 * [Davide Saurino](mailto:[email protected])
 * [raghunayyar](mailto:[email protected])
@@ -30,6 +30,7 @@
 * [Koen Martens](mailto:[email protected])
 * [Lukas Reschke](mailto:[email protected])
 * [Tucker McKnight](mailto:[email protected])
+* [Valdnet](mailto:[email protected])
 * [Bart Visscher](mailto:[email protected])
 * [Christian Elmer](mailto:[email protected])
 * [Nicolas Wendling](mailto:[email protected])
@@ -68,19 +69,22 @@
 * [Nikita Chernyi](mailto:[email protected])
 * [Peter Hedlund](mailto:[email protected])
 * [Simon Spannagel](mailto:[email protected])
-* [Valdnet](mailto:[email protected])
 * [bbBowser](mailto:[email protected])
 * [benediktb](mailto:[email protected])
+* [chylex](mailto:[email protected])
 * [coderkun](mailto:[email protected])
 * [davidak](mailto:[email protected])
 * [hooger](mailto:[email protected])
 * [lsmooth](mailto:[email protected])
 * [s17t.net](mailto:[email protected])
+* [Accalia](mailto:[email protected])
+* [Accalia Elementia](mailto:[email protected])
 * [Alec Kojaev](mailto:[email protected])
 * [Alessandro](mailto:[email protected])
 * [Alexander Grüßung](mailto:[email protected])
 * [Allan Nordhøy](mailto:[email protected])
 * [Alwaysin](mailto:[email protected])
+* [Anderson Silva](mailto:[email protected])
 * [Andrea Boero](mailto:[email protected])
 * [Andreas Demmelbauer](mailto:[email protected])
 * [Artem Lavrukhin](mailto:[email protected])
@@ -89,7 +93,9 @@
 * [Aurelien DAVID](mailto:[email protected])
 * [Benedikt Geißler](mailto:[email protected])
 * [Bernhard Posselt](mailto:[email protected])
+* [Björn Bidar](mailto:[email protected])
 * [Candid Dauth](mailto:[email protected])
+* [Carl Schwan](mailto:[email protected])
 * [Carlos Silva](mailto:[email protected])
 * [Cesar Enrique Garcia Dabo](mailto:[email protected])
 * [Chris Aumann](mailto:[email protected])
@@ -127,6 +133,7 @@
 * [Martin Ferretti](mailto:[email protected])
 * [Matthias](mailto:[email protected])
 * [Matthias Blümel](mailto:[email protected])
+* [Michael Chang](mailto:[email protected])
 * [Michael Grosser](mailto:[email protected])
 * [Michael Hamann](mailto:[email protected])
 * [Michael Holley](mailto:[email protected])
@@ -175,6 +182,7 @@
 * [markusj](mailto:[email protected])
 * [mnassabain](mailto:[email protected])
 * [mormegil](mailto:[email protected])
+* [nextcloud486153](mailto:[email protected])
 * [nexus-uw](mailto:[email protected])
 * [repat](mailto:[email protected])
 * [ritchiewilson](mailto:[email protected])