Merge branch '3.1' into 3

src/Extensions/FileSubsites.php

@@ -14,6 +14,7 @@ use SilverStripe\Subsites\State\SubsiteState;
  * Extension for the File object to add subsites support
  *
  * @package subsites
+ * @method Subsite Subsite()
  */
 class FileSubsites extends DataExtension
 {

src/Extensions/GroupSubsites.php

@@ -22,6 +22,7 @@ use SilverStripe\Subsites\State\SubsiteState;
  * Extension for the Group object to add subsites support
  *
  * @package subsites
+ * @method SilverStripe\ORM\ManyManyList<Subsite> Subsites()
  */
 class GroupSubsites extends DataExtension implements PermissionProvider
 {

src/Extensions/SiteConfigSubsites.php

@@ -13,6 +13,7 @@ use SilverStripe\Subsites\State\SubsiteState;
 
 /**
  * Extension for the SiteConfig object to add subsites support
+ * @method Subsite Subsite()
  */
 class SiteConfigSubsites extends DataExtension
 {

src/Extensions/SiteTreeSubsites.php

@@ -32,6 +32,8 @@ use SilverStripe\VersionedAdmin\Controllers\HistoryViewerController;
 
 /**
  * Extension for the SiteTree object to add subsites support
+ * @method SilverStripe\ORM\ManyManyList<SiteTree> CrossSubsiteLinkTracking()
+ * @method Subsite Subsite()
  */
 class SiteTreeSubsites extends DataExtension
 {

src/Extensions/SubsiteMenuExtension.php

@@ -4,16 +4,15 @@ namespace SilverStripe\Subsites\Extensions;
 
 use SilverStripe\Core\Extension;
 
-/*
+/**
  * Simple extension to show admins in the menu of subsites.
  * If an admin area should be available to a subsite, you can attach
  * this class to your admin in config. eg:
  *
- * 		MyAdmin::add_extension('SubsiteMenuExtension');
+ * MyAdmin::add_extension('SubsiteMenuExtension');
  *
  * Or you can include the subsiteCMSShowInMenu function in your admin class and have it return true
  */
-
 class SubsiteMenuExtension extends Extension
 {
     public function subsiteCMSShowInMenu()

src/Model/Subsite.php

@@ -38,6 +38,8 @@ use UnexpectedValueException;
  * You can simulate subsite access without setting up virtual hosts by appending ?SubsiteID=<ID> to the request.
  *
  * @package subsites
+ * @method SilverStripe\ORM\HasManyList<SubsiteDomain> Domains()
+ * @method SilverStripe\ORM\ManyManyList<Group> Groups()
  */
 class Subsite extends DataObject
 {

src/Model/SubsiteDomain.php

@@ -17,6 +17,7 @@ use SilverStripe\Subsites\Forms\WildcardDomainField;
  * @property string $SubstitutedDomain Domain name with all wildcards filled in
  * @property string $FullProtocol Full protocol including ://
  * @property bool $IsPrimary Is this the primary subdomain?
+ * @method Subsite Subsite()
  */
 class SubsiteDomain extends DataObject
 {