diff --git a/upload/admin/controller/common/reset.php b/upload/admin/controller/common/reset.php
index 73e21dc19..b6dfff77d 100644
--- a/upload/admin/controller/common/reset.php
+++ b/upload/admin/controller/common/reset.php
@@ -13,9 +13,9 @@ class ControllerCommonReset extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		if ($this->user->isLogged() && isset($this->request->get['user_token']) && ($this->request->get['user_token'] == $this->session->data['user_token'])) {
 			$this->response->redirect($this->url->link('common/dashboard', '', true));
 		}
diff --git a/upload/admin/controller/customer/customer.php b/upload/admin/controller/customer/customer.php
index 5fc066217..763c87b74 100644
--- a/upload/admin/controller/customer/customer.php
+++ b/upload/admin/controller/customer/customer.php
@@ -1078,9 +1078,9 @@ protected function validateUnlock(): bool {
 	/**
 	 * Login
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function login(): ?object {
+	public function login(): ?\Action {
 		if (isset($this->request->get['customer_id'])) {
 			$customer_id = (int)$this->request->get['customer_id'];
 		} else {
diff --git a/upload/admin/controller/extension/other/db_schema.php b/upload/admin/controller/extension/other/db_schema.php
index 9d1f9be87..e33476122 100644
--- a/upload/admin/controller/extension/other/db_schema.php
+++ b/upload/admin/controller/extension/other/db_schema.php
@@ -187,9 +187,9 @@ public function report(): string {
 	/**
 	 * Get Report
 	 *
-	 * @return ?object
+	 * @return \Action|null
 	 */
-	public function getReport(): ?object {
+	public function getReport(): ?\Action {
 		$this->load->language('extension/other/db_schema');
 
 		$data['title'] = $this->language->get('text_report');
diff --git a/upload/admin/controller/extension/other/recurring.php b/upload/admin/controller/extension/other/recurring.php
index c9badb029..57b3e365a 100644
--- a/upload/admin/controller/extension/other/recurring.php
+++ b/upload/admin/controller/extension/other/recurring.php
@@ -385,9 +385,9 @@ protected function getList(): void {
 	/**
 	 * Info
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function info(): ?object {
+	public function info(): ?\Action {
 		$this->load->model('extension/other/recurring');
 
 		if (isset($this->request->get['order_recurring_id'])) {
@@ -536,9 +536,9 @@ public function info(): ?object {
 	/**
 	 * Get Report
 	 *
-	 * @return ?object
+	 * @return \Action|null
 	 */
-	public function getReport(): ?object {
+	public function getReport(): ?\Action {
 		$this->load->language('extension/other/recurring');
 
 		$data['title'] = $this->language->get('text_report');
diff --git a/upload/admin/controller/startup/login.php b/upload/admin/controller/startup/login.php
index a774f692a..7d2ca3cbb 100644
--- a/upload/admin/controller/startup/login.php
+++ b/upload/admin/controller/startup/login.php
@@ -8,9 +8,9 @@ class ControllerStartupLogin extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		$route = $this->request->get['route'] ?? '';
 
 		$ignore = [
diff --git a/upload/admin/controller/startup/permission.php b/upload/admin/controller/startup/permission.php
index fff914dfe..408eab1fd 100644
--- a/upload/admin/controller/startup/permission.php
+++ b/upload/admin/controller/startup/permission.php
@@ -8,9 +8,9 @@ class ControllerStartupPermission extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		if (isset($this->request->get['route'])) {
 			$route = '';
 
diff --git a/upload/admin/model/extension/payment/amazon_login_pay.php b/upload/admin/model/extension/payment/amazon_login_pay.php
index 1e20e5d56..fb6090a88 100644
--- a/upload/admin/model/extension/payment/amazon_login_pay.php
+++ b/upload/admin/model/extension/payment/amazon_login_pay.php
@@ -439,7 +439,7 @@ public function isOrderInState(string $order_reference_id, array $states = []):
 	 *
 	 * @param string $order_reference_id
 	 *
-	 * @return object
+	 * @return object|null
 	 */
 	public function fetchOrder(string $order_reference_id): ?object {
 		$order = $this->offAmazon('GetOrderReferenceDetails', [
diff --git a/upload/admin/model/extension/payment/cardinity.php b/upload/admin/model/extension/payment/cardinity.php
index 64f9aec5b..934c9ebeb 100644
--- a/upload/admin/model/extension/payment/cardinity.php
+++ b/upload/admin/model/extension/payment/cardinity.php
@@ -27,7 +27,7 @@ public function getOrder(int $order_id): array {
 	 *
 	 * @param array<string, mixed> $credentials
 	 *
-	 * @return ?object
+	 * @return object
 	 */
 	public function createClient(array $credentials): ?object {
 		if ($credentials) {
diff --git a/upload/catalog/controller/account/order.php b/upload/catalog/controller/account/order.php
index dfb87f6a0..3fcd6fb4e 100644
--- a/upload/catalog/controller/account/order.php
+++ b/upload/catalog/controller/account/order.php
@@ -100,9 +100,9 @@ public function index(): void {
 	/**
 	 * Info
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function info(): ?object {
+	public function info(): ?\Action {
 		$this->load->language('account/order');
 
 		if (isset($this->request->get['order_id'])) {
diff --git a/upload/catalog/controller/account/reset.php b/upload/catalog/controller/account/reset.php
index 6635d3bda..11fd512ea 100644
--- a/upload/catalog/controller/account/reset.php
+++ b/upload/catalog/controller/account/reset.php
@@ -8,9 +8,9 @@ class ControllerAccountReset extends Controller {
 	private array $error = [];
 
 	/**
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		if ($this->customer->isLogged()) {
 			$this->response->redirect($this->url->link('account/account', '', true));
 		}
diff --git a/upload/catalog/controller/account/tracking.php b/upload/catalog/controller/account/tracking.php
index 5c53ed0a0..dfdd2d346 100644
--- a/upload/catalog/controller/account/tracking.php
+++ b/upload/catalog/controller/account/tracking.php
@@ -8,9 +8,9 @@ class ControllerAccountTracking extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		if (!$this->customer->isLogged() || (!isset($this->request->get['customer_token']) || !isset($this->session->data['customer_token']) || ($this->request->get['customer_token'] != $this->session->data['customer_token']))) {
 			$this->session->data['redirect'] = $this->url->link('account/tracking', '', true);
 
diff --git a/upload/catalog/controller/extension/subscription/opayo.php b/upload/catalog/controller/extension/subscription/opayo.php
index 0534bf560..e5e9913f7 100644
--- a/upload/catalog/controller/extension/subscription/opayo.php
+++ b/upload/catalog/controller/extension/subscription/opayo.php
@@ -3,7 +3,7 @@ class ControllerExtensionRecurringOpayo extends Controller {
 	/**
 	 * @var array<string, string>
 	 */
-	private $error = [];
+	private array $error = [];
 
 	/**
 	 * Index
diff --git a/upload/catalog/controller/information/gdpr.php b/upload/catalog/controller/information/gdpr.php
index 944b2df9f..84ffc9f75 100644
--- a/upload/catalog/controller/information/gdpr.php
+++ b/upload/catalog/controller/information/gdpr.php
@@ -8,9 +8,9 @@ class ControllerInformationGdpr extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \System\Engine\Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		// Information
 		$this->load->model('catalog/information');
 
@@ -49,11 +49,11 @@ public function index(): ?object {
 			$data['header'] = $this->load->controller('common/header');
 
 			$this->response->setOutput($this->load->view('information/gdpr', $data));
+
+			return null;
 		} else {
 			return new \Action('error/not_found');
 		}
-
-		return null;
 	}
 
 	/**
@@ -145,9 +145,9 @@ public function action(): void {
 	/**
 	 * Success
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function success(): ?object {
+	public function success(): ?\Action {
 		if (isset($this->request->get['code'])) {
 			$code = (string)$this->request->get['code'];
 		} else {
diff --git a/upload/catalog/controller/startup/maintenance.php b/upload/catalog/controller/startup/maintenance.php
index 43ad21299..42ff38f01 100644
--- a/upload/catalog/controller/startup/maintenance.php
+++ b/upload/catalog/controller/startup/maintenance.php
@@ -8,9 +8,9 @@ class ControllerStartupMaintenance extends Controller {
 	/**
 	 * Index
 	 *
-	 * @return \Action|object|null
+	 * @return \Action|null
 	 */
-	public function index(): ?object {
+	public function index(): ?\Action {
 		if ($this->config->get('config_maintenance')) {
 			// Route
 			if (isset($this->request->get['route'])) {