Continued:

- lesser assert(), was not needed, will always be Filterable
- removed "END - *" a bit

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index be32e26a69bda21af457272715a88a434bb7951f..6ec51ebb0146c87ac12b94a3c8825a9a912ce578 100644 (file)
--- 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 1049200e9d99d7fab62c4ff4715f882158386858..9f4df7f074be59ff5c1ea8096c1819f4fff0d56c 100644 (file)
--- 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 177a2f1e8aabbc9ff5dab519c6477cfd3d6d6f19..9a91b2559ffd1e66c796bb023a5ce8f0eca0174e 100644 (file)
--- 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 d14bfc3e94ae5e51a1a226d1cd6ac3dbf42a0e9c..b9b5a76b8a3780860b62d10b67265a4be949f795 100644 (file)
--- 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 2ff9ee3667f7df5a9360a9acbfc2901265b3914b..c67f501f0068e9e7e335a5ed0ab8367170cd840f 100644 (file)
--- 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);