tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-18 10:41:40 +02:00
Code Issues Projects Releases Wiki Activity

fixing code analysis: safely use single quotes

Browse Source
This commit is contained in:
Werner M. Krauß 2017-06-01 14:49:55 +02:00
parent 76852594a8
commit e7ad086641
16 changed files with 120 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/admin/SubsiteAdmin.php
View File

@ -20,9 +20,9 @@ class SubsiteAdmin extends ModelAdmin
private static $url_segment = 'subsites';
private static $menu_title = "Subsites";
private static $menu_title = 'Subsites';
private static $menu_icon = "subsites/images/subsites.png";
private static $menu_icon = 'subsites/images/subsites.png';
public $showImportForm = false;

2
code/extensions/ErrorPageSubsite.php
View File

@ -22,7 +22,7 @@ class ErrorPageSubsite extends DataExtension
public function alternateFilepathForErrorcode($statusCode, $locale = null)
{
$static_filepath = Config::inst()->get($this->owner->ClassName, 'static_filepath');
$subdomainPart = "";
$subdomainPart = '';
// Try to get current subsite from session
$subsite = Subsite::currentSubsite(false);

4
code/extensions/FileSubsites.php
View File

@ -35,7 +35,7 @@ class FileSubsites extends DataExtension
public function alternateTreeTitle()
{
if ($this->owner->SubsiteID == 0) {
return " * " . $this->owner->Title;
return ' * ' . $this->owner->Title;
}
return $this->owner->Title;
@ -105,7 +105,7 @@ class FileSubsites extends DataExtension
// Ordering when deleting or counting doesn't apply
if (!$isCounting) {
$query->addOrderBy("\"SubsiteID\"");
$query->addOrderBy('"SubsiteID"');
}
}

24
code/extensions/GroupSubsites.php
View File

@ -89,25 +89,25 @@ class GroupSubsites extends DataExtension implements PermissionProvider
// Interface is different if you have the rights to modify subsite group values on
// all subsites
if(isset($subsiteMap[0])) {
$fields->addFieldToTab("Root.Subsites", new OptionsetField("AccessAllSubsites",
$fields->addFieldToTab('Root.Subsites', new OptionsetField('AccessAllSubsites',
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
[
1 => _t('GroupSubsites.ACCESSALL', "All subsites"),
0 => _t('GroupSubsites.ACCESSONLY', "Only these subsites"),
1 => _t('GroupSubsites.ACCESSALL', 'All subsites'),
0 => _t('GroupSubsites.ACCESSONLY', 'Only these subsites'),
]
));
unset($subsiteMap[0]);
$fields->addFieldToTab("Root.Subsites", new CheckboxSetField("Subsites", "",
$fields->addFieldToTab('Root.Subsites', new CheckboxSetField('Subsites', '',
$subsiteMap));
} else {
if (sizeof($subsiteMap) <= 1) {
$fields->addFieldToTab("Root.Subsites", new ReadonlyField("SubsitesHuman",
$fields->addFieldToTab('Root.Subsites', new ReadonlyField('SubsitesHuman',
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
reset($subsiteMap)));
} else {
$fields->addFieldToTab("Root.Subsites", new CheckboxSetField("Subsites",
$fields->addFieldToTab('Root.Subsites', new CheckboxSetField('Subsites',
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
$subsiteMap));
}
@ -127,7 +127,7 @@ class GroupSubsites extends DataExtension implements PermissionProvider
$title = _t('GroupSubsites.GlobalGroup', 'global group');
return htmlspecialchars($this->owner->Title, ENT_QUOTES) . ' <i>(' . $title . ')</i>';
} else {
$subsites = Convert::raw2xml(implode(", ", $this->owner->Subsites()->column('Title')));
$subsites = Convert::raw2xml(implode(', ', $this->owner->Subsites()->column('Title')));
return htmlspecialchars($this->owner->Title) . " <i>($subsites)</i>";
}
}
@ -165,19 +165,19 @@ class GroupSubsites extends DataExtension implements PermissionProvider
if (!$hasGroupSubsites) {
if ($subsiteID) {
$query->addLeftJoin("Group_Subsites", "\"Group_Subsites\".\"GroupID\"
$query->addLeftJoin('Group_Subsites', "\"Group_Subsites\".\"GroupID\"
= \"Group\".\"ID\" AND \"Group_Subsites\".\"SubsiteID\" = $subsiteID");
$query->addWhere("(\"Group_Subsites\".\"SubsiteID\" IS NOT NULL OR
\"Group\".\"AccessAllSubsites\" = 1)");
$query->addWhere('("Group_Subsites"."SubsiteID" IS NOT NULL OR
"Group"."AccessAllSubsites" = 1)');
} else {
$query->addWhere("\"Group\".\"AccessAllSubsites\" = 1");
$query->addWhere('"Group"."AccessAllSubsites" = 1');
}
}
// WORKAROUND for databases that complain about an ORDER BY when the column wasn't selected (e.g. SQL Server)
$select = $query->getSelect();
if (isset($select[0]) && !$select[0] == 'COUNT(*)') {
$query->addOrderBy("AccessAllSubsites", "DESC");
$query->addOrderBy('AccessAllSubsites', 'DESC');
}
}
}

6
code/extensions/LeftAndMainSubsites.php
View File

@ -62,7 +62,7 @@ class LeftAndMainSubsites extends Extension
*
* @return ArrayList of {@link Subsite} instances.
*/
public function sectionSites($includeMainSite = true, $mainSiteTitle = "Main site", $member = null)
public function sectionSites($includeMainSite = true, $mainSiteTitle = 'Main site', $member = null)
{
if ($mainSiteTitle == 'Main site') {
$mainSiteTitle = _t('Subsites.MainSiteTitle', 'Main site');
@ -185,7 +185,7 @@ class LeftAndMainSubsites extends Extension
public function CanAddSubsites()
{
return Permission::check("ADMIN", "any", null, "all");
return Permission::check('ADMIN', 'any', null, 'all');
}
/**
@ -218,7 +218,7 @@ class LeftAndMainSubsites extends Extension
}
// Check if we have access to current section on the current subsite.
$accessibleSites = $this->owner->sectionSites(true, "Main site", $member);
$accessibleSites = $this->owner->sectionSites(true, 'Main site', $member);
if ($accessibleSites->count() && $accessibleSites->find('ID', Subsite::currentSubsiteID())) {
// Current section can be accessed on the current site, all good.
return true;

15
code/extensions/SiteTreeSubsites.php
View File

@ -40,7 +40,7 @@ class SiteTreeSubsites extends DataExtension
);
private static $many_many_extraFields = array(
"CrossSubsiteLinkTracking" => array("FieldName" => "Varchar")
'CrossSubsiteLinkTracking' => array('FieldName' => 'Varchar')
);
public function isMainSite()
@ -101,7 +101,7 @@ class SiteTreeSubsites extends DataExtension
public function updateCMSFields(FieldList $fields)
{
$subsites = Subsite::accessible_sites("CMS_ACCESS_CMSMain");
$subsites = Subsite::accessible_sites('CMS_ACCESS_CMSMain');
$subsitesMap = array();
if ($subsites && $subsites->count()) {
$subsitesToMap = $subsites->exclude('ID', $this->owner->SubsiteID);
@ -117,11 +117,12 @@ class SiteTreeSubsites extends DataExtension
ToggleCompositeField::create('SubsiteOperations',
_t('SiteTreeSubsites.SubsiteOperations', 'Subsite Operations'),
array(
new DropdownField("CopyToSubsiteID", _t('SiteTreeSubsites.CopyToSubsite', "Copy page to subsite"), $subsitesMap),
new CheckboxField("CopyToSubsiteWithChildren", _t('SiteTreeSubsites.CopyToSubsiteWithChildren', 'Include children pages?')),
new DropdownField('CopyToSubsiteID', _t('SiteTreeSubsites.CopyToSubsite',
'Copy page to subsite'), $subsitesMap),
new CheckboxField('CopyToSubsiteWithChildren', _t('SiteTreeSubsites.CopyToSubsiteWithChildren', 'Include children pages?')),
$copyAction = new InlineFormAction(
"copytosubsite",
_t('SiteTreeSubsites.CopyAction', "Copy")
'copytosubsite',
_t('SiteTreeSubsites.CopyAction', 'Copy')
)
)
)->setHeadingLevel(4)
@ -327,7 +328,7 @@ class SiteTreeSubsites extends DataExtension
public function MetaTags(&$tags)
{
if ($this->owner->SubsiteID) {
$tags .= "<meta name=\"x-subsite-id\" content=\"" . $this->owner->SubsiteID . "\" />\n";
$tags .= '<meta name="x-subsite-id" content="' . $this->owner->SubsiteID . "\" />\n";
}
return $tags;

4
code/forms/WildcardDomainField.php
View File

@ -24,8 +24,8 @@ class WildcardDomainField extends TextField
$validator->validationError(
$this->getName(),
_t("DomainNameField.INVALID_DOMAIN", "Invalid domain name"),
"validation"
_t('DomainNameField.INVALID_DOMAIN', 'Invalid domain name'),
'validation'
);
return false;

48
code/model/Subsite.php
View File

@ -227,9 +227,9 @@ class Subsite extends DataObject
$matchingDomains = DataObject::get(
SubsiteDomain::class,
"'$SQL_host' LIKE replace(\"SubsiteDomain\".\"Domain\",'*','%')",
"\"IsPrimary\" DESC"
'"IsPrimary" DESC'
)->innerJoin('Subsite',
"\"Subsite\".\"ID\" = \"SubsiteDomain\".\"SubsiteID\" AND \"Subsite\".\"IsPublic\"=1");
'"Subsite"."ID" = "SubsiteDomain"."SubsiteID" AND "Subsite"."IsPublic"=1');
}
if ($matchingDomains && $matchingDomains->count()) {
@ -245,7 +245,7 @@ class Subsite extends DataObject
$subsiteID = $subsiteIDs[0];
} else {
if ($default = DataObject::get_one(Subsite::class, "\"DefaultSite\" = 1")) {
if ($default = DataObject::get_one(Subsite::class, '"DefaultSite" = 1')) {
// Check for a 'default' subsite
$subsiteID = $default->ID;
} else {
@ -270,7 +270,7 @@ class Subsite extends DataObject
* @param string $limit
* @return DataList
*/
public static function get_from_all_subsites($className, $filter = "", $sort = "", $join = "", $limit = "")
public static function get_from_all_subsites($className, $filter = '', $sort = '', $join = '', $limit = '')
{
$result = DataObject::get($className, $filter, $sort, $join, $limit);
$result = $result->setDataQueryParam('Subsite.filter', false);
@ -299,7 +299,7 @@ class Subsite extends DataObject
*
* @return SS_List List of {@link Subsite} objects (DataList or ArrayList).
*/
public static function all_sites($includeMainSite = true, $mainSiteTitle = "Main site")
public static function all_sites($includeMainSite = true, $mainSiteTitle = 'Main site')
{
$subsites = Subsite::get();
@ -322,7 +322,7 @@ class Subsite extends DataObject
*
* @return ArrayList of {@link Subsite} instances.
*/
public static function all_accessible_sites($includeMainSite = true, $mainSiteTitle = "Main site", $member = null)
public static function all_accessible_sites($includeMainSite = true, $mainSiteTitle = 'Main site', $member = null)
{
// Rationalise member arguments
if (!$member) {
@ -370,7 +370,7 @@ class Subsite extends DataObject
public static function accessible_sites(
$permCode,
$includeMainSite = true,
$mainSiteTitle = "Main site",
$mainSiteTitle = 'Main site',
$member = null
)
{
@ -400,9 +400,9 @@ class Subsite extends DataObject
$subsites = DataList::create(Subsite::class)
->where("\"Subsite\".\"Title\" != ''")
->leftJoin('Group_Subsites', "\"Group_Subsites\".\"SubsiteID\" = \"Subsite\".\"ID\"")
->leftJoin('Group_Subsites', '"Group_Subsites"."SubsiteID" = "Subsite"."ID"')
->innerJoin('Group',
"\"Group\".\"ID\" = \"Group_Subsites\".\"GroupID\" OR \"Group\".\"AccessAllSubsites\" = 1")
'"Group"."ID" = "Group_Subsites"."GroupID" OR "Group"."AccessAllSubsites" = 1')
->innerJoin('Group_Members',
"\"Group_Members\".\"GroupID\"=\"Group\".\"ID\" AND \"Group_Members\".\"MemberID\" = $member->ID")
->innerJoin('Permission',
@ -415,13 +415,13 @@ class Subsite extends DataObject
/** @var DataList $rolesSubsites */
$rolesSubsites = DataList::create(Subsite::class)
->where("\"Subsite\".\"Title\" != ''")
->leftJoin('Group_Subsites', "\"Group_Subsites\".\"SubsiteID\" = \"Subsite\".\"ID\"")
->leftJoin('Group_Subsites', '"Group_Subsites"."SubsiteID" = "Subsite"."ID"')
->innerJoin('Group',
"\"Group\".\"ID\" = \"Group_Subsites\".\"GroupID\" OR \"Group\".\"AccessAllSubsites\" = 1")
'"Group"."ID" = "Group_Subsites"."GroupID" OR "Group"."AccessAllSubsites" = 1')
->innerJoin('Group_Members',
"\"Group_Members\".\"GroupID\"=\"Group\".\"ID\" AND \"Group_Members\".\"MemberID\" = $member->ID")
->innerJoin('Group_Roles', "\"Group_Roles\".\"GroupID\"=\"Group\".\"ID\"")
->innerJoin('PermissionRole', "\"Group_Roles\".\"PermissionRoleID\"=\"PermissionRole\".\"ID\"")
->innerJoin('Group_Roles', '"Group_Roles"."GroupID"="Group"."ID"')
->innerJoin('PermissionRole', '"Group_Roles"."PermissionRoleID"="PermissionRole"."ID"')
->innerJoin('PermissionRoleCode',
"\"PermissionRole\".\"ID\"=\"PermissionRoleCode\".\"RoleID\" AND \"PermissionRoleCode\".\"Code\" IN ($SQL_codes, 'CMS_ACCESS_LeftAndMain', 'ADMIN')");
@ -498,7 +498,7 @@ class Subsite extends DataObject
}
$data = "<?php \n";
$data .= "// Generated by Subsite::writeHostMap() on " . date('d/M/y') . "\n";
$data .= '// Generated by Subsite::writeHostMap() on ' . date('d/M/y') . "\n";
$data .= '$subsiteHostmap = ' . var_export($hostmap, true) . ';';
if (is_writable(dirname($file)) || is_writable($file)) {
@ -533,8 +533,8 @@ class Subsite extends DataObject
return false;
}
if (!in_array("ADMIN", $permissionCodes)) {
$permissionCodes[] = "ADMIN";
if (!in_array('ADMIN', $permissionCodes)) {
$permissionCodes[] = 'ADMIN';
}
$SQLa_perm = Convert::raw2sql($permissionCodes);
@ -597,7 +597,7 @@ class Subsite extends DataObject
* @var array
*/
private static $belongs_many_many = [
"Groups" => Group::class,
'Groups' => Group::class,
];
/**
@ -619,7 +619,7 @@ class Subsite extends DataObject
/**
* @var string
*/
private static $default_sort = "\"Title\" ASC";
private static $default_sort = '"Title" ASC';
/**
* @todo Possible security issue, don't grant edit permissions to everybody.
@ -639,8 +639,8 @@ class Subsite extends DataObject
{
if ($this->ID != 0) {
$domainTable = new GridField(
"Domains",
_t('Subsite.DomainsListTitle', "Domains"),
'Domains',
_t('Subsite.DomainsListTitle', 'Domains'),
$this->Domains(),
GridFieldConfig_RecordEditor::create(10)
);
@ -675,7 +675,7 @@ class Subsite extends DataObject
new HeaderField(
'DomainsForSubsiteHeaderField',
_t('Subsite.DomainsHeadline', "Domains for this subsite")
_t('Subsite.DomainsHeadline', 'Domains for this subsite')
),
$domainTable,
$languageSelector,
@ -902,9 +902,9 @@ JS;
Member::class,
"\"Group\".\"SubsiteID\" = $this->ID AND \"Permission\".\"Code\" IN ('$SQL_permissionCodes')",
'',
"LEFT JOIN \"Group_Members\" ON \"Member\".\"ID\" = \"Group_Members\".\"MemberID\"
LEFT JOIN \"Group\" ON \"Group\".\"ID\" = \"Group_Members\".\"GroupID\"
LEFT JOIN \"Permission\" ON \"Permission\".\"GroupID\" = \"Group\".\"ID\""
'LEFT JOIN "Group_Members" ON "Member"."ID" = "Group_Members"."MemberID"
LEFT JOIN "Group" ON "Group"."ID" = "Group_Members"."GroupID"
LEFT JOIN "Permission" ON "Permission"."GroupID" = "Group"."ID"'
);
}

12
code/model/SubsiteDomain.php
View File

@ -28,15 +28,15 @@ class SubsiteDomain extends DataObject
*
* @var string
*/
private static $default_sort = "\"IsPrimary\" DESC";
private static $default_sort = '"IsPrimary" DESC';
/** *
* @var array
*/
private static $db = [
"Domain" => "Varchar(255)",
"Protocol" => "Enum('http,https,automatic','automatic')",
"IsPrimary" => "Boolean",
'Domain' => 'Varchar(255)',
'Protocol' => "Enum('http,https,automatic','automatic')",
'IsPrimary' => 'Boolean',
];
/**
@ -69,7 +69,7 @@ class SubsiteDomain extends DataObject
* @var array
*/
private static $has_one = [
"Subsite" => Subsite::class,
'Subsite' => Subsite::class,
];
/**
@ -203,7 +203,7 @@ class SubsiteDomain extends DataObject
// Default to "subsite." prefix for first wildcard
// TODO Whats the significance of "subsite" inthiscontext?!
$domain = preg_replace('/^\*\./', "subsite.", $domain);
$domain = preg_replace('/^\*\./', 'subsite.', $domain);
// *Only* removes "intermediate" subdomains, so 'subdomain.www.domain.com' becomes 'subdomain.domain.com'
$domain = str_replace('.www.', '.', $domain);

18
code/pages/SubsitesVirtualPage.php
View File

@ -52,8 +52,8 @@ class SubsitesVirtualPage extends VirtualPage
$fields->addFieldToTab(
'Root.Main',
DropdownField::create(
"CopyContentFromID_SubsiteID",
_t('SubsitesVirtualPage.SubsiteField', "Subsite"),
'CopyContentFromID_SubsiteID',
_t('SubsitesVirtualPage.SubsiteField', 'Subsite'),
$subsites->map('ID', 'Title')
)->addExtraClass('subsitestreedropdownfield-chooser no-change-track'),
'CopyContentFromID'
@ -61,11 +61,11 @@ class SubsitesVirtualPage extends VirtualPage
// Setup the linking to the original page.
$pageSelectionField = new SubsitesTreeDropdownField(
"CopyContentFromID",
_t('VirtualPage.CHOOSE', "Choose a page to link to"),
'CopyContentFromID',
_t('VirtualPage.CHOOSE', 'Choose a page to link to'),
"SilverStripe\\CMS\\Model\\SiteTree",
"ID",
"MenuTitle"
'ID',
'MenuTitle'
);
if (Controller::has_curr() && Controller::curr()->getRequest()) {
@ -80,10 +80,10 @@ class SubsitesVirtualPage extends VirtualPage
$linkToContent = "
<a class=\"cmsEditlink\" href=\"$editLink\">" .
_t('VirtualPage.EDITCONTENT', 'Click here to edit the content') .
"</a>";
$fields->removeByName("VirtualPageContentLinkLabel");
'</a>';
$fields->removeByName('VirtualPageContentLinkLabel');
$fields->addFieldToTab(
"Root.Main",
'Root.Main',
$linkToContentLabelField = new LabelField('VirtualPageContentLinkLabel', $linkToContent),
'Title'
);

10
tests/php/LeftAndMainSubsitesTest.php
View File

@ -32,19 +32,19 @@ class LeftAndMainSubsitesTest extends FunctionalTest
$member = $this->objFromFixture(Member::class, 'subsite1member');
$cmsmain = singleton(CMSMain::class);
$subsites = $cmsmain->sectionSites(true, "Main site", $member);
$subsites = $cmsmain->sectionSites(true, 'Main site', $member);
$this->assertDOSEquals(array(
array('Title' =>'Subsite1 Template')
), $subsites, 'Lists member-accessible sites for the accessible controller.');
$assetadmin = singleton(AssetAdmin::class);
$subsites = $assetadmin->sectionSites(true, "Main site", $member);
$subsites = $assetadmin->sectionSites(true, 'Main site', $member);
$this->assertDOSEquals([], $subsites, 'Does not list any sites for forbidden controller.');
$member = $this->objFromFixture(Member::class, 'editor');
$cmsmain = singleton(CMSMain::class);
$subsites = $cmsmain->sectionSites(true, "Main site", $member);
$subsites = $cmsmain->sectionSites(true, 'Main site', $member);
$this->assertDOSContains(array(
array('Title' =>'Main site')
), $subsites, 'Includes the main site for members who can access all sites.');
@ -52,7 +52,7 @@ class LeftAndMainSubsitesTest extends FunctionalTest
public function testAccessChecksDontChangeCurrentSubsite()
{
$admin = $this->objFromFixture(Member::class, "admin");
$admin = $this->objFromFixture(Member::class, 'admin');
$this->logInAs($admin);
$ids = array();
@ -74,7 +74,7 @@ class LeftAndMainSubsitesTest extends FunctionalTest
$left = new LeftAndMain();
$this->assertTrue($left->canView(), "Admin user can view subsites LeftAndMain with id = '$id'");
$this->assertEquals($id, Subsite::currentSubsiteID(),
"The current subsite has not been changed in the process of checking permissions for admin user.");
'The current subsite has not been changed in the process of checking permissions for admin user.');
}
}

14
tests/php/SiteTreeSubsitesTest.php
View File

@ -100,7 +100,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$subsite2 = $this->objFromFixture(Subsite::class, 'subsite2');
// Cant pass member as arguments to canEdit() because of GroupSubsites
Session::set("loggedInAs", $admin->ID);
Session::set('loggedInAs', $admin->ID);
$this->assertTrue(
(bool)$subsite1page->canEdit(),
'Administrators can edit all subsites'
@ -109,13 +109,13 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
// @todo: Workaround because GroupSubsites->augmentSQL() is relying on session state
Subsite::changeSubsite($subsite1);
Session::set("loggedInAs", $subsite1member->ID);
Session::set('loggedInAs', $subsite1member->ID);
$this->assertTrue(
(bool)$subsite1page->canEdit(),
'Members can edit pages on a subsite if they are in a group belonging to this subsite'
);
Session::set("loggedInAs", $subsite2member->ID);
Session::set('loggedInAs', $subsite2member->ID);
$this->assertFalse(
(bool)$subsite1page->canEdit(),
'Members cant edit pages on a subsite if they are not in a group belonging to this subsite'
@ -139,12 +139,12 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$s2 = $this->objFromFixture(Subsite::class, 'domaintest2');
$p1 = new SiteTree();
$p1->Title = $p1->URLSegment = "test-page";
$p1->Title = $p1->URLSegment = 'test-page';
$p1->SubsiteID = $s1->ID;
$p1->write();
$p2 = new SiteTree();
$p2->Title = $p1->URLSegment = "test-page";
$p2->Title = $p1->URLSegment = 'test-page';
$p2->SubsiteID = $s2->ID;
$p2->write();
@ -163,7 +163,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
public function testPageTypesBlacklistInClassDropdown()
{
$editor = $this->objFromFixture(Member::class, 'editor');
Session::set("loggedInAs", $editor->ID);
Session::set('loggedInAs', $editor->ID);
$s1 = $this->objFromFixture(Subsite::class, 'domaintest1');
$s2 = $this->objFromFixture(Subsite::class, 'domaintest2');
@ -229,7 +229,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
public function testPageTypesBlacklistInCMSMain()
{
$editor = $this->objFromFixture(Member::class, 'editor');
Session::set("loggedInAs", $editor->ID);
Session::set('loggedInAs', $editor->ID);
$cmsmain = new CMSMain();

18
tests/php/SubsiteAdminFunctionalTest.php
View File

@ -54,7 +54,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
public function testAdminCanAccessAllSubsites()
{
$member = $this->objFromFixture(Member::class, 'admin');
Session::set("loggedInAs", $member->ID);
Session::set('loggedInAs', $member->ID);
$this->getAndFollowAll('admin/pages/?SubsiteID=0');
$this->assertEquals(Subsite::currentSubsiteID(), '0', 'Can access main site.');
@ -73,7 +73,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
public function testAdminIsRedirectedToObjectsSubsite()
{
$member = $this->objFromFixture(Member::class, 'admin');
Session::set("loggedInAs", $member->ID);
Session::set('loggedInAs', $member->ID);
$mainSubsitePage = $this->objFromFixture('Page', 'mainSubsitePage');
$subsite1Home = $this->objFromFixture('Page', 'subsite1_home');
@ -84,17 +84,17 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
Subsite::changeSubsite(0);
$this->getAndFollowAll("admin/pages/edit/show/$subsite1Home->ID");
$this->assertEquals(Subsite::currentSubsiteID(), $subsite1Home->SubsiteID, 'Loading an object switches the subsite');
$this->assertRegExp("#^admin/pages.*#", $this->mainSession->lastUrl(), 'Lands on the correct section');
$this->assertRegExp('#^admin/pages.*#', $this->mainSession->lastUrl(), 'Lands on the correct section');
Config::modify()->set(CMSPageEditController::class, 'treats_subsite_0_as_global', true);
Subsite::changeSubsite(0);
$this->getAndFollowAll("admin/pages/edit/show/$subsite1Home->ID");
$this->assertEquals(Subsite::currentSubsiteID(), $subsite1Home->SubsiteID, 'Loading a non-main-site object still switches the subsite if configured with treats_subsite_0_as_global');
$this->assertRegExp("#^admin/pages.*#", $this->mainSession->lastUrl(), 'Lands on the correct section');
$this->assertRegExp('#^admin/pages.*#', $this->mainSession->lastUrl(), 'Lands on the correct section');
$this->getAndFollowAll("admin/pages/edit/show/$mainSubsitePage->ID");
$this->assertNotEquals(Subsite::currentSubsiteID(), $mainSubsitePage->SubsiteID, 'Loading a main-site object does not change the subsite if configured with treats_subsite_0_as_global');
$this->assertRegExp("#^admin/pages.*#", $this->mainSession->lastUrl(), 'Lands on the correct section');
$this->assertRegExp('#^admin/pages.*#', $this->mainSession->lastUrl(), 'Lands on the correct section');
Config::unnest();
}
@ -106,7 +106,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
public function testEditorCanAccessAllSubsites()
{
$member = $this->objFromFixture(Member::class, 'editor');
Session::set("loggedInAs", $member->ID);
Session::set('loggedInAs', $member->ID);
$this->getAndFollowAll('admin/pages/?SubsiteID=0');
$this->assertEquals(Subsite::currentSubsiteID(), '0', 'Can access main site.');
@ -128,7 +128,7 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
public function testSubsiteAdmin()
{
$member = $this->objFromFixture(Member::class, 'subsite1member');
Session::set("loggedInAs", $member->ID);
Session::set('loggedInAs', $member->ID);
$subsite1 = $this->objFromFixture(Subsite::class, 'subsite1');
@ -144,11 +144,11 @@ class SubsiteAdminFunctionalTest extends FunctionalTest
'Is redirected away from forbidden section');
// Check forbidden site, on a section that's allowed on another subsite
$this->getAndFollowAll("admin/pages/?SubsiteID=0");
$this->getAndFollowAll('admin/pages/?SubsiteID=0');
$this->assertEquals(Subsite::currentSubsiteID(), $subsite1->ID, 'Is redirected to permitted subsite.');
// Check forbidden site, on a section that's not allowed on any other subsite
$this->getAndFollowAll("admin/assets/?SubsiteID=0");
$this->getAndFollowAll('admin/assets/?SubsiteID=0');
$this->assertEquals(Subsite::currentSubsiteID(), $subsite1->ID, 'Is redirected to first permitted subsite.');
$this->assertNotRegExp('#^Security/login.*#', $this->mainSession->lastUrl(), 'Is not denied access');

16
tests/php/SubsiteAdminTest.php
View File

@ -34,8 +34,8 @@ class SubsiteAdminTest extends BaseSubsiteTest
$response2 = Director::test("admin/subsites/SilverStripe-Subsites-Model-Subsite/EditForm/field/SilverStripe-Subsites-Model-Subsite/item/$subsite1ID/edit", null,
$this->adminLoggedInSession());
$this->assertTrue(strpos($response2->getBody(), 'id="Form_ItemEditForm_ID"') !== false,
"Testing Form_ItemEditForm_ID exists");
$this->assertTrue(strpos($response2->getBody(), '<head') !== false, "Testing <head> exists");
'Testing Form_ItemEditForm_ID exists');
$this->assertTrue(strpos($response2->getBody(), '<head') !== false, 'Testing <head> exists');
}
@ -46,17 +46,19 @@ class SubsiteAdminTest extends BaseSubsiteTest
public function testMainsiteAdminCanAccessAllSubsites()
{
$member = $this->objFromFixture(Member::class, 'admin');
Session::set("loggedInAs", $member->ID);
Session::set('loggedInAs', $member->ID);
$cmsMain = new CMSMain();
foreach ($cmsMain->Subsites() as $subsite) {
$ids[$subsite->ID] = true;
}
$this->assertArrayHasKey(0, $ids, "Main site accessible");
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'main'), $ids, "Site with no groups inaccesible");
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'subsite1'), $ids, "Subsite1 Template inaccessible");
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'subsite2'), $ids, "Subsite2 Template inaccessible");
$this->assertArrayHasKey(0, $ids, 'Main site accessible');
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'main'), $ids, 'Site with no groups inaccesible');
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'subsite1'), $ids,
'Subsite1 Template inaccessible');
$this->assertArrayHasKey($this->idFromFixture(Subsite::class,'subsite2'), $ids,
'Subsite2 Template inaccessible');
}

30
tests/php/SubsiteTest.php
View File

@ -268,11 +268,11 @@ class SubsiteTest extends BaseSubsiteTest
$this->assertEquals('two.mysite.com',
$this->objFromFixture(Subsite::class, 'domaintest2')->domain());
$_SERVER['HTTP_HOST'] = "www.example.org";
$_SERVER['HTTP_HOST'] = 'www.example.org';
$this->assertEquals('three.example.org',
$this->objFromFixture(Subsite::class, 'domaintest3')->domain());
$_SERVER['HTTP_HOST'] = "mysite.example.org";
$_SERVER['HTTP_HOST'] = 'mysite.example.org';
$this->assertEquals('three.mysite.example.org',
$this->objFromFixture(Subsite::class, 'domaintest3')->domain());
@ -356,15 +356,15 @@ class SubsiteTest extends BaseSubsiteTest
*/
public function testAccessibleSites()
{
$member1Sites = Subsite::accessible_sites("CMS_ACCESS_CMSMain", false, null,
$member1Sites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', false, null,
$this->objFromFixture(Member::class, 'subsite1member'));
$member1SiteTitles = $member1Sites->column("Title");
$member1SiteTitles = $member1Sites->column('Title');
sort($member1SiteTitles);
$this->assertEquals('Subsite1 Template', $member1SiteTitles[0], 'Member can get to a subsite via a group');
$adminSites = Subsite::accessible_sites("CMS_ACCESS_CMSMain", false, null,
$adminSites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', false, null,
$this->objFromFixture(Member::class, 'admin'));
$adminSiteTitles = $adminSites->column("Title");
$adminSiteTitles = $adminSites->column('Title');
sort($adminSiteTitles);
$this->assertEquals(array(
'Subsite1 Template',
@ -378,10 +378,10 @@ class SubsiteTest extends BaseSubsiteTest
), array_values($adminSiteTitles));
$member2Sites = Subsite::accessible_sites(
"CMS_ACCESS_CMSMain", false, null,
'CMS_ACCESS_CMSMain', false, null,
$this->objFromFixture(Member::class, 'subsite1member2')
);
$member2SiteTitles = $member2Sites->column("Title");
$member2SiteTitles = $member2Sites->column('Title');
sort($member2SiteTitles);
$this->assertEquals('Subsite1 Template', $member2SiteTitles[0], 'Member can get to subsite via a group role');
}
@ -398,31 +398,31 @@ class SubsiteTest extends BaseSubsiteTest
'Default permissions granted for super-admin'
);
$this->assertTrue(
Subsite::hasMainSitePermission($admin, array("ADMIN")),
Subsite::hasMainSitePermission($admin, array('ADMIN')),
'ADMIN permissions granted for super-admin'
);
$this->assertFalse(
Subsite::hasMainSitePermission($subsite1admin, array("ADMIN")),
Subsite::hasMainSitePermission($subsite1admin, array('ADMIN')),
'ADMIN permissions (on main site) denied for subsite1 admin'
);
$this->assertFalse(
Subsite::hasMainSitePermission($subsite1admin, array("CMS_ACCESS_CMSMain")),
Subsite::hasMainSitePermission($subsite1admin, array('CMS_ACCESS_CMSMain')),
'CMS_ACCESS_CMSMain (on main site) denied for subsite1 admin'
);
$this->assertFalse(
Subsite::hasMainSitePermission($allsubsitesauthor, array("ADMIN")),
Subsite::hasMainSitePermission($allsubsitesauthor, array('ADMIN')),
'ADMIN permissions (on main site) denied for CMS author with edit rights on all subsites'
);
$this->assertTrue(
Subsite::hasMainSitePermission($allsubsitesauthor, array("CMS_ACCESS_CMSMain")),
Subsite::hasMainSitePermission($allsubsitesauthor, array('CMS_ACCESS_CMSMain')),
'CMS_ACCESS_CMSMain (on main site) granted for CMS author with edit rights on all subsites'
);
$this->assertFalse(
Subsite::hasMainSitePermission($subsite1member, array("ADMIN")),
Subsite::hasMainSitePermission($subsite1member, array('ADMIN')),
'ADMIN (on main site) denied for subsite1 subsite1 cms author'
);
$this->assertFalse(
Subsite::hasMainSitePermission($subsite1member, array("CMS_ACCESS_CMSMain")),
Subsite::hasMainSitePermission($subsite1member, array('CMS_ACCESS_CMSMain')),
'CMS_ACCESS_CMSMain (on main site) denied for subsite1 cms author'
);
}

12
tests/php/SubsitesVirtualPageTest.php
View File

@ -108,7 +108,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$this->markTestSkipped('Needs some update or refactoring');
// Fixture
$p = new Page();
$p->Content = "test content";
$p->Content = 'test content';
$p->write();
$vp = new SubsitesVirtualPage();
$vp->CopyContentFromID = $p->ID;
@ -129,7 +129,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$this->assertTrue($vp2->IsAddedToStage);
// Also remains orange after a republish
$p->Content = "new content";
$p->Content = 'new content';
$p->write();
$p->doPublish();
$this->fixVersionNumberCache($vp2);
@ -143,7 +143,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$this->assertFalse($vp->IsModifiedOnStage);
// P edited, VP and P both go green
$p->Content = "third content";
$p->Content = 'third content';
$p->write();
$this->fixVersionNumberCache($vp, $p);
@ -238,12 +238,12 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$page->doUnpublish();
Subsite::changeSubsite($vp1->SubsiteID);
$onLive = Versioned::get_one_by_stage(SubsitesVirtualPage::class, 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp1->ID);
$onLive = Versioned::get_one_by_stage(SubsitesVirtualPage::class, 'Live', '"SiteTree_Live"."ID" = ' .$vp1->ID);
$this->assertNull($onLive, 'SVP has been removed from live');
$subsite = $this->objFromFixture(Subsite::class, 'subsite2');
Subsite::changeSubsite($vp2->SubsiteID);
$onLive = Versioned::get_one_by_stage(SubsitesVirtualPage::class, 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp2->ID);
$onLive = Versioned::get_one_by_stage(SubsitesVirtualPage::class, 'Live', '"SiteTree_Live"."ID" = ' .$vp2->ID);
$this->assertNull($onLive, 'SVP has been removed from live');
}
@ -285,7 +285,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$this->assertEquals(
$subsite2Vp->URLSegment,
$subsite1Page->URLSegment,
"Does allow explicit URLSegment overrides when only existing in a different subsite"
'Does allow explicit URLSegment overrides when only existing in a different subsite'
);
// When changing subsites and re-saving this page, it doesn't trigger a change