diff options
author | Chih-Hsuan Yen <[email protected]> | 2022-07-02 22:01:51 +0800 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2022-07-12 22:23:48 +0300 |
commit | 4b6161892000cb2b8392dce92a9cf2cabdf2d20e (patch) | |
tree | 5cad602010e4d13e1a48d6b922d4768c0893ac8b /vendor/chillerlan/php-qrcode/.github/workflows | |
parent | d9861038bcc3cb2f38c7153bdca7d5ab89597afa (diff) |
Update php-qrcode and php-settings-container for PHP 8.1
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
Diffstat (limited to 'vendor/chillerlan/php-qrcode/.github/workflows')
-rw-r--r-- | vendor/chillerlan/php-qrcode/.github/workflows/tests.yml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/vendor/chillerlan/php-qrcode/.github/workflows/tests.yml b/vendor/chillerlan/php-qrcode/.github/workflows/tests.yml index 991e6503c..07cf16cb7 100644 --- a/vendor/chillerlan/php-qrcode/.github/workflows/tests.yml +++ b/vendor/chillerlan/php-qrcode/.github/workflows/tests.yml @@ -2,8 +2,12 @@ # https://github.com/sebastianbergmann/phpunit/blob/master/.github/workflows/ci.yml on: - - pull_request - - push + push: + branches: + - v4.3.x + pull_request: + branches: + - v4.3.x name: "Continuous Integration" @@ -46,14 +50,17 @@ jobs: matrix: os: - ubuntu-latest -# - windows-latest + - windows-latest php-version: - - "7.2" - - "7.3" - "7.4" - "8.0" + - "8.1" steps: +# - name: "Configure git to avoid issues with line endings" +# if: matrix.os == 'windows-latest' +# run: git config --global core.autocrlf false + - name: "Checkout" uses: actions/checkout@v2 @@ -69,7 +76,7 @@ jobs: 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 + run: php vendor/bin/phpunit --configuration=phpunit.xml - name: "Send code coverage report to Codecov.io" uses: codecov/codecov-action@v1 |