[Vue Rewrite] Upmerge Release 22 into Vue Rewrite Branch

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+
+* Resolves: # <!-- related github issue -->
+
+## Summary
+
+<!-- your text -->
+
+## Checklist
+
+- Code is [properly formatted](https://nextcloud.github.io/news/developer/#coding-style-guidelines)
+- [Sign-off message](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md) is added to all commits
+- Changelog entry added for all important changes.

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

@@ -28,23 +28,19 @@ jobs:
           - 5432:5432 # Maps tcp port 5432 on service container to the host
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
-        nextcloud: ['stable23', 'stable24', 'stable25']
+        php-versions: ['8.0', '8.1']
+        nextcloud: ['stable27']
         database: ['sqlite', 'pgsql', 'mysql']
         experimental: [false]
         include:
-          - php-versions: '8.0'
+          - php-versions: 8.1
             nextcloud: pre-release
             database: sqlite
             experimental: true
-          - php-versions: '8.2'
+          - php-versions: 8.2
             nextcloud: pre-release
             database: sqlite
             experimental: true
-          - php-versions: 8.1
-            nextcloud: stable25
-            database: sqlite
-            experimental: false
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -126,9 +122,6 @@ jobs:
           kill %1
           kill %2
 
-      - name: Setup problem matchers for PHP
-        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-
       - name: Functional tests maintenance
         working-directory: ../server
         run: |

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

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

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

@@ -10,16 +10,10 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        nextcloud: ['stable25']
+        nextcloud: ['stable27']
         database: ['sqlite']
         experimental: [false]
         codecoverage: [false]
-        include:
-          - php-versions: 8.0
-            nextcloud: stable24
-            database: sqlite
-            experimental: false
-            codecoverage: true
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -50,9 +44,6 @@ jobs:
           app: 'news'
           check-code: false
 
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Prep PHP tests
         working-directory: ../server/apps/news
         run: make php-test-dependencies

.github/workflows/build-release.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        nextcloud: ['stable25']
+        nextcloud: ['stable27']
         database: ['sqlite']
     steps:
       - name: Checkout
@@ -29,7 +29,7 @@ jobs:
           coverage: none
 
       - name: Set up server non MySQL
-        uses: SMillerDev/nextcloud-actions/setup-nextcloud@fae87e29aa7cdf1ea0b8033c67f60e75b10be2cd
+        uses: SMillerDev/nextcloud-actions/setup-nextcloud@main
         with:
           cron: false
           version: ${{ matrix.nextcloud }}
@@ -39,7 +39,7 @@ jobs:
         run: make
 
       - name: Configure server with app
-        uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@fae87e29aa7cdf1ea0b8033c67f60e75b10be2cd
+        uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main
         with:
           app: ${{ env.APP_NAME }}
           check-code: false
@@ -52,7 +52,7 @@ jobs:
           app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}
 
       - name: Upload app tarball to release
-        uses: svenstaro/upload-release-action@133984371c30d34e38222a64855679a414cb7575
+        uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/frontend-nodejs-tests.yml

@@ -4,13 +4,13 @@ on:
 
 jobs:
   php:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     continue-on-error: ${{ matrix.experimental }}
     name: "Frontend: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
     strategy:
       matrix:
         php-versions: ['8.1']
-        nextcloud: ['stable24']
+        nextcloud: ['stable27']
         database: ['sqlite']
         experimental: [false]
     steps:

.github/workflows/lint-eslint.yml

@@ -25,10 +25,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.2
+        uses: skjnldsv/read-package-engines-version-actions@v2.2
         id: versions
         with:
-          fallbackNode: '^12'
+          fallbackNode: '^16'
           fallbackNpm: '^6'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}

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

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

.github/workflows/updater-test.yml

@@ -0,0 +1,80 @@
+name: Updater Tests
+on:
+  pull_request
+
+env:
+  POSTGRES_PASSWORD: nc_test_db
+  MYSQL_USER: nc_test
+  MYSQL_PASSWORD: nc_test_db
+  MYSQL_DATABASE: nc_test
+  MYSQL_PORT: 3800
+
+jobs:
+  integration:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    name: "Update Test: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }}"
+    strategy:
+      matrix:
+        php-versions: ['8.1']
+        nextcloud: ['stable27']
+        database: ['sqlite']
+        experimental: [false]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: pdo_sqlite,pdo_mysql,pdo_pgsql,gd,zip
+          coverage: none
+
+      - name: Setup BATS & httpie
+        run: sudo apt-get install -y httpie && npm install -g [email protected]
+
+      - name: Set up server
+        uses: SMillerDev/nextcloud-actions/setup-nextcloud@main
+        with:
+          version: ${{ matrix.nextcloud }}
+          cron: true
+          database-type: ${{ matrix.database }}
+          database-host: localhost
+          database-port: 5432
+          database-name: postgres
+          database-user: postgres
+          database-password: ${{ env.POSTGRES_PASSWORD }}
+
+      - name: Prime app build
+        run: make
+
+      - name: Configure server with app
+        uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main
+        with:
+          app: 'news'
+          check-code: false
+          force: ${{ matrix.experimental }}
+
+      - name: Install composer install php-feed-generator
+        working-directory: ../server
+        run: composer install -d apps/news/tests/test_helper/php-feed-generator
+
+      - name: Run Updater 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/updater
+
+          # Kill php server
+          kill %1
+          kill %2
+

.gitignore

@@ -16,6 +16,9 @@ tests/api/helpers/settings-override.bash
 
 #bats
 tests/api/helpers/settings-override.bash
+tests/test_helper/feeds/test.xml
+tests/test_helper/feeds/feed1.xml
+tests/test_helper/feeds/feed2.xml
 
 # python
 PKG-INFO
@@ -72,3 +75,6 @@ nbproject
 # Mac OS
 .DS_Store
 *.iml
+
+# VS Code
+.vscode

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "tests/test_helper/bats-assert"]
 	path = tests/test_helper/bats-assert
 	url = https://github.com/bats-core/bats-assert.git
+[submodule "tests/test_helper/php-feed-generator"]
+	path = tests/test_helper/php-feed-generator
+	url = https://github.com/Grotax/php-feed-generator.git

AUTHORS.md

@@ -50,11 +50,14 @@
 * [Daniel Kesselberg](mailto:[email protected])
 * [ELHADDAD Hamza](mailto:[email protected])
 * [Jakob Sack](mailto:[email protected])
+* [ManuelSailer](mailto:[email protected])
 * [Qingping Hou](mailto:[email protected])
 * [Roman](mailto:[email protected])
 * [b_b](mailto:[email protected])
+* [chylex](mailto:[email protected])
 * [heyarne](mailto:[email protected])
 * [[email protected]](mailto:[email protected])
+* [Anderson Silva](mailto:[email protected])
 * [Andreas Fischer](mailto:[email protected])
 * [David Guillot](mailto:[email protected])
 * [Gioele Falcetti](mailto:[email protected])
@@ -66,13 +69,13 @@
 * [Konrad Graefe](mailto:[email protected])
 * [Loki3000](mailto:[email protected])
 * [Maik Kulbe](mailto:[email protected])
+* [Manuel Sailer](mailto:[email protected])
 * [Michael Gapczynski](mailto:[email protected])
 * [Nikita Chernyi](mailto:[email protected])
 * [Peter Hedlund](mailto:[email protected])
 * [Simon Spannagel](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])
@@ -85,7 +88,6 @@
 * [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])
@@ -107,6 +109,7 @@
 * [Colin W](mailto:[email protected])
 * [Daniel Aleksandersen](mailto:[email protected])
 * [Daniel S](mailto:[email protected])
+* [Daniel Starzmann](mailto:[email protected])
 * [David Baucum](mailto:[email protected])
 * [David Engster](mailto:[email protected])
 * [Dennis Müller](mailto:[email protected])
@@ -129,6 +132,7 @@
 * [Hendrik Leppelsack](mailto:[email protected])
 * [Jasper Knockaert](mailto:[email protected])
 * [Kevin Decherf](mailto:[email protected])
+* [Kuba Orlik](mailto:[email protected])
 * [Maceček Richard](mailto:[email protected])
 * [Marc Cousin](mailto:[email protected])
 * [Martin Ferretti](mailto:[email protected])
@@ -148,6 +152,7 @@
 * [Piotr Dobrowolski](mailto:[email protected])
 * [Raspbeguy](mailto:[email protected])
 * [René Henrich](mailto:[email protected])
+* [Robert Wunderer](mailto:[email protected])
 * [Rodrigo Aguilera](mailto:[email protected])
 * [Roeland Jago Douma](mailto:[email protected])
 * [Simon](mailto:[email protected])