#16746 - Replace samyoul/u2f-php-server by code-lts/u2f-php-server

Signed-off-by: William Desportes <williamdes@wdes.fr>

.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

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",

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)
 --------------------------------

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;

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',
             ];
         }
 

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

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;