fixing code analysis: public method and case mismatch

silverstripe · Jun 1, 2017 · 7685259 · 7685259
1 parent e86cc55
commit 7685259
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/code/extensions/CMSPageAddControllerExtension.php b/code/extensions/CMSPageAddControllerExtension.php
@@ -8,7 +8,7 @@
 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
@@ -48,7 +48,7 @@ public function init()
      */
     public function getCMSTreeTitle()
     {
-        $subsite = Subsite::currentSubSite();
+        $subsite = Subsite::currentSubsite();
         return $subsite ? Convert::raw2xml($subsite->Title) : _t('LeftAndMain.SITECONTENTLEFT');
     }
 
@@ -139,7 +139,7 @@ public function ListSubsites()
         $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
@@ -103,7 +103,7 @@ public function updateCMSFields(FieldList $fields)
     {
         $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
@@ -232,7 +232,7 @@ public static function getSubsiteIDForDomain($host = null, $checkPermissions = t
                 "\"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
@@ -53,7 +53,7 @@ public function testSectionSites()
     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
@@ -65,7 +65,7 @@ public function testSubsiteCreation()
 
         // 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');