tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix switch statement syntax and replace deprecated doPublish() method.

This commit is contained in:
Raissa North 2018-02-01 13:24:48 +13:00
parent 098660e27d
commit 809b1d9b85
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Model/SubsiteDomain.php
View File

@ -166,15 +166,12 @@ class SubsiteDomain extends DataObject
public function getFullProtocol()
{
switch ($this->Protocol) {
case self::PROTOCOL_HTTPS: {
case self::PROTOCOL_HTTPS:
return 'https://';
}
case self::PROTOCOL_HTTP: {
case self::PROTOCOL_HTTP:
return 'http://';
}
default: {
default:
return Director::protocol();
}
}
}

4
tests/php/SiteTreeSubsitesTest.php
View File

@ -288,7 +288,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$mainHome->Content = '<p>Some new content</p>';
$mainHome->write();
$this->assertEquals('home', $mainHome->URLSegment);
$mainHome->doPublish();
$mainHome->publishRecursive();
$mainHomeLive = Versioned::get_one_by_stage('Page', 'Live', sprintf('"SiteTree"."ID" = \'%d\'', $mainHome->ID));
$this->assertEquals('home', $mainHomeLive->URLSegment);
@ -298,7 +298,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$subsite1Home->Content = '<p>In subsite 1</p>';
$subsite1Home->write();
$this->assertEquals('home', $subsite1Home->URLSegment);
$subsite1Home->doPublish();
$subsite1Home->publishRecursive();
$subsite1HomeLive = Versioned::get_one_by_stage(
'Page',
'Live',