Merge pull request #3 from richard67/4.1-dev-nikosdion-feature-task-r…

…esumable-mod-1 [CMS PR 36708] Revert use DateInterval
Bakual · Jan 16, 2022 · 9962baf · 9962baf
2 parents 4a39d60 + 0975726
commit 9962baf
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/administrator/components/com_scheduler/src/Task/Task.php b/administrator/components/com_scheduler/src/Task/Task.php
@@ -12,7 +12,6 @@
 // Restrict direct access
 \defined('_JEXEC') or die;
 
-use DateInterval;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\AbstractEvent;
@@ -266,7 +265,7 @@ public function run(): bool
 			 * Moreover, the times executed does NOT increase for each step. It will increase once,
 			 * after the last step, when they return Status::OK.
 			 */
-			$this->set('next_execution', Factory::getDate('now', 'UTC')->sub(new DateInterval('PT1M'))->toSql());
+			$this->set('next_execution', Factory::getDate('now', 'UTC')->sub(new \DateInterval('PT1M'))->toSql());
 		}
 
 		// The only acceptable "successful" statuses are either clean exit or resuming execution.
@@ -322,7 +321,7 @@ public function acquireLock(): bool
 		$now   = Factory::getDate('now', 'GMT');
 
 		$timeout          = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
-		$timeout          = new DateInterval(sprintf('PT%dS', $timeout));
+		$timeout          = new \DateInterval(sprintf('PT%dS', $timeout));
 		$timeoutThreshold = (clone $now)->sub($timeout)->toSql();
 		$now              = $now->toSql();