From b4d753008219c7bd632d5147c008c3e19b7454d4 Mon Sep 17 00:00:00 2001 From: Raissa North Date: Mon, 29 Jan 2018 15:57:17 +1300 Subject: [PATCH] API Rename GridFieldConfig so it has no underscore in the class name --- .upgrade.yml | 2 +- ...FieldConfig_BlogPost.php => GridFieldConfigBlogPost.php} | 2 +- src/Model/Blog.php | 4 ++-- src/Model/BlogMemberExtension.php | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) rename src/Forms/GridField/{GridFieldConfig_BlogPost.php => GridFieldConfigBlogPost.php} (90%) diff --git a/.upgrade.yml b/.upgrade.yml index 813650c..a93591b 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -20,7 +20,7 @@ mappings: BlogAdminSidebar: SilverStripe\Blog\Forms\BlogAdminSidebar GridFieldAddByDBField: SilverStripe\Blog\Forms\GridField\GridFieldAddByDBField GridFieldBlogPostState: SilverStripe\Blog\Forms\GridField\GridFieldBlogPostState - GridFieldConfig_BlogPost: SilverStripe\Blog\Forms\GridField\GridFieldConfig_BlogPost + GridFieldConfig_BlogPost: SilverStripe\Blog\Forms\GridField\GridFieldConfigBlogPost BlogArchiveWidget: SilverStripe\Blog\Widgets\BlogArchiveWidget BlogArchiveWidget_Controller: SilverStripe\Blog\Widgets\BlogArchiveWidgetController BlogCategoriesWidget: SilverStripe\Blog\Widgets\BlogCategoriesWidget diff --git a/src/Forms/GridField/GridFieldConfig_BlogPost.php b/src/Forms/GridField/GridFieldConfigBlogPost.php similarity index 90% rename from src/Forms/GridField/GridFieldConfig_BlogPost.php rename to src/Forms/GridField/GridFieldConfigBlogPost.php index e14d948..5be03f3 100644 --- a/src/Forms/GridField/GridFieldConfig_BlogPost.php +++ b/src/Forms/GridField/GridFieldConfigBlogPost.php @@ -10,7 +10,7 @@ use SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState; * GridField config necessary for managing a SiteTree object. * */ -class GridFieldConfig_BlogPost extends GridFieldConfig_Lumberjack +class GridFieldConfigBlogPost extends GridFieldConfig_Lumberjack { /** * @param null|int $itemsPerPage diff --git a/src/Model/Blog.php b/src/Model/Blog.php index 3a465ee..bc82dcc 100644 --- a/src/Model/Blog.php +++ b/src/Model/Blog.php @@ -4,7 +4,7 @@ namespace SilverStripe\Blog\Model; use Page; use SilverStripe\Blog\Admin\GridFieldCategorisationConfig; -use SilverStripe\Blog\Forms\GridField\GridFieldConfig_BlogPost; +use SilverStripe\Blog\Forms\GridField\GridFieldConfigBlogPost; use SilverStripe\CMS\Controllers\RootURLController; use SilverStripe\Control\Controller; use SilverStripe\Core\Convert; @@ -608,7 +608,7 @@ class Blog extends Page implements PermissionProvider */ public function getLumberjackGridFieldConfig() { - return GridFieldConfig_BlogPost::create(); + return GridFieldConfigBlogPost::create(); } /** diff --git a/src/Model/BlogMemberExtension.php b/src/Model/BlogMemberExtension.php index 4ee4f73..73eadd2 100644 --- a/src/Model/BlogMemberExtension.php +++ b/src/Model/BlogMemberExtension.php @@ -3,9 +3,7 @@ namespace SilverStripe\Blog\Model; use SilverStripe\Assets\Image; -use SilverStripe\Blog\Forms\GridField\GridFieldConfig_BlogPost; -use SilverStripe\Blog\Model\BlogPost; -use SilverStripe\Core\Manifest\ModuleLoader; +use SilverStripe\Blog\Forms\GridField\GridFieldConfigBlogPost; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\Tab; @@ -122,7 +120,7 @@ class BlogMemberExtension extends DataExtension 'BlogPosts', _t(__CLASS__ . '.BLOGPOSTS', 'Blog Posts'), $this->owner->BlogPosts(), - GridFieldConfig_BlogPost::create() + GridFieldConfigBlogPost::create() ); $tab->Fields()->add($gridField);