diff --git a/app/Controllers/Admin/Customer/AccountController.php b/app/Controllers/Admin/Customer/AccountController.php index 2913ad6..d1819bb 100644 --- a/app/Controllers/Admin/Customer/AccountController.php +++ b/app/Controllers/Admin/Customer/AccountController.php @@ -28,7 +28,7 @@ class AccountController extends CustomerController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): AccountHelper { if (!$this->_helper) { $this->_helper = new AccountHelper($this->request); diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index 82b9e77..0c14ab2 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -31,7 +31,7 @@ class ClientController extends CustomerController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): ClientHelper { if (!$this->_helper) { $this->_helper = new ClientHelper($this->request); diff --git a/app/Controllers/Admin/Customer/CouponController.php b/app/Controllers/Admin/Customer/CouponController.php index b27e4c9..75898dd 100644 --- a/app/Controllers/Admin/Customer/CouponController.php +++ b/app/Controllers/Admin/Customer/CouponController.php @@ -28,7 +28,7 @@ class CouponController extends CustomerController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): CouponHelper { if (!$this->_helper) { $this->_helper = new CouponHelper($this->request); diff --git a/app/Controllers/Admin/Customer/PointController.php b/app/Controllers/Admin/Customer/PointController.php index aaaeddf..4cfaab7 100644 --- a/app/Controllers/Admin/Customer/PointController.php +++ b/app/Controllers/Admin/Customer/PointController.php @@ -28,7 +28,7 @@ class PointController extends CustomerController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): PointHelper { if (!$this->_helper) { $this->_helper = new PointHelper($this->request); diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index f273f33..1fc37da 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -36,7 +36,7 @@ class ServiceController extends CustomerController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): ServiceHelper { if (!$this->_helper) { $this->_helper = new ServiceHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/DefenceController.php b/app/Controllers/Admin/Equipment/DefenceController.php index f8fc1f2..416231e 100644 --- a/app/Controllers/Admin/Equipment/DefenceController.php +++ b/app/Controllers/Admin/Equipment/DefenceController.php @@ -27,7 +27,7 @@ class DefenceController extends EquipmentController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): DefenceHelper { if (!$this->_helper) { $this->_helper = new DefenceHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/IpController.php b/app/Controllers/Admin/Equipment/IpController.php index d04917e..584a9b6 100644 --- a/app/Controllers/Admin/Equipment/IpController.php +++ b/app/Controllers/Admin/Equipment/IpController.php @@ -27,7 +27,7 @@ class IpController extends EquipmentController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): IpHelper { if (!$this->_helper) { $this->_helper = new IpHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/LineController.php b/app/Controllers/Admin/Equipment/LineController.php index 7d091c5..4eb7f2f 100644 --- a/app/Controllers/Admin/Equipment/LineController.php +++ b/app/Controllers/Admin/Equipment/LineController.php @@ -31,7 +31,7 @@ class LineController extends EquipmentController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): LineHelper { if (!$this->_helper) { $this->_helper = new LineHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Link/CpuController.php b/app/Controllers/Admin/Equipment/Link/CpuController.php index 77160ab..75d99c9 100644 --- a/app/Controllers/Admin/Equipment/Link/CpuController.php +++ b/app/Controllers/Admin/Equipment/Link/CpuController.php @@ -29,7 +29,7 @@ class CpuController extends LinkController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): CpuHelper { if (!$this->_helper) { $this->_helper = new CpuHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Link/DiskController.php b/app/Controllers/Admin/Equipment/Link/DiskController.php index edeb559..3bf0e83 100644 --- a/app/Controllers/Admin/Equipment/Link/DiskController.php +++ b/app/Controllers/Admin/Equipment/Link/DiskController.php @@ -29,7 +29,7 @@ class DiskController extends LinkController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): DiskHelper { if (!$this->_helper) { $this->_helper = new DiskHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Link/RamController.php b/app/Controllers/Admin/Equipment/Link/RamController.php index 69d891e..6b551da 100644 --- a/app/Controllers/Admin/Equipment/Link/RamController.php +++ b/app/Controllers/Admin/Equipment/Link/RamController.php @@ -29,7 +29,7 @@ class RamController extends LinkController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): RamHelper { if (!$this->_helper) { $this->_helper = new RamHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Part/CpuController.php b/app/Controllers/Admin/Equipment/Part/CpuController.php index 3de2c24..0bcaafb 100644 --- a/app/Controllers/Admin/Equipment/Part/CpuController.php +++ b/app/Controllers/Admin/Equipment/Part/CpuController.php @@ -27,7 +27,7 @@ class CpuController extends PartController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): CpuHelper { if (!$this->_helper) { $this->_helper = new CpuHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Part/DiskController.php b/app/Controllers/Admin/Equipment/Part/DiskController.php index 585d6b1..3e3a727 100644 --- a/app/Controllers/Admin/Equipment/Part/DiskController.php +++ b/app/Controllers/Admin/Equipment/Part/DiskController.php @@ -27,7 +27,7 @@ class DiskController extends PartController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): DiskHelper { if (!$this->_helper) { $this->_helper = new DiskHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/Part/RamController.php b/app/Controllers/Admin/Equipment/Part/RamController.php index 8b2c96e..a8b0129 100644 --- a/app/Controllers/Admin/Equipment/Part/RamController.php +++ b/app/Controllers/Admin/Equipment/Part/RamController.php @@ -27,7 +27,7 @@ class RamController extends PartController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): RamHelper { if (!$this->_helper) { $this->_helper = new RamHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index 2e6027a..4562f09 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -33,7 +33,7 @@ class ServerController extends EquipmentController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): ServerHelper { if (!$this->_helper) { $this->_helper = new ServerHelper($this->request); diff --git a/app/Controllers/Admin/Equipment/SoftwareController.php b/app/Controllers/Admin/Equipment/SoftwareController.php index 791eed7..d3bd788 100644 --- a/app/Controllers/Admin/Equipment/SoftwareController.php +++ b/app/Controllers/Admin/Equipment/SoftwareController.php @@ -28,7 +28,7 @@ class SoftwareController extends EquipmentController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): SoftwareHelper { if (!$this->_helper) { $this->_helper = new SoftwareHelper($this->request); diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php index 8e0a1a3..b565509 100644 --- a/app/Controllers/Admin/Home.php +++ b/app/Controllers/Admin/Home.php @@ -5,8 +5,8 @@ namespace App\Controllers\Admin; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; -use App\Services\UserService as Service; -use App\Helpers\UserHelper as Helper; +use App\Services\UserService; +use App\Helpers\UserHelper; class Home extends AdminController { @@ -16,17 +16,17 @@ class Home extends AdminController parent::initController($request, $response, $logger); } - final public function getService(): Service + final public function getService(): UserService { if (!$this->_service) { - $this->_service = new Service($this->request); + $this->_service = new UserService($this->request); } return $this->_service; } public function getHelper(): mixed { if (!$this->_helper) { - $this->_helper = new Helper($this->request); + $this->_helper = new UserHelper($this->request); } return $this->_helper; } diff --git a/app/Controllers/Admin/MyLogController.php b/app/Controllers/Admin/MyLogController.php index 2f60d3e..1cafac5 100644 --- a/app/Controllers/Admin/MyLogController.php +++ b/app/Controllers/Admin/MyLogController.php @@ -7,8 +7,8 @@ use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; -use App\Services\MyLogService as Service; -use App\Helpers\MyLogHelper as Helper; +use App\Services\MyLogService; +use App\Helpers\MyLogHelper; use App\Services\UserService; class MyLogController extends AdminController @@ -24,17 +24,17 @@ class MyLogController extends AdminController // $this->view_path .= strtolower($this->getService()->getClassName()) . DIRECTORY_SEPARATOR; } - final public function getService(): Service + final public function getService(): MyLogService { if (!$this->_service) { - $this->_service = new Service($this->request); + $this->_service = new MyLogService($this->request); } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): MyLogHelper { if (!$this->_helper) { - $this->_helper = new Helper($this->request); + $this->_helper = new MyLogHelper($this->request); } return $this->_helper; } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index f506b6d..991da77 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -32,7 +32,7 @@ class UserController extends AdminController } return $this->_service; } - public function getHelper(): mixed + public function getHelper(): UserHelper { if (!$this->_helper) { $this->_helper = new UserHelper($this->request); diff --git a/app/Services/Equipment/Link/CpuService.php b/app/Services/Equipment/Link/CpuService.php index 2b444bd..dc4ca52 100644 --- a/app/Services/Equipment/Link/CpuService.php +++ b/app/Services/Equipment/Link/CpuService.php @@ -18,7 +18,7 @@ class CpuService extends LinkService } public function getModelClass(): CpuModel { - return new CpuModel(); + return new CpuModel; } public function getEntityClass(): CpuEntity { diff --git a/app/Services/Equipment/Link/DiskService.php b/app/Services/Equipment/Link/DiskService.php index 37376fe..79ec3e4 100644 --- a/app/Services/Equipment/Link/DiskService.php +++ b/app/Services/Equipment/Link/DiskService.php @@ -18,7 +18,7 @@ class DiskService extends LinkService } public function getModelClass(): DiskModel { - return new DiskModel(); + return new DiskModel; } public function getEntityClass(): DiskEntity { diff --git a/app/Services/Equipment/Part/CpuService.php b/app/Services/Equipment/Part/CpuService.php index 17c5bb6..522e755 100644 --- a/app/Services/Equipment/Part/CpuService.php +++ b/app/Services/Equipment/Part/CpuService.php @@ -17,7 +17,7 @@ class CpuService extends PartService } public function getModelClass(): CpuModel { - return new CpuModel(); + return new CpuModel; } public function getEntityClass(): CpuEntity { diff --git a/app/Services/Equipment/Part/DiskService.php b/app/Services/Equipment/Part/DiskService.php index a007243..9117e57 100644 --- a/app/Services/Equipment/Part/DiskService.php +++ b/app/Services/Equipment/Part/DiskService.php @@ -17,7 +17,7 @@ class DiskService extends PartService } public function getModelClass(): DiskModel { - return new DiskModel(); + return new DiskModel; } public function getEntityClass(): DiskEntity {