FIX Update config API reference in FulltextSearchable and use namespaced imports for class names

This commit is contained in:
Robbie Averill 2017-03-29 00:20:39 +13:00
parent 6f6a53c17c
commit bd14f6db9e

View File

@ -2,6 +2,8 @@
namespace SilverStripe\ORM\Search; namespace SilverStripe\ORM\Search;
use SilverStripe\Assets\File;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Controllers\ContentController;
use SilverStripe\ORM\Connect\MySQLSchemaManager; use SilverStripe\ORM\Connect\MySQLSchemaManager;
@ -51,12 +53,11 @@ class FulltextSearchable extends DataExtension
* listed here. Default: {@link SiteTree} and {@link File}. * listed here. Default: {@link SiteTree} and {@link File}.
* @throws Exception * @throws Exception
*/ */
public static function enable( public static function enable($searchableClasses = [SiteTree::class, File::class])
$searchableClasses = array('SilverStripe\\CMS\\Model\\SiteTree', 'SilverStripe\\Assets\\File') {
) {
$defaultColumns = array( $defaultColumns = array(
'SilverStripe\\CMS\\Model\\SiteTree' => '"Title","MenuTitle","Content","MetaDescription"', SiteTree::class => '"Title","MenuTitle","Content","MetaDescription"',
'SilverStripe\\Assets\\File' => '"Name","Title"' File::class => '"Name","Title"'
); );
if (!is_array($searchableClasses)) { if (!is_array($searchableClasses)) {
@ -68,7 +69,7 @@ class FulltextSearchable extends DataExtension
} }
if (isset($defaultColumns[$class])) { if (isset($defaultColumns[$class])) {
Config::inst()->update( Config::modify()->set(
$class, $class,
'create_table_options', 'create_table_options',
array(MySQLSchemaManager::ID => 'ENGINE=MyISAM') array(MySQLSchemaManager::ID => 'ENGINE=MyISAM')