From 16e0462a8921d92380ad5304faf8b368f8a5048f Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 2 Aug 2018 18:30:20 +0200
Subject: [PATCH] fixes #26

---
 Utils/TaskSchedule/Cron.php              | 15 ---------------
 Utils/TaskSchedule/CronJob.php           | 20 +++++++++++++++++---
 Utils/TaskSchedule/Schedule.php          | 24 ++++++++++++------------
 Utils/TaskSchedule/SchedulerAbstract.php | 14 ++++++++++++++
 Utils/TaskSchedule/TaskScheduler.php     | 14 --------------
 5 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/Utils/TaskSchedule/Cron.php b/Utils/TaskSchedule/Cron.php
index c0f333e89..082888d67 100644
--- a/Utils/TaskSchedule/Cron.php
+++ b/Utils/TaskSchedule/Cron.php
@@ -25,21 +25,6 @@ namespace phpOMS\Utils\TaskSchedule;
  */
 class Cron extends SchedulerAbstract
 {
-
-    /**
-     * Normalize run result for easier parsing
-     *
-     * @param string $raw Raw command output
-     *
-     * @return string Normalized string for parsing
-     *
-     * @since  1.0.0
-     */
-    private function normalize(string $raw) : string
-    {
-        return \str_replace("\r\n", "\n", $raw);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/Utils/TaskSchedule/CronJob.php b/Utils/TaskSchedule/CronJob.php
index 9df129406..654eff21e 100644
--- a/Utils/TaskSchedule/CronJob.php
+++ b/Utils/TaskSchedule/CronJob.php
@@ -14,6 +14,8 @@ declare(strict_types=1);
 
 namespace phpOMS\Utils\TaskSchedule;
 
+use phpOMS\Validation\Base\DateTime;
+
 /**
  * CronJob class.
  *
@@ -29,10 +31,22 @@ class CronJob extends TaskAbstract
      */
     public static function createWith(array $jobData) : TaskAbstract
     {
-            $job = new self($jobData[5], '');
+        $job = new self($jobData[1], '');
 
-            $job->setRun($jobData[5]);
+        $job->setRun($jobData[8]);
+        $job->setStatus($jobData[3]);
 
-            return $job;
+        if (DateTime::isValid($jobData[2])) {
+            $job->setNextRunTime(new \DateTime($jobData[2]));
+        }
+
+        if (DateTime::isValid($jobData[5])) {
+            $job->setLastRuntime(new \DateTime($jobData[5]));
+        }
+
+        $job->setComment($jobData[10]);
+        $job->addResult($jobData[6]);
+
+        return $job;
     }
 }
diff --git a/Utils/TaskSchedule/Schedule.php b/Utils/TaskSchedule/Schedule.php
index ba465a1a8..f4f18e959 100644
--- a/Utils/TaskSchedule/Schedule.php
+++ b/Utils/TaskSchedule/Schedule.php
@@ -31,22 +31,22 @@ class Schedule extends TaskAbstract
      */
     public static function createWith(array $jobData) : TaskAbstract
     {
-            $job = new self($jobData[1], '');
+        $job = new self($jobData[1], '');
 
-            $job->setRun($jobData[8]);
-            $job->setStatus($jobData[3]);
+        $job->setRun($jobData[8]);
+        $job->setStatus($jobData[3]);
 
-            if (DateTime::isValid($jobData[2])) {
-                $job->setNextRunTime(new \DateTime($jobData[2]));
-            }
+        if (DateTime::isValid($jobData[2])) {
+            $job->setNextRunTime(new \DateTime($jobData[2]));
+        }
 
-            if (DateTime::isValid($jobData[5])) {
-                $job->setLastRuntime(new \DateTime($jobData[5]));
-            }
+        if (DateTime::isValid($jobData[5])) {
+            $job->setLastRuntime(new \DateTime($jobData[5]));
+        }
 
-            $job->setComment($jobData[10]);
-            $job->addResult($jobData[6]);
+        $job->setComment($jobData[10]);
+        $job->addResult($jobData[6]);
 
-            return $job;
+        return $job;
     }
 }
diff --git a/Utils/TaskSchedule/SchedulerAbstract.php b/Utils/TaskSchedule/SchedulerAbstract.php
index 489ae85aa..5b8a00126 100644
--- a/Utils/TaskSchedule/SchedulerAbstract.php
+++ b/Utils/TaskSchedule/SchedulerAbstract.php
@@ -182,6 +182,20 @@ abstract class SchedulerAbstract
         $this->run($task->getCommand());
     }
 
+    /**
+     * Normalize run result for easier parsing
+     *
+     * @param string $raw Raw command output
+     *
+     * @return string Normalized string for parsing
+     *
+     * @since  1.0.0
+     */
+    protected function normalize(string $raw) : string
+    {
+        return \str_replace("\r\n", "\n", $raw);
+    }
+
     /**
      * Get all jobs/tasks by name
      *
diff --git a/Utils/TaskSchedule/TaskScheduler.php b/Utils/TaskSchedule/TaskScheduler.php
index bc0544237..a57ffc8ae 100644
--- a/Utils/TaskSchedule/TaskScheduler.php
+++ b/Utils/TaskSchedule/TaskScheduler.php
@@ -25,20 +25,6 @@ namespace phpOMS\Utils\TaskSchedule;
  */
 class TaskScheduler extends SchedulerAbstract
 {
-    /**
-     * Normalize run result for easier parsing
-     *
-     * @param string $raw Raw command output
-     *
-     * @return string Normalized string for parsing
-     *
-     * @since  1.0.0
-     */
-    private function normalize(string $raw) : string
-    {
-        return \str_replace("\r\n", "\n", $raw);
-    }
-
     /**
      * {@inheritdoc}
      */