From 795a001883f90e1207fb1bd4577297339457ae3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 17 Feb 2023 09:15:06 +0100 Subject: [PATCH] Continued: - requestIsValid() is now renamed to a propper setter setIsRequestValid() and with no default (setters don't have default values) - updated 'core' framework --- .../console/class_HubConsoleAptProxyController.php | 2 +- .../controller/console/class_HubConsoleChatController.php | 2 +- .../console/class_HubConsoleCrawlerController.php | 2 +- .../console/class_HubConsoleCruncherController.php | 2 +- .../console/class_HubConsoleDefaultNewsController.php | 2 +- .../controller/console/class_HubConsoleFuseController.php | 2 +- .../console/class_HubConsoleMinerController.php | 2 +- application/hub/exceptions.php | 8 ++++---- core | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/hub/classes/controller/console/class_HubConsoleAptProxyController.php b/application/hub/classes/controller/console/class_HubConsoleAptProxyController.php index 1ff8fbeb2..2de040e52 100644 --- a/application/hub/classes/controller/console/class_HubConsoleAptProxyController.php +++ b/application/hub/classes/controller/console/class_HubConsoleAptProxyController.php @@ -83,7 +83,7 @@ class HubConsoleAptProxyController extends BaseController implements Controller $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleChatController.php b/application/hub/classes/controller/console/class_HubConsoleChatController.php index 4d1498562..ee93060b7 100644 --- a/application/hub/classes/controller/console/class_HubConsoleChatController.php +++ b/application/hub/classes/controller/console/class_HubConsoleChatController.php @@ -83,7 +83,7 @@ class HubConsoleChatController extends BaseController implements Controller { $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleCrawlerController.php b/application/hub/classes/controller/console/class_HubConsoleCrawlerController.php index 309f95a23..0b58b8f2d 100644 --- a/application/hub/classes/controller/console/class_HubConsoleCrawlerController.php +++ b/application/hub/classes/controller/console/class_HubConsoleCrawlerController.php @@ -83,7 +83,7 @@ class HubConsoleCrawlerController extends BaseController implements Controller { $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleCruncherController.php b/application/hub/classes/controller/console/class_HubConsoleCruncherController.php index eafbd0632..bc191d727 100644 --- a/application/hub/classes/controller/console/class_HubConsoleCruncherController.php +++ b/application/hub/classes/controller/console/class_HubConsoleCruncherController.php @@ -84,7 +84,7 @@ class HubConsoleCruncherController extends BaseController implements Controller $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php b/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php index 9a11b4782..59cbf7772 100644 --- a/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php +++ b/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php @@ -88,7 +88,7 @@ class HubConsoleDefaultNewsController extends BaseController implements Controll $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleFuseController.php b/application/hub/classes/controller/console/class_HubConsoleFuseController.php index a967153d2..624def3f4 100644 --- a/application/hub/classes/controller/console/class_HubConsoleFuseController.php +++ b/application/hub/classes/controller/console/class_HubConsoleFuseController.php @@ -83,7 +83,7 @@ class HubConsoleFuseController extends BaseController implements Controller { $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/classes/controller/console/class_HubConsoleMinerController.php b/application/hub/classes/controller/console/class_HubConsoleMinerController.php index 87bd1f5b5..3bed7c42f 100644 --- a/application/hub/classes/controller/console/class_HubConsoleMinerController.php +++ b/application/hub/classes/controller/console/class_HubConsoleMinerController.php @@ -83,7 +83,7 @@ class HubConsoleMinerController extends BaseController implements Controller { $this->executePreFilters($requestInstance, $responseInstance); // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); diff --git a/application/hub/exceptions.php b/application/hub/exceptions.php index 7104544f0..6e8fd9f70 100644 --- a/application/hub/exceptions.php +++ b/application/hub/exceptions.php @@ -106,9 +106,9 @@ Backtrace: } // Error handler -function hub_error_handler ($errno, $errstr, $errfile, $errline, array $errcontext) { +function hub_error_handler (int $errno, string $errstr, string $errfile, int $errline, array $errcontext) { // Construct the message - $message = sprintf('File: %s, Line: %s, Code: %s, Message: %s', + $message = sprintf('File: %s, Line: %d, Code: %d, Message: %s', basename($errfile), $errline, $errno, @@ -120,9 +120,9 @@ function hub_error_handler ($errno, $errstr, $errfile, $errline, array $errconte } // Assertion handler -function hub_assert_handler ($file, $line, $code) { +function hub_assert_handler (string $file, int $line, int $code) { // Empty code? - if ($code === '') { + if (empty($code)) { $code = 'Unknown'; } diff --git a/core b/core index ad17ce1c5..262f905be 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ad17ce1c5fe13f2290e74bec676f23e65c2e9100 +Subproject commit 262f905be8d6f9dc9fd02acc9505cb45ef2a53f6 -- 2.39.5