From 57b4b400d2e4a35f92d83270477157df4ee7c2c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Dec 2020 04:18:14 +0100 Subject: [PATCH] Continued: - lesser assert(), was not needed, will always be Filterable - removed "END - *" a bit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../classes/commands/html/class_HtmlLoginAreaCommand.php | 2 +- .../classes/factories/index/class_FileStackIndexFactory.php | 4 ---- framework/main/classes/filter/class_FilterChain.php | 5 +---- framework/main/classes/mailer/debug/class_DebugMailer.php | 2 +- .../resolver/controller/class_BaseControllerResolver.php | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php index be32e26a..6ec51ebb 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -97,7 +97,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $applicationInstance = GenericRegistry::getRegistry()->getInstance('application'); diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php index 1049200e..9f4df7f0 100644 --- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php +++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php @@ -5,7 +5,6 @@ namespace Org\Mxchange\CoreFramework\Factory\Filesystem\Stack; // Import framework stuff use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; -use Org\Mxchange\CoreFramework\Stacker\Index\IndexableStack; // Import SPL stuff use \SplFileInfo; @@ -58,9 +57,6 @@ class FileStackIndexFactory extends ObjectFactory { // Get the handler instance $indexInstance = self::createObjectByConfiguredName($type . '_file_stack_index_class', array($infoInstance)); - // Add check for interface - assert($indexInstance instanceof IndexableStack); - // Add it to the registry GenericRegistry::getRegistry()->addInstance($type . '_index', $indexInstance); } diff --git a/framework/main/classes/filter/class_FilterChain.php b/framework/main/classes/filter/class_FilterChain.php index 177a2f1e..9a91b255 100644 --- a/framework/main/classes/filter/class_FilterChain.php +++ b/framework/main/classes/filter/class_FilterChain.php @@ -126,9 +126,6 @@ class FilterChain extends BaseFrameworkSystem implements Registerable { // Run all filters //* DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('COUNT=' . $this->countGenericArray('filters')); foreach ($this->getFilters() as $filterInstance) { - // Must be an instance of Filterable - assert($filterInstance instanceof Filterable); - // Try to execute this filter try { //* DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('FILTER: ' . $filterInstance->__toString() . ': Processing started.'); @@ -139,7 +136,7 @@ class FilterChain extends BaseFrameworkSystem implements Registerable { self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Failed to execute lase filter ' . $filterInstance->__toString() . ': ' . $e->getMessage()); break; } - } // END - foreach + } } } diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php index d14bfc3e..b9b5a76b 100644 --- a/framework/main/classes/mailer/debug/class_DebugMailer.php +++ b/framework/main/classes/mailer/debug/class_DebugMailer.php @@ -85,7 +85,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail { if (!$recipientInstance instanceof ManageableMember) { // Invalid entry found! throw new InvalidInterfaceException(array($this, 'ManageableMember'), self::EXCEPTION_REQUIRED_INTERFACE_MISSING); - } // END - if + } // User class found, so entry is valid, first load the template $this->loadTemplate($templateName); diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php index 2ff9ee36..c67f501f 100644 --- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php +++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php @@ -236,7 +236,7 @@ abstract class BaseControllerResolver extends BaseResolver { if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) { // This controller has an invalid instance! throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); - } // END - if + } // Set last controller $this->setResolvedInstance($controllerInstance); -- 2.39.2