Merge pull request #66 from kinglozzer/ss-obj

Add PHP 7.2 support
silverstripe · Nov 20, 2018 · 7d892c0 · 7d892c0
2 parents 95923e8 + ae1a042
commit 7d892c0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/_config.php b/_config.php
@@ -1,5 +1,9 @@
 <?php
 
-Object::add_extension("RequestHandler", "RedirectedURLHandler");
-Object::add_extension("ContentController", "RedirectedURLHandler");
-Object::add_extension("ModelAsController", "RedirectedURLHandler");
+// 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');
+
+SS_Object::add_extension("RequestHandler", "RedirectedURLHandler");
+SS_Object::add_extension("ContentController", "RedirectedURLHandler");
+SS_Object::add_extension("ModelAsController", "RedirectedURLHandler");