Merge branch 'master' into fix-ss-4-master

.travis.yml

@@ -1,4 +1,4 @@
-# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
+# See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
 language: php
 
@@ -11,7 +11,7 @@ php:
 
 env:
   global:
-    - CORE_RELEASE=master
+    - CORE_RELEASE=4
   matrix:
     - DB=MYSQL
     - DB=PGSQL
@@ -24,7 +24,7 @@ matrix:
 before_script:
  - composer self-update || true
  - phpenv rehash
- - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+ - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
  - "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"
  - cd ~/builds/ss

_config.php

@@ -4,4 +4,3 @@ use SilverStripe\Reports\Report;
 use SilverStripe\Subsites\Reports\SubsiteReportWrapper;
 
 Report::add_excluded_reports(SubsiteReportWrapper::class);
-

_config/config.yml

@@ -6,6 +6,6 @@ After:
 SilverStripe\AssetAdmin\Controller\AssetAdmin:
   treats_subsite_0_as_global: true
 
-SilverStripe\Control\Director:
+Director:
   rules:
     SubsiteXHRController: SilverStripe\Subsites\Controller\SubsiteXHRController

code/extensions/CMSPageAddControllerExtension.php

@@ -13,5 +13,4 @@ class CMSPageAddControllerExtension extends Extension
     {
         $fields->push(new HiddenField('SubsiteID', 'SubsiteID', Subsite::currentSubsiteID()));
     }
-
 }

code/extensions/ControllerSubsites.php

@@ -5,27 +5,24 @@ namespace SilverStripe\Subsites\Extensions;
 use SilverStripe\Core\Extension;
 use SilverStripe\Subsites\Model\Subsite;
 use SilverStripe\View\SSViewer;
-
 /**
  * @package subsites
  */
 class ControllerSubsites extends Extension
 {
-
     public function controllerAugmentInit()
     {
-        $subsite = $this->CurrentSubsite();
+        if ($subsite = Subsite::currentSubsite()) {
-        if ($subsite && $theme = $subsite->Theme) {
+            if ($theme = $subsite->Theme) {
-            SSViewer::set_themes([$theme, SSViewer::DEFAULT_THEME]);
+                SSViewer::set_themes([$theme, SSViewer::DEFAULT_THEME]);
+            }
         }
     }
 
-    /**
-     * @return Subsite
-     */
     public function CurrentSubsite()
     {
-        return Subsite::currentSubsite();
+        if ($subsite = Subsite::currentSubsite()) {
+            return $subsite;
+        }
     }
-
 }

code/extensions/ErrorPageSubsite.php

@@ -10,7 +10,6 @@ use SilverStripe\Subsites\Model\Subsite;
 
 class ErrorPageSubsite extends DataExtension
 {
-
     /**
      * Alter file path to generated a static (static) error page file to handle error page template on different sub-sites
      *
@@ -53,5 +52,4 @@ class ErrorPageSubsite extends DataExtension
 
         return $filepath;
     }
-
 }

code/extensions/FileSubsites.php

@@ -158,5 +158,4 @@ class FileSubsites extends DataExtension
     {
         return 'subsite-' . Subsite::currentSubsiteID();
     }
-
 }

code/extensions/GroupSubsites.php

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Subsites\Extensions;
 
-
 use SilverStripe\Control\Cookie;
 use SilverStripe\Core\Convert;
 use SilverStripe\Forms\CheckboxSetField;
@@ -17,7 +16,6 @@ use SilverStripe\Security\Group;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Subsites\Model\Subsite;
 
-
 /**
  * Extension for the Group object to add subsites support
  *
@@ -151,6 +149,7 @@ class GroupSubsites extends DataExtension implements PermissionProvider
         if (!$query->filtersOnID()) {
 
             /*if($context = DataObject::context_obj()) $subsiteID = (int)$context->SubsiteID;
+
             else */
             $subsiteID = (int)Subsite::currentSubsiteID();
 
@@ -169,9 +168,9 @@ class GroupSubsites extends DataExtension implements PermissionProvider
             if (!$hasGroupSubsites) {
                 if ($subsiteID) {
                     $query->addLeftJoin('Group_Subsites', "\"Group_Subsites\".\"GroupID\"
-						= \"Group\".\"ID\" AND \"Group_Subsites\".\"SubsiteID\" = $subsiteID");
+                        = \"Group\".\"ID\" AND \"Group_Subsites\".\"SubsiteID\" = $subsiteID");
                     $query->addWhere('("Group_Subsites"."SubsiteID" IS NOT NULL OR
-						"Group"."AccessAllSubsites" = 1)');
+                        "Group"."AccessAllSubsites" = 1)');
                 } else {
                     $query->addWhere('"Group"."AccessAllSubsites" = 1');
                 }
@@ -227,5 +226,4 @@ class GroupSubsites extends DataExtension implements PermissionProvider
             ]
         ];
     }
-
 }

code/extensions/LeftAndMainSubsites.php

@@ -27,7 +27,6 @@ use SilverStripe\View\Requirements;
  */
 class LeftAndMainSubsites extends Extension
 {
-
     private static $allowed_actions = ['CopyToSubsite'];
 
     /**
@@ -219,12 +218,10 @@ class LeftAndMainSubsites extends Extension
         // Admin can access everything, no point in checking.
         $member = Member::currentUser();
         if ($member &&
-            (
+        (
-                Permission::checkMember($member, 'ADMIN') || // 'Full administrative rights' in SecurityAdmin
+            Permission::checkMember($member, 'ADMIN') || // 'Full administrative rights' in SecurityAdmin
-                Permission::checkMember($member,
+            Permission::checkMember($member, 'CMS_ACCESS_LeftAndMain') // 'Access to all CMS sections' in SecurityAdmin
-                    'CMS_ACCESS_LeftAndMain') // 'Access to all CMS sections' in SecurityAdmin
+        )) {
-            )
-        ) {
             return true;
         }
 
@@ -348,14 +345,15 @@ class LeftAndMainSubsites extends Extension
         }
     }
 
-    /**
+	/**
-     * @param array $data
+	 * @param array $data
-     */
+	 * @param Form $form
-    public function copytosubsite($data)
+	 */
+    public function copytosubsite($data, $form)
     {
-        $page = SiteTree::get()->byID($data['ID']);
+        $page = DataObject::get_by_id('SiteTree', $data['ID']);
-        $subsite = Subsite::get()->byID($data['CopyToSubsiteID']);
+        $subsite = DataObject::get_by_id('Subsite', $data['CopyToSubsiteID']);
-        $includeChildren = isset($data['CopyToSubsiteWithChildren']) ? $data['CopyToSubsiteWithChildren'] : false;
+        $includeChildren = (isset($data['CopyToSubsiteWithChildren'])) ? $data['CopyToSubsiteWithChildren'] : false;
 
         $newPage = $page->duplicateToSubsite($subsite->ID, $includeChildren);
         $response = $this->owner->getResponse();
@@ -366,5 +364,4 @@ class LeftAndMainSubsites extends Extension
             $newPage->ID
         ));
     }
-
 }

code/extensions/SiteConfigSubsites.php

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Subsites\Extensions;
 
-
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\ORM\DataExtension;
@@ -11,7 +10,6 @@ use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Subsites\Model\Subsite;
 
-
 /**
  * Extension for the SiteConfig object to add subsites support
  */
@@ -73,5 +71,4 @@ class SiteConfigSubsites extends DataExtension
     {
         $fields->push(new HiddenField('SubsiteID', 'SubsiteID', Subsite::currentSubsiteID()));
     }
-
 }

code/extensions/SiteTreeSubsites.php

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Subsites\Extensions;
 
-
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
@@ -23,13 +22,11 @@ use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Subsites\Model\Subsite;
 use SilverStripe\View\SSViewer;
 
-
 /**
  * Extension for the SiteTree object to add subsites support
  */
 class SiteTreeSubsites extends DataExtension
 {
-
     private static $has_one = [
         'Subsite' => Subsite::class, // The subsite that this page belongs to
     ];
@@ -150,6 +147,86 @@ class SiteTreeSubsites extends DataExtension
         }
     }
 
+    /**
+     * Does the basic duplication, but doesn't write anything
+     * this means we can subclass this easier and do more complex
+     * relation duplication.
+     */
+    public function duplicateToSubsitePrep($subsiteID)
+    {
+        if (is_object($subsiteID)) {
+            $subsiteID = $subsiteID->ID;
+        }
+
+        $oldSubsite = Subsite::currentSubsiteID();
+        if ($subsiteID) {
+            Subsite::changeSubsite($subsiteID);
+        } else {
+            $subsiteID = $oldSubsite;
+        }
+        // doesn't write as we need to reset the SubsiteID, ParentID etc
+        $clone = $this->owner->duplicate(false);
+        $clone->CheckedPublicationDifferences = $clone->AddedToStage = true;
+        $subsiteID = ($subsiteID ? $subsiteID : $oldSubsite);
+        $clone->SubsiteID = $subsiteID;
+        // We have no idea what the parentID should be, so as a workaround use the url-segment and subsite ID
+        if ($this->owner->Parent()) {
+            $parentSeg = $this->owner->Parent()->URLSegment;
+            $newParentPage = Page::get()->filter('URLSegment', $parentSeg)->first();
+            if ($newParentPage) {
+                $clone->ParentID = $newParentPage->ID;
+            } else {
+                // reset it to the top level, so the user can decide where to put it
+                $clone->ParentID = 0;
+            }
+        }
+        // MasterPageID is here for legacy purposes, to satisfy the subsites_relatedpages module
+        $clone->MasterPageID = $this->owner->ID;
+        return $clone;
+    }
+
+    /**
+     * Create a duplicate of this page and save it to another subsite
+     * @param $subsiteID int|Subsite The Subsite to copy to, or its ID
+     */
+    public function duplicateToSubsite($subsiteID = null)
+    {
+        $clone = $this->owner->duplicateToSubsitePrep($subsiteID);
+        $clone->invokeWithExtensions('onBeforeDuplicateToSubsite', $this->owner);
+        $clone->write();
+        $clone->duplicateSubsiteRelations($this->owner);
+        // new extension hooks which happens after write,
+        // onAfterDuplicate isn't reliable due to
+        // https://github.com/silverstripe/silverstripe-cms/issues/1253
+        $clone->invokeWithExtensions('onAfterDuplicateToSubsite', $this->owner);
+        return $clone;
+    }
+
+    /**
+     * Duplicate relations using a static property to define
+     * which ones we want to duplicate
+     *
+     * It may be that some relations are not diostinct to sub site so can stay
+     * whereas others may need to be duplicated
+     *
+     */
+    public function duplicateSubsiteRelations($originalPage)
+    {
+        $thisClass = $originalPage->ClassName;
+        $relations = Config::inst()->get($thisClass, 'duplicate_to_subsite_relations');
+
+        if ($relations && !empty($relations)) {
+            foreach ($relations as $relation) {
+                $items = $originalPage->$relation();
+                foreach ($items as $item) {
+                    $duplicateItem = $item->duplicate(false);
+                    $duplicateItem->{$thisClass.'ID'} = $this->owner->ID;
+                    $duplicateItem->write();
+                }
+            }
+        }
+    }
+
     /**
      * @return SiteConfig
      */
@@ -242,52 +319,6 @@ class SiteTreeSubsites extends DataExtension
         return $this->canEdit($member);
     }
 
-    /**
-     * Create a duplicate of this page and save it to another subsite
-     *
-     * @param int|Subsite $subsiteID The Subsite to copy to, or its ID
-     * @param bool $includeChildren Recursively copy child Pages.
-     * @param int $parentID Where to place the Page in the SiteTree's structure.
-     *
-     * @return SiteTree duplicated page
-     */
-    public function duplicateToSubsite($subsiteID = null, $includeChildren = false, $parentID = 0)
-    {
-        if ($subsiteID instanceof Subsite) {
-            $subsiteID = $subsiteID->ID;
-        }
-
-        $oldSubsite = Subsite::currentSubsiteID();
-
-        if ($subsiteID) {
-            Subsite::changeSubsite($subsiteID);
-        } else {
-            $subsiteID = $oldSubsite;
-        }
-
-        $page = $this->owner->duplicate(false);
-
-        $page->CheckedPublicationDifferences = $page->AddedToStage = true;
-        $subsiteID = ($subsiteID ? $subsiteID : $oldSubsite);
-        $page->SubsiteID = $subsiteID;
-
-        $page->ParentID = $parentID;
-
-        // MasterPageID is here for legacy purposes, to satisfy the subsites_relatedpages module
-        $page->MasterPageID = $this->owner->ID;
-        $page->write();
-
-        Subsite::changeSubsite($oldSubsite);
-
-        if ($includeChildren) {
-            foreach ($this->owner->AllChildren() as $child) {
-                $child->duplicateToSubsite($subsiteID, $includeChildren, $page->ID);
-            }
-        }
-
-        return $page;
-    }
-
     /**
      * Called by ContentController::init();
      * @param $controller
@@ -431,5 +462,4 @@ class SiteTreeSubsites extends DataExtension
             }
         }
     }
-
 }

code/extensions/SubsiteMenuExtension.php

@@ -18,10 +18,8 @@ use SilverStripe\Core\Extension;
 
 class SubsiteMenuExtension extends Extension
 {
-
     public function subsiteCMSShowInMenu()
     {
         return true;
     }
-
 }

code/forms/GridFieldSubsiteDetailForm.php

@@ -6,7 +6,5 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm;
 
 class GridFieldSubsiteDetailForm extends GridFieldDetailForm
 {
-
     protected $itemRequestClass = 'GridFieldSubsiteDetailForm_ItemRequest';
-
 }

code/forms/GridFieldSubsiteDetailForm_ItemRequest.php

@@ -3,6 +3,7 @@
 namespace SilverStripe\Subsites\Forms;
 
 use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\Form;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use SilverStripe\Subsites\Model\Subsite;
 

code/forms/SubsitesTreeDropdownField.php

@@ -3,6 +3,7 @@
 namespace SilverStripe\Subsites\Forms;
 
 
+use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Forms\TreeDropdownField;
@@ -46,12 +47,14 @@ class SubsitesTreeDropdownField extends TreeDropdownField
 
     public function tree(HTTPRequest $request)
     {
-        $oldSubsiteID = Session::get('SubsiteID');
+        $session = Controller::curr()->getRequest()->getSession();
-        Session::set('SubsiteID', $this->subsiteID);
+
+        $oldSubsiteID = $session->get('SubsiteID');
+        $session->set('SubsiteID', $this->subsiteID);
 
         $results = parent::tree($request);
 
-        Session::set('SubsiteID', $oldSubsiteID);
+        $session->set('SubsiteID', $oldSubsiteID);
 
         return $results;
     }

code/forms/WildcardDomainField.php

@@ -1,15 +1,12 @@
 <?php
-
 namespace SilverStripe\Subsites\Forms;
 
 use SilverStripe\Forms\TextField;
-
 /**
  * A text field that accepts only valid domain names, but allows the wildcard (*) character
  */
 class WildcardDomainField extends TextField
 {
-
     /**
      * Validate this field as a valid hostname
      *
@@ -27,7 +24,6 @@ class WildcardDomainField extends TextField
             _t('DomainNameField.INVALID_DOMAIN', 'Invalid domain name'),
             'validation'
         );
-
         return false;
     }
 
@@ -46,5 +42,4 @@ class WildcardDomainField extends TextField
     {
         return 'text wildcarddomain';
     }
-
 }

code/model/Subsite.php

@@ -505,7 +505,7 @@ class Subsite extends DataObject
         }
 
         $data = "<?php \n";
-        $data .= '// Generated by Subsite::writeHostMap() on ' . date('d/M/y') . "\n";
+        $data .= "// Generated by Subsite::writeHostMap() on " . date('d/M/y') . "\n";
         $data .= '$subsiteHostmap = ' . var_export($hostmap, true) . ';';
 
         if (is_writable(dirname($file)) || is_writable($file)) {
@@ -555,7 +555,7 @@ class Subsite extends DataObject
             INNER JOIN \"Group\" ON \"Group\".\"ID\" = \"Permission\".\"GroupID\" AND \"Group\".\"AccessAllSubsites\" = 1
             INNER JOIN \"Group_Members\" ON \"Group_Members\".\"GroupID\" = \"Permission\".\"GroupID\"
             WHERE \"Permission\".\"Code\" IN ('$SQL_perms')
-            AND \"MemberID\" = {$memberID}
+            AND \"Group_Members\".\"MemberID\" = {$memberID}
         ")->value();
 
         // Count this user's groups which have a role that can access the main site
@@ -568,7 +568,7 @@ class Subsite extends DataObject
             INNER JOIN \"PermissionRoleCode\" ON \"PermissionRole\".\"ID\"=\"PermissionRoleCode\".\"RoleID\"
             WHERE \"PermissionRoleCode\".\"Code\" IN ('$SQL_perms')
             AND \"Group\".\"AccessAllSubsites\" = 1
-            AND \"MemberID\" = {$memberID}
+            AND \"Group_Members\".\"MemberID\" = {$memberID}
         ")->value();
 
         // There has to be at least one that allows access.
@@ -678,40 +678,44 @@ class Subsite extends DataObject
                 new Tab(
                     'Configuration',
                     _t('Subsite.TabTitleConfig', 'Configuration'),
-                    new HeaderField('ConfigForSubsiteHeaderField', 'Subsite Configuration'),
+                    HeaderField::create('ConfigForSubsiteHeaderField', 'Subsite Configuration'),
-                    new TextField('Title', $this->fieldLabel('Title'), $this->Title),
+                    TextField::create('Title', $this->fieldLabel('Title'), $this->Title),
 
-                    new HeaderField(
+                    HeaderField::create(
                         'DomainsForSubsiteHeaderField',
                         _t('Subsite.DomainsHeadline', 'Domains for this subsite')
                     ),
                     $domainTable,
                     $languageSelector,
                     // new TextField('RedirectURL', 'Redirect to URL', $this->RedirectURL),
-                    new CheckboxField('DefaultSite', $this->fieldLabel('DefaultSite'), $this->DefaultSite),
+                    CheckboxField::create('DefaultSite', $this->fieldLabel('DefaultSite'), $this->DefaultSite),
-                    new CheckboxField('IsPublic', $this->fieldLabel('IsPublic'), $this->IsPublic),
+                    CheckboxField::create('IsPublic', $this->fieldLabel('IsPublic'), $this->IsPublic),
 
-                    new DropdownField('Theme', $this->fieldLabel('Theme'), $this->allowedThemes(), $this->Theme),
+                    LiteralField::create(
-
-
-                    new LiteralField(
                         'PageTypeBlacklistToggle',
                         sprintf(
                             '<div class="field"><a href="#" id="PageTypeBlacklistToggle">%s</a></div>',
                             _t('Subsite.PageTypeBlacklistField', 'Disallow page types?')
                         )
                     ),
-                    new CheckboxSetField(
+                    CheckboxSetField::create(
                         'PageTypeBlacklist',
                         false,
                         $pageTypeMap
                     )
                 )
             ),
-            new HiddenField('ID', '', $this->ID),
+            HiddenField::create('ID', '', $this->ID),
-            new HiddenField('IsSubsite', '', 1)
+            HiddenField::create('IsSubsite', '', 1)
         );
 
+        // If there are any themes available, add the dropdown
+        $themes = $this->allowedThemes();
+        if (!empty($themes)) {
+            $fields->addFieldToTab('Root.Configuration',
+                DropdownField::create('Theme', $this->fieldLabel('Theme'), $this->allowedThemes(), $this->Theme)->setEmptyString(_t('Subsite.ThemeFieldEmptyString', '')), 'PageTypeBlacklistToggle');
+        }
+
         $subsiteTabs->addExtraClass('subsite-model');
 
         $this->extend('updateCMSFields', $fields);

code/model/SubsiteDomain.php

@@ -102,7 +102,7 @@ class SubsiteDomain extends DataObject
 
     /**
      *
-     * @return \FieldList
+     * @return FieldList
      */
     public function getCMSFields()
     {
@@ -122,11 +122,13 @@ class SubsiteDomain extends DataObject
                     'SubsiteDomain.PROTOCOL_DESCRIPTION',
                     'When generating links to this subsite, use the selected protocol. <br />' .
                     'Selecting \'Automatic\' means subsite links will default to the current protocol.'
-                )), CheckboxField::create('IsPrimary', $this->fieldLabel('IsPrimary'))
+                )),
-            ->setDescription(_t(
+            CheckboxField::create('IsPrimary', $this->fieldLabel('IsPrimary'))
-                'SubsiteDomain.PROTOCOL_DESCRIPTION',
+                ->setDescription(_t(
-                'Mark this as the default domain for this subsite'
+                    'SubsiteDomain.PROTOCOL_DESCRIPTION',
-            )));
+                    'Mark this as the default domain for this subsite'
+                ))
+        );
 
         $this->extend('updateCMSFields', $fields);
         return $fields;
@@ -147,15 +149,6 @@ class SubsiteDomain extends DataObject
         return $labels;
     }
 
-    /**
-     * Before writing the Subsite Domain, strip out any HTML the user has entered.
-     * @return void
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
-    }
-
     /**
      * Get the link to this subsite
      *
@@ -202,8 +195,8 @@ class SubsiteDomain extends DataObject
         $domain = preg_replace('/\.\*$/', ".{$currentHost}", $this->Domain);
 
         // Default to "subsite." prefix for first wildcard
-        // TODO Whats the significance of "subsite" inthiscontext?!
+        // TODO Whats the significance of "subsite" in this context?!
-        $domain = preg_replace('/^\*\./', 'subsite.', $domain);
+        $domain = preg_replace('/^\*\./', "subsite.", $domain);
 
         // *Only* removes "intermediate" subdomains, so 'subdomain.www.domain.com' becomes 'subdomain.domain.com'
         $domain = str_replace('.www.', '.', $domain);
@@ -230,6 +223,7 @@ class SubsiteDomain extends DataObject
     {
         return Controller::join_links(
             $this->getAbsoluteLink(),
-            Director::baseURL());
+            Director::baseURL()
+        );
     }
 }

code/tasks/SubsiteCopyPagesTask.php

@@ -4,6 +4,7 @@ namespace SilverStripe\Subsites\Tasks;
 
 
 use InvalidArgumentException;
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Subsites\Model\Subsite;
@@ -24,7 +25,6 @@ use SilverStripe\Versioned\Versioned;
 class SubsiteCopyPagesTask extends BuildTask
 {
     protected $title = 'Copy pages to different subsite';
-
     protected $description = '';
 
     public function run($request)
@@ -33,7 +33,7 @@ class SubsiteCopyPagesTask extends BuildTask
         if (!is_numeric($subsiteFromId)) {
             throw new InvalidArgumentException('Missing "from" parameter');
         }
-        $subsiteFrom = DataObject::get_by_id('Subsite', $subsiteFromId);
+        $subsiteFrom = DataObject::get_by_id(Subsite::class, $subsiteFromId);
         if (!$subsiteFrom) {
             throw new InvalidArgumentException('Subsite not found');
         }
@@ -42,7 +42,7 @@ class SubsiteCopyPagesTask extends BuildTask
         if (!is_numeric($subsiteToId)) {
             throw new InvalidArgumentException('Missing "to" parameter');
         }
-        $subsiteTo = DataObject::get_by_id('Subsite', $subsiteToId);
+        $subsiteTo = DataObject::get_by_id(Subsite::class, $subsiteToId);
         if (!$subsiteTo) {
             throw new InvalidArgumentException('Subsite not found');
         }

composer.json

@@ -1,33 +1,32 @@
 {
-	"name": "silverstripe/subsites",
+    "name": "silverstripe/subsites",
-	"description": "Run multiple sites from a single SilverStripe install.",
+    "description": "Run multiple sites from a single SilverStripe install.",
-	"license": "BSD-3-Clause",
+    "license": "BSD-3-Clause",
-	"type": "silverstripe-module",
+    "type": "silverstripe-module",
-	"keywords": ["silverstripe", "subsites", "multisite"],
+    "keywords": ["silverstripe", "subsites", "multisite"],
-	"authors": [
+    "authors": [
-		{
+        {
-			"name": "Sam Minnee",
+            "name": "Sam Minnee",
-			"email": "sam@silverstripe.com"
+            "email": "sam@silverstripe.com"
-		}
+        }
-	],
+    ],
-	"require":
+    "require": {
-	{
+        "silverstripe/framework": "~4.0",
-		"silverstripe/framework": "~4.0",
+        "silverstripe/cms": "~4.0",
-		"silverstripe/cms": "~4.0",
         "silverstripe/asset-admin": "~1.0.0"
-	},
+    },
-	"require-dev": {
+    "require-dev": {
-		"phpunit/PHPUnit": "~4.8@stable"
+        "phpunit/PHPUnit": "~4.8@stable"
-	},
+    },
-  "autoload": {
+    "autoload": {
-    "psr-4": {
+        "psr-4": {
-      "SilverStripe\\Subsites\\": "code/",
+            "SilverStripe\\Subsites\\": "code/",
-      "SilverStripe\\Subsites\\Tests\\": "tests/php/"
+            "SilverStripe\\Subsites\\Tests\\": "tests/php/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
-  },
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.0.x-dev"
-		}
-	}
 }

css/LeftAndMain_Subsites.css

@@ -25,17 +25,12 @@
 		}
 
 .cms-menu .cms-subsites{
-	padding: 0 8px 12px;
+	padding:3px 0px 15px;
 }
 .cms-menu .cms-subsites .field.dropdown{
 	padding-bottom:0;
 	margin-bottom:0;
 }
-
-.cms-menu .cms-subsites .field.dropdown span {
-    color: #4f5861;
-}
-
 .cms-menu.collapsed .cms-subsites {
 	display: none;
 }

lang/en.yml

@@ -72,6 +72,7 @@ en:
     PrimaryDomainFieldLabel: 'Primary Domain'
     RedirectURLFieldLabel: 'Redirect URL'
     ThemeFieldLabel: Theme
+    ThemeFieldEmptyString: ''
     TitleFieldLabel: 'Subsite Name'
   SubsitesVirtualPage:
     DESCRIPTION: 'Displays the content of a page on another subsite'

tests/SubsiteXHRControllerTest.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: dmooyman
+ * Date: 27/05/16
+ * Time: 3:10 PM
+ */
+class SubsiteXHRControllerTest extends FunctionalTest
+{
+	protected static $fixture_file = 'SubsiteTest.yml';
+
+	public function testCanView() {
+		// Test unauthenticated access
+		Session::clear('MemberID');
+		$result = $this->get('SubsiteXHRController', null, array(
+			'X-Pjax' => 'SubsiteList',
+			'X-Requested-With' => 'XMLHttpRequest'
+		));
+		$this->assertEquals(403, $result->getStatusCode());
+
+		// Login with NO permissions
+		$this->logInWithPermission('NOT_CMS_PERMISSION');
+		$result = $this->get('SubsiteXHRController', null, array(
+			'X-Pjax' => 'SubsiteList',
+			'X-Requested-With' => 'XMLHttpRequest'
+		));
+		$this->assertEquals(403, $result->getStatusCode());
+
+		// Test cms user
+		$this->logInWithPermission('CMS_ACCESS_CMSMain');
+		$result = $this->get('SubsiteXHRController', null, array(
+			'X-Pjax' => 'SubsiteList',
+			'X-Requested-With' => 'XMLHttpRequest'
+		));
+		$this->assertEquals(200, $result->getStatusCode());
+		$this->assertEquals('text/json', $result->getHeader('Content-Type'));
+		$body = $result->getBody();
+		$this->assertContains('Main site', $body);
+		$this->assertContains('Test 1', $body);
+		$this->assertContains('Test 2', $body);
+		$this->assertContains('Test 3', $body);
+	}
+}

tests/WildcardDomainFieldTest.php

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Tests {@see WildcardDomainField}
+ */
+class WildcardDomainFieldTest extends SapphireTest {
+
+    /**
+     * Check that valid domains are accepted
+     *
+     * @dataProvider validDomains
+     */
+    public function testValidDomains($domain) {
+        $field = new WildcardDomainField('DomainField');
+        $this->assertTrue($field->checkHostname($domain), "Validate that {$domain} is a valid domain name");
+    }
+
+    /**
+     * Check that valid domains are accepted
+     *
+     * @dataProvider invalidDomains
+     */
+    public function testInvalidDomains($domain) {
+        $field = new WildcardDomainField('DomainField');
+        $this->assertFalse($field->checkHostname($domain), "Validate that {$domain} is an invalid domain name");
+    }
+
+    /**
+     * Check that valid domains are accepted
+     *
+     * @dataProvider validWildcards
+     */
+    public function testValidWildcards($domain) {
+        $field = new WildcardDomainField('DomainField');
+        $this->assertTrue($field->checkHostname($domain), "Validate that {$domain} is a valid domain wildcard");
+    }
+
+    public function validDomains() {
+        return array(
+            array('www.mysite.com'),
+            array('domain7'),
+            array('mysite.co.n-z'),
+            array('subdomain.my-site.com'),
+            array('subdomain.mysite')
+        );
+    }
+
+    public function invalidDomains() {
+        return array(
+            array('-mysite'),
+            array('.mysite'),
+            array('mys..ite'),
+            array('mysite-'),
+            array('mysite.'),
+            array('-mysite.*'),
+            array('.mysite.*'),
+            array('mys..ite.*'),
+            array('*.mysite-'),
+            array('*.mysite.')
+        );
+    }
+    
+    public function validWildcards() {
+        return array(
+            array('*.mysite.com'),
+            array('mys*ite.com'),
+            array('*.my-site.*'),
+            array('*')
+        );
+    }
+
+}

tests/behat/features/bootstrap/Context/FeatureContext.php

@@ -79,7 +79,6 @@ class FeatureContext extends SilverStripeContext
     public function setMinkParameters(array $parameters)
     {
         parent::setMinkParameters($parameters);
-
         if (isset($parameters['files_path'])) {
             $this->getSubcontext('FixtureContext')->setFilesPath($parameters['files_path']);
         }

tests/php/SiteTreeSubsitesTest.php

@@ -378,7 +378,6 @@ class SiteTreeSubsitesTest_ClassB extends SiteTree implements TestOnly
 
 class SiteTreeSubsitesTest_ErrorPage extends ErrorPage implements TestOnly
 {
-
     /**
      * Helper method to call protected members
      *

tests/php/SubsiteTest.yml

@@ -112,14 +112,14 @@ Page:
       SubsiteID: =>SilverStripe\Subsites\Model\Subsite.subsite2
       URLSegment: contact-us
 
-SilverStripe\Security\PermissionRoleCode:
+PermissionRoleCode:
   roleCode1:
     Code: CMS_ACCESS_CMSMain
-SilverStripe\Security\PermissionRole:
+PermissionRole:
   role1:
     Title: role1
-    Codes: =>SilverStripe\Security\PermissionRoleCode.roleCode1
+    Codes: =>PermissionRoleCode.roleCode1
-SilverStripe\Security\Group:
+Group:
   admin:
     Title: Admin
     Code: admin
@@ -151,71 +151,71 @@ SilverStripe\Security\Group:
     Title: subsite1_group_via_role
     Code: subsite1_group_via_role
     AccessAllSubsites: 1
-    Roles: =>SilverStripe\Security\PermissionRole.role1
+    Roles: =>PermissionRole.role1
-SilverStripe\Security\Permission:
+Permission:
   admin:
     Code: ADMIN
-    GroupID: =>SilverStripe\Security\Group.admin
+    GroupID: =>Group.admin
   editor1:
     Code: CMS_ACCESS_CMSMain
-    GroupID: =>SilverStripe\Security\Group.editor
+    GroupID: =>Group.editor
   editor2:
     Code: SITETREE_VIEW_ALL
-    GroupID: =>SilverStripe\Security\Group.editor
+    GroupID: =>Group.editor
   editor3:
     Code: VIEW_DRAFT_CONTENT
-    GroupID: =>SilverStripe\Security\Group.editor
+    GroupID: =>Group.editor
   accesscmsmain1:
     Code: CMS_ACCESS_CMSMain
-    GroupID: =>SilverStripe\Security\Group.subsite1_group
+    GroupID: =>Group.subsite1_group
   accesscmsmain2:
     Code: CMS_ACCESS_CMSMain
-    GroupID: =>SilverStripe\Security\Group.subsite2_group
+    GroupID: =>Group.subsite2_group
   accesscmsmain3:
     Code: CMS_ACCESS_CMSMain
-    GroupID: =>SilverStripe\Security\Group.subsite1admins
+    GroupID: =>Group.subsite1admins
   accesscmsmain4:
     Code: CMS_ACCESS_CMSMain
-    GroupID: =>SilverStripe\Security\Group.allsubsitesauthors
+    GroupID: =>Group.allsubsitesauthors
   securityaccess1:
     Code: CMS_ACCESS_SecurityAdmin
-    GroupID: =>SilverStripe\Security\Group.subsite1_group
+    GroupID: =>Group.subsite1_group
   securityaccess2:
     Code: CMS_ACCESS_SecurityAdmin
-    GroupID: =>SilverStripe\Security\Group.subsite2_group
+    GroupID: =>Group.subsite2_group
   adminsubsite1:
     Code: ADMIN
-    GroupID: =>SilverStripe\Security\Group.subsite1admins
+    GroupID: =>Group.subsite1admins
 
-SilverStripe\Security\Member:
+Member:
   admin:
     FirstName: Admin
     Surname: User
     Email: admin@test.com
     Password: rangi
-    Groups: =>SilverStripe\Security\Group.admin
+    Groups: =>Group.admin
   editor:
     FirstName: Editor
     Surname: User
     Email: editor@test.com
     Password: rangi
-    Groups: =>SilverStripe\Security\Group.editor
+    Groups: =>Group.editor
   subsite1member:
     Email: subsite1member@test.com
-    Groups: =>SilverStripe\Security\Group.subsite1_group
+    Groups: =>Group.subsite1_group
   subsite2member:
     Email: subsite2member@test.com
-    Groups: =>SilverStripe\Security\Group.subsite2_group
+    Groups: =>Group.subsite2_group
   subsite1admin:
     Email: subsite1admin@test.com
-    Groups: =>SilverStripe\Security\Group.subsite1admins
+    Groups: =>Group.subsite1admins
   allsubsitesauthor:
     Email: allsubsitesauthor@test.com
-    Groups: =>SilverStripe\Security\Group.allsubsitesauthors
+    Groups: =>Group.allsubsitesauthors
   subsite1member2:
     Email: subsite1member2@test.com
-    Groups: =>SilverStripe\Security\Group.subsite1_group_via_role
+    Groups: =>Group.subsite1_group_via_role
 
-SilverStripe\SiteConfig\SiteConfig:
+SiteConfig:
   config:
     CanCreateTopLevelType: LoggedInUsers

tests/php/SubsitesVirtualPageTest.yml

@@ -1,11 +1,11 @@
 # These need to come first so that SiteTree has the link meta-data written.
-SilverStripe\Assets\File:
+File:
   file1:
     FileFilename: testscript-test-file.pdf
     FileHash: 464dedb70af0dc7f8f3360e7f3ae43cbbf1cdf4e
     Name: testscript-test-file.pdf
 
-SilverStripe\CMS\Model\SiteTree:
+SiteTree:   
   page1:
     Title: page1
     URLSegment: page1