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

Merge pull request #7688 from open-sausages/pulls/4.0/less-breaking-warnings

Browse Source 
BUG Don't warn on table name for classes without tables
This commit is contained in:
Robbie Averill 2017-12-11 10:39:54 +13:00 committed by GitHub
commit 7643c90410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ORM/DataObjectSchema.php
View File

@ -3,15 +3,16 @@
namespace SilverStripe\ORM; namespace SilverStripe\ORM;
use Exception; use Exception;
use SilverStripe\Core\Injector\Injectable; use InvalidArgumentException;
use LogicException;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Config\Configurable; use SilverStripe\Core\Config\Configurable;
use SilverStripe\Core\Injector\Injectable;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\FieldType\DBComposite; use SilverStripe\ORM\FieldType\DBComposite;
use SilverStripe\Core\ClassInfo; use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Core\Config\Config;
use InvalidArgumentException;
use LogicException;
/** /**
* Provides dataobject and database schema mapping functionality * Provides dataobject and database schema mapping functionality
@ -316,7 +317,7 @@ class DataObjectSchema
return $class; return $class;
} }
if (!ClassInfo::classImplements($class, TestOnly::class)) { if (!ClassInfo::classImplements($class, TestOnly::class) && $this->classHasTable($class)) {
trigger_error( trigger_error(
"It is recommended to define a table_name for your '$class'." . "It is recommended to define a table_name for your '$class'." .
' Not defining a table_name may cause subsequent table names to be too long and may not be supported' . ' Not defining a table_name may cause subsequent table names to be too long and may not be supported' .
@ -541,7 +542,6 @@ class DataObjectSchema
*/ */
protected function cacheDefaultDatabaseIndexes($class) protected function cacheDefaultDatabaseIndexes($class)
{ {
$indexes = [];
if (array_key_exists($class, $this->defaultDatabaseIndexes)) { if (array_key_exists($class, $this->defaultDatabaseIndexes)) {
return $this->defaultDatabaseIndexes[$class]; return $this->defaultDatabaseIndexes[$class];
} }