tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Excluded TestOnly classes from field conflict check

Browse Source
This commit is contained in:
Jackson Darlow 2020-06-17 11:22:44 +12:00
parent 55cb8f37ea
commit 2a59b1b387
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ORM/DataObject.php
View File

@ -12,6 +12,7 @@ use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Resettable; use SilverStripe\Core\Resettable;
use SilverStripe\Dev\Debug; use SilverStripe\Dev\Debug;
use SilverStripe\Dev\Deprecation; use SilverStripe\Dev\Deprecation;
use SilverStripe\Dev\TestOnly;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FormField; use SilverStripe\Forms\FormField;
use SilverStripe\Forms\FormScaffolder; use SilverStripe\Forms\FormScaffolder;
@ -3453,7 +3454,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Sanity check for fields that conflict with parent // Sanity check for fields that conflict with parent
foreach (array_keys($fields) as $fieldName) { foreach (array_keys($fields) as $fieldName) {
if (method_exists(get_parent_class($this), $fieldName)) { if (method_exists(get_parent_class($this), $fieldName) && !($this instanceof TestOnly)) {
throw new LogicException(sprintf( throw new LogicException(sprintf(
'\'%s\' has a $db field named "%s" that coincides with an inherited method of the same name.', '\'%s\' has a $db field named "%s" that coincides with an inherited method of the same name.',
static::class, static::class,