From 76852594a87c5c03d2686aa1fb9683d47f4e289d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Werner=20M=2E=20Krau=C3=9F?= <werner.krauss@netwerkstatt.at>
Date: Thu, 1 Jun 2017 14:44:09 +0200
Subject: [PATCH] fixing code analysis: public method and case mismatch

---
 code/extensions/CMSPageAddControllerExtension.php | 2 +-
 code/extensions/LeftAndMainSubsites.php           | 4 ++--
 code/extensions/SiteTreeSubsites.php              | 2 +-
 code/model/Subsite.php                            | 2 +-
 tests/php/LeftAndMainSubsitesTest.php             | 2 +-
 tests/php/SubsiteTest.php                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/extensions/CMSPageAddControllerExtension.php b/code/extensions/CMSPageAddControllerExtension.php
index 4ac1ca4..c1554e1 100644
--- a/code/extensions/CMSPageAddControllerExtension.php
+++ b/code/extensions/CMSPageAddControllerExtension.php
@@ -8,7 +8,7 @@ use SilverStripe\Subsites\Model\Subsite;
 class CMSPageAddControllerExtension extends Extension
 {
 
-    function updatePageOptions(&$fields)
+    public function updatePageOptions(&$fields)
     {
         $fields->push(new HiddenField('SubsiteID', 'SubsiteID', Subsite::currentSubsiteID()));
     }
diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php
index 1bc53bf..da4a20f 100644
--- a/code/extensions/LeftAndMainSubsites.php
+++ b/code/extensions/LeftAndMainSubsites.php
@@ -48,7 +48,7 @@ class LeftAndMainSubsites extends Extension
      */
     public function getCMSTreeTitle()
     {
-        $subsite = Subsite::currentSubSite();
+        $subsite = Subsite::currentSubsite();
         return $subsite ? Convert::raw2xml($subsite->Title) : _t('LeftAndMain.SITECONTENTLEFT');
     }
 
@@ -139,7 +139,7 @@ class LeftAndMainSubsites extends Extension
         $list = $this->Subsites();
         $currentSubsiteID = Subsite::currentSubsiteID();
 
-        if ($list == null || $list->Count() == 1 && $list->First()->DefaultSite == true) {
+        if ($list == null || $list->count() == 1 && $list->first()->DefaultSite == true) {
             return false;
         }
 
diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
index abcb06f..f5d4873 100644
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@@ -103,7 +103,7 @@ class SiteTreeSubsites extends DataExtension
     {
         $subsites = Subsite::accessible_sites("CMS_ACCESS_CMSMain");
         $subsitesMap = array();
-        if ($subsites && $subsites->Count()) {
+        if ($subsites && $subsites->count()) {
             $subsitesToMap = $subsites->exclude('ID', $this->owner->SubsiteID);
             $subsitesMap = $subsitesToMap->map('ID', 'Title');
         }
diff --git a/code/model/Subsite.php b/code/model/Subsite.php
index 201c8aa..b5ac7aa 100644
--- a/code/model/Subsite.php
+++ b/code/model/Subsite.php
@@ -232,7 +232,7 @@ class Subsite extends DataObject
                 "\"Subsite\".\"ID\" = \"SubsiteDomain\".\"SubsiteID\" AND \"Subsite\".\"IsPublic\"=1");
         }
 
-        if ($matchingDomains && $matchingDomains->Count()) {
+        if ($matchingDomains && $matchingDomains->count()) {
             $subsiteIDs = array_unique($matchingDomains->column('SubsiteID'));
             $subsiteDomains = array_unique($matchingDomains->column('Domain'));
             if (sizeof($subsiteIDs) > 1) {
diff --git a/tests/php/LeftAndMainSubsitesTest.php b/tests/php/LeftAndMainSubsitesTest.php
index 4d714a2..dda15d6 100644
--- a/tests/php/LeftAndMainSubsitesTest.php
+++ b/tests/php/LeftAndMainSubsitesTest.php
@@ -53,7 +53,7 @@ class LeftAndMainSubsitesTest extends FunctionalTest
     public function testAccessChecksDontChangeCurrentSubsite()
     {
         $admin = $this->objFromFixture(Member::class, "admin");
-        $this->loginAs($admin);
+        $this->logInAs($admin);
         $ids = array();
 
         $subsite1 = $this->objFromFixture(Subsite::class, 'domaintest1');
diff --git a/tests/php/SubsiteTest.php b/tests/php/SubsiteTest.php
index d90e916..a910fce 100644
--- a/tests/php/SubsiteTest.php
+++ b/tests/php/SubsiteTest.php
@@ -65,7 +65,7 @@ class SubsiteTest extends BaseSubsiteTest
 
         // Publish all the pages in the template, testing that DataObject::get only returns pages from the chosen subsite
         $pages = DataObject::get(SiteTree::class);
-        $totalPages = $pages->Count();
+        $totalPages = $pages->count();
         foreach ($pages as $page) {
             $this->assertEquals($template->ID, $page->SubsiteID);
             $page->publish('Stage', 'Live');