added support for PHP 7.2 (#96)

unclecheese · Sep 5, 2018 · ede693a · ede693a
1 parent 1dfd259
commit ede693a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/_config.php b/_config.php
@@ -1,3 +1,7 @@
 <?php
 
 define('DISPLAY_LOGIC_DIR', basename(dirname(__FILE__)));
+
+// 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');
diff --git a/code/DisplayLogicCriteria.php b/code/DisplayLogicCriteria.php
@@ -7,7 +7,7 @@
  * @package  display_logic
  * @author  Uncle Cheese <unclecheese@leftandmain.com>
  */
-class DisplayLogicCriteria extends Object {
+class DisplayLogicCriteria extends SS_Object {
 
 
 	/**

diff --git a/code/DisplayLogicCriterion.php b/code/DisplayLogicCriterion.php
@@ -7,7 +7,7 @@
  * @package  display_logic
  * @author  Uncle Cheese <unclecheese@leftandmain.com>
  */
-class DisplayLogicCriterion extends Object {
+class DisplayLogicCriterion extends SS_Object {
 
 
 	/**