Chih-Hsuan Yen
4b61618920
By running the following command after updating composer.json ``` composer update chillerlan/php-qrcode chillerlan/php-settings-container ``` This change fixes a deprecation warning from Preferences -> Personal data / Authentication -> Authenticator (OTP). ``` Return type of chillerlan\Settings\SettingsContainerAbstract::jsonSerialize() should either be compatible with JsonSerializable::jsonSerialize(): mixed, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice 1. vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php(19): ttrss_error_handler(Return type of chillerlan\Settings\SettingsContainerAbstract::jsonSerialize() should either be compatible with JsonSerializable::jsonSerialize(): mixed, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice, vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 2. vendor/composer/ClassLoader.php(571): include(/usr/share/webapps/tt-rss/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 3. vendor/composer/ClassLoader.php(428): Composer\Autoload\includeFile(/usr/share/webapps/tt-rss/vendor/composer/../chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 4. vendor/chillerlan/php-qrcode/src/QROptions.php(59): loadClass(chillerlan\Settings\SettingsContainerAbstract) 5. vendor/composer/ClassLoader.php(571): include(/usr/share/webapps/tt-rss/vendor/chillerlan/php-qrcode/src/QROptions.php) 6. vendor/composer/ClassLoader.php(428): Composer\Autoload\includeFile(/usr/share/webapps/tt-rss/vendor/composer/../chillerlan/php-qrcode/src/QROptions.php) 7. vendor/chillerlan/php-qrcode/src/QRCode.php(113): loadClass(chillerlan\QRCode\QROptions) 8. classes/pref/prefs.php(958): __construct() 9. classes/pref/prefs.php(469): _get_otp_qrcode_img() 10. classes/pref/prefs.php(541): index_auth_2fa() 11. backend.php(136): index_auth() ``` The issue is fixed in php-settings-container 2.1.1 [1] Here I use the latest php-qrcode version for another PHP 8.1 fix [2]. [1] https://github.com/chillerlan/php-settings-container/commit/68bc5019c8b38956c83906431ef879668366b036#diff-359c7f7a6d32d9935951e1b0742eb116fb654f4a932c8d40328bb5dcab2fa111L162 [2] https://github.com/chillerlan/php-qrcode/issues/97
108 lines
2.4 KiB
YAML
108 lines
2.4 KiB
YAML
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
|
|
# https://github.com/sebastianbergmann/phpunit/blob/master/.github/workflows/ci.yml
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- main
|
|
pull_request:
|
|
branches:
|
|
- main
|
|
|
|
|
|
name: "CI"
|
|
|
|
jobs:
|
|
|
|
static-code-analysis:
|
|
name: "Static Code Analysis"
|
|
|
|
runs-on: ubuntu-latest
|
|
|
|
env:
|
|
PHAN_ALLOW_XDEBUG: 0
|
|
PHAN_DISABLE_XDEBUG_WARN: 1
|
|
|
|
steps:
|
|
- name: "Checkout"
|
|
uses: actions/checkout@v2
|
|
|
|
- name: "Install PHP"
|
|
uses: shivammathur/setup-php@v2
|
|
with:
|
|
php-version: "7.4"
|
|
tools: pecl
|
|
coverage: none
|
|
extensions: ast, json
|
|
|
|
- name: "Update dependencies with composer"
|
|
run: composer update --no-interaction --no-ansi --no-progress --no-suggest
|
|
|
|
- name: "Run phan"
|
|
run: php vendor/bin/phan
|
|
|
|
build-docs:
|
|
name: "Build and publish Docs"
|
|
|
|
runs-on: ubuntu-latest
|
|
|
|
steps:
|
|
- name: "Checkout sources"
|
|
uses: actions/checkout@v2
|
|
|
|
- name: "Install PHP"
|
|
uses: shivammathur/setup-php@v2
|
|
with:
|
|
php-version: "7.4"
|
|
coverage: none
|
|
tools: phpDocumentor
|
|
extensions: json
|
|
|
|
- name: "Build Docs"
|
|
run: phpdoc --config=phpdoc.xml
|
|
|
|
- name: "Publish Docs to gh-pages"
|
|
uses: JamesIves/github-pages-deploy-action@v4.2.5
|
|
with:
|
|
branch: gh-pages
|
|
folder: docs
|
|
clean: true
|
|
|
|
tests:
|
|
name: "Unit Tests"
|
|
|
|
runs-on: ${{ matrix.os }}
|
|
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
os:
|
|
- ubuntu-latest
|
|
- windows-latest
|
|
php-version:
|
|
- "7.4"
|
|
- "8.0"
|
|
- "8.1"
|
|
|
|
steps:
|
|
- name: "Checkout"
|
|
uses: actions/checkout@v2
|
|
|
|
- name: "Install PHP with extensions"
|
|
uses: shivammathur/setup-php@v2
|
|
with:
|
|
php-version: ${{ matrix.php-version }}
|
|
coverage: pcov
|
|
extensions: json
|
|
|
|
- name: "Install dependencies with composer"
|
|
run: composer update --no-ansi --no-interaction --no-progress --no-suggest
|
|
|
|
- name: "Run tests with phpunit"
|
|
run: php vendor/phpunit/phpunit/phpunit --configuration=phpunit.xml
|
|
|
|
- name: "Send code coverage report to Codecov.io"
|
|
uses: codecov/codecov-action@v1
|
|
with:
|
|
token: ${{ secrets.CODECOV_TOKEN }}
|