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: replacing deprecated methods

Browse Source
This commit is contained in:
Werner M. Krauß 2017-06-01 14:57:28 +02:00
parent 4fc13b19f7
commit abe1ac9fe6
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/extensions/ControllerSubsites.php
View File

@ -15,7 +15,7 @@ class ControllerSubsites extends Extension
{ {
if ($subsite = Subsite::currentSubsite()) { if ($subsite = Subsite::currentSubsite()) {
if ($theme = $subsite->Theme) { if ($theme = $subsite->Theme) {
SSViewer::set_theme($theme); SSViewer::set_themes([$theme, SSViewer::DEFAULT_THEME]);
} }
} }
} }

2
code/model/Subsite.php
View File

@ -936,7 +936,7 @@ JS;
$childClone = $child->duplicateToSubsite($duplicate, false); $childClone = $child->duplicateToSubsite($duplicate, false);
$childClone->ParentID = $destParentID; $childClone->ParentID = $destParentID;
$childClone->writeToStage('Stage'); $childClone->writeToStage('Stage');
$childClone->publish('Stage', 'Live'); $childClone->copyVersionToStage('Stage', 'Live');
self::changeSubsite($this->ID); //Change Back to this subsite self::changeSubsite($this->ID); //Change Back to this subsite

2
code/tasks/SubsiteCopyPagesTask.php
View File

@ -74,7 +74,7 @@ class SubsiteCopyPagesTask extends BuildTask
$childClone->ParentID = $destParentID; $childClone->ParentID = $destParentID;
$childClone->writeToStage('Stage'); $childClone->writeToStage('Stage');
$childClone->publish('Stage', 'Live'); $childClone->copyVersionToStage('Stage', 'Live');
array_push($stack, array($child->ID, $childClone->ID)); array_push($stack, array($child->ID, $childClone->ID));
$this->log(sprintf('Copied "%s" (#%d, %s)', $child->Title, $child->ID, $child->Link())); $this->log(sprintf('Copied "%s" (#%d, %s)', $child->Title, $child->ID, $child->Link()));

2
tests/behat/features/bootstrap/Context/FeatureContext.php
View File

@ -71,7 +71,7 @@ class FeatureContext extends SilverStripeContext
foreach (ClassInfo::subclassesFor(SiteTree::class) as $id => $class) { foreach (ClassInfo::subclassesFor(SiteTree::class) as $id => $class) {
$blueprint = Injector::inst()->create(FixtureBlueprint::class, $class); $blueprint = Injector::inst()->create(FixtureBlueprint::class, $class);
$blueprint->addCallback('afterCreate', function ($obj, $identifier, &$data, &$fixtures) { $blueprint->addCallback('afterCreate', function ($obj, $identifier, &$data, &$fixtures) {
$obj->publish('Stage', 'Live'); $obj->copyVersionToStage('Stage', 'Live');
}); });
$factory->define($class, $blueprint); $factory->define($class, $blueprint);
} }

6
tests/php/SiteTreeSubsitesTest.php
View File

@ -42,12 +42,12 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$pageMain = new SiteTree(); $pageMain = new SiteTree();
$pageMain->URLSegment = 'testpage'; $pageMain->URLSegment = 'testpage';
$pageMain->write(); $pageMain->write();
$pageMain->publish('Stage', 'Live'); $pageMain->copyVersionToStage('Stage', 'Live');
$pageMainOther = new SiteTree(); $pageMainOther = new SiteTree();
$pageMainOther->URLSegment = 'testpage'; $pageMainOther->URLSegment = 'testpage';
$pageMainOther->write(); $pageMainOther->write();
$pageMainOther->publish('Stage', 'Live'); $pageMainOther->copyVersionToStage('Stage', 'Live');
$this->assertNotEquals($pageMain->URLSegment, $pageMainOther->URLSegment, $this->assertNotEquals($pageMain->URLSegment, $pageMainOther->URLSegment,
'Pages in same subsite cant share the same URL' 'Pages in same subsite cant share the same URL'
@ -58,7 +58,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest
$pageSubsite1 = new SiteTree(); $pageSubsite1 = new SiteTree();
$pageSubsite1->URLSegment = 'testpage'; $pageSubsite1->URLSegment = 'testpage';
$pageSubsite1->write(); $pageSubsite1->write();
$pageSubsite1->publish('Stage', 'Live'); $pageSubsite1->copyVersionToStage('Stage', 'Live');
$this->assertEquals($pageMain->URLSegment, $pageSubsite1->URLSegment, $this->assertEquals($pageMain->URLSegment, $pageSubsite1->URLSegment,
'Pages in different subsites can share the same URL' 'Pages in different subsites can share the same URL'

2
tests/php/SubsiteTest.php
View File

@ -68,7 +68,7 @@ class SubsiteTest extends BaseSubsiteTest
$totalPages = $pages->count(); $totalPages = $pages->count();
foreach ($pages as $page) { foreach ($pages as $page) {
$this->assertEquals($template->ID, $page->SubsiteID); $this->assertEquals($template->ID, $page->SubsiteID);
$page->publish('Stage', 'Live'); $page->copyVersionToStage('Stage', 'Live');
} }
// Create a new site // Create a new site

6
tests/php/SubsitesVirtualPageTest.php
View File

@ -172,7 +172,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$p->Content = 'Content'; $p->Content = 'Content';
$p->Title = 'Title'; $p->Title = 'Title';
$p->writeToStage('Stage'); $p->writeToStage('Stage');
$p->publish('Stage', 'Live'); $p->copyVersionToStage('Stage', 'Live');
$this->assertTrue($p->ExistsOnLive); $this->assertTrue($p->ExistsOnLive);
// change to subsite // change to subsite
@ -185,7 +185,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$svp->CopyContentFromID = $p->ID; $svp->CopyContentFromID = $p->ID;
$svp->write(); $svp->write();
$svp->writeToStage('Stage'); $svp->writeToStage('Stage');
$svp->publish('Stage', 'Live'); $svp->copyVersionToStage('Stage', 'Live');
$this->assertEquals($svp->SubsiteID, $subsite->ID); $this->assertEquals($svp->SubsiteID, $subsite->ID);
$this->assertTrue($svp->ExistsOnLive); $this->assertTrue($svp->ExistsOnLive);
@ -196,7 +196,7 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
$p->Title = 'New Title'; $p->Title = 'New Title';
// "save & publish" // "save & publish"
$p->writeToStage('Stage'); $p->writeToStage('Stage');
$p->publish('Stage', 'Live'); $p->copyVersionToStage('Stage', 'Live');
$this->assertNotEquals($p->SubsiteID, $subsite->ID); $this->assertNotEquals($p->SubsiteID, $subsite->ID);
// reload SVP from database // reload SVP from database