tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Damian Mooyman 2018-04-04 17:38:26 +12:00
commit 5ff6874dbc
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Dev/SapphireTest.php
View File

@ -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

2
src/ORM/FieldType/DBMultiEnum.php
View File

@ -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);

2
templates/SilverStripe/Forms/SelectionGroup.ss
View File

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