diff --git a/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php b/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php index 8d573279..03c02864 100644 --- a/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php +++ b/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php @@ -25,14 +25,10 @@ namespace SP\Modules\Web\Controllers\AccountFavorite; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Account\AccountToFavoriteServiceInterface; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class AccountFavoriteBase @@ -43,14 +39,10 @@ abstract class AccountFavoriteBase extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, AccountToFavoriteServiceInterface $accountToFavoriteService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php index 6714de59..dd168b40 100644 --- a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php +++ b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php @@ -25,18 +25,14 @@ namespace SP\Modules\Web\Controllers\Bootstrap; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Crypt\CryptPKI; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Import\Services\ImportService; -use SP\Http\RequestInterface; use SP\Infrastructure\File\FileException; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Plugin\PluginManager; use SP\Providers\Auth\Browser\BrowserAuthInterface; @@ -55,11 +51,7 @@ final class GetEnvironmentController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, CryptPKI $cryptPKI, PluginManager $pluginManager, BrowserAuthInterface $browser @@ -68,7 +60,7 @@ final class GetEnvironmentController extends SimpleControllerBase $this->pluginManager = $pluginManager; $this->browser = $browser; - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); } /** diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php index 23cc4f18..877cc6d5 100644 --- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php +++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php @@ -26,8 +26,6 @@ namespace SP\Modules\Web\Controllers\ConfigBackup; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; @@ -35,13 +33,11 @@ use SP\Core\Context\SessionContext; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SessionTimeout; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Export\FileBackupServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class FileBackupController @@ -54,14 +50,10 @@ final class FileBackupController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, FileBackupServiceInterface $fileBackupService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->fileBackupService = $fileBackupService; } diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php index b025e90a..710e6399 100644 --- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php +++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php @@ -25,8 +25,6 @@ namespace SP\Modules\Web\Controllers\ConfigBackup; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; @@ -34,14 +32,12 @@ use SP\Core\Context\SessionContext; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SessionTimeout; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Export\XmlExportServiceInterface; use SP\Domain\Export\XmlVerifyServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class XmlExportController @@ -55,15 +51,11 @@ final class XmlExportController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, XmlExportServiceInterface $xmlExportService, XmlVerifyServiceInterface $xmlVerifyService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->xmlExportService = $xmlExportService; $this->xmlVerifyService = $xmlVerifyService; diff --git a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php index 86fe7ca1..0a13ce54 100644 --- a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php +++ b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php @@ -26,8 +26,6 @@ namespace SP\Modules\Web\Controllers\ConfigEncryption; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; @@ -35,13 +33,11 @@ use SP\Core\Crypt\Hash; use SP\Core\Crypt\Session as CryptSession; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Crypt\MasterPassServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class RefreshController @@ -54,14 +50,10 @@ final class RefreshController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, MasterPassServiceInterface $masterPassService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->masterPassService = $masterPassService; } diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveController.php b/app/modules/web/Controllers/ConfigEncryption/SaveController.php index 3138efba..4277630f 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveController.php @@ -26,15 +26,11 @@ namespace SP\Modules\Web\Controllers\ConfigEncryption; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Crypt\Hash; use SP\Core\Events\Event; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Config\ConfigServiceInterface; use SP\Domain\Crypt\MasterPassServiceInterface; use SP\Domain\Crypt\Services\MasterPassService; @@ -42,9 +38,9 @@ use SP\Domain\Crypt\Services\UpdateMasterPassRequest; use SP\Domain\Task\Services\Task; use SP\Domain\Task\Services\TaskFactory; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class SaveController @@ -58,15 +54,11 @@ final class SaveController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, MasterPassServiceInterface $masterPassService, ConfigServiceInterface $configService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->masterPassService = $masterPassService; $this->configService = $configService; diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php index 9d819487..795c2706 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php @@ -25,19 +25,15 @@ namespace SP\Modules\Web\Controllers\ConfigEncryption; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Crypt\TemporaryMasterPassServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class ConfigEncryptionController @@ -52,14 +48,10 @@ final class SaveTempController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, TemporaryMasterPassServiceInterface $temporaryMasterPassService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->temporaryMasterPassService = $temporaryMasterPassService; } diff --git a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php index d6f169a5..e0d81719 100644 --- a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php +++ b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php @@ -25,21 +25,17 @@ namespace SP\Modules\Web\Controllers\ConfigGeneral; use Exception; -use Klein\Klein; use RuntimeException; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Config\ConfigBackupServiceInterface; use SP\Domain\Config\Services\ConfigBackupService; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class DownloadConfigBackup @@ -52,14 +48,10 @@ final class DownloadConfigBackup extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, ConfigBackupServiceInterface $configBackupService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->configBackupService = $configBackupService; } diff --git a/app/modules/web/Controllers/ConfigImport/ImportController.php b/app/modules/web/Controllers/ConfigImport/ImportController.php index 7dcd8309..be723485 100644 --- a/app/modules/web/Controllers/ConfigImport/ImportController.php +++ b/app/modules/web/Controllers/ConfigImport/ImportController.php @@ -25,23 +25,19 @@ namespace SP\Modules\Web\Controllers\ConfigImport; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Context\SessionContext; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Import\ImportServiceInterface; use SP\Domain\Import\Services\FileImport; use SP\Domain\Import\Services\ImportParams; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class ImportController @@ -56,14 +52,10 @@ final class ImportController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, ImportServiceInterface $importService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->importService = $importService; } diff --git a/app/modules/web/Controllers/ConfigLdap/CheckController.php b/app/modules/web/Controllers/ConfigLdap/CheckController.php index 19387eb3..fcdc68ba 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckController.php @@ -26,20 +26,16 @@ namespace SP\Modules\Web\Controllers\ConfigLdap; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Exceptions\CheckException; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Auth\LdapCheckServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\TemplateInterface; /** @@ -54,15 +50,11 @@ final class CheckController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, LdapCheckServiceInterface $ldapCheckService, TemplateInterface $template, ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->ldapCheckService = $ldapCheckService; $this->template = $template; diff --git a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php index 21d8111e..31e195de 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php @@ -62,7 +62,7 @@ final class CheckImportController extends SimpleControllerBase LdapCheckServiceInterface $ldapCheckService, TemplateInterface $template ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $theme); $this->ldapCheckService = $ldapCheckService; $this->template = $template; diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php index 4471bd9b..0e123c52 100644 --- a/app/modules/web/Controllers/ConfigLdap/ImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php @@ -63,7 +63,7 @@ final class ImportController extends SimpleControllerBase PhpExtensionChecker $extensionChecker, LdapImportServiceInterface $ldapImportService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $theme); $this->ldapImportService = $ldapImportService; } diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php index c8f361be..b1e6e0d3 100644 --- a/app/modules/web/Controllers/ConfigMail/CheckController.php +++ b/app/modules/web/Controllers/ConfigMail/CheckController.php @@ -26,8 +26,6 @@ namespace SP\Modules\Web\Controllers\ConfigMail; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; @@ -35,14 +33,12 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; use SP\Core\Exceptions\ValidationException; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Config\Services\ConfigUtil; use SP\Domain\Notification\MailServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Providers\Mail\MailParams; /** @@ -56,14 +52,10 @@ final class CheckController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, MailServiceInterface $mailService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->mailService = $mailService; } diff --git a/app/modules/web/Controllers/Items/AccountUserController.php b/app/modules/web/Controllers/Items/AccountUserController.php index 0824c2a1..68e1f6cf 100644 --- a/app/modules/web/Controllers/Items/AccountUserController.php +++ b/app/modules/web/Controllers/Items/AccountUserController.php @@ -24,16 +24,12 @@ namespace SP\Modules\Web\Controllers\Items; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Account\AccountServiceInterface; use SP\Http\Json; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; use stdClass; /** @@ -45,14 +41,10 @@ final class AccountUserController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, AccountServiceInterface $accountService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Items/CategoriesController.php b/app/modules/web/Controllers/Items/CategoriesController.php index a8de3c55..f82113d2 100644 --- a/app/modules/web/Controllers/Items/CategoriesController.php +++ b/app/modules/web/Controllers/Items/CategoriesController.php @@ -24,18 +24,14 @@ namespace SP\Modules\Web\Controllers\Items; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Category\CategoryServiceInterface; use SP\Http\Json; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; /** @@ -47,14 +43,10 @@ final class CategoriesController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, CategoryServiceInterface $categoryService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Items/ClientsController.php b/app/modules/web/Controllers/Items/ClientsController.php index 7b7859dd..037dddd3 100644 --- a/app/modules/web/Controllers/Items/ClientsController.php +++ b/app/modules/web/Controllers/Items/ClientsController.php @@ -24,15 +24,11 @@ namespace SP\Modules\Web\Controllers\Items; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Client\ClientServiceInterface; use SP\Http\Json; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; /** @@ -44,14 +40,10 @@ final class ClientsController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, ClientServiceInterface $clientService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Items/NotificationsController.php b/app/modules/web/Controllers/Items/NotificationsController.php index f668d442..7cd0d4d0 100644 --- a/app/modules/web/Controllers/Items/NotificationsController.php +++ b/app/modules/web/Controllers/Items/NotificationsController.php @@ -24,18 +24,14 @@ namespace SP\Modules\Web\Controllers\Items; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\DataModel\NotificationData; use SP\Domain\Notification\NotificationServiceInterface; use SP\Html\Html; use SP\Http\Json; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class NotificationsController @@ -46,14 +42,10 @@ final class NotificationsController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, NotificationServiceInterface $notificationService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Items/TagsController.php b/app/modules/web/Controllers/Items/TagsController.php index f0ebd212..99696191 100644 --- a/app/modules/web/Controllers/Items/TagsController.php +++ b/app/modules/web/Controllers/Items/TagsController.php @@ -24,18 +24,14 @@ namespace SP\Modules\Web\Controllers\Items; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Domain\Tag\TagServiceInterface; use SP\Http\Json; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; use SP\Mvc\View\Components\SelectItemAdapter; /** @@ -47,14 +43,10 @@ final class TagsController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, TagServiceInterface $tagService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/app/modules/web/Controllers/Resource/ResourceBase.php b/app/modules/web/Controllers/Resource/ResourceBase.php index 59906455..6facea76 100644 --- a/app/modules/web/Controllers/Resource/ResourceBase.php +++ b/app/modules/web/Controllers/Resource/ResourceBase.php @@ -24,14 +24,10 @@ namespace SP\Modules\Web\Controllers\Resource; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\Html\Minify; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class ResourceBase @@ -42,14 +38,10 @@ abstract class ResourceBase extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, Minify $minify ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->minify = $minify; diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php index 92c7b35a..2f870f9a 100644 --- a/app/modules/web/Controllers/SimpleControllerBase.php +++ b/app/modules/web/Controllers/SimpleControllerBase.php @@ -37,8 +37,8 @@ use SP\Core\UI\ThemeInterface; use SP\Domain\Config\In\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Http\Request; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Traits\WebControllerTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class SimpleControllerBase @@ -65,17 +65,13 @@ abstract class SimpleControllerBase */ public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker + SimpleControllerHelper $simpleControllerHelper ) { - $this->theme = $theme; - $this->router = $router; - $this->acl = $acl; - $this->request = $request; - $this->extensionChecker = $extensionChecker; + $this->theme = $simpleControllerHelper->getTheme(); + $this->router = $simpleControllerHelper->getRouter(); + $this->acl = $simpleControllerHelper->getAcl(); + $this->request = $simpleControllerHelper->getRequest(); + $this->extensionChecker = $simpleControllerHelper->getExtensionChecker(); $this->controllerName = $this->getControllerName(); $this->config = $application->getConfig(); $this->configData = $this->config->getConfigData(); diff --git a/app/modules/web/Controllers/Status/StatusBase.php b/app/modules/web/Controllers/Status/StatusBase.php index 1a98620c..aff20b36 100644 --- a/app/modules/web/Controllers/Status/StatusBase.php +++ b/app/modules/web/Controllers/Status/StatusBase.php @@ -26,13 +26,9 @@ namespace SP\Modules\Web\Controllers\Status; use GuzzleHttp\ClientInterface; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class StatusBase @@ -43,14 +39,10 @@ abstract class StatusBase extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, ClientInterface $client ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->client = $client; } diff --git a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php index 2b1b2ef4..23805421 100644 --- a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php +++ b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php @@ -25,20 +25,16 @@ namespace SP\Modules\Web\Controllers\UserSettingsGeneral; use Exception; -use Klein\Klein; -use SP\Core\Acl\Acl; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Core\PhpExtensionChecker; -use SP\Core\UI\ThemeInterface; use SP\DataModel\UserPreferencesData; use SP\Domain\User\Services\UserLoginResponse; use SP\Domain\User\Services\UserService; use SP\Domain\User\UserServiceInterface; use SP\Http\JsonResponse; -use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Mvc\Controller\SimpleControllerHelper; /** * Class SaveController @@ -53,14 +49,10 @@ final class SaveController extends SimpleControllerBase public function __construct( Application $application, - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, UserServiceInterface $userService ) { - parent::__construct($application, $theme, $router, $acl, $request, $extensionChecker); + parent::__construct($application, $simpleControllerHelper); $this->checks(); diff --git a/lib/SP/Mvc/Controller/SimpleControllerHelper.php b/lib/SP/Mvc/Controller/SimpleControllerHelper.php new file mode 100644 index 00000000..a6079128 --- /dev/null +++ b/lib/SP/Mvc/Controller/SimpleControllerHelper.php @@ -0,0 +1,83 @@ +. + */ + +namespace SP\Mvc\Controller; + + +use Klein\Klein; +use SP\Core\Acl\Acl; +use SP\Core\PhpExtensionChecker; +use SP\Core\UI\ThemeInterface; +use SP\Http\RequestInterface; + +/** + * Class SimpleControllerHelper + */ +final class SimpleControllerHelper +{ + private ThemeInterface $theme; + private Klein $router; + private Acl $acl; + private RequestInterface $request; + private PhpExtensionChecker $extensionChecker; + + public function __construct( + ThemeInterface $theme, + Klein $router, + Acl $acl, + RequestInterface $request, + PhpExtensionChecker $extensionChecker + ) { + $this->theme = $theme; + $this->router = $router; + $this->acl = $acl; + $this->request = $request; + $this->extensionChecker = $extensionChecker; + } + + public function getTheme(): ThemeInterface + { + return $this->theme; + } + + public function getRouter(): Klein + { + return $this->router; + } + + public function getAcl(): Acl + { + return $this->acl; + } + + public function getRequest(): RequestInterface + { + return $this->request; + } + + public function getExtensionChecker(): PhpExtensionChecker + { + return $this->extensionChecker; + } +} \ No newline at end of file diff --git a/lib/SP/Mvc/Controller/WebControllerHelper.php b/lib/SP/Mvc/Controller/WebControllerHelper.php index a464c1db..0800c48c 100644 --- a/lib/SP/Mvc/Controller/WebControllerHelper.php +++ b/lib/SP/Mvc/Controller/WebControllerHelper.php @@ -49,20 +49,16 @@ final class WebControllerHelper private LayoutHelper $layoutHelper; public function __construct( - ThemeInterface $theme, - Klein $router, - Acl $acl, - RequestInterface $request, - PhpExtensionChecker $extensionChecker, + SimpleControllerHelper $simpleControllerHelper, TemplateInterface $template, BrowserAuthInterface $browser, LayoutHelper $layoutHelper ) { - $this->theme = $theme; - $this->router = $router; - $this->acl = $acl; - $this->request = $request; - $this->extensionChecker = $extensionChecker; + $this->theme = $simpleControllerHelper->getTheme(); + $this->router = $simpleControllerHelper->getRouter(); + $this->acl = $simpleControllerHelper->getAcl(); + $this->request = $simpleControllerHelper->getRequest(); + $this->extensionChecker = $simpleControllerHelper->getExtensionChecker(); $this->template = $template; $this->browser = $browser; $this->layoutHelper = $layoutHelper;