Skip to content

Commit

Permalink
Merge remote-tracking branch 'nextcloud/master' into master-merge
Browse files Browse the repository at this point in the history
Signed-off-by: Devlin Junker <[email protected]>
  • Loading branch information
devlinjunker committed Oct 22, 2023
2 parents 94f04d4 + d423ca5 commit 3e35d78
Show file tree
Hide file tree
Showing 53 changed files with 859 additions and 408 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = {
'@nextcloud',
'plugin:@typescript-eslint/recommended',
],
ignorePatterns: ['*.d.ts'],
ignorePatterns: ['*.d.ts', 'l10n/*.js'],
rules: {
'no-console': 'warn',
'@typescript-eslint/no-var-requires': 'off',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
experimental: true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-php-static-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: "phpstan: Nextcloud ${{ matrix.nextcloud }} with ${{ matrix.php-versions }}"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up php
uses: shivammathur/setup-php@master
with:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/api-php-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ jobs:
database: ['sqlite']
experimental: [false]
codecoverage: [false]
include:
- php-versions: 8.2
nextcloud: stable27
database: sqlite
experimental: false
codecoverage: true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2 # https://github.com/codecov/codecov-action/issues/190#issuecomment-790729633

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
database: ['sqlite']
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 #2.26.0
with:
php-version: ${{ matrix.php-versions }}
extensions: pdo_sqlite,pdo_mysql,pdo_pgsql,gd,zip
coverage: none

- name: Set up server non MySQL
uses: SMillerDev/nextcloud-actions/setup-nextcloud@main
uses: SMillerDev/nextcloud-actions/setup-nextcloud@1e38cb369e2193642279c64ee140fc93ddd4fa77
with:
cron: false
version: ${{ matrix.nextcloud }}
Expand All @@ -39,7 +39,7 @@ jobs:
run: make

- name: Configure server with app
uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main
uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@1e38cb369e2193642279c64ee140fc93ddd4fa77
with:
app: ${{ env.APP_NAME }}
check-code: false
Expand All @@ -52,7 +52,7 @@ jobs:
app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}

- name: Upload app tarball to release
uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689
uses: svenstaro/upload-release-action@1beeb572c19a9242f4361f4cee78f8e0d9aec5df
id: attach_to_release
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout master
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-nodejs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
experimental: [false]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Read package.json node and npm engines version
uses: skjnldsv/[email protected]
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/post-merge-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ jobs:
php:
runs-on: ubuntu-latest
continue-on-error: false
name: "Coverage: Nextcloud PHP ${{ matrix.php-versions }}"
name: "Coverage: Nextcloud ${{ matrix.nextcloud }} PHP ${{ matrix.php-version }}"
strategy:
matrix:
nextcloud: ['stable27']
codecoverage: [true]
php-version: ["8.1"]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: ${{ matrix.php-version }}

### Back to normal setup
- name: Set up server non MySQL
Expand All @@ -39,7 +41,11 @@ jobs:

- name: Prep PHP tests
run: cd ../server/apps/news && make php-test-dependencies

- name: Unittests
run: cd ../server/apps/news && make unit-test
env:
CODECOVERAGE: ${{ matrix.codecoverage }}

- name: Upload codecoverage
run: cd ../server/apps/news && bash <(curl -s https://codecov.io/bash) -f build/php-unit.clover
2 changes: 1 addition & 1 deletion .github/workflows/updater-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
experimental: [false]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ coverage

#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

#bats
tests/api/helpers/settings-override.bash
Expand Down
34 changes: 29 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,37 @@ All notable changes to this project will be documented in this file.
The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), older entries don't fully match.

# Unreleased
## [23.x.x]
## [25.x.x]
### Changed
- Vue Rewrite
- Add Typescript
- Add Jest for Unit Tests
# Releases
## [24.x.x]
### Changed
- Set User Agent for curl in Scraper

### Fixed

# Releases
## [24.0.0] - 2023-09-26
No major changes compared to 24.0.0-beta1.

## [24.0.0-beta1] - 2023-08-26
### Changed
- Drop support for Nextcloud 25, Supported: 26, 27 (#2316)
- Add a new command for occ `./occ news:updater:job` allows to check and reset the update job (#2166)
- Check for available http(s) compression options and use them (gzip, deflate, brotli) (#2328)
- Change and unify [cache](https://nextcloud.github.io/news/install/#cache) to use the instance ID of Nextcloud (#2331)

## [23.0.0] - 2023-08-16
No notable changes compared to 23.0.0-beta1

## [23.0.0-beta1] - 2023-08-09
### Changed
- Drop support for PHP 7.4 new min. version is php 8.0 (#2237)
- Upgrade feed-io to v5.1.3 (#2238)
### Fixed
- Some feeds missing items (#2236)

## [22.0.0] - 2023-07-23
### Changed
- Support deflate and gzip compression for HTTP response bodies (#2269)
Expand Down Expand Up @@ -48,15 +72,15 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
- Use httpLastModified field for If-Modified-Since header when fetching feed updates (#2119)

## [21.1.0] - 2023-03-20
No notable changes compared 21.1.0-beta1
No notable changes compared to 21.1.0-beta1

## [21.1.0-beta1] - 2023-03-13
### Changed
- Remove unused background job OCA\News\Cron\Updater (#2137)
- (Nextcloud 26+) Add info card to the admin settings, showing last job execution (#2141)

## [21.0.0] - 2023-02-28
No notable changes compared 21.0.0-beta1
No notable changes compared to 21.0.0-beta1

## [21.0.0-beta1] - 2023-02-14
### Changed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Read this when you want to:
* Disable all browser add-ons to make sure that it's not a plugin's fault (adblockers, especially cosmetic filters)
* Clear your PHP opcode cache if you use any by restarting your webserver.
* [Check if they have already been reported](https://github.com/nextcloud/news/issues?state=open)
* [Check if your problem is covered in the FAQ section]( https://nextcloud.github.io/news/faq)
* [Check if your problem is covered in the Troubleshooting section](https://nextcloud.github.io/news/troubleshooting/)

### Debugging issues
* Enable debug mode in your **config/config.php**:
Expand Down
5 changes: 3 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
]]></description>
<version>22.0.0</version>
<version>24.0.0</version>
<licence>agpl</licence>
<author>Benjamin Brahmer</author>
<author>Sean Molenaar</author>
Expand All @@ -43,7 +43,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2.png</screenshot>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3.png</screenshot>
<dependencies>
<php min-version="7.4" min-int-size="64"/>
<php min-version="8.0" min-int-size="64"/>
<database min-version="10">pgsql</database>
<database>sqlite</database>
<database min-version="8.0">mysql</database>
Expand Down Expand Up @@ -75,6 +75,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<command>OCA\News\Command\Updater\UpdateUser</command>
<command>OCA\News\Command\Updater\BeforeUpdate</command>
<command>OCA\News\Command\Updater\AfterUpdate</command>
<command>OCA\News\Command\Updater\Job</command>
<command>OCA\News\Command\Config\FolderList</command>
<command>OCA\News\Command\Config\FolderAdd</command>
<command>OCA\News\Command\Config\FolderDelete</command>
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ezyang/htmlpurifier": "^4.16.0",
"pear/net_url2": "^2.2.2",
"riimu/kit-pathjoin": "^1.2.0",
"debril/feed-io": "^v4.9.12",
"debril/feed-io": "^v5.3.1",
"arthurhoaro/favicon": "^1.3.3",
"fivefilters/readability.php": "^3.1",
"ext-json": "*",
Expand All @@ -56,14 +56,14 @@
"require-dev": {
"phpunit/phpunit": "9.6.*",
"squizlabs/php_codesniffer": "^3.7.2",
"phpstan/phpstan": "^1.10.26",
"phpstan/phpstan-doctrine": "^1.3.40",
"phpstan/phpstan": "^1.10.39",
"phpstan/phpstan-doctrine": "^1.3.43",
"phpstan/phpstan-strict-rules": "^1.5.1",
"phpstan/phpstan-phpunit": "^1.3.13",
"phpstan/phpstan-phpunit": "^1.3.15",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan-deprecation-rules": "^1.1",
"guzzlehttp/guzzle": "^7.3.0",
"doctrine/dbal": "^3.6.5",
"doctrine/dbal": "^3.7.1",
"symfony/console": "^4.4.19",
"psr/log": "^1.1.0"
},
Expand Down
Loading

0 comments on commit 3e35d78

Please sign in to comment.