chore: Move ErrorUtil

Signed-off-by: Rubén D <[email protected]>
nuxsmin · Apr 28, 2024 · e916420 · e916420
1 parent ce7d02f
commit e916420
Show file tree

Hide file tree

Showing 15 changed files with 701 additions and 657 deletions.
diff --git a/app/modules/web/Controllers/Account/CopyController.php b/app/modules/web/Controllers/Account/CopyController.php
@@ -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 @@
 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

diff --git a/app/modules/web/Controllers/Account/CreateController.php b/app/modules/web/Controllers/Account/CreateController.php
@@ -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 @@
 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

diff --git a/app/modules/web/Controllers/Account/DeleteController.php b/app/modules/web/Controllers/Account/DeleteController.php
@@ -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\Helpers\Account\AccountHelper;
+use SP\Modules\Web\Util\ErrorUtil;
 use SP\Mvc\Controller\WebControllerHelper;
-use SP\Util\ErrorUtil;
 
 /**
  * Class DeleteController

diff --git a/app/modules/web/Controllers/Account/EditController.php b/app/modules/web/Controllers/Account/EditController.php
@@ -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 @@
 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

diff --git a/app/modules/web/Controllers/Account/EditPassController.php b/app/modules/web/Controllers/Account/EditPassController.php
@@ -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\NotFoundExceptionInterface;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Util\ErrorUtil;
+use SP\Modules\Web\Util\ErrorUtil;
 
 /**
  * Class EditPassController

diff --git a/app/modules/web/Controllers/Account/IndexController.php b/app/modules/web/Controllers/Account/IndexController.php
@@ -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 @@
 
 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

diff --git a/app/modules/web/Controllers/Account/RequestAccessController.php b/app/modules/web/Controllers/Account/RequestAccessController.php
@@ -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\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

diff --git a/app/modules/web/Controllers/Account/ViewController.php b/app/modules/web/Controllers/Account/ViewController.php
@@ -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\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Util\ErrorUtil;
+use SP\Modules\Web\Util\ErrorUtil;
 
 /**
  * ViewController

diff --git a/app/modules/web/Controllers/Account/ViewHistoryController.php b/app/modules/web/Controllers/Account/ViewHistoryController.php
@@ -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\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

diff --git a/app/modules/web/Controllers/Account/ViewLinkController.php b/app/modules/web/Controllers/Account/ViewLinkController.php
@@ -40,8 +40,8 @@
 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;
 

diff --git a/app/modules/web/Controllers/AccountFile/ListController.php b/app/modules/web/Controllers/AccountFile/ListController.php
@@ -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 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

diff --git a/app/modules/web/Controllers/UserPassReset/IndexController.php b/app/modules/web/Controllers/UserPassReset/IndexController.php
@@ -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 @@ public function indexAction(): void
 
         $this->view();
     }
-}
+}
diff --git a/app/modules/web/Controllers/UserPassReset/ResetController.php b/app/modules/web/Controllers/UserPassReset/ResetController.php
@@ -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 @@
 
 
 use SP\Modules\Web\Controllers\ControllerBase;
-use SP\Util\ErrorUtil;
+use SP\Modules\Web\Util\ErrorUtil;
 
 /**
  * Class ResetController
@@ -49,4 +49,4 @@ public function resetAction(?string $hash = null): void
 
         $this->view();
     }
-}
+}
diff --git a/lib/SP/Util/ErrorUtil.php → app/modules/web/Util/ErrorUtil.php b/lib/SP/Util/ErrorUtil.php → app/modules/web/Util/ErrorUtil.php
@@ -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\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 @@ public static function showExceptionInView(
             case AccountPermissionException::class:
                 self::showErrorInView($view, self::ERR_ACCOUNT_NO_PERMISSION, $render, $replace);
                 break;
-            default;
+            default:
                 self::showErrorInView($view, self::ERR_EXCEPTION, $render, $replace);
         }
     }