From d76c272eb178ef0646a5d975136ab8ca16cdd79d Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Wed, 5 Dec 2018 14:13:07 +0000
Subject: [PATCH] PHP 7.2 compatibility

---
 _config.php                       | 6 +++++-
 code/ValidationLogicCriteria.php  | 4 ++--
 code/ValidationLogicCriterion.php | 4 ++--
 code/ZenValidatorConstraint.php   | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/_config.php b/_config.php
index cccb7fc..c1d6459 100644
--- a/_config.php
+++ b/_config.php
@@ -1,3 +1,7 @@
 <?php
 
-if(!defined('ZENVALIDATOR_PATH')) define('ZENVALIDATOR_PATH', rtrim(basename(dirname(__FILE__))));
\ No newline at end of file
+if(!defined('ZENVALIDATOR_PATH')) define('ZENVALIDATOR_PATH', rtrim(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/ValidationLogicCriteria.php b/code/ValidationLogicCriteria.php
index a52d4a3..b7c9037 100644
--- a/code/ValidationLogicCriteria.php
+++ b/code/ValidationLogicCriteria.php
@@ -5,7 +5,7 @@
  * @author <shea@silverstripe.com.au>
  * Credit to Uncle Cheese for the recipe
  */
-class ValidationLogicCriteria extends Object
+class ValidationLogicCriteria extends SS_Object
 {
     /**
      * The name of the form field that depends on the criteria
@@ -238,4 +238,4 @@ public function getMasterList()
         }
         return $list;
     }
-}
\ No newline at end of file
+}
diff --git a/code/ValidationLogicCriterion.php b/code/ValidationLogicCriterion.php
index 169ee16..c1ac924 100644
--- a/code/ValidationLogicCriterion.php
+++ b/code/ValidationLogicCriterion.php
@@ -7,7 +7,7 @@
  *
  * Credit to Uncle Cheese for the recipe
  */
-class ValidationLogicCriterion extends Object
+class ValidationLogicCriterion extends SS_Object
 {
 
 
@@ -125,4 +125,4 @@ public function toPHP()
                 throw new Exception("ValidationLogicCriteria: php operator \"$this->operator\" not configured.");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/code/ZenValidatorConstraint.php b/code/ZenValidatorConstraint.php
index 0310bd5..680a84b 100644
--- a/code/ZenValidatorConstraint.php
+++ b/code/ZenValidatorConstraint.php
@@ -5,7 +5,7 @@
  * @license BSD License http://www.silverstripe.org/bsd-license
  * @author <shea@silverstripe.com.au>
  * */
-abstract class ZenValidatorConstraint extends Object
+abstract class ZenValidatorConstraint extends SS_Object
 {
 
     /**