tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

fixing code analysis: public method and case mismatch

Browse Source
This commit is contained in:
Werner M. Krauß 2017-06-01 14:44:09 +02:00
parent e86cc55ba6
commit 76852594a8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/extensions/CMSPageAddControllerExtension.php
View File

@ -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()));
}

4
code/extensions/LeftAndMainSubsites.php
View File

@ -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;
}

2
code/extensions/SiteTreeSubsites.php
View File

@ -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');
}

2
code/model/Subsite.php
View File

@ -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) {

2
tests/php/LeftAndMainSubsitesTest.php
View File

@ -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');

2
tests/php/SubsiteTest.php
View File

@ -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');