Merge branch 'v2.2'

# Conflicts:
#	README.md

Author: Rubén D

.gitignore

@@ -45,3 +45,4 @@ crashlytics-build.properties
 fabric.properties
 
 tools
+vendor

README.md

@@ -6,29 +6,17 @@ Plugin to use two factor based authentication with applications that generate TO
 
 Please, select the correct branch in order to download a sysPass compatible version:
 
-* sysPass v3.1 --> Master or v2.1 branch
-* sysPass v3.0 --> 2.0 branch
-* sysPass v2 --> 1.0 branch 
+|sysPass version|Plugin's version|Branch|
+|:-------------:|:--------------:|:----:|
+|v3.2           |v2.2            |master || v2.2|
+|v3.0 <= v3.1   |v2.1            |v2.1|
+|v2.0 < v3.0    |v1.0            |v1.0|
 
 ---
 
-### v2.1 Installation
+### v2 Installation
 
-This version is only compatible with **sysPass v3.1** and it needs to be installed through **composer**.
-
-Please select the installation method depending on the instance type:
-
-* If you are running a **non-Docker** based instance:
-
-```composer require syspass/plugin-authenticator:^v2.1```
-
-* If you are running a **Docker** based instance, set `syspass/plugin-authenticator:^v2.1` value within an environment variable called `COMPOSER_EXTENSIONS`.
- 
----
-
-### v2.0 Installation
-
-This version is only compatible with **sysPass v3** and it needs to be installed through **composer**.
+As told above, this version is only compatible with **sysPass v3** and it needs to be installed through **composer**.
 
 Please select the installation method depending on the instance type:
 
@@ -40,7 +28,7 @@ Please select the installation method depending on the instance type:
 
 ---
 
-### v1.0 Installation
+### v1 Installation
 
 Please download the v1 branch files and unpack them into `.../inc/Plugins` directory.
 

base.php

@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
  * @copyright 2012-2019, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,20 +22,25 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use Composer\Autoload\ClassLoader;
+use SP\Modules\Web\Controllers\AuthenticatorController;
+use SP\Modules\Web\Controllers\AuthenticatorLoginController;
+use SP\Modules\Web\Plugins\Authenticator\Plugin;
+
 $lib = __DIR__ . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'lib';
 
 $base = [
     'namespace' => 'SP\Modules\\Web\\Plugins\\Authenticator\\',
     'dir' => $lib
 ];
 
-if (!class_exists(\SP\Modules\Web\Plugins\Authenticator\Plugin::class)) {
-    /** @var \Composer\Autoload\ClassLoader $loader */
+if (!class_exists(Plugin::class)) {
+    /** @var ClassLoader $loader */
     $loader = require APP_ROOT . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
     $loader->addPsr4($base['namespace'], $base['dir']);
     $loader->addClassMap([
-        \SP\Modules\Web\Controllers\AuthenticatorController::class => $lib . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'AuthenticatorController.php',
-        \SP\Modules\Web\Controllers\AuthenticatorLoginController::class => $lib . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'AuthenticatorLoginController.php'
+        AuthenticatorController::class => $lib . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'AuthenticatorController.php',
+        AuthenticatorLoginController::class => $lib . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'AuthenticatorLoginController.php'
     ]);
 }
 

composer.json

@@ -19,9 +19,9 @@
     "docs": "https://doc.syspass.org"
   },
   "require": {
-    "syspass/extension-installer-plugin": "*",
-    "php": "~7.0 || ~7.1 || ~7.2",
-    "bacon/bacon-qr-code": "^1.0",
+    "syspass/extension-installer-plugin": "^2.0",
+    "php": "~7.3 || ~7.4",
+    "bacon/bacon-qr-code": "^2.0",
     "ext-gettext": "*"
   },
   "extra": {