From e3c223c2711ce7c31a3cbd3116ec1865879e38b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 9 Sep 2024 07:08:51 +0200 Subject: [PATCH] Continued: - private and final together doesn't make any sense since PHP has fixed a lot of internal wrong handling a VERY long time ago ... --- .../backend/lfdb_legacy/class_CachedLocalFileDatabase.php | 4 ++-- .../database/frontend/class_BaseDatabaseFrontend.php | 2 +- .../decorator/xml/compactor/class_XmlCompactorDecorator.php | 2 +- framework/main/classes/images/class_BaseImage.php | 2 +- framework/main/classes/mailer/class_BaseMailer.php | 2 +- .../main/classes/template/class_BaseTemplateEngine.php | 6 +++--- .../main/classes/template/menu/class_MenuTemplateEngine.php | 4 ++-- .../classes/template/xml/class_BaseXmlTemplateEngine.php | 2 +- framework/main/exceptions/class_FrameworkException.php | 2 +- .../main/middleware/database/class_DatabaseConnection.php | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php index b82baad5..d693aced 100644 --- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php +++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php @@ -135,7 +135,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac * @param $infoInstance The FQFN of the last read file * @return void */ - private final function setLastFile (SplFileInfo $infoInstance) { + private function setLastFile (SplFileInfo $infoInstance) { // Cast string and set it $this->lastFile = $infoInstance; } @@ -155,7 +155,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac * @param $contents An array with header and data elements * @return void */ - private final function setLastFileContents (array $contents) { + private function setLastFileContents (array $contents) { // Set array $this->lastContents = $contents; } diff --git a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php index 78665d33..525b7efc 100644 --- a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php +++ b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php @@ -74,7 +74,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem { * * @return void */ - private final function initCacheInstance () { + private function initCacheInstance () { // Set "cache" attributes //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('BASE-DATABASE-FRONTEND: CALLED!'); $this->databaseCacheEnabled = FrameworkBootstrap::getConfigurationInstance()->isEnabled('database_cache'); diff --git a/framework/main/classes/decorator/xml/compactor/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/compactor/class_XmlCompactorDecorator.php index 9fc7d1a7..6d7b0165 100644 --- a/framework/main/classes/decorator/xml/compactor/class_XmlCompactorDecorator.php +++ b/framework/main/classes/decorator/xml/compactor/class_XmlCompactorDecorator.php @@ -83,7 +83,7 @@ class XmlCompactorDecorator extends BaseDecorator implements Parseable { * * @return $parserInstance An instance of an Parseable */ - private final function getParserInstance () { + private function getParserInstance () { return $this->parserInstance; } diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php index a6f8faa5..76871d1b 100644 --- a/framework/main/classes/images/class_BaseImage.php +++ b/framework/main/classes/images/class_BaseImage.php @@ -125,7 +125,7 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable { * @param $colorChannel Red, green or blue channel? * @param $colorValue Value to set */ - private final function setColor (string $colorMode, string $colorChannel, $colorValue) { + private function setColor (string $colorMode, string $colorChannel, $colorValue) { // Construct the eval() command $eval = sprintf("\$this->%s['%s'] = \"%s\";", $colorMode, diff --git a/framework/main/classes/mailer/class_BaseMailer.php b/framework/main/classes/mailer/class_BaseMailer.php index dd951361..840bb616 100644 --- a/framework/main/classes/mailer/class_BaseMailer.php +++ b/framework/main/classes/mailer/class_BaseMailer.php @@ -89,7 +89,7 @@ abstract class BaseMailer extends BaseFrameworkSystem { * @param $variableName Template variable name to add * @return void */ - private final function addTemplateVariable ($section, $variableName) { + private function addTemplateVariable ($section, $variableName) { // Get template name $templateName = $this->getTemplateName(); diff --git a/framework/main/classes/template/class_BaseTemplateEngine.php b/framework/main/classes/template/class_BaseTemplateEngine.php index dccbddc4..f428be61 100644 --- a/framework/main/classes/template/class_BaseTemplateEngine.php +++ b/framework/main/classes/template/class_BaseTemplateEngine.php @@ -633,7 +633,7 @@ abstract class BaseTemplateEngine extends BaseFrameworkSystem { * @param $template The last loaded template * @return void */ - private final function setLastTemplate (SplFileInfo $fileInstance) { + private function setLastTemplate (SplFileInfo $fileInstance) { $this->lastTemplate = $fileInstance; } @@ -642,7 +642,7 @@ abstract class BaseTemplateEngine extends BaseFrameworkSystem { * * @return $template The last loaded template */ - private final function getLastTemplate () { + private function getLastTemplate () { return $this->lastTemplate; } @@ -803,7 +803,7 @@ abstract class BaseTemplateEngine extends BaseFrameworkSystem { * @param $compiledData Compiled template data * @return void */ - private final function setCompiledData (string $compiledData) { + private function setCompiledData (string $compiledData) { // And store it in this class $this->compiledData = $compiledData; } diff --git a/framework/main/classes/template/menu/class_MenuTemplateEngine.php b/framework/main/classes/template/menu/class_MenuTemplateEngine.php index e7e932a5..53febfd6 100644 --- a/framework/main/classes/template/menu/class_MenuTemplateEngine.php +++ b/framework/main/classes/template/menu/class_MenuTemplateEngine.php @@ -216,7 +216,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla * * @return $menuInstance A RenderableMenu instance */ - private final function getMenuInstance () { + private function getMenuInstance () { return $this->menuInstance; } @@ -250,7 +250,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla * @param $element Element name to set as current main node * @return $currMainNode Current main node */ - private final function setCurrMainNode (string $element) { + private function setCurrMainNode (string $element) { $this->curr['main_node'] = $element; } diff --git a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php index 0b7cb379..bc53481c 100644 --- a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php +++ b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php @@ -235,7 +235,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi * @param $element Element name to set as current main node * @return $currMainNode Current main node */ - private final function setCurrMainNode (string $element) { + private function setCurrMainNode (string $element) { $this->curr['main_node'] = $element; } diff --git a/framework/main/exceptions/class_FrameworkException.php b/framework/main/exceptions/class_FrameworkException.php index c08687a2..7852a066 100644 --- a/framework/main/exceptions/class_FrameworkException.php +++ b/framework/main/exceptions/class_FrameworkException.php @@ -85,7 +85,7 @@ abstract class FrameworkException extends ReflectionException { * * @return void */ - private final function saveBackTrace () { + private function saveBackTrace () { // Get full backtrace $this->backTrace = debug_backtrace(); diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php index b64d5189..2b18d36b 100644 --- a/framework/main/middleware/database/class_DatabaseConnection.php +++ b/framework/main/middleware/database/class_DatabaseConnection.php @@ -104,7 +104,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re * @param $backendInstance An instance of a DatabaseBackend class * @return void */ - private final function setBackendInstance (DatabaseBackend $backendInstance) { + private function setBackendInstance (DatabaseBackend $backendInstance) { $this->backendInstance = $backendInstance; } -- 2.39.5