Extract timestamp creation for cron commands, #296

Preparation for upcoming changes in Magento 2.2.0.

Note: There is no branch on version yet, this needs future
      implementation.

Refs:

- #296

CHANGELOG.md

@@ -3,6 +3,7 @@ RECENT CHANGES
 
 1.5.1
 -----
+* Imp: Extract timestamp creation for cron commands (by Tom Klingenberg, #296)
 
 1.5.0
 -----

src/N98/Magento/Command/System/Cron/AbstractCronCommand.php

@@ -198,4 +198,17 @@ protected function getJobForExecuteMethod(InputInterface $input, OutputInterface
 
         return array($jobCode, $jobConfig, $model);
     }
+
+    /**
+     * Get timestamp used for time related database fields in the cron tables
+     *
+     * Note: The timestamp used will change from Magento 2.1.7 to 2.2.0 and
+     *       these changes can be branched on Magento version in this method.
+     *
+     * @return int
+     */
+    protected function getCronTimestamp()
+    {
+        return $this->timezone->scopeTimeStamp();
+    }
 }

src/N98/Magento/Command/System/Cron/RunCommand.php

@@ -51,24 +51,24 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $schedule
             ->setJobCode($jobCode)
             ->setStatus(Schedule::STATUS_RUNNING)
-            ->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->timezone->scopeTimeStamp()))
+            ->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->getCronTimestamp()))
             ->save();
 
         try {
             $this->state->emulateAreaCode(Area::AREA_CRONTAB, $callback, array($schedule));
 
             $schedule
                 ->setStatus(Schedule::STATUS_SUCCESS)
-                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', $this->timezone->scopeTimeStamp()))
+                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', $this->getCronTimestamp()))
                 ->save();
         } catch (Exception $e) {
             $schedule
                 ->setStatus(Schedule::STATUS_ERROR)
                 ->setMessages($e->getMessage())
-                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', $this->timezone->scopeTimeStamp()))
+                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', $this->getCronTimestamp()))
                 ->save();
         }
-        
+
         if (isset($e)) {
             throw new RuntimeException(
                 sprintf('Cron-job "%s" threw exception %s', $jobCode, get_class($e)),

src/N98/Magento/Command/System/Cron/ScheduleCommand.php

@@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             '<info>Scheduling </info><comment>' . $jobConfig['instance'] . '::' . $jobConfig['method'] . '</comment> '
         );
 
-        $createdAtTime = $this->timezone->scopeTimeStamp();
+        $createdAtTime = $this->getCronTimestamp();
         $scheduledAtTime = $createdAtTime;
 
         /* @var $schedule \Magento\Cron\Model\Schedule */