From d2cd67f8dc4aa39cc172653a6937445eac240563 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 12 Dec 2021 12:16:52 +0100
Subject: [PATCH] #16746 - Replace samyoul/u2f-php-server by
 code-lts/u2f-php-server

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 .scrutinizer.yml                            | 2 +-
 composer.json                               | 7 +++----
 doc/two_factor.rst                          | 2 +-
 libraries/classes/Plugins/TwoFactor/Key.php | 4 ++--
 libraries/classes/TwoFactor.php             | 4 ++--
 scripts/create-release.sh                   | 4 ++--
 test/classes/TwoFactorTest.php              | 4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index c0298ea43e..2bd4d78c7e 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -27,7 +27,7 @@ build:
       dependencies:
         before:
           - composer install
-          - composer require tecnickcom/tcpdf pragmarx/google2fa-qrcode samyoul/u2f-php-server
+          - composer require tecnickcom/tcpdf pragmarx/google2fa-qrcode code-lts/u2f-php-server
       tests:
         override:
           - php-scrutinizer-run
diff --git a/composer.json b/composer.json
index a616bb0339..52dcad5045 100644
--- a/composer.json
+++ b/composer.json
@@ -64,8 +64,7 @@
         "phpseclib/phpseclib": "2.0.8",
         "tecnickcom/tcpdf": "<6.2",
         "pragmarx/google2fa": "<6.1.0 || >8.0",
-        "pragmarx/google2fa-qrcode": "<1.0.1",
-        "samyoul/u2f-php-server": "<1.1"
+        "pragmarx/google2fa-qrcode": "<1.0.1"
     },
     "suggest": {
         "ext-openssl": "Cookie encryption",
@@ -78,7 +77,7 @@
         "ext-mbstring": "For best performance",
         "tecnickcom/tcpdf": "For PDF support",
         "pragmarx/google2fa-qrcode": "For 2FA authentication",
-        "samyoul/u2f-php-server": "For FIDO U2F authentication"
+        "code-lts/u2f-php-server": "For FIDO U2F authentication"
     },
     "require-dev": {
         "php-webdriver/webdriver": "^1.11",
@@ -88,7 +87,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
         "pragmarx/google2fa-qrcode": "^1.0.1",
-        "samyoul/u2f-php-server": "^1.1",
+        "code-lts/u2f-php-server": "^1.2",
         "symfony/console": "^4.4",
         "symfony/finder": "^4.4",
         "symfony/twig-bridge": "^4.4",
diff --git a/doc/two_factor.rst b/doc/two_factor.rst
index b929d0c4e2..06c85c6117 100644
--- a/doc/two_factor.rst
+++ b/doc/two_factor.rst
@@ -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)
 --------------------------------
diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php
index 9e78181aa1..ae40f471b2 100644
--- a/libraries/classes/Plugins/TwoFactor/Key.php
+++ b/libraries/classes/Plugins/TwoFactor/Key.php
@@ -10,8 +10,8 @@ namespace PhpMyAdmin\Plugins\TwoFactor;
 use PhpMyAdmin\Plugins\TwoFactorPlugin;
 use PhpMyAdmin\Response;
 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;
diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php
index f8fc4bd0a0..869ec1fab3 100644
--- a/libraries/classes/TwoFactor.php
+++ b/libraries/classes/TwoFactor.php
@@ -12,7 +12,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;
 use function in_array;
@@ -152,7 +152,7 @@ class TwoFactor
         if (! class_exists(U2FServer::class)) {
             $result[] = [
                 'class' => Key::getName(),
-                'dep' => 'samyoul/u2f-php-server',
+                'dep' => 'code-lts/u2f-php-server',
             ];
         }
 
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index f32db01591..0e896aac7b 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -260,7 +260,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
@@ -428,7 +428,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 samyoul/u2f-php-server'
+PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode code-lts/u2f-php-server'
 
 for PACKAGES in $PACKAGE_LIST
 do
diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php
index f5f497d083..06bd674f3b 100644
--- a/test/classes/TwoFactorTest.php
+++ b/test/classes/TwoFactorTest.php
@@ -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;
 use function json_encode;