Continued:

[core.git] / framework / main / classes / handler / tasks / class_TaskHandler.php

diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php
index 84b9f603a4519775e1fb5ff5e95854def598c892..f2a63cfe955735bc6f6d46bcc6d9e877ee3dedb6 100644 (file)
--- a/framework/main/classes/handler/tasks/class_TaskHandler.php
+++ b/framework/main/classes/handler/tasks/class_TaskHandler.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Handler\Task;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\BaseHandler;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Task\Taskable;
@@ -105,7 +105,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                if (!$this->getListInstance()->getIterator()->valid()) {
                        // Not valid!
                        throw new InvalidTaskException($this, self::EXCEPTION_TASK_IS_INVALID);
-               } // END - if
+               }
 
                // Get current task
                $currentTask = $this->getListInstance()->getIterator()->current();
@@ -120,7 +120,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                                // Skip this silently
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK-HANDLER: Task ' . $currentTask['id'] . ' not started: diff=' . $diff . ',task_startup_delay=' . $currentTask['task_startup_delay']);
                                return;
-                       } // END - if
+                       }
 
                        // Launch the task and mark it as updated
                        $currentTask['task_started'] = true;
@@ -128,7 +128,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
 
                        // Debug message
                        self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK-HANDLER: Task ' . $currentTask['id'] . ' started with startup_delay=' . $currentTask['task_startup_delay'] . 'ms');
-               } // END - if
+               }
 
                // Get time difference from interval delay
                $diff = ($this->getMilliTime() - $currentTask['task_last_activity']) * 1000;
@@ -142,11 +142,11 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                        if ($updateTask === true) {
                                // Update the task before leaving
                                $this->updateTask($currentTask);
-                       } // END - if
+                       }
 
                        // Skip this silently
                        return;
-               } // END - if
+               }
 
                // Set last activity
                $currentTask['task_last_activity'] = $this->getMilliTime();
@@ -218,8 +218,8 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
 
                                // Abort here
                                break;
-                       } // END - if
-               } // END - foreach
+                       }
+               }
 
                // Return found name
                return $taskName;
@@ -229,10 +229,10 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
         * Registers a task with a task handler.
         *
         * @param       $taskName               A task name to register the task on
-        * @param       $taskInstance   The instance that should be registered as a task
+        * @param       $taskInstance   An instance of a Taskable class
         * @return      void
         */
-       public function registerTask ($taskName, Visitable $taskInstance) {
+       public function registerTask (string $taskName, Taskable $taskInstance) {
                // Get interval delay
                $intervalDelay = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('task_' . $taskName . '_interval_delay');
                $startupDelay  = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('task_' . $taskName . '_startup_delay');
@@ -243,7 +243,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                assert(($taskName === 'idle_loop') || (($taskName != 'idle_loop') && ($startupDelay > 0)));
 
                // Create the entry
-               $taskEntry = array(
+               $taskEntry = [
                        // Identifier for the generateHash() method
                        'id'                  => $taskName,
                        // Whether the task is started
@@ -266,7 +266,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                        'task_interval_delay' => $intervalDelay,
                        // How often should this task run?
                        'task_max_runs'       => FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('task_' . $taskName . '_max_runs'),
-               );
+               ];
 
                // Add the entry
                $this->getListInstance()->addEntry('tasks', $taskEntry);
@@ -306,7 +306,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                if (!$this->getListInstance()->getIterator()->valid()) {
                        // Rewind to the beginning for next loop
                        $this->getListInstance()->getIterator()->rewind();
-               } // END - if
+               }
 
                // Try to execute the task
                $this->executeCurrentTask();
@@ -350,7 +350,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
 
                        // Advance to next one
                        $this->getListInstance()->getIterator()->next();
-               } // END - while
+               }
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK-HANDLER: Shutdown of all tasks completed.');
@@ -358,7 +358,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
                // Remove all tasks
                foreach ($tasks as $entry) {
                        $this->unregisterTask($entry);
-               } // END - foreach
+               }
        }
 
 }