-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #70 from kinglozzer/php72
PHP 7.2 compatibility
- Loading branch information
Showing
4 changed files
with
10 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
<?php | ||
|
||
if(!defined('ZENVALIDATOR_PATH')) define('ZENVALIDATOR_PATH', rtrim(basename(dirname(__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'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
* @author <[email protected]> | ||
* 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; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
* @license BSD License http://www.silverstripe.org/bsd-license | ||
* @author <[email protected]> | ||
* */ | ||
abstract class ZenValidatorConstraint extends Object | ||
abstract class ZenValidatorConstraint extends SS_Object | ||
{ | ||
|
||
/** | ||
|