From 098660e27d611164f77bdf9915b22d2b7ee69f42 Mon Sep 17 00:00:00 2001
From: Raissa North <raissa@silverstripe.com>
Date: Thu, 1 Feb 2018 13:22:48 +1300
Subject: [PATCH] Refactor GridFieldSubsiteDetailForm_ItemRequest and
 $_cache_accessible_sites

Remove underscores to comply with PSR-2
---
 src/Forms/GridFieldSubsiteDetailForm.php      |  2 +-
 ...GridFieldSubsiteDetailFormItemRequest.php} |  2 +-
 src/Model/Subsite.php                         | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/Forms/{GridFieldSubsiteDetailForm_ItemRequest.php => GridFieldSubsiteDetailFormItemRequest.php} (95%)

diff --git a/src/Forms/GridFieldSubsiteDetailForm.php b/src/Forms/GridFieldSubsiteDetailForm.php
index 739fd61..35efc4e 100644
--- a/src/Forms/GridFieldSubsiteDetailForm.php
+++ b/src/Forms/GridFieldSubsiteDetailForm.php
@@ -6,5 +6,5 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm;
 
 class GridFieldSubsiteDetailForm extends GridFieldDetailForm
 {
-    protected $itemRequestClass = GridFieldSubsiteDetailForm_ItemRequest::class;
+    protected $itemRequestClass = GridFieldSubsiteDetailFormItemRequest::class;
 }
diff --git a/src/Forms/GridFieldSubsiteDetailForm_ItemRequest.php b/src/Forms/GridFieldSubsiteDetailFormItemRequest.php
similarity index 95%
rename from src/Forms/GridFieldSubsiteDetailForm_ItemRequest.php
rename to src/Forms/GridFieldSubsiteDetailFormItemRequest.php
index c93a886..275368d 100644
--- a/src/Forms/GridFieldSubsiteDetailForm_ItemRequest.php
+++ b/src/Forms/GridFieldSubsiteDetailFormItemRequest.php
@@ -7,7 +7,7 @@ use SilverStripe\Forms\Form;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use SilverStripe\Subsites\Model\Subsite;
 
-class GridFieldSubsiteDetailForm_ItemRequest extends GridFieldDetailForm_ItemRequest
+class GridFieldSubsiteDetailFormItemRequest extends GridFieldDetailForm_ItemRequest
 {
 
     private static $allowed_actions = [
diff --git a/src/Model/Subsite.php b/src/Model/Subsite.php
index 4b25af2..4b78ed3 100644
--- a/src/Model/Subsite.php
+++ b/src/Model/Subsite.php
@@ -74,14 +74,14 @@ class Subsite extends DataObject
      *
      * @array
      */
-    private static $_cache_accessible_sites = [];
+    protected static $cache_accessible_sites = [];
 
     /**
      * Memory cache of subsite id for domains
      *
      * @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.
@@ -268,8 +268,8 @@ class Subsite extends DataObject
 
             $currentUserId = Security::getCurrentUser() ? Security::getCurrentUser()->ID : 0;
             $cacheKey = implode('_', [$host, $currentUserId, static::config()->get('check_is_public')]);
-            if (isset(self::$_cache_subsite_for_domain[$cacheKey])) {
-                return self::$_cache_subsite_for_domain[$cacheKey];
+            if (isset(self::$cache_subsite_for_domain[$cacheKey])) {
+                return self::$cache_subsite_for_domain[$cacheKey];
             }
 
             $SQL_host = Convert::raw2sql($host);
@@ -319,7 +319,7 @@ class Subsite extends DataObject
         }
 
         if ($cacheKey) {
-            self::$_cache_subsite_for_domain[$cacheKey] = $subsiteID;
+            self::$cache_subsite_for_domain[$cacheKey] = $subsiteID;
         }
 
         return $subsiteID;
@@ -355,8 +355,8 @@ class Subsite extends DataObject
      */
     public static function on_db_reset()
     {
-        self::$_cache_accessible_sites = [];
-        self::$_cache_subsite_for_domain = [];
+        self::$cache_accessible_sites = [];
+        self::$cache_subsite_for_domain = [];
     }
 
     /**
@@ -462,8 +462,8 @@ class Subsite extends DataObject
 
         // Cache handling
         $cacheKey = $SQL_codes . '-' . $member->ID . '-' . $includeMainSite . '-' . $mainSiteTitle;
-        if (isset(self::$_cache_accessible_sites[$cacheKey])) {
-            return self::$_cache_accessible_sites[$cacheKey];
+        if (isset(self::$cache_accessible_sites[$cacheKey])) {
+            return self::$cache_accessible_sites[$cacheKey];
         }
 
         /** @skipUpgrade */
@@ -539,7 +539,7 @@ class Subsite extends DataObject
             }
         }
 
-        self::$_cache_accessible_sites[$cacheKey] = $subsites;
+        self::$cache_accessible_sites[$cacheKey] = $subsites;
 
         return $subsites;
     }