Merge remote-tracking branch 'origin/4.1' into 4

src/Dev/SapphireTest.php

@@ -37,6 +37,7 @@ use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
 use SilverStripe\View\SSViewer;
+use SilverStripe\Core\Manifest\ModuleResourceLoader;
 
 if (!class_exists(PHPUnit_Framework_TestCase::class)) {
     return;
@@ -1169,6 +1170,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase implements TestOnly
      */
     protected function resolveFixturePath($fixtureFilePath)
     {
+        // support loading via composer name path.
+        if (strpos($fixtureFilePath, ':') !== false) {
+            return ModuleResourceLoader::singleton()->resolvePath($fixtureFilePath);
+        }
+        
         // Support fixture paths relative to the test class, rather than relative to webroot
         // String checking is faster than file_exists() calls.
         $isRelativeToFile

src/ORM/FieldType/DBMultiEnum.php

@@ -11,7 +11,7 @@ use SilverStripe\Forms\CheckboxSetField;
  */
 class DBMultiEnum extends DBEnum
 {
-    public function __construct($name, $enum = null, $default = null)
+    public function __construct($name = null, $enum = null, $default = null)
     {
         // MultiEnum needs to take care of its own defaults
         parent::__construct($name, $enum, null);

templates/SilverStripe/Forms/SelectionGroup.ss

@@ -6,9 +6,9 @@
 			$RadioLabel
 			$FieldHolder
 		</li>
-	</ul>
 	<% end_if %>
 	<% end_loop %>
+	</ul>
 <% else %>
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
 	<% loop $FieldSet %>