gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_1'

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-12-12 19:35:20 +01:00
commit f718f475e4
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
10 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.scrutinizer.yml
View File

@ -28,7 +28,7 @@ build:
before:
- composer config --unset repositories.0
- composer install
- composer require tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code samyoul/u2f-php-server
- composer require tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server
tests:
override:
- php-scrutinizer-run

2
ChangeLog
View File

@ -135,6 +135,8 @@ phpMyAdmin - ChangeLog
- issue Fix a PHP notice when logging out
- issue #17090 Fix bbcode not rendered for error messages on setup
- issue #17198 Fix the database selection when the navigation tree is disabled
- issue #17228 Fixed copy to clipboard with NULL values gives non usable text
- issue #16746 Replace samyoul/u2f-php-server by code-lts/u2f-php-server
5.1.1 (2021-06-04)
- issue #13325 Fixed created procedure shows up in triggers and events and vice-versa

5
composer.json
View File

@ -71,7 +71,6 @@
"conflict": {
"bacon/bacon-qr-code": "<2.0",
"pragmarx/google2fa-qrcode": "<2.1",
"samyoul/u2f-php-server": "<1.1",
"tecnickcom/tcpdf": "<6.2"
},
"suggest": {
@ -85,7 +84,7 @@
"tecnickcom/tcpdf": "For PDF support",
"pragmarx/google2fa-qrcode": "^2.1 - For 2FA authentication",
"bacon/bacon-qr-code": "^2.0 - For 2FA authentication",
"samyoul/u2f-php-server": "For FIDO U2F authentication"
"code-lts/u2f-php-server": "For FIDO U2F authentication"
},
"require-dev": {
"bacon/bacon-qr-code": "^2.0",
@ -99,7 +98,7 @@
"pragmarx/google2fa-qrcode": "^2.1",
"psalm/plugin-phpunit": "^0.16.1",
"roave/security-advisories": "dev-latest",
"samyoul/u2f-php-server": "^1.1",
"code-lts/u2f-php-server": "^1.2",
"symfony/console": "^5.2.3",
"tecnickcom/tcpdf": "^6.4.2",
"vimeo/psalm": "^4.15.0"

2
doc/two_factor.rst
View File

@ -21,7 +21,7 @@ Or when using a hardware security key with FIDO U2F:
.. code-block:: sh
composer require samyoul/u2f-php-server
composer require code-lts/u2f-php-server
Authentication Application (2FA)
--------------------------------

4
js/src/sql.js
View File

@ -379,7 +379,9 @@ AJAX.registerOnload('sql.js', function () {
textArea.value += '\n';
$('.table_results tbody tr').each(function () {
$(this).find('.data span').each(function () {
textArea.value += $(this).text() + '\t';
// Extract <em> tag for NULL values before converting to string to not mess up formatting
var data = $(this).find('em').length !== 0 ? $(this).find('em')[0] : this;
textArea.value += $(data).text() + '\t';
});
textArea.value += '\n';
});

4
libraries/classes/Plugins/TwoFactor/Key.php
View File

@ -10,8 +10,8 @@ namespace PhpMyAdmin\Plugins\TwoFactor;
use PhpMyAdmin\Plugins\TwoFactorPlugin;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\TwoFactor;
use Samyoul\U2F\U2FServer\U2FException;
use Samyoul\U2F\U2FServer\U2FServer;
use CodeLts\U2F\U2FServer\U2FException;
use CodeLts\U2F\U2FServer\U2FServer;
use stdClass;
use Throwable;
use Twig\Error\LoaderError;

4
libraries/classes/TwoFactor.php
View File

@ -13,7 +13,7 @@ use PhpMyAdmin\Plugins\TwoFactor\Invalid;
use PhpMyAdmin\Plugins\TwoFactor\Key;
use PhpMyAdmin\Plugins\TwoFactorPlugin;
use PragmaRX\Google2FAQRCode\Google2FA;
use Samyoul\U2F\U2FServer\U2FServer;
use CodeLts\U2F\U2FServer\U2FServer;
use function array_merge;
use function class_exists;
@ -160,7 +160,7 @@ class TwoFactor
if (! class_exists(U2FServer::class)) {
$result[] = [
'class' => Key::getName(),
'dep' => 'samyoul/u2f-php-server',
'dep' => 'code-lts/u2f-php-server',
];
}

2
scripts/check-release-excludes.sh
View File

@ -150,7 +150,7 @@ validateExtension() {
-a "${filename}" != "README.md" -a "${filename}" != "BACKERS.md" \
-a "${filename}" != "LICENSE.md" -a "${filename}" != "ARCHITECTURE.md" \
-a "${filename}" != "LICENSE.txt" -a "${filename}" != "AUTHORS" \
-a "${filename}" != "LICENCE.md" \
-a "${filename}" != "LICENCE.md" -a "${filename}" != "LICENCE" \
]; then
foundFileExt
fi

6
scripts/create-release.sh
View File

@ -171,6 +171,8 @@ cleanup_composer_vendors() {
vendor/williamdes/mariadb-mysql-kbs/dist/merged-raw.md \
vendor/williamdes/mariadb-mysql-kbs/dist/merged-slim.json \
vendor/williamdes/mariadb-mysql-kbs/dist/merged-ultraslim.php \
vendor/code-lts/u2f-php-server/phpunit.xml \
vendor/code-lts/u2f-php-server/test/ \
vendor/nikic/fast-route/.travis.yml \
vendor/nikic/fast-route/.hhconfig \
vendor/nikic/fast-route/FastRoute.hhi \
@ -272,7 +274,7 @@ security_checkup() {
echo 'TCPDF should be installed, detection failed !'
exit 1;
fi
if [ ! -f vendor/samyoul/u2f-php-server/src/U2FServer.php ]; then
if [ ! -f vendor/code-lts/u2f-php-server/src/U2FServer.php ]; then
echo 'U2F-server should be installed, detection failed !'
exit 1;
fi
@ -440,7 +442,7 @@ composer update --no-interaction --no-dev --optimize-autoloader
# Parse the required versions from composer.json
PACKAGES_VERSIONS=''
PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code samyoul/u2f-php-server'
PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server'
for PACKAGES in $PACKAGE_LIST
do

4
test/classes/TwoFactorTest.php
View File

@ -6,8 +6,8 @@ namespace PhpMyAdmin\Tests;
use PhpMyAdmin\Plugins\TwoFactor\Application;
use PhpMyAdmin\TwoFactor;
use Samyoul\U2F\U2FServer\RegistrationRequest;
use Samyoul\U2F\U2FServer\SignRequest;
use CodeLts\U2F\U2FServer\RegistrationRequest;
use CodeLts\U2F\U2FServer\SignRequest;
use function count;
use function in_array;