chore(7.4): Replace Object with SS_Object

symbiote · Jun 3, 2020 · c91e8ef · c91e8ef
1 parent e9bc07c
commit c91e8ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/_config.php b/_config.php
@@ -1,5 +1,9 @@
 <?php
 
+// Ensure compatibility with PHP 7.2 ("object" is a reserved word),
+// with SilverStripe 3.6 (using Object) and SilverStripe 3.7 (using SS_Object)
+if (!class_exists('SS_Object')) class_alias('Object', 'SS_Object');
+
 if (($QUEUED_JOBS_DIR = basename(dirname(__FILE__))) != 'queuedjobs') {
 	die("The queued jobs module must be installed in /queuedjobs, not $QUEUED_JOBS_DIR");
 }
diff --git a/code/services/QueuedJobService.php b/code/services/QueuedJobService.php
@@ -426,7 +426,7 @@ protected function restartStalledJob($stalledJob) {
 	protected function initialiseJob(QueuedJobDescriptor $jobDescriptor) {
 		// create the job class
 		$impl = $jobDescriptor->Implementation;
-		$job = Object::create($impl);
+		$job = SS_Object::create($impl);
 		/* @var $job QueuedJob */
 		if (!$job) {
 			throw new Exception("Implementation $impl no longer exists");