Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-22 00:06:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Move ErrorUtil

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2024-04-28 10:46:41 +02:00
parent ce7d02f5e5
commit e916420db6
15 changed files with 699 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/modules/web/Controllers/Account/CopyController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class CopyController

4
app/modules/web/Controllers/Account/CreateController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class CreateController

4
app/modules/web/Controllers/Account/DeleteController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -31,8 +31,8 @@ use SP\Core\UI\ThemeIcons;
use SP\Domain\Account\Ports\AccountService;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Modules\Web\Controllers\Helpers\Account\AccountHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use SP\Util\ErrorUtil;
/**
* Class DeleteController

4
app/modules/web/Controllers/Account/EditController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class EditController

4
app/modules/web/Controllers/Account/EditPassController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -29,7 +29,7 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class EditPassController

6
app/modules/web/Controllers/Account/IndexController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -27,12 +27,10 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Application;
use SP\Core\Context\ContextBase;
use SP\Core\Events\Event;
use SP\Modules\Web\Controllers\Helpers\Account\AccountSearchHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use SP\Providers\Acl\AclHandler;
use SP\Util\ErrorUtil;
/**
* Class IndexController

4
app/modules/web/Controllers/Account/RequestAccessController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -31,8 +31,8 @@ use SP\Domain\Account\Ports\AccountService;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Modules\Web\Controllers\ControllerBase;
use SP\Modules\Web\Controllers\Helpers\Account\AccountRequestHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use SP\Util\ErrorUtil;
/**
* Class RequestAccessController

4
app/modules/web/Controllers/Account/ViewController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -28,7 +28,7 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* ViewController

4
app/modules/web/Controllers/Account/ViewHistoryController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -30,8 +30,8 @@ use SP\Core\Events\Event;
use SP\Domain\Account\Ports\AccountHistoryService;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Modules\Web\Controllers\Helpers\Account\AccountHistoryHelper;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use SP\Util\ErrorUtil;
/**
* ViewHistoryController

2
app/modules/web/Controllers/Account/ViewLinkController.php
View File

@@ -40,8 +40,8 @@ use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Domain\Core\Crypt\VaultInterface;
use SP\Domain\Image\Ports\ImageService;
use SP\Http\Uri;
use SP\Modules\Web\Util\ErrorUtil;
use SP\Mvc\Controller\WebControllerHelper;
use SP\Util\ErrorUtil;
use SP\Util\Image;
use SP\Util\Serde;

4
app/modules/web/Controllers/AccountFile/ListController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -28,7 +28,7 @@ use Exception;
use SP\Core\Acl\Acl;
use SP\Core\Events\Event;
use SP\Domain\Core\Acl\AclActionsInterface;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class ListController

6
app/modules/web/Controllers/UserPassReset/IndexController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -25,7 +25,7 @@
namespace SP\Modules\Web\Controllers\UserPassReset;
use SP\Modules\Web\Controllers\ControllerBase;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class IndexController
@@ -44,4 +44,4 @@ final class IndexController extends ControllerBase
$this->view();
}
}
}

6
app/modules/web/Controllers/UserPassReset/ResetController.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\UserPassReset;
use SP\Modules\Web\Controllers\ControllerBase;
use SP\Util\ErrorUtil;
use SP\Modules\Web\Util\ErrorUtil;
/**
* Class ResetController
@@ -49,4 +49,4 @@ final class ResetController extends ControllerBase
$this->view();
}
}
}

9
lib/SP/Util/ErrorUtil.php → app/modules/web/Util/ErrorUtil.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -22,7 +22,7 @@
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*/
namespace SP\Util;
namespace SP\Modules\Web\Util;
use Exception;
use SP\Domain\Core\Acl\AccountPermissionException;
@@ -33,12 +33,11 @@ use SP\Domain\User\Services\UpdatedMasterPassException;
use SP\Mvc\View\Template;
use SP\Mvc\View\TemplateInterface;
use function SP\__;
use function SP\processException;
/**
* Class ErrorUtil
*
* @package SP\Util
*/
final class ErrorUtil
{
@@ -76,7 +75,7 @@ final class ErrorUtil
case AccountPermissionException::class:
self::showErrorInView($view, self::ERR_ACCOUNT_NO_PERMISSION, $render, $replace);
break;
default;
default:
self::showErrorInView($view, self::ERR_EXCEPTION, $render, $replace);
}
}

1289
composer.lock generated
View File

File diff suppressed because it is too large Load Diff