diff --git a/_config/config.yml b/_config/config.yml index 05cef68..4b7cf18 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -10,3 +10,7 @@ SiteTree: HtmlEditorField_Toolbar: extensions: - DocumentHtmlEditorFieldToolbar + +# Ensure that if the parent UploadField is overloaded with the injector, that the DMSUploadField is returned +Injector: + DMSUploadField: DMSUploadField diff --git a/composer.json b/composer.json index 1ee150e..d97ac33 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "silverstripe/framework": "^3.5", "silverstripe/cms": "^3.5", - "silverstripe-australia/gridfieldextensions": "^1.1.0", + "symbiote/silverstripe-gridfieldextensions": "^1.1.0", "silverstripe/taxonomy": "^1.2" }, "suggest": { diff --git a/tests/cms/DMSUploadFieldTest.php b/tests/cms/DMSUploadFieldTest.php index 6048f86..42969ff 100644 --- a/tests/cms/DMSUploadFieldTest.php +++ b/tests/cms/DMSUploadFieldTest.php @@ -14,6 +14,15 @@ class DMSUploadFieldTest extends SapphireTest $this->field = new DMSUploadField('StubUploadField'); } + /** + * SS 3.x injector will return an overloaded parent of a child class if the child is not injected. + * This is a sanity check. + */ + public function testDmsUploadFieldIsInjectable() + { + $this->assertInstanceOf('DMSUploadField', DMSUploadField::create('Stub')); + } + /** * The validator is coded to always return true. Replace this test if this behaviour changes in future. */