* [ADD] Unit testing. Work in progress

* [MOD] Code refactoring * [MOD] Make classes final for performance improvements and avoid some side behaviours
2026-03-24 17:17:15 +01:00 · 2018-07-28 19:15:11 +02:00
parent d0056d74a8
commit 3e26a1df71
367 changed files with 1774 additions and 1251 deletions
--- a/app/modules/api/Controllers/AccountController.php
+++ b/app/modules/api/Controllers/AccountController.php
@@ -24,12 +24,12 @@

 namespace SP\Modules\Api\Controllers;

-use SP\Account\AccountRequest;
-use SP\Account\AccountSearchFilter;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Services\Account\AccountRequest;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\Account\AccountService;
 use SP\Services\Api\ApiResponse;

@@ -166,7 +166,7 @@ class AccountController extends ControllerBase
            $accountSearchFilter->setLimitCount($this->apiService->getParamInt('count', false, 50));
            $accountSearchFilter->setSortOrder($this->apiService->getParamInt('order', false, AccountSearchFilter::SORT_DEFAULT));

-            $this->returnResponse(new ApiResponse($this->accountService->getByFilter($accountSearchFilter)->getData()));
+            $this->returnResponse(new ApiResponse($this->accountService->getByFilter($accountSearchFilter)));
        } catch (\Exception $e) {
            $this->returnResponseException($e);

--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -34,7 +34,7 @@ use SP\Services\Upgrade\UpgradeAppService;
 use SP\Services\Upgrade\UpgradeDatabaseService;
 use SP\Services\Upgrade\UpgradeUtil;
 use SP\Storage\Database\Database;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Util\HttpUtil;

 /**
@@ -57,6 +57,7 @@ class Init extends ModuleBase
     * Module constructor.
     *
     * @param Container $container
+     *
     * @throws \DI\DependencyException
     * @throws \DI\NotFoundException
     */
@@ -70,6 +71,7 @@ class Init extends ModuleBase

    /**
     * @param string $controller
+     *
     * @throws InitializationException
     * @throws \DI\DependencyException
     * @throws \DI\NotFoundException
@@ -105,7 +107,7 @@ class Init extends ModuleBase
        $this->checkUpgrade();

        // Checks if the database is set up
-        DBUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName());
+        DatabaseUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName());

        // Initialize event handlers
        $this->initEventHandlers();
--- a/app/modules/web/Controllers/ConfigMailController.php
+++ b/app/modules/web/Controllers/ConfigMailController.php
@@ -32,7 +32,7 @@ use SP\Core\Events\EventMessage;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 use SP\Providers\Mail\MailParams;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;

 /**
 * Class ConfigMailController
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -42,7 +42,7 @@ use SP\Services\Task\Task;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Services\UserProfile\UserProfileService;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Storage\Database\MySQLHandler;
 use SP\Util\Checks;
 use SP\Util\Util;
@@ -331,7 +331,7 @@ class ConfigManagerController extends ControllerBase
        $template->setBase('config');
        $template->addTemplate('info');

-        $template->assign('dbInfo', DBUtil::getDBinfo($this->dic->get(MySQLHandler::class)));
+        $template->assign('dbInfo', DatabaseUtil::getDBinfo($this->dic->get(MySQLHandler::class)));
        $template->assign('dbName', $this->configData->getDbName() . '@' . $this->configData->getDbHost());
        $template->assign('configBackupDate', date('r', $this->dic->get(ConfigService::class)->getByParam('config_backup_date', 0)));
        $template->assign('plugins', PluginUtil::getLoadedPlugins());
--- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
@@ -24,14 +24,14 @@

 namespace SP\Modules\Web\Controllers\Helpers\Account;

-use SP\Account\AccountAcl;
-use SP\Account\AccountSearchItem;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\UI\ThemeIcons;
 use SP\Html\DataGrid\DataGridAction;
 use SP\Html\DataGrid\DataGridActionType;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
+use SP\Services\Account\AccountAcl;
+use SP\Services\Account\AccountSearchItem;

 /**
 * Class AccountIconsHelper
@@ -73,11 +73,12 @@ class AccountActionsHelper extends HelperBase
    /**
     * Set icons for view
     *
-     * @param AccountAcl        $accountAcl
-     * @param AccountActionsDto $accountActionsDto
+     * @param \SP\Services\Account\AccountAcl $accountAcl
+     * @param AccountActionsDto               $accountActionsDto
+     *
     * @return DataGridAction[]
     */
-    public function getActionsForAccount(AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
+    public function getActionsForAccount(\SP\Services\Account\AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
    {
        $actions = [];

@@ -248,8 +249,9 @@ class AccountActionsHelper extends HelperBase
    /**
     * Set icons for view
     *
-     * @param AccountAcl        $accountAcl
-     * @param AccountActionsDto $accountActionsDto
+     * @param \SP\Services\Account\AccountAcl $accountAcl
+     * @param AccountActionsDto               $accountActionsDto
+     *
     * @return DataGridAction[]
     */
    public function getActionsGrouppedForAccount(AccountAcl $accountAcl, AccountActionsDto $accountActionsDto)
@@ -417,7 +419,7 @@ class AccountActionsHelper extends HelperBase
        $action->setTitle(__('Ver Clave'));
        $action->addClass('btn-action');
        $action->setIcon($this->icons->getIconViewPass());
-        $action->setRuntimeFilter(AccountSearchItem::class, 'isShowViewPass');
+        $action->setRuntimeFilter(\SP\Services\Account\AccountSearchItem::class, 'isShowViewPass');
        $action->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNT_VIEW_PASS));
        $action->addData('action-full', 1);
        $action->addData('action-sk', $this->sk);
--- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
@@ -24,7 +24,6 @@

 namespace SP\Modules\Web\Controllers\Helpers\Account;

-use SP\Account\AccountAcl;
 use SP\Core\Acl\AccountPermissionException;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
@@ -37,6 +36,7 @@ use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Modules\Web\Controllers\Traits\ItemTrait;
 use SP\Mvc\View\Components\SelectItemAdapter;
 use SP\Repositories\NoSuchItemException;
+use SP\Services\Account\AccountAcl;
 use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountHistoryService;
 use SP\Services\Account\AccountService;
@@ -79,7 +79,7 @@ class AccountHelper extends HelperBase
     */
    private $actionId;
    /**
-     * @var AccountAcl
+     * @var \SP\Services\Account\AccountAcl
     */
    private $accountAcl;
    /**
@@ -212,7 +212,7 @@ class AccountHelper extends HelperBase
     *
     * @param AccountDetailsResponse $accountDetailsResponse
     *
-     * @return AccountAcl
+     * @return \SP\Services\Account\AccountAcl
     * @throws AccountPermissionException
     * @throws \SP\Core\Exceptions\ConstraintException
     * @throws \SP\Core\Exceptions\QueryException
@@ -297,7 +297,7 @@ class AccountHelper extends HelperBase
    public function setViewForBlank($actionId)
    {
        $this->actionId = $actionId;
-        $this->accountAcl = new AccountAcl($actionId);
+        $this->accountAcl = new \SP\Services\Account\AccountAcl($actionId);

        $this->checkActionAccess();

--- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
@@ -24,7 +24,6 @@

 namespace SP\Modules\Web\Controllers\Helpers\Account;

-use SP\Account\AccountAcl;
 use SP\Core\Acl\AccountPermissionException;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\UnauthorizedPageException;
@@ -33,6 +32,7 @@ use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountAclDto;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Mvc\View\Components\SelectItemAdapter;
+use SP\Services\Account\AccountAcl;
 use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountHistoryService;
 use SP\Services\Category\CategoryService;
--- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
@@ -24,8 +24,6 @@

 namespace SP\Modules\Web\Controllers\Helpers\Account;

-use SP\Account\AccountSearchFilter;
-use SP\Account\AccountSearchItem;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
 use SP\Html\DataGrid\DataGrid;
@@ -37,6 +35,8 @@ use SP\Html\DataGrid\DataGridPager;
 use SP\Html\DataGrid\DataGridSort;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Mvc\View\Components\SelectItemAdapter;
+use SP\Services\Account\AccountSearchFilter;
+use SP\Services\Account\AccountSearchItem;
 use SP\Services\Account\AccountSearchService;
 use SP\Services\Category\CategoryService;
 use SP\Services\Client\ClientService;
@@ -66,7 +66,7 @@ class AccountSearchHelper extends HelperBase
     */
    private $isAjax = false;
    /**
-     * @var  AccountSearchFilter
+     * @var  \SP\Services\Account\AccountSearchFilter
     */
    private $accountSearchFilter;

@@ -118,13 +118,13 @@ class AccountSearchHelper extends HelperBase

        AccountSearchItem::$accountLink = $userPreferences->isAccountLink();
        AccountSearchItem::$topNavbar = $userPreferences->isTopNavbar();
-        AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions();
+        \SP\Services\Account\AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions();
        AccountSearchItem::$wikiEnabled = $this->configData->isWikiEnabled();
        AccountSearchItem::$dokuWikiEnabled = $this->configData->isDokuwikiEnabled();
-        AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled();
+        \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled();
        AccountSearchItem::$isDemoMode = $this->configData->isDemoEnabled();

-        if (AccountSearchItem::$wikiEnabled) {
+        if (\SP\Services\Account\AccountSearchItem::$wikiEnabled) {
            $wikiFilter = array_map(function ($value) {
                return preg_quote($value, '/');
            }, $this->configData->getWikiFilter());
@@ -213,35 +213,35 @@ class AccountSearchHelper extends HelperBase
        $GridSortCustomer = new DataGridSort();
        $GridSortCustomer->setName(__('Cliente'))
            ->setTitle(__('Ordenar por Cliente'))
-            ->setSortKey(AccountSearchFilter::SORT_CLIENT)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CLIENT)
            ->setIconUp($icons->getIconUp())
            ->setIconDown($icons->getIconDown());

        $GridSortName = new DataGridSort();
        $GridSortName->setName(__('Nombre'))
            ->setTitle(__('Ordenar por Nombre'))
-            ->setSortKey(AccountSearchFilter::SORT_NAME)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_NAME)
            ->setIconUp($icons->getIconUp())
            ->setIconDown($icons->getIconDown());

        $GridSortCategory = new DataGridSort();
        $GridSortCategory->setName(__('Categoría'))
            ->setTitle(__('Ordenar por Categoría'))
-            ->setSortKey(AccountSearchFilter::SORT_CATEGORY)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CATEGORY)
            ->setIconUp($icons->getIconUp())
            ->setIconDown($icons->getIconDown());

        $GridSortLogin = new DataGridSort();
        $GridSortLogin->setName(__('Usuario'))
            ->setTitle(__('Ordenar por Usuario'))
-            ->setSortKey(AccountSearchFilter::SORT_LOGIN)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_LOGIN)
            ->setIconUp($icons->getIconUp())
            ->setIconDown($icons->getIconDown());

        $GridSortUrl = new DataGridSort();
        $GridSortUrl->setName(__('URL / IP'))
            ->setTitle(__('Ordenar por URL / IP'))
-            ->setSortKey(AccountSearchFilter::SORT_URL)
+            ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_URL)
            ->setIconUp($icons->getIconUp())
            ->setIconDown($icons->getIconDown());

@@ -297,7 +297,7 @@ class AccountSearchHelper extends HelperBase
    /**
     * Set search filters
     *
-     * @return AccountSearchFilter
+     * @return \SP\Services\Account\AccountSearchFilter
     */
    private function getFilters()
    {
--- a/app/modules/web/Controllers/UserController.php
+++ b/app/modules/web/Controllers/UserController.php
@@ -36,7 +36,7 @@ use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Modules\Web\Forms\UserForm;
 use SP\Mvc\Controller\CrudControllerInterface;
 use SP\Mvc\View\Components\SelectItemAdapter;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Services\UserPassRecover\UserPassRecoverService;
--- a/app/modules/web/Controllers/UserPassResetController.php
+++ b/app/modules/web/Controllers/UserPassResetController.php
@@ -32,7 +32,7 @@ use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Repositories\Track\TrackRequest;
-use SP\Services\MailService;
+use SP\Services\Mail\MailService;
 use SP\Services\Track\TrackService;
 use SP\Services\User\UserService;
 use SP\Services\UserPassRecover\UserPassRecoverService;
--- a/app/modules/web/Forms/AccountForm.php
+++ b/app/modules/web/Forms/AccountForm.php
@@ -24,9 +24,9 @@

 namespace SP\Modules\Web\Forms;

-use SP\Account\AccountRequest;
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ValidationException;
+use SP\Services\Account\AccountRequest;

 /**
 * Class AccountForm
@@ -44,6 +44,7 @@ class AccountForm extends FormBase implements FormInterface
     * Validar el formulario
     *
     * @param $action
+     *
     * @return bool
     * @throws \SP\Core\Exceptions\ValidationException
     */
--- a/app/modules/web/Init.php
+++ b/app/modules/web/Init.php
@@ -42,7 +42,7 @@ use SP\Services\Upgrade\UpgradeDatabaseService;
 use SP\Services\Upgrade\UpgradeUtil;
 use SP\Services\UserProfile\UserProfileService;
 use SP\Storage\Database\Database;
-use SP\Storage\Database\DBUtil;
+use SP\Storage\Database\DatabaseUtil;
 use SP\Util\HttpUtil;

 /**
@@ -163,7 +163,7 @@ class Init extends ModuleBase
            }

            // Checks if the database is set up
-            if (!DBUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName())) {
+            if (!DatabaseUtil::checkDatabaseExist($this->container->get(Database::class)->getDbHandler(), $this->configData->getDbName())) {
                $this->router->response()
                    ->redirect('index.php?r=error/databaseError')
                    ->send();
--- a/app/modules/web/themes/material-blue/views/account/account-history.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-history.inc
@@ -1,5 +1,5 @@
 <?php
-/** @var \SP\Account\AccountAcl $accountAcl */
+/** @var \SP\Services\Account\AccountAcl $accountAcl */
 /** @var \SP\DataModel\AccountHistoryData $accountData */
 /** @var \SP\Mvc\View\Template $this */
 ?>
--- a/app/modules/web/themes/material-blue/views/account/account-permissions.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl       $accountAcl
- * @var \SP\DataModel\AccountExtData $accountData
- * @var \SP\Core\UI\ThemeIcons       $icons
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Core\UI\ThemeIcons          $icons
 */
 ?>

--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl $accountAcl
- * @var \SP\DataModel\AccountExtData $accountData
- * @var \SP\Config\ConfigData $configData
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\DataModel\AccountExtData    $accountData
+ * @var \SP\Config\ConfigData           $configData
 */

 $showLinked = $gotData && count($linkedAccounts) > 0;
--- a/app/modules/web/themes/material-blue/views/account/details.inc
+++ b/app/modules/web/themes/material-blue/views/account/details.inc
@@ -1,5 +1,5 @@
 <?php
-/** @var \SP\Account\AccountAcl $AccountAcl */
+/** @var \SP\Services\Account\AccountAcl $AccountAcl */
 /** @var \SP\DataModel\AccountExtData $accountData */
 ?>

--- a/app/modules/web/themes/material-blue/views/account/files.inc
+++ b/app/modules/web/themes/material-blue/views/account/files.inc
@@ -1,7 +1,7 @@
 <?php
 /**
- * @var \SP\Account\AccountAcl $accountAcl
- * @var \SP\Core\UI\ThemeIcons $icons
+ * @var \SP\Services\Account\AccountAcl $accountAcl
+ * @var \SP\Core\UI\ThemeIcons          $icons
 */
 ?>

--- a/app/modules/web/themes/material-blue/views/account/search-header.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-header.inc
@@ -1,7 +1,7 @@
 <?php
 /**
 * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
 * @var $this    \SP\Mvc\View\Template
 */
 ?>
--- a/app/modules/web/themes/material-blue/views/account/search-index.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-index.inc
@@ -1,7 +1,7 @@
 <?php
 /**
 * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
 * @var $this    \SP\Mvc\View\Template
 */
 ?>
@@ -15,7 +15,7 @@
            <?php include $data->getDataHeaderTemplate(); ?>
        </div>

-        <?php if (\SP\Account\AccountSearchItem::$topNavbar): ?>
+        <?php if (\SP\Services\Account\AccountSearchItem::$topNavbar): ?>
            <!-- Data Pager -->
            <div id="search-pager-top">
                <?php include $data->getDataPagerTemplate(); ?>
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -1,7 +1,7 @@
 <?php
 /**
 * @var $data              \SP\Html\DataGrid\DataGridTab
- * @var $accountSearchItem \SP\Account\AccountSearchItem
+ * @var $accountSearchItem \SP\Services\Account\AccountSearchItem
 * @var $this              \SP\Mvc\View\Template
 * @var $action            \SP\Html\DataGrid\DataGridActionBase
 * @var $actionMenu        \SP\Html\DataGrid\DataGridActionBase
@@ -189,7 +189,7 @@

                        <?php if (isset($wikiFilter)): ?>
                            <?php if (preg_match('/^(' . $wikiFilter . ').*/i', $accountSearchData->getName())): ?>
-                                <?php if (\SP\Account\AccountSearchItem::$dokuWikiEnabled): ?>
+                                <?php if (\SP\Services\Account\AccountSearchItem::$dokuWikiEnabled): ?>
                                    <a href="<?php echo $wikiPageUrl, $accountSearchData->getName(); ?>"
                                       target="_blank">
                                        <i class="material-icons"
--- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
@@ -1,7 +1,7 @@
 <?php
 /**
 * @var $data    SP\Html\DataGrid\DataGridTab
- * @var $account SP\Account\AccountSearchItem
+ * @var $account \SP\Services\Account\AccountSearchItem
 * @var $this    \SP\Mvc\View\Template
 * @var $icons   \SP\Core\UI\ThemeIcons
 */
--- a/lib/Definitions.php
+++ b/lib/Definitions.php
@@ -37,8 +37,8 @@ return [
        }
    },
    \SP\Config\Config::class => object(\SP\Config\Config::class)
-        ->constructor(object(\SP\Storage\XmlHandler::class)
-            ->constructor(object(\SP\Storage\FileHandler::class)
+        ->constructor(object(\SP\Storage\File\XmlHandler::class)
+            ->constructor(object(\SP\Storage\File\FileHandler::class)
                ->constructor(CONFIG_FILE)), get(\SP\Core\Context\ContextInterface::class)),
    \SP\Core\Language::class => object(\SP\Core\Language::class),
    \SP\Config\ConfigData::class => function (\SP\Config\Config $config) {
@@ -51,8 +51,8 @@ return [
        ->constructor(object(\SP\Storage\Database\MySQLHandler::class)
            ->constructor(get(\SP\Storage\Database\DatabaseConnectionData::class))),
    \SP\Core\Acl\Actions::class => object(\SP\Core\Acl\Actions::class)
-        ->constructor(object(\SP\Storage\FileCache::class), object(\SP\Storage\XmlHandler::class)
-            ->constructor(object(\SP\Storage\FileHandler::class)
+        ->constructor(object(\SP\Storage\File\FileCache::class), object(\SP\Storage\File\XmlHandler::class)
+            ->constructor(object(\SP\Storage\File\FileHandler::class)
                ->constructor(ACTIONS_FILE))),
    \SP\Core\Events\EventDispatcher::class => object(\SP\Core\Events\EventDispatcher::class),
    \SP\Core\Acl\Acl::class => object(\SP\Core\Acl\Acl::class)
--- a/lib/SP/Bootstrap.php
+++ b/lib/SP/Bootstrap.php
@@ -55,7 +55,7 @@ defined('APP_ROOT') || die();
 *
 * @package SP
 */
-class Bootstrap
+final class Bootstrap
 {
    /**
     * @var string The installation path on the server (e.g. /srv/www/syspass)
--- a/lib/SP/Config/Config.php
+++ b/lib/SP/Config/Config.php
@@ -29,8 +29,8 @@ use ReflectionObject;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\ConfigException;
 use SP\Services\Config\ConfigBackupService;
-use SP\Storage\FileException;
-use SP\Storage\XmlFileStorageInterface;
+use SP\Storage\File\FileException;
+use SP\Storage\File\XmlFileStorageInterface;
 use SP\Util\Util;

 defined('APP_ROOT') || die();
@@ -38,7 +38,7 @@ defined('APP_ROOT') || die();
 /**
 * Esta clase es responsable de leer y escribir la configuración del archivo config.php
 */
-class Config
+final class Config
 {
    /**
     * @var int
@@ -53,7 +53,7 @@ class Config
     */
    private $configData;
    /**
-     * @var XmlFileStorageInterface
+     * @var \SP\Storage\File\XmlFileStorageInterface
     */
    private $fileStorage;
    /**
@@ -68,9 +68,9 @@ class Config
    /**
     * Config constructor.
     *
-     * @param XmlFileStorageInterface $fileStorage
-     * @param ContextInterface        $session
-     * @param Container               $dic
+     * @param \SP\Storage\File\XmlFileStorageInterface $fileStorage
+     * @param ContextInterface                         $session
+     * @param Container                                $dic
     *
     * @throws ConfigException
     */
--- a/lib/SP/Config/ConfigCache.php
+++ b/lib/SP/Config/ConfigCache.php
@@ -24,15 +24,15 @@

 namespace SP\Config;

-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;

 /**
 * Class ConfigCache
 *
 * @package SP\Config
 */
-class ConfigCache
+final class ConfigCache
 {
    /**
     * Cache file name
--- a/lib/SP/Config/ConfigData.php
+++ b/lib/SP/Config/ConfigData.php
@@ -31,7 +31,7 @@ use JsonSerializable;
 *
 * @package SP\Config
 */
-class ConfigData implements JsonSerializable
+final class ConfigData implements JsonSerializable
 {
    /**
     * @var string
@@ -416,6 +416,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $dokuwikiEnabled
+     *
     * @return $this
     */
    public function setDokuwikiEnabled($dokuwikiEnabled)
@@ -435,6 +436,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dokuwikiUrl
+     *
     * @return $this
     */
    public function setDokuwikiUrl($dokuwikiUrl)
@@ -454,6 +456,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dokuwikiUrlBase
+     *
     * @return $this
     */
    public function setDokuwikiUrlBase($dokuwikiUrlBase)
@@ -473,6 +476,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dokuwikiUser
+     *
     * @return $this
     */
    public function setDokuwikiUser($dokuwikiUser)
@@ -492,6 +496,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dokuwikiPass
+     *
     * @return $this
     */
    public function setDokuwikiPass($dokuwikiPass)
@@ -511,6 +516,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dokuwikiNamespace
+     *
     * @return $this
     */
    public function setDokuwikiNamespace($dokuwikiNamespace)
@@ -530,6 +536,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $ldapDefaultGroup
+     *
     * @return $this
     */
    public function setLdapDefaultGroup($ldapDefaultGroup)
@@ -549,6 +556,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $ldapDefaultProfile
+     *
     * @return $this
     */
    public function setLdapDefaultProfile($ldapDefaultProfile)
@@ -568,6 +576,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $proxyEnabled
+     *
     * @return $this
     */
    public function setProxyEnabled($proxyEnabled)
@@ -587,6 +596,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $proxyServer
+     *
     * @return $this
     */
    public function setProxyServer($proxyServer)
@@ -606,6 +616,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $proxyPort
+     *
     * @return $this
     */
    public function setProxyPort($proxyPort)
@@ -625,6 +636,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $proxyUser
+     *
     * @return $this
     */
    public function setProxyUser($proxyUser)
@@ -644,6 +656,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $proxyPass
+     *
     * @return $this
     */
    public function setProxyPass($proxyPass)
@@ -664,6 +677,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $publinksMaxViews
+     *
     * @return $this
     */
    public function setPublinksMaxViews($publinksMaxViews)
@@ -683,6 +697,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $publinksMaxTime
+     *
     * @return $this
     */
    public function setPublinksMaxTime($publinksMaxTime)
@@ -702,6 +717,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $syslogEnabled
+     *
     * @return $this
     */
    public function setSyslogEnabled($syslogEnabled)
@@ -721,6 +737,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $syslogRemoteEnabled
+     *
     * @return $this
     */
    public function setSyslogRemoteEnabled($syslogRemoteEnabled)
@@ -740,6 +757,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $syslogServer
+     *
     * @return $this
     */
    public function setSyslogServer($syslogServer)
@@ -759,6 +777,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $syslogPort
+     *
     * @return $this
     */
    public function setSyslogPort($syslogPort)
@@ -778,6 +797,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $backup_hash
+     *
     * @return $this
     */
    public function setBackupHash($backup_hash)
@@ -797,6 +817,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $export_hash
+     *
     * @return $this
     */
    public function setExportHash($export_hash)
@@ -816,6 +837,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapBindUser
+     *
     * @return $this
     */
    public function setLdapBindUser($ldapBindUser)
@@ -835,6 +857,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapProxyUser
+     *
     * @return $this
     */
    public function setLdapProxyUser($ldapProxyUser)
@@ -854,6 +877,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $accountCount
+     *
     * @return $this
     */
    public function setAccountCount($accountCount)
@@ -873,6 +897,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $accountLink
+     *
     * @return $this
     */
    public function setAccountLink($accountLink)
@@ -892,6 +917,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $checkUpdates
+     *
     * @return $this
     */
    public function setCheckUpdates($checkUpdates)
@@ -929,6 +955,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dbHost
+     *
     * @return $this
     */
    public function setDbHost($dbHost)
@@ -948,6 +975,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dbName
+     *
     * @return $this
     */
    public function setDbName($dbName)
@@ -967,6 +995,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dbPass
+     *
     * @return $this
     */
    public function setDbPass($dbPass)
@@ -986,6 +1015,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $dbUser
+     *
     * @return $this
     */
    public function setDbUser($dbUser)
@@ -1005,6 +1035,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $debug
+     *
     * @return $this
     */
    public function setDebug($debug)
@@ -1024,6 +1055,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $demoEnabled
+     *
     * @return $this
     */
    public function setDemoEnabled($demoEnabled)
@@ -1043,6 +1075,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param array $filesAllowedExts
+     *
     * @return $this
     */
    public function setFilesAllowedExts(array $filesAllowedExts = [])
@@ -1062,6 +1095,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $filesAllowedSize
+     *
     * @return $this
     */
    public function setFilesAllowedSize($filesAllowedSize)
@@ -1081,6 +1115,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $filesEnabled
+     *
     * @return $this
     */
    public function setFilesEnabled($filesEnabled)
@@ -1100,6 +1135,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $globalSearch
+     *
     * @return $this
     */
    public function setGlobalSearch($globalSearch)
@@ -1119,6 +1155,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $installed
+     *
     * @return $this
     */
    public function setInstalled($installed)
@@ -1138,6 +1175,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapBase
+     *
     * @return $this
     */
    public function setLdapBase($ldapBase)
@@ -1157,6 +1195,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $ldapEnabled
+     *
     * @return $this
     */
    public function setLdapEnabled($ldapEnabled)
@@ -1176,6 +1215,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapGroup
+     *
     * @return $this
     */
    public function setLdapGroup($ldapGroup)
@@ -1195,6 +1235,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapServer
+     *
     * @return $this
     */
    public function setLdapServer($ldapServer)
@@ -1214,6 +1255,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapUserattr
+     *
     * @return $this
     */
    public function setLdapUserattr($ldapUserattr)
@@ -1233,6 +1275,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $logEnabled
+     *
     * @return $this
     */
    public function setLogEnabled($logEnabled)
@@ -1252,6 +1295,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $mailAuthenabled
+     *
     * @return $this
     */
    public function setMailAuthenabled($mailAuthenabled)
@@ -1271,6 +1315,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $mailEnabled
+     *
     * @return $this
     */
    public function setMailEnabled($mailEnabled)
@@ -1290,6 +1335,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $mailFrom
+     *
     * @return $this
     */
    public function setMailFrom($mailFrom)
@@ -1309,6 +1355,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $mailPass
+     *
     * @return $this
     */
    public function setMailPass($mailPass)
@@ -1328,6 +1375,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $mailPort
+     *
     * @return $this
     */
    public function setMailPort($mailPort)
@@ -1347,6 +1395,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $mailRequestsEnabled
+     *
     * @return $this
     */
    public function setMailRequestsEnabled($mailRequestsEnabled)
@@ -1366,6 +1415,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $mailSecurity
+     *
     * @return $this
     */
    public function setMailSecurity($mailSecurity)
@@ -1385,6 +1435,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $mailServer
+     *
     * @return $this
     */
    public function setMailServer($mailServer)
@@ -1404,6 +1455,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $mailUser
+     *
     * @return $this
     */
    public function setMailUser($mailUser)
@@ -1423,6 +1475,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $maintenance
+     *
     * @return $this
     */
    public function setMaintenance($maintenance)
@@ -1442,6 +1495,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $passwordSalt
+     *
     * @return $this
     */
    public function setPasswordSalt($passwordSalt)
@@ -1461,6 +1515,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $resultsAsCards
+     *
     * @return $this
     */
    public function setResultsAsCards($resultsAsCards)
@@ -1480,6 +1535,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $sessionTimeout
+     *
     * @return $this
     */
    public function setSessionTimeout($sessionTimeout)
@@ -1499,6 +1555,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $siteLang
+     *
     * @return $this
     */
    public function setSiteLang($siteLang)
@@ -1518,6 +1575,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $siteTheme
+     *
     * @return $this
     */
    public function setSiteTheme($siteTheme)
@@ -1537,6 +1595,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $configVersion
+     *
     * @return $this
     */
    public function setConfigVersion($configVersion)
@@ -1556,6 +1615,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $wikiEnabled
+     *
     * @return $this
     */
    public function setWikiEnabled($wikiEnabled)
@@ -1575,6 +1635,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param array $wikiFilter
+     *
     * @return $this
     */
    public function setWikiFilter($wikiFilter)
@@ -1594,6 +1655,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $wikiPageurl
+     *
     * @return $this
     */
    public function setWikiPageurl($wikiPageurl)
@@ -1613,6 +1675,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $wikiSearchurl
+     *
     * @return $this
     */
    public function setWikiSearchurl($wikiSearchurl)
@@ -1632,6 +1695,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $ldapAds
+     *
     * @return $this
     */
    public function setLdapAds($ldapAds)
@@ -1651,6 +1715,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $ldapBindPass
+     *
     * @return $this
     */
    public function setLdapBindPass($ldapBindPass)
@@ -1670,6 +1735,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $publinksImageEnabled
+     *
     * @return $this
     */
    public function setPublinksImageEnabled($publinksImageEnabled)
@@ -1689,6 +1755,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $httpsEnabled
+     *
     * @return $this
     */
    public function setHttpsEnabled($httpsEnabled)
@@ -1708,6 +1775,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $checknotices
+     *
     * @return $this
     */
    public function setChecknotices($checknotices)
@@ -1727,6 +1795,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $accountPassToImage
+     *
     * @return $this
     */
    public function setAccountPassToImage($accountPassToImage)
@@ -1746,6 +1815,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $upgradeKey
+     *
     * @return $this
     */
    public function setUpgradeKey($upgradeKey)
@@ -1765,6 +1835,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $dbPort
+     *
     * @return $this
     */
    public function setDbPort($dbPort)
@@ -1784,6 +1855,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param boolean $publinksEnabled
+     *
     * @return $this
     */
    public function setPublinksEnabled($publinksEnabled)
@@ -1816,6 +1888,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $configSaver
+     *
     * @return $this
     */
    public function setConfigSaver($configSaver)
@@ -1851,6 +1924,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param bool $encryptSession
+     *
     * @return $this
     */
    public function setEncryptSession($encryptSession)
@@ -1870,6 +1944,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param bool $accountFullGroupAccess
+     *
     * @return $this
     */
    public function setAccountFullGroupAccess($accountFullGroupAccess)
@@ -2001,6 +2076,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param string $databaseVersion
+     *
     * @return ConfigData
     */
    public function setDatabaseVersion($databaseVersion)
@@ -2020,6 +2096,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $configDate
+     *
     * @return $this
     */
    public function setConfigDate($configDate)
@@ -2039,6 +2116,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param bool $accountExpireEnabled
+     *
     * @return ConfigData
     */
    public function setAccountExpireEnabled($accountExpireEnabled)
@@ -2058,6 +2136,7 @@ class ConfigData implements JsonSerializable

    /**
     * @param int $accountExpireTime
+     *
     * @return ConfigData
     */
    public function setAccountExpireTime($accountExpireTime)
--- a/lib/SP/Config/ConfigInterface.php
+++ b/lib/SP/Config/ConfigInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -38,6 +38,7 @@ interface ConfigInterface
     *
     * @param string $param   El valor a obtener
     * @param string $default El valor por defecto
+     *
     * @return string el valor o $default
     */
    public static function getValue($param, $default = null);
@@ -45,10 +46,11 @@ interface ConfigInterface
    /**
     * Guardar un parámetro de configuración
     *
-     * @param string $param El parámetro a guardar
-     * @param string $value El valor a guardar
-     * @param bool   $email enviar email?
+     * @param string $param     El parámetro a guardar
+     * @param string $value     El valor a guardar
+     * @param bool   $email     enviar email?
     * @param bool   $hideValue Ocultar el valor del registro en el log
+     *
     * @return bool
     */
    public static function setValue($param, $value, $email = true, $hideValue = false);
@@ -57,6 +59,7 @@ interface ConfigInterface
     * Elimina un parámetro de la configuración.
     *
     * @param string $param clave
+     *
     * @return bool
     */
    public static function deleteParam($param);
--- a/lib/SP/Config/ConfigUtil.php
+++ b/lib/SP/Config/ConfigUtil.php
@@ -32,12 +32,13 @@ use SP\Util\Checks;
 *
 * @package Config
 */
-class ConfigUtil
+final class ConfigUtil
 {
    /**
     * Adaptador para convertir una cadena de extensiones a un array
     *
     * @param string $filesAllowedExts
+     *
     * @return array
     */
    public static function filesExtsAdapter($filesAllowedExts)
@@ -55,6 +56,7 @@ class ConfigUtil
     * Adaptador para convertir una cadena de direcciones de email a un array
     *
     * @param string $mailAddresses
+     *
     * @return array
     */
    public static function mailAddressesAdapter($mailAddresses)
@@ -68,6 +70,7 @@ class ConfigUtil
     * Adaptador para convertir una cadena de eventos a un array
     *
     * @param array $events
+     *
     * @return array
     */
    public static function eventsAdapter(array $events)
--- a/lib/SP/Core/Acl/AccountPermissionException.php
+++ b/lib/SP/Core/Acl/AccountPermissionException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
 *
 * @package SP\Core\Acl
 */
-class AccountPermissionException extends SPException
+final class AccountPermissionException extends SPException
 {
    /**
     * SPException constructor.
--- a/lib/SP/Core/Acl/Acl.php
+++ b/lib/SP/Core/Acl/Acl.php
@@ -36,7 +36,7 @@ defined('APP_ROOT') || die();
 /**
 * Esta clase es la encargada de calcular las access lists de acceso a usuarios.
 */
-class Acl implements ActionsInterface
+final class Acl implements ActionsInterface
 {
    /**
     * @var Actions
--- a/lib/SP/Core/Acl/ActionNotFoundException.php
+++ b/lib/SP/Core/Acl/ActionNotFoundException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
 *
 * @package SP\Core\Acl
 */
-class ActionNotFoundException extends SPException
+final class ActionNotFoundException extends SPException
 {

 }
--- a/lib/SP/Core/Acl/Actions.php
+++ b/lib/SP/Core/Acl/Actions.php
@@ -25,16 +25,16 @@
 namespace SP\Core\Acl;

 use SP\DataModel\ActionData;
-use SP\Storage\FileException;
-use SP\Storage\FileStorageInterface;
-use SP\Storage\XmlFileStorageInterface;
+use SP\Storage\File\FileException;
+use SP\Storage\File\FileStorageInterface;
+use SP\Storage\File\XmlFileStorageInterface;

 /**
 * Class Actions
 *
 * @package SP\Core\Acl
 */
-class Actions
+final class Actions
 {
    /**
     * Cache file name
@@ -53,7 +53,7 @@ class Actions
     */
    protected $actions;
    /**
-     * @var XmlFileStorageInterface
+     * @var \SP\Storage\File\XmlFileStorageInterface
     */
    protected $xmlFileStorage;
    /**
@@ -64,8 +64,8 @@ class Actions
    /**
     * Action constructor.
     *
-     * @param FileStorageInterface    $fileStorage
-     * @param XmlFileStorageInterface $xmlFileStorage
+     * @param FileStorageInterface                     $fileStorage
+     * @param \SP\Storage\File\XmlFileStorageInterface $xmlFileStorage
     *
     * @throws \SP\Core\Exceptions\FileNotFoundException
     */
--- a/lib/SP/Core/Acl/UnauthorizedPageException.php
+++ b/lib/SP/Core/Acl/UnauthorizedPageException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
 *
 * @package SP\Core\Acl
 */
-class UnauthorizedPageException extends SPException
+final class UnauthorizedPageException extends SPException
 {
    /**
     * SPException constructor.
--- a/lib/SP/Core/Context/ContextCollection.php
+++ b/lib/SP/Core/Context/ContextCollection.php
@@ -31,7 +31,7 @@ use SP\Core\DataCollection;
 *
 * @package SP\Core\Context
 */
-class ContextCollection extends DataCollection
+final class ContextCollection extends DataCollection
 {

 }
--- a/lib/SP/Core/Context/ContextException.php
+++ b/lib/SP/Core/Context/ContextException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException;
 *
 * @package SP\Core\Context
 */
-class ContextException extends SPException
+final class ContextException extends SPException
 {

 }
--- a/lib/SP/Core/Context/SessionContext.php
+++ b/lib/SP/Core/Context/SessionContext.php
@@ -24,11 +24,11 @@

 namespace SP\Core\Context;

-use SP\Account\AccountSearchFilter;
 use SP\Config\ConfigData;
 use SP\Core\Crypt\Vault;
 use SP\DataModel\Dto\AccountCache;
 use SP\DataModel\ProfileData;
+use SP\Services\Account\AccountSearchFilter;
 use SP\Services\User\UserLoginResponse;

 /**
@@ -36,7 +36,7 @@ use SP\Services\User\UserLoginResponse;
 *
 * @package SP\Core\Session
 */
-class SessionContext extends ContextBase
+final class SessionContext extends ContextBase
 {
    private static $isReset = false;
    private static $isLocked = false;
--- a/lib/SP/Core/Context/StatelessContext.php
+++ b/lib/SP/Core/Context/StatelessContext.php
@@ -33,7 +33,7 @@ use SP\Services\User\UserLoginResponse;
 *
 * @package SP\Core\Context
 */
-class StatelessContext extends ContextBase
+final class StatelessContext extends ContextBase
 {
    /**
     * Establecer la configuración
--- a/lib/SP/Core/Crypt/Cookie.php
+++ b/lib/SP/Core/Crypt/Cookie.php
@@ -60,6 +60,7 @@ abstract class Cookie
     *
     * @param string $data
     * @param string $cypher
+     *
     * @return string
     */
    protected final function sign($data, $cypher)
@@ -74,6 +75,7 @@ abstract class Cookie
     *
     * @param string $data
     * @param string $cypher
+     *
     * @return bool|string
     */
    protected final function getCookieData($data, $cypher)
@@ -101,6 +103,7 @@ abstract class Cookie
     * Sets cookie data
     *
     * @param $data
+     *
     * @return bool
     */
    protected function setCookie($data)
--- a/lib/SP/Core/Crypt/Crypt.php
+++ b/lib/SP/Core/Crypt/Crypt.php
@@ -34,7 +34,7 @@ use Defuse\Crypto\KeyProtectedByPassword;
 *
 * @package SP\Core\Crypt
 */
-class Crypt
+final class Crypt
 {
    /**
     * Encriptar datos con una clave segura
@@ -42,6 +42,7 @@ class Crypt
     * @param string     $data
     * @param string|Key $securedKey
     * @param string     $password
+     *
     * @return string
     * @throws CryptoException
     */
@@ -68,6 +69,7 @@ class Crypt
     * @param string $key
     * @param string $password
     * @param bool   $useAscii
+     *
     * @return string|Key
     * @throws CryptoException
     */
@@ -92,6 +94,7 @@ class Crypt
     * @param string                            $data
     * @param string|Key|KeyProtectedByPassword $securedKey
     * @param string                            $password
+     *
     * @return string
     * @throws CryptoException
     */
@@ -122,6 +125,7 @@ class Crypt
     *
     * @param string $password
     * @param bool   $useAscii
+     *
     * @return string|KeyProtectedByPassword
     * @throws CryptoException
     */
--- a/lib/SP/Core/Crypt/CryptPKI.php
+++ b/lib/SP/Core/Crypt/CryptPKI.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -35,7 +35,7 @@ use SP\Core\Exceptions\SPException;
 *
 * @package SP
 */
-class CryptPKI
+final class CryptPKI
 {
    /**
     * @var RSA
@@ -44,6 +44,7 @@ class CryptPKI

    /**
     * @param RSA $rsa
+     *
     * @throws SPException
     */
    public function __construct(RSA $rsa)
@@ -96,6 +97,7 @@ class CryptPKI
     * Encriptar datos con la clave pública
     *
     * @param string $data los datos a encriptar
+     *
     * @return string
     * @throws \SP\Core\Exceptions\FileNotFoundException
     */
@@ -128,6 +130,7 @@ class CryptPKI
     * Desencriptar datos cifrados con la clave pública
     *
     * @param string $data los datos a desencriptar
+     *
     * @return string
     * @throws \SP\Core\Exceptions\FileNotFoundException
     */
--- a/lib/SP/Core/Crypt/CryptSessionHandler.php
+++ b/lib/SP/Core/Crypt/CryptSessionHandler.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -32,7 +32,7 @@ use Defuse\Crypto\Key;
 *
 * @package SP\Core\Crypt
 */
-class CryptSessionHandler extends \SessionHandler
+final class CryptSessionHandler extends \SessionHandler
 {
    /**
     * @var bool Indica si la sesión está encriptada
@@ -57,7 +57,9 @@ class CryptSessionHandler extends \SessionHandler
     * Read session data
     *
     * @link  http://php.net/manual/en/sessionhandler.read.php
-     * @param string $id         The session id to read data for.
+     *
+     * @param string $id The session id to read data for.
+     *
     * @return string <p>
     *                           Returns an encoded string of the read data.
     *                           If nothing was read, it must return an empty string.
@@ -91,6 +93,7 @@ class CryptSessionHandler extends \SessionHandler
     * Write session data
     *
     * @link  http://php.net/manual/en/sessionhandler.write.php
+     *
     * @param string $id           The session id.
     * @param string $data         <p>
     *                             The encoded session data. This data is the
@@ -99,6 +102,7 @@ class CryptSessionHandler extends \SessionHandler
     *                             string and passing it as this parameter.
     *                             Please note sessions use an alternative serialization method.
     *                             </p>
+     *
     * @return bool <p>
     *                             The return value (usually TRUE on success, FALSE on failure).
     *                             Note this value is returned internally to PHP for processing.
--- a/lib/SP/Core/Crypt/Hash.php
+++ b/lib/SP/Core/Crypt/Hash.php
@@ -29,7 +29,7 @@ namespace SP\Core\Crypt;
 *
 * @package SP\Core\Crypt
 */
-class Hash
+final class Hash
 {
    /**
     * Longitud máxima aceptada para hashing
@@ -41,6 +41,7 @@ class Hash
     *
     * @param string $key  con la clave a comprobar
     * @param string $hash con el hash a comprobar
+     *
     * @return bool
     */
    public static function checkHashKey($key, $hash)
@@ -53,6 +54,7 @@ class Hash
     *
     * @param string $key
     * @param bool   $isCheck Indica si la operación es de comprobación o no
+     *
     * @return string
     */
    private static function getKey(&$key, $isCheck = true)
@@ -72,6 +74,7 @@ class Hash
     * Generar un hash de una clave criptográficamente segura
     *
     * @param string $key con la clave a 'hashear'
+     *
     * @return string con el hash de la clave
     */
    public static function hashKey($key)
@@ -84,6 +87,7 @@ class Hash
     *
     * @param $message
     * @param $key
+     *
     * @return string
     */
    public static function signMessage($message, $key)
@@ -97,6 +101,7 @@ class Hash
     * @param $message
     * @param $key
     * @param $hash
+     *
     * @return bool
     */
    public static function checkMessage($message, $key, $hash)
--- a/lib/SP/Core/Crypt/OldCrypt.php
+++ b/lib/SP/Core/Crypt/OldCrypt.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -33,8 +33,10 @@ defined('APP_ROOT') || die();

 /**
 * Esta clase es la encargada de realizar el encriptado/desencriptado de claves
+ *
+ * @deprecated Since 2.1
 */
-class OldCrypt
+final class OldCrypt
 {
    public static $strInitialVector;

@@ -43,6 +45,7 @@ class OldCrypt
     *
     * @param string $pwd        con la clave a 'hashear'
     * @param bool   $prefixSalt Añadir el salt al hash
+     *
     * @return string con el hash de la clave
     */
    public static function mkHashPassword($pwd, $prefixSalt = true)
@@ -58,6 +61,7 @@ class OldCrypt
     *
     * @param string $salt
     * @param bool   $random
+     *
     * @return string con el salt creado
     */
    public static function makeHashSalt($salt = null, $random = true)
@@ -116,7 +120,8 @@ class OldCrypt
     *
     * @param string $customPwd con la clave a encriptar
     * @param string $masterPwd con la clave maestra
-     * @return string con la clave encriptada
+     *
+     * @return array con la clave encriptada
     */
    public static function mkCustomMPassEncrypt($customPwd, $masterPwd)
    {
@@ -132,6 +137,7 @@ class OldCrypt
     * @param string $strValue    con los datos a encriptar
     * @param string $strPassword con la clave maestra
     * @param string $cryptIV     con el IV
+     *
     * @return string con los datos encriptados
     */
    private static function encrypt($strValue, $strPassword, $cryptIV)
@@ -154,6 +160,7 @@ class OldCrypt
     *
     * @param mixed  $data string Los datos a encriptar
     * @param string $pwd  La clave de encriptación
+     *
     * @return array
     * @throws SPException
     */
@@ -201,6 +208,7 @@ class OldCrypt
     *
     * @param string $data      con los datos a encriptar
     * @param string $masterPwd con la clave maestra
+     *
     * @return bool
     */
    public static function mkEncrypt($data, $masterPwd)
@@ -216,6 +224,7 @@ class OldCrypt
     * @param string $cryptData Los datos a desencriptar
     * @param string $cryptIV   con el IV
     * @param string $password  La clave maestra
+     *
     * @return string con los datos desencriptados
     */
    public static function getDecrypt($cryptData, $cryptIV, $password)
@@ -239,6 +248,7 @@ class OldCrypt
     *
     * @param string $string La cadena de la que deriva la key
     * @param null   $salt   El salt utilizado
+     *
     * @return string
     */
    public static function generateAesKey($string, $salt = null)
--- a/lib/SP/Core/Crypt/SecureKeyCookie.php
+++ b/lib/SP/Core/Crypt/SecureKeyCookie.php
@@ -33,7 +33,7 @@ use SP\Http\Request;
 *
 * @package SP\Core\Crypt
 */
-class SecureKeyCookie extends Cookie
+final class SecureKeyCookie extends Cookie
 {
    /**
     * Nombre de la cookie
@@ -51,7 +51,8 @@ class SecureKeyCookie extends Cookie
     *
     * @return SecureKeyCookie
     */
-    public static function factory(Request $request) {
+    public static function factory(Request $request)
+    {
        return new self(self::COOKIE_NAME, $request);
    }

--- a/lib/SP/Core/Crypt/Session.php
+++ b/lib/SP/Core/Crypt/Session.php
@@ -31,12 +31,13 @@ use SP\Core\Context\SessionContext;
 *
 * @package SP\Core\Crypt
 */
-class Session
+final class Session
 {
    /**
     * Devolver la clave maestra de la sesión
     *
     * @param SessionContext $sessionContext
+     *
     * @return string
     * @throws \Defuse\Crypto\Exception\CryptoException
     */
@@ -47,6 +48,7 @@ class Session

    /**
     * @param SessionContext $sessionContext
+     *
     * @return string
     */
    private static function getKey(SessionContext $sessionContext)
@@ -59,6 +61,7 @@ class Session
     *
     * @param                $data
     * @param SessionContext $sessionContext
+     *
     * @throws \Defuse\Crypto\Exception\CryptoException
     */
    public static function saveSessionKey($data, SessionContext $sessionContext)
@@ -70,6 +73,7 @@ class Session
     * Regenerar la clave de sesión
     *
     * @param SessionContext $sessionContext
+     *
     * @throws \Defuse\Crypto\Exception\CryptoException
     */
    public static function reKey(SessionContext $sessionContext)
--- a/lib/SP/Core/Crypt/Vault.php
+++ b/lib/SP/Core/Crypt/Vault.php
@@ -29,7 +29,7 @@ namespace SP\Core\Crypt;
 *
 * @package SP\Core\Crypt
 */
-class Vault
+final class Vault
 {
    /**
     * @var string
--- a/lib/SP/Core/DataCollection.php
+++ b/lib/SP/Core/DataCollection.php
@@ -61,9 +61,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Whether a offset exists
     *
     * @link  http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
     * @param mixed $offset <p>
     *                      An offset to check for.
     *                      </p>
+     *
     * @return boolean true on success or false on failure.
     *                      </p>
     *                      <p>
@@ -79,6 +81,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * See if an attribute exists in the collection
     *
     * @param string $key The name of the parameter
+     *
     * @return boolean
     */
    public function exists($key)
@@ -91,9 +94,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Offset to retrieve
     *
     * @link  http://php.net/manual/en/arrayaccess.offsetget.php
+     *
     * @param mixed $offset <p>
     *                      The offset to retrieve.
     *                      </p>
+     *
     * @return mixed Can return all value types.
     * @since 5.0.0
     */
@@ -109,6 +114,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     *
     * @param string $key         The name of the parameter to return
     * @param mixed  $default_val The default value of the parameter if it contains no value
+     *
     * @return mixed
     */
    public function get($key, $default_val = null)
@@ -124,12 +130,14 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Offset to set
     *
     * @link  http://php.net/manual/en/arrayaccess.offsetset.php
+     *
     * @param mixed $offset <p>
     *                      The offset to assign the value to.
     *                      </p>
     * @param mixed $value  <p>
     *                      The value to set.
     *                      </p>
+     *
     * @return void
     * @since 5.0.0
     */
@@ -143,6 +151,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     *
     * @param string $key   The name of the parameter to set
     * @param mixed  $value The value of the parameter to set
+     *
     * @return DataCollection
     */
    public function set($key, $value)
@@ -156,9 +165,11 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Offset to unset
     *
     * @link  http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
     * @param mixed $offset <p>
     *                      The offset to unset.
     *                      </p>
+     *
     * @return void
     * @since 5.0.0
     */
@@ -171,6 +182,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Remove an attribute from the collection
     *
     * @param string $key The name of the parameter
+     *
     * @return void
     */
    public function remove($key)
@@ -209,6 +221,7 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * Replace the collection's attributes
     *
     * @param array $attributes The attributes to replace the collection's with
+     *
     * @return DataCollection
     */
    public function replace(array $attributes = array())
@@ -235,7 +248,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * this instance while treating it as an instance property
     *
     * @see get()
+     *
     * @param string $key The name of the parameter to return
+     *
     * @return mixed
     */
    public function __get($key)
@@ -250,8 +265,10 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * this instance while treating it as an instance property
     *
     * @see set()
+     *
     * @param string $key   The name of the parameter to set
     * @param mixed  $value The value of the parameter to set
+     *
     * @return void
     */
    public function __set($key, $value)
@@ -266,7 +283,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * from this instance while treating it as an instance property
     *
     * @see exists()
+     *
     * @param string $key The name of the parameter
+     *
     * @return boolean
     */
    public function __isset($key)
@@ -281,7 +300,9 @@ abstract class DataCollection implements IteratorAggregate, ArrayAccess, Countab
     * this instance while treating it as an instance property
     *
     * @see remove()
+     *
     * @param string $key The name of the parameter
+     *
     * @return void
     */
    public function __unset($key)
--- a/lib/SP/Core/Dic/Container.php
+++ b/lib/SP/Core/Dic/Container.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -53,6 +53,7 @@ final class Container implements DicInterface
     *
     * @param string   $name
     * @param callable $callable
+     *
     * @internal param callable|string $class
     */
    public function share($name, $callable = null)
@@ -65,6 +66,7 @@ final class Container implements DicInterface
     *
     * @param string   $name
     * @param callable $callable
+     *
     * @internal param callable|string $class
     */
    public function add($name, $callable = null)
@@ -76,6 +78,7 @@ final class Container implements DicInterface
     * Inject object
     *
     * @param $context
+     *
     * @return mixed
     * @throws \Psr\Container\ContainerExceptionInterface
     */
@@ -156,6 +159,7 @@ final class Container implements DicInterface

    /**
     * @param $id
+     *
     * @return mixed
     * @throws ContainerExceptionInterface
     */
@@ -178,6 +182,7 @@ final class Container implements DicInterface

    /**
     * @param $id
+     *
     * @return mixed
     */
    private function getSharedObject($id)
--- a/lib/SP/Core/Dic/ContainerException.php
+++ b/lib/SP/Core/Dic/ContainerException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Dic/DicInterface.php
+++ b/lib/SP/Core/Dic/DicInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -53,6 +53,7 @@ interface DicInterface extends ContainerInterface
     * Inject object
     *
     * @param $context
+     *
     * @return mixed
     */
    public function inject($context);
--- a/lib/SP/Core/Dic/InjectableTrait.php
+++ b/lib/SP/Core/Dic/InjectableTrait.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Dic/Injector.php
+++ b/lib/SP/Core/Dic/Injector.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -40,6 +40,7 @@ class Injector
     *
     * @param ContainerInterface $container
     * @param                    $context
+     *
     * @return mixed
     * @throws ContainerException
     */
--- a/lib/SP/Core/Dic/NotFoundException.php
+++ b/lib/SP/Core/Dic/NotFoundException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Events/Event.php
+++ b/lib/SP/Core/Events/Event.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use InvalidArgumentException;
 *
 * @package SP\Core\Events
 */
-class Event
+final class Event
 {
    /**
     * @var object
@@ -45,8 +45,9 @@ class Event
    /**
     * Event constructor.
     *
-     * @param object $source
+     * @param object       $source
     * @param EventMessage $eventMessage
+     *
     * @throws InvalidArgumentException
     */
    public function __construct($source, EventMessage $eventMessage = null)
--- a/lib/SP/Core/Events/EventDispatcher.php
+++ b/lib/SP/Core/Events/EventDispatcher.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Events;
 *
 * @package SP\Core\EventDispatcher
 */
-class EventDispatcher extends EventDispatcherBase
+final class EventDispatcher extends EventDispatcherBase
 {

 }
--- a/lib/SP/Core/Events/EventDispatcherInterface.php
+++ b/lib/SP/Core/Events/EventDispatcherInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Events/EventMessage.php
+++ b/lib/SP/Core/Events/EventMessage.php
@@ -32,7 +32,7 @@ use SP\Html\Html;
 *
 * @package SP\Core\Events
 */
-class EventMessage implements MessageInterface
+final class EventMessage implements MessageInterface
 {
    /**
     * @var array Detalles de la acción en formato "detalle : descripción"
@@ -67,6 +67,7 @@ class EventMessage implements MessageInterface
     * Devuelve la descripción de la acción realizada en formato HTML
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getHtmlDescription($translate = false)
@@ -78,6 +79,7 @@ class EventMessage implements MessageInterface
     * Devuelve la descripción de la acción realizada
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getDescription($translate = false)
@@ -108,6 +110,7 @@ class EventMessage implements MessageInterface
     *
     * @param $key   string
     * @param $value string
+     *
     * @return $this
     */
    public function addDetailHtml($key, $value)
@@ -122,6 +125,7 @@ class EventMessage implements MessageInterface
     *
     * @param $key   string
     * @param $value string
+     *
     * @return $this
     */
    public function addDetail($key, $value)
@@ -141,6 +145,7 @@ class EventMessage implements MessageInterface
     * Formatear una cadena para guardarla en el registro
     *
     * @param $string string La cadena a formatear
+     *
     * @return string
     */
    private function formatString($string)
@@ -152,6 +157,7 @@ class EventMessage implements MessageInterface
     * Establece la descripción de la acción realizada en formato HTML
     *
     * @param string $description
+     *
     * @return $this
     */
    public function addDescriptionHtml($description = '')
@@ -165,6 +171,7 @@ class EventMessage implements MessageInterface
     * Establece la descripción de la acción realizada
     *
     * @param string $description
+     *
     * @return $this
     */
    public function addDescription($description = '')
@@ -188,6 +195,7 @@ class EventMessage implements MessageInterface
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = PHP_EOL)
@@ -199,6 +207,7 @@ class EventMessage implements MessageInterface
     * Devuelve los detalles de la acción realizada
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getDetails($translate = false)
@@ -216,7 +225,8 @@ class EventMessage implements MessageInterface
     * Devolver un detalle formateado
     *
     * @param array $detail
-     * @param bool $translate
+     * @param bool  $translate
+     *
     * @return string
     */
    protected function formatDetail(array $detail, $translate = false)
@@ -259,6 +269,7 @@ class EventMessage implements MessageInterface
     * Devuelve los detalles en formato HTML
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getHtmlDetails($translate = false)
@@ -292,7 +303,8 @@ class EventMessage implements MessageInterface

    /**
     * @param string $type
-     * @param mixed $data
+     * @param mixed  $data
+     *
     * @return EventMessage
     */
    public function addData($type, $data)
--- a/lib/SP/Core/Events/EventReceiver.php
+++ b/lib/SP/Core/Events/EventReceiver.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Exceptions/ConfigException.php
+++ b/lib/SP/Core/Exceptions/ConfigException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class ConfigException extends SPException
+final class ConfigException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/ConstraintException.php
+++ b/lib/SP/Core/Exceptions/ConstraintException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class ConstraintException extends SPException
+final class ConstraintException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/FileNotFoundException.php
+++ b/lib/SP/Core/Exceptions/FileNotFoundException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class FileNotFoundException extends SPException
+final class FileNotFoundException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/InitializationException.php
+++ b/lib/SP/Core/Exceptions/InitializationException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class InitializationException extends SPException
+final class InitializationException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/InvalidArgumentException.php
+++ b/lib/SP/Core/Exceptions/InvalidArgumentException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class InvalidArgumentException extends SPException
+final class InvalidArgumentException extends SPException
 {
-    
+
 }
--- a/lib/SP/Core/Exceptions/InvalidClassException.php
+++ b/lib/SP/Core/Exceptions/InvalidClassException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class InvalidClassException extends SPException
+final class InvalidClassException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/InvalidImageException.php
+++ b/lib/SP/Core/Exceptions/InvalidImageException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class InvalidImageException extends SPException
+final class InvalidImageException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/ItemException.php
+++ b/lib/SP/Core/Exceptions/ItemException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -30,7 +30,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class ItemException extends \Exception
+final class ItemException extends \Exception
 {

 }
--- a/lib/SP/Core/Exceptions/QueryException.php
+++ b/lib/SP/Core/Exceptions/QueryException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class QueryException extends SPException
+final class QueryException extends SPException
 {

 }
--- a/lib/SP/Core/Exceptions/SPException.php
+++ b/lib/SP/Core/Exceptions/SPException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -69,6 +69,7 @@ class SPException extends \Exception

    /**
     * @param $type
+     *
     * @return mixed
     */
    public static function getExceptionTypeName($type)
--- a/lib/SP/Core/Exceptions/ValidationException.php
+++ b/lib/SP/Core/Exceptions/ValidationException.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Exceptions;
 *
 * @package SP\Core\Exceptions
 */
-class ValidationException extends \Exception
+final class ValidationException extends \Exception
 {

 }
--- a/lib/SP/Core/ItemsTypeInterface.php
+++ b/lib/SP/Core/ItemsTypeInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Language.php
+++ b/lib/SP/Core/Language.php
@@ -37,7 +37,7 @@ defined('APP_ROOT') || die();
 *
 * @package SP
 */
-class Language
+final class Language
 {
    /**
     * Lenguaje del usuario
--- a/lib/SP/Core/Messages/LogMessage.php
+++ b/lib/SP/Core/Messages/LogMessage.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use SP\Html\Html;
 *
 * @package SP\Core\Messages
 */
-class LogMessage extends MessageBase
+final class LogMessage extends MessageBase
 {
    /**
     * @var string Acción realizada
@@ -54,6 +54,7 @@ class LogMessage extends MessageBase
     * Devuelve la descripción de la acción realizada en formato HTML
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getHtmlDescription($translate = false)
@@ -65,6 +66,7 @@ class LogMessage extends MessageBase
     * Devuelve la descripción de la acción realizada
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getDescription($translate = false)
@@ -89,6 +91,7 @@ class LogMessage extends MessageBase
     *
     * @param $key   string
     * @param $value string
+     *
     * @return $this
     */
    public function addDetailsHtml($key, $value)
@@ -103,6 +106,7 @@ class LogMessage extends MessageBase
     *
     * @param $key   string
     * @param $value string
+     *
     * @return $this
     */
    public function addDetails($key, $value)
@@ -118,10 +122,23 @@ class LogMessage extends MessageBase
        return $this;
    }

+    /**
+     * Formatear una cadena para guardarla en el registro
+     *
+     * @param $string string La cadena a formatear
+     *
+     * @return string
+     */
+    private function formatString($string)
+    {
+        return strip_tags($string);
+    }
+
    /**
     * Establece la descripción de la acción realizada en formato HTML
     *
     * @param string $description
+     *
     * @return $this
     */
    public function addDescriptionHtml($description = '')
@@ -135,6 +152,7 @@ class LogMessage extends MessageBase
     * Establece la descripción de la acción realizada
     *
     * @param string $description
+     *
     * @return $this
     */
    public function addDescription($description = '')
@@ -159,6 +177,7 @@ class LogMessage extends MessageBase
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = PHP_EOL)
@@ -174,6 +193,7 @@ class LogMessage extends MessageBase
     * Devuelve la acción realizada
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getAction($translate = false)
@@ -185,6 +205,7 @@ class LogMessage extends MessageBase
     * Establece la acción realizada
     *
     * @param string $action
+     *
     * @return $this
     */
    public function setAction($action)
@@ -194,21 +215,11 @@ class LogMessage extends MessageBase
        return $this;
    }

-    /**
-     * Formatear una cadena para guardarla en el registro
-     *
-     * @param $string string La cadena a formatear
-     * @return string
-     */
-    private function formatString($string)
-    {
-        return strip_tags($string);
-    }
-
    /**
     * Devuelve los detalles de la acción realizada
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getDetails($translate = false)
@@ -234,7 +245,8 @@ class LogMessage extends MessageBase
     * Devolver un detalle formateado
     *
     * @param array $detail
-     * @param bool $translate
+     * @param bool  $translate
+     *
     * @return string
     */
    protected function formatDetail(array $detail, $translate = false)
@@ -289,6 +301,7 @@ class LogMessage extends MessageBase
     * Devuelve los detalles en formato HTML
     *
     * @param bool $translate
+     *
     * @return string
     */
    public function getHtmlDetails($translate = false)
--- a/lib/SP/Core/Messages/MailMessage.php
+++ b/lib/SP/Core/Messages/MailMessage.php
@@ -29,7 +29,7 @@ namespace SP\Core\Messages;
 *
 * @package SP\Core\Messages
 */
-class MailMessage extends MessageBase implements MessageInterface
+final class MailMessage extends MessageBase implements MessageInterface
 {
    /**
     * Adds a blank description line
@@ -59,6 +59,7 @@ class MailMessage extends MessageBase implements MessageInterface
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = PHP_EOL)
--- a/lib/SP/Core/Messages/MessageBase.php
+++ b/lib/SP/Core/Messages/MessageBase.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -62,6 +62,7 @@ abstract class MessageBase implements MessageInterface

    /**
     * @param string $title
+     *
     * @return MessageBase
     */
    public function setTitle($title)
@@ -81,6 +82,7 @@ abstract class MessageBase implements MessageInterface

    /**
     * @param array $description
+     *
     * @return MessageBase
     */
    public function setDescription(array $description)
@@ -92,6 +94,7 @@ abstract class MessageBase implements MessageInterface

    /**
     * @param string $description
+     *
     * @return MessageBase
     */
    public function addDescription($description)
@@ -111,6 +114,7 @@ abstract class MessageBase implements MessageInterface

    /**
     * @param array $footer
+     *
     * @return MessageBase
     */
    public function setFooter(array $footer)
--- a/lib/SP/Core/Messages/MessageInterface.php
+++ b/lib/SP/Core/Messages/MessageInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -35,6 +35,7 @@ interface MessageInterface
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = PHP_EOL);
--- a/lib/SP/Core/Messages/NotificationMessage.php
+++ b/lib/SP/Core/Messages/NotificationMessage.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -29,7 +29,7 @@ namespace SP\Core\Messages;
 *
 * @package SP\Core\Messages
 */
-class NotificationMessage extends MessageBase
+final class NotificationMessage extends MessageBase
 {
    /**
     * Componer un mensaje en formato HTML
@@ -51,6 +51,7 @@ class NotificationMessage extends MessageBase
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = PHP_EOL)
--- a/lib/SP/Core/Messages/TaskMessage.php
+++ b/lib/SP/Core/Messages/TaskMessage.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -31,7 +31,7 @@ use JsonSerializable;
 *
 * @package SP\Core\Messages
 */
-class TaskMessage implements MessageInterface, JsonSerializable
+final class TaskMessage implements MessageInterface, JsonSerializable
 {
    /**
     * @var string
@@ -80,6 +80,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param string $task
+     *
     * @return TaskMessage
     */
    public function setTask($task)
@@ -99,6 +100,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param string $message
+     *
     * @return TaskMessage
     */
    public function setMessage($message)
@@ -118,6 +120,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param int $time
+     *
     * @return TaskMessage
     */
    public function setTime($time)
@@ -137,6 +140,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param int $progress
+     *
     * @return TaskMessage
     */
    public function setProgress($progress)
@@ -156,6 +160,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param int $end
+     *
     * @return TaskMessage
     */
    public function setEnd($end)
@@ -169,6 +174,7 @@ class TaskMessage implements MessageInterface, JsonSerializable
     * Componer un mensaje en formato texto
     *
     * @param string $delimiter
+     *
     * @return string
     */
    public function composeText($delimiter = ';')
@@ -231,6 +237,7 @@ class TaskMessage implements MessageInterface, JsonSerializable

    /**
     * @param string $taskId
+     *
     * @return TaskMessage
     */
    public function setTaskId($taskId)
--- a/lib/SP/Core/Plugin/PluginBase.php
+++ b/lib/SP/Core/Plugin/PluginBase.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Plugin/PluginDataStore.php
+++ b/lib/SP/Core/Plugin/PluginDataStore.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -39,6 +39,7 @@ class PluginDataStore
     * Guardar los datos de un plugin
     *
     * @param PluginInterface $Plugin
+     *
     * @throws \SP\Core\Exceptions\SPException
     */
    public static function save(PluginInterface $Plugin)
@@ -55,6 +56,7 @@ class PluginDataStore
     * Cargar los datos de un plugin
     *
     * @param PluginInterface $Plugin
+     *
     * @return bool
     * @throws \SP\Core\Exceptions\InvalidClassException
     * @throws \SP\Core\Exceptions\SPException
--- a/lib/SP/Core/Plugin/PluginEventReceiver.php
+++ b/lib/SP/Core/Plugin/PluginEventReceiver.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Plugin/PluginInterface.php
+++ b/lib/SP/Core/Plugin/PluginInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/Plugin/PluginUtil.php
+++ b/lib/SP/Core/Plugin/PluginUtil.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -84,6 +84,7 @@ class PluginUtil
     * Cargar un plugin
     *
     * @param string $name Nombre del plugin
+     *
     * @return bool|PluginInterface
     * @throws \SP\Core\Exceptions\SPException
     */
@@ -149,6 +150,7 @@ class PluginUtil
     * Obtener la información de un plugin
     *
     * @param string $name Nombre del plugin
+     *
     * @return bool|PluginInterface
     * @throws \SP\Core\Exceptions\SPException
     */
--- a/lib/SP/Core/SessionUtil.php
+++ b/lib/SP/Core/SessionUtil.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/UI/Theme.php
+++ b/lib/SP/Core/UI/Theme.php
@@ -30,8 +30,8 @@ use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Context\SessionContext;
 use SP\Core\Exceptions\InvalidClassException;
-use SP\Storage\FileCache;
-use SP\Storage\FileException;
+use SP\Storage\File\FileCache;
+use SP\Storage\File\FileException;

 defined('APP_ROOT') || die();

@@ -40,7 +40,7 @@ defined('APP_ROOT') || die();
 *
 * @package SP
 */
-class Theme implements ThemeInterface
+final class Theme implements ThemeInterface
 {
    const ICONS_CACHE_FILE = CACHE_PATH . DIRECTORY_SEPARATOR . 'icons.cache';
    /**
@@ -105,6 +105,7 @@ class Theme implements ThemeInterface

    /**
     * @param bool $force
+     *
     * @throws InvalidClassException
     */
    public function initialize($force = false)
@@ -119,6 +120,7 @@ class Theme implements ThemeInterface
     * Inicializar el tema visual a utilizar
     *
     * @param bool $force Forzar la detección del tema para los inicios de sesión
+     *
     * @return void
     */
    public function initTheme($force = false)
--- a/lib/SP/Core/UI/ThemeIconsInterface.php
+++ b/lib/SP/Core/UI/ThemeIconsInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/Core/UI/ThemeInterface.php
+++ b/lib/SP/Core/UI/ThemeInterface.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -33,6 +33,7 @@ interface ThemeInterface
 {
    /**
     * @param bool $force Forzar la detección del tema para los inicios de sesión
+     *
     * @return mixed
     */
    public function initTheme($force = false);
--- a/lib/SP/DataModel/AccountData.php
+++ b/lib/SP/DataModel/AccountData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/AccountExtData.php
+++ b/lib/SP/DataModel/AccountExtData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/AccountHistoryData.php
+++ b/lib/SP/DataModel/AccountHistoryData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/AccountToUserGroupData.php
+++ b/lib/SP/DataModel/AccountToUserGroupData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/AccountVData.php
+++ b/lib/SP/DataModel/AccountVData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/ActionData.php
+++ b/lib/SP/DataModel/ActionData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/AuthTokenData.php
+++ b/lib/SP/DataModel/AuthTokenData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -161,7 +161,7 @@ class AuthTokenData extends DataModelBase implements DataModelInterface
    {
        $this->startDate = (int)$startDate;
    }
-    
+
    /**
     * @return string
     */
--- a/lib/SP/DataModel/CategoryData.php
+++ b/lib/SP/DataModel/CategoryData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
@@ -74,6 +74,7 @@ class CategoryData extends DataModelBase implements DataModelInterface

    /**
     * @param int $id
+     *
     * @return $this
     */
    public function setId($id)
--- a/lib/SP/DataModel/ClientData.php
+++ b/lib/SP/DataModel/ClientData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/ConfigData.php
+++ b/lib/SP/DataModel/ConfigData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/CustomFieldBaseData.php
+++ b/lib/SP/DataModel/CustomFieldBaseData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/CustomFieldDefinitionData.php
+++ b/lib/SP/DataModel/CustomFieldDefinitionData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/CustomFieldTypeData.php
+++ b/lib/SP/DataModel/CustomFieldTypeData.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/lib/SP/DataModel/DataModelBase.php
+++ b/lib/SP/DataModel/DataModelBase.php
@@ -2,8 +2,8 @@
 /**
 * sysPass
 *
- * @author nuxsmin
- * @link https://syspass.org
+ * @author    nuxsmin
+ * @link      https://syspass.org
 * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
--- a/Show More
+++ b/Show More