Merge remote-tracking branch 'origin/2.0'

_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

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": {

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.
      */