tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor GridFieldSubsiteDetailForm_ItemRequest and $_cache_accessible_sites 

Remove underscores to comply with PSR-2
This commit is contained in:
Raissa North 2018-02-01 13:22:48 +13:00
parent 8b5f593999
commit 098660e27d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/GridFieldSubsiteDetailForm.php
View File

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

2
src/Forms/GridFieldSubsiteDetailForm_ItemRequest.php → src/Forms/GridFieldSubsiteDetailFormItemRequest.php
View File

@ -7,7 +7,7 @@ use SilverStripe\Forms\Form;
use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest; use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
class GridFieldSubsiteDetailForm_ItemRequest extends GridFieldDetailForm_ItemRequest class GridFieldSubsiteDetailFormItemRequest extends GridFieldDetailForm_ItemRequest
{ {
private static $allowed_actions = [ private static $allowed_actions = [

20
src/Model/Subsite.php
View File

@ -74,14 +74,14 @@ class Subsite extends DataObject
* *
* @array * @array
*/ */
private static $_cache_accessible_sites = []; protected static $cache_accessible_sites = [];
/** /**
* Memory cache of subsite id for domains * Memory cache of subsite id for domains
* *
* @var array * @var array
*/ */
private static $_cache_subsite_for_domain = []; protected static $cache_subsite_for_domain = [];
/** /**
* Numeric array of all themes which are allowed to be selected for all subsites. * Numeric array of all themes which are allowed to be selected for all subsites.
@ -268,8 +268,8 @@ class Subsite extends DataObject
$currentUserId = Security::getCurrentUser() ? Security::getCurrentUser()->ID : 0; $currentUserId = Security::getCurrentUser() ? Security::getCurrentUser()->ID : 0;
$cacheKey = implode('_', [$host, $currentUserId, static::config()->get('check_is_public')]); $cacheKey = implode('_', [$host, $currentUserId, static::config()->get('check_is_public')]);
if (isset(self::$_cache_subsite_for_domain[$cacheKey])) { if (isset(self::$cache_subsite_for_domain[$cacheKey])) {
return self::$_cache_subsite_for_domain[$cacheKey]; return self::$cache_subsite_for_domain[$cacheKey];
} }
$SQL_host = Convert::raw2sql($host); $SQL_host = Convert::raw2sql($host);
@ -319,7 +319,7 @@ class Subsite extends DataObject
} }
if ($cacheKey) { if ($cacheKey) {
self::$_cache_subsite_for_domain[$cacheKey] = $subsiteID; self::$cache_subsite_for_domain[$cacheKey] = $subsiteID;
} }
return $subsiteID; return $subsiteID;
@ -355,8 +355,8 @@ class Subsite extends DataObject
*/ */
public static function on_db_reset() public static function on_db_reset()
{ {
self::$_cache_accessible_sites = []; self::$cache_accessible_sites = [];
self::$_cache_subsite_for_domain = []; self::$cache_subsite_for_domain = [];
} }
/** /**
@ -462,8 +462,8 @@ class Subsite extends DataObject
// Cache handling // Cache handling
$cacheKey = $SQL_codes . '-' . $member->ID . '-' . $includeMainSite . '-' . $mainSiteTitle; $cacheKey = $SQL_codes . '-' . $member->ID . '-' . $includeMainSite . '-' . $mainSiteTitle;
if (isset(self::$_cache_accessible_sites[$cacheKey])) { if (isset(self::$cache_accessible_sites[$cacheKey])) {
return self::$_cache_accessible_sites[$cacheKey]; return self::$cache_accessible_sites[$cacheKey];
} }
/** @skipUpgrade */ /** @skipUpgrade */
@ -539,7 +539,7 @@ class Subsite extends DataObject
} }
} }
self::$_cache_accessible_sites[$cacheKey] = $subsites; self::$cache_accessible_sites[$cacheKey] = $subsites;
return $subsites; return $subsites;
} }