tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Apply SilverStripe\CMS namespace

Browse Source
This commit is contained in:
Damian Mooyman 2016-07-22 11:32:32 +12:00
parent cb946508cf
commit 5bf364bedb
70 changed files with 922 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
.upgrade.yml Normal file
View File

@ -0,0 +1,67 @@
mappings:
CMSBatchAction_Publish: SilverStripe\CMS\BatchActions\CMSBatchAction_Publish
CMSBatchAction_Unpublish: SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish
CMSBatchAction_Archive: SilverStripe\CMS\BatchActions\CMSBatchAction_Archive
CMSBatchAction_Restore: SilverStripe\CMS\BatchActions\CMSBatchAction_Restore
CMSBatchAction_Delete: SilverStripe\CMS\BatchActions\CMSBatchAction_Delete
AssetAdmin: SilverStripe\CMS\Controllers\AssetAdmin
AssetAdmin_DeleteBatchAction: SilverStripe\CMS\Controllers\AssetAdmin_DeleteBatchAction
CMSMain: SilverStripe\CMS\Controllers\CMSMain
CMSPageAddController: SilverStripe\CMS\Controllers\CMSPageAddController
CMSPageEditController: SilverStripe\CMS\Controllers\CMSPageEditController
CMSPageHistoryController: SilverStripe\CMS\Controllers\CMSPageHistoryController
CMSPagesController: SilverStripe\CMS\Controllers\CMSPagesController
CMSPageSettingsController: SilverStripe\CMS\Controllers\CMSPageSettingsController
CMSSettingsController: SilverStripe\CMS\Controllers\CMSSettingsController
CMSSiteTreeFilter: SilverStripe\CMS\Controllers\CMSSiteTreeFilter
CMSSiteTreeFilter_PublishedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_PublishedPages
CMSSiteTreeFilter_DeletedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_DeletedPages
CMSSiteTreeFilter_ChangedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_ChangedPages
CMSSiteTreeFilter_StatusRemovedFromDraftPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusRemovedFromDraftPages
CMSSiteTreeFilter_StatusDraftPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDraftPages
CMSSiteTreeFilter_StatusDeletedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDeletedPages
CMSSiteTreeFilter_Search: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search
ContentController: SilverStripe\CMS\Controllers\ContentController
ErrorPageControllerExtension: SilverStripe\CMS\Controllers\ErrorPageControllerExtension
ErrorPageFileExtension: SilverStripe\CMS\Controllers\ErrorPageFileExtension
LeftAndMainPageIconsExtension: SilverStripe\CMS\Controllers\LeftAndMainPageIconsExtension
ModelAsController: SilverStripe\CMS\Controllers\ModelAsController
NestedController: SilverStripe\CMS\Controllers\NestedController
OldPageRedirector: SilverStripe\CMS\Controllers\OldPageRedirector
RootURLController: SilverStripe\CMS\Controllers\RootURLController
SilverStripeNavigator: SilverStripe\CMS\Controllers\SilverStripeNavigator
SilverStripeNavigatorItem: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem
SilverStripeNavigatorItem_CMSLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_CMSLink
SilverStripeNavigatorItem_StageLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_StageLink
SilverStripeNavigatorItem_LiveLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_LiveLink
SilverStripeNavigatorItem_ArchiveLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_ArchiveLink
Folder_UnusedAssetsField: SilverStripe\CMS\Forms\Folder_UnusedAssetsField
SiteTreeURLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField
SiteTreeURLSegmentField_Readonly: SilverStripe\CMS\Forms\SiteTreeURLSegmentField_Readonly
CurrentPageIdentifier: SilverStripe\CMS\Model\CurrentPageIdentifier
ErrorPage: SilverStripe\CMS\Model\ErrorPage
ErrorPage_Controller: SilverStripe\CMS\Model\ErrorPage_Controller
RedirectorPage: SilverStripe\CMS\Model\RedirectorPage
RedirectorPage_Controller: SilverStripe\CMS\Model\RedirectorPage_Controller
SiteTree: SilverStripe\CMS\Model\SiteTree
SiteTreeExtension: SilverStripe\CMS\Model\SiteTreeExtension
SiteTreeFileExtension: SilverStripe\CMS\Model\SiteTreeFileExtension
SiteTreeFolderExtension: SilverStripe\CMS\Model\SiteTreeFolderExtension
SiteTreeLinkTracking: SilverStripe\CMS\Model\SiteTreeLinkTracking
SiteTreeLinkTracking_Parser: SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser
VirtualPage: SilverStripe\CMS\Model\VirtualPage
VirtualPage_Controller: SilverStripe\CMS\Model\VirtualPage_Controller
BrokenFilesReport: SilverStripe\CMS\Reports\BrokenFilesReport
SideReport_BrokenFiles: SilverStripe\CMS\Reports\SideReport_BrokenFiles
BrokenLinksReport: SilverStripe\CMS\Reports\BrokenLinksReport
SideReport_BrokenLinks: SilverStripe\CMS\Reports\SideReport_BrokenLinks
BrokenRedirectorPagesReport: SilverStripe\CMS\Reports\BrokenRedirectorPagesReport
SideReport_BrokenRedirectorPages: SilverStripe\CMS\Reports\SideReport_BrokenRedirectorPages
BrokenVirtualPagesReport: SilverStripe\CMS\Reports\BrokenVirtualPagesReport
SideReport_BrokenVirtualPages: SilverStripe\CMS\Reports\SideReport_BrokenVirtualPages
EmptyPagesReport: SilverStripe\CMS\Reports\EmptyPagesReport
SideReport_EmptyPages: SilverStripe\CMS\Reports\SideReport_EmptyPages
RecentlyEditedReport: SilverStripe\CMS\Reports\RecentlyEditedReport
SideReport_RecentlyEdited: SilverStripe\CMS\Reports\SideReport_RecentlyEdited
ContentControllerSearchExtension: SilverStripe\CMS\Search\ContentControllerSearchExtension
SearchForm: SilverStripe\CMS\Search\SearchForm

14
_config.php
View File

@ -10,16 +10,16 @@ define('CMS_PATH', BASE_PATH . '/' . CMS_DIR);
/**
* Register the default internal shortcodes.
*/
ShortcodeParser::get('default')->register('sitetree_link', array('SiteTree', 'link_shortcode_handler'));
ShortcodeParser::get('default')->register('sitetree_link', array('SilverStripe\\CMS\\Model\\SiteTree', 'link_shortcode_handler'));
File::add_extension('SiteTreeFileExtension');
File::add_extension('SilverStripe\\CMS\\Model\\SiteTreeFileExtension');
// TODO Remove once we can configure CMSMenu through static, nested configuration files
CMSMenu::remove_menu_item('CMSMain');
CMSMenu::remove_menu_item('CMSPageEditController');
CMSMenu::remove_menu_item('CMSPageSettingsController');
CMSMenu::remove_menu_item('CMSPageHistoryController');
CMSMenu::remove_menu_item('SilverStripe\\CMS\\Controllers\\CMSMain');
CMSMenu::remove_menu_item('SilverStripe\\CMS\\Controllers\\CMSPageEditController');
CMSMenu::remove_menu_item('SilverStripe\\CMS\\Controllers\\CMSPageSettingsController');
CMSMenu::remove_menu_item('SilverStripe\\CMS\\Controllers\\CMSPageHistoryController');
CMSMenu::remove_menu_item('CMSPageReportsController');
CMSMenu::remove_menu_item('CMSPageAddController');
CMSMenu::remove_menu_item('SilverStripe\\CMS\\Controllers\\CMSPageAddController');
CMSMenu::remove_menu_item("SiteConfigLeftAndMain");

2
_config/cmslogging.yml
View File

@ -6,4 +6,4 @@ Except:
---
Injector:
FriendlyErrorFormatter:
class: SilverStripe\Cms\Logging\ErrorPageErrorFormatter
class: SilverStripe\CMS\Logging\ErrorPageErrorFormatter

7
code/BatchActions/CMSBatchActions.php
View File

@ -1,9 +1,14 @@
<?php
namespace SilverStripe\CMS\BatchActions;
use SilverStripe\ORM\SS_List;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\Security\Permission;
use CMSBatchAction;
/**
* Publish items batch action.
@ -147,7 +152,7 @@ class CMSBatchAction_Delete extends CMSBatchAction {
// check to see if the record exists on the live site,
// if it doesn't remove the tree node
$liveRecord = Versioned::get_one_by_stage( 'SiteTree', 'Live', array(
$liveRecord = Versioned::get_one_by_stage( 'SilverStripe\\CMS\\Model\\SiteTree', 'Live', array(
'"SiteTree"."ID"' => $id
));
if($liveRecord) {

51
code/Controllers/AssetAdmin.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\Filesystem\Storage\AssetNameGenerator;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\Versioning\Versioned;
@ -7,6 +9,49 @@ use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\SS_List;
use SilverStripe\Security\Security;
use SilverStripe\Security\PermissionProvider;
use LeftAndMain;
use Session;
use Requirements;
use CMSBatchActionHandler;
use File;
use DateField;
use HiddenField;
use GridFieldConfig;
use GridFieldToolbarHeader;
use GridFieldSortableHeader;
use GridFieldFilterHeader;
use GridFieldDataColumns;
use GridFieldPaginator;
use GridFieldEditButton;
use GridFieldDeleteAction;
use GridFieldDetailForm;
use GridFieldLevelup;
use GridField;
use Controller;
use LiteralField;
use TabSet;
use Tab;
use CompositeField;
use UploadField;
use FormField;
use SS_HTTPResponse;
use Convert;
use SS_HTTPResponse_Exception;
use HeaderField;
use FieldGroup;
use DropdownField;
use CheckboxField;
use FieldList;
use FormAction;
use Object;
use Form;
use TextField;
use Folder;
use Injector;
use Director;
use ArrayData;
use CMSBatchAction;
/**
@ -75,7 +120,7 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
Requirements::javascript(CMS_DIR . "/client/dist/js/AssetAdmin.js");
Requirements::add_i18n_javascript(CMS_DIR . '/client/lang', false, true);
Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css');
CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
CMSBatchActionHandler::register('delete', 'SilverStripe\\CMS\\Controllers\\AssetAdmin_DeleteBatchAction', 'Folder');
}
/**
@ -154,7 +199,7 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
// Remove legacy previewable behaviour.
$form->removeExtraClass('cms-previewable');
$form->Fields()->removeByName('SilverStripeNavigator');
$form->Fields()->removeByName('SilverStripe\\CMS\\Controllers\\SilverStripeNavigator');
// File listing
$gridFieldConfig = GridFieldConfig::create()->addComponents(
@ -588,7 +633,7 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
// The root element should explicitly point to the root node.
// Uses session state for current record otherwise.
$items[0]->Link = Controller::join_links(singleton('AssetAdmin')->Link('show'), 0);
$items[0]->Link = Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\AssetAdmin')->Link('show'), 0);
// If a search is in progress, don't show the path
if($this->getRequest()->requestVar('q')) {

122
code/Controllers/CMSMain.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\HiddenClass;
@ -12,6 +14,52 @@ use SilverStripe\Security\Security;
use SilverStripe\Security\SecurityToken;
use SilverStripe\Security\Permission;
use SilverStripe\Security\PermissionProvider;
use LeftAndMain;
use Translatable;
use Requirements;
use CMSBatchActionHandler;
use Controller;
use AdminRootController;
use Director;
use Page;
use TextField;
use HeaderField;
use DateField;
use DropdownField;
use FieldGroup;
use FieldList;
use FormAction;
use Object;
use Form;
use SS_Cache;
use Zend_Cache;
use Convert;
use ArrayData;
use HiddenField;
use CMSPreviewable;
use LiteralField;
use RequiredFields;
use LabelField;
use InvalidArgumentException;
use GridFieldConfig;
use GridFieldSortableHeader;
use GridFieldDataColumns;
use GridFieldPaginator;
use GridFieldLevelup;
use GridField;
use SS_HTTPResponse_Exception;
use Session;
use AddToCampaignHandler;
use HTMLEditorField;
use SS_HTTPResponse;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\CMS\Model\CurrentPageIdentifier;
@ -39,7 +87,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
private static $menu_priority = 10;
private static $tree_class = "SiteTree";
private static $tree_class = "SilverStripe\\CMS\\Model\\SiteTree";
private static $subitem_class = "SilverStripe\\Security\\Member";
@ -88,7 +136,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
public function init() {
// set reading lang
if(SiteTree::has_extension('Translatable') && !$this->getRequest()->isAjax()) {
Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SilverStripe\\CMS\\Model\\SiteTree')));
}
parent::init();
@ -109,11 +157,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
]
]);
CMSBatchActionHandler::register('publish', 'CMSBatchAction_Publish');
CMSBatchActionHandler::register('unpublish', 'CMSBatchAction_Unpublish');
CMSBatchActionHandler::register('delete', 'CMSBatchAction_Delete');
CMSBatchActionHandler::register('archive', 'CMSBatchAction_Archive');
CMSBatchActionHandler::register('restore', 'CMSBatchAction_Restore');
CMSBatchActionHandler::register('publish', 'SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Publish');
CMSBatchActionHandler::register('unpublish', 'SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Unpublish');
CMSBatchActionHandler::register('delete', 'SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Delete');
CMSBatchActionHandler::register('archive', 'SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Archive');
CMSBatchActionHandler::register('restore', 'SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Restore');
}
public function index($request) {
@ -182,7 +230,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
public function LinkPages() {
return singleton('CMSPagesController')->Link();
return singleton('SilverStripe\\CMS\\Controllers\\CMSPagesController')->Link();
}
public function LinkPagesWithSearch() {
@ -190,28 +238,28 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
public function LinkTreeView() {
return $this->LinkWithSearch(singleton('CMSMain')->Link('treeview'));
return $this->LinkWithSearch(singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->Link('treeview'));
}
public function LinkListView() {
return $this->LinkWithSearch(singleton('CMSMain')->Link('listview'));
return $this->LinkWithSearch(singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->Link('listview'));
}
public function LinkGalleryView() {
return $this->LinkWithSearch(singleton('CMSMain')->Link('galleryview'));
return $this->LinkWithSearch(singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->Link('galleryview'));
}
public function LinkPageEdit($id = null) {
if(!$id) $id = $this->currentPageID();
return $this->LinkWithSearch(
Controller::join_links(singleton('CMSPageEditController')->Link('show'), $id)
Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'), $id)
);
}
public function LinkPageSettings() {
if($id = $this->currentPageID()) {
return $this->LinkWithSearch(
Controller::join_links(singleton('CMSPageSettingsController')->Link('show'), $id)
Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageSettingsController')->Link('show'), $id)
);
}
}
@ -219,7 +267,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
public function LinkPageHistory() {
if($id = $this->currentPageID()) {
return $this->LinkWithSearch(
Controller::join_links(singleton('CMSPageHistoryController')->Link('show'), $id)
Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageHistoryController')->Link('show'), $id)
);
}
}
@ -239,7 +287,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
public function LinkPageAdd($extra = null, $placeholders = null) {
$link = singleton("CMSPageAddController")->Link();
$link = singleton("SilverStripe\\CMS\\Controllers\\CMSPageAddController")->Link();
$this->extend('updateLinkPageAdd', $link);
if($extra) {
@ -276,8 +324,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
*/
public function SiteTreeAsUL() {
// Pre-cache sitetree version numbers for querying efficiency
Versioned::prepopulate_versionnumber_cache("SiteTree", "Stage");
Versioned::prepopulate_versionnumber_cache("SiteTree", "Live");
Versioned::prepopulate_versionnumber_cache("SilverStripe\\CMS\\Model\\SiteTree", "Stage");
Versioned::prepopulate_versionnumber_cache("SilverStripe\\CMS\\Model\\SiteTree", "Live");
$html = $this->getSiteTreeFor($this->stat('tree_class'));
$this->extend('updateSiteTreeAsUL', $html);
@ -291,7 +339,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
public function TreeIsFiltered() {
$query = $this->getRequest()->getVar('q');
if (!$query || (count($query) === 1 && isset($query['FilterClass']) && $query['FilterClass'] === 'CMSSiteTreeFilter_Search')) {
if (!$query || (count($query) === 1 && isset($query['FilterClass']) && $query['FilterClass'] === 'SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter_Search')) {
return false;
}
@ -364,7 +412,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
// Create the form
$form = Form::create($this, 'SearchForm', $fields, $actions)
$form = Form::create($this, 'SilverStripe\\CMS\\Search\\SearchForm', $fields, $actions)
->addExtraClass('cms-search-form')
->setFormMethod('GET')
->setFormAction($this->Link())
@ -504,14 +552,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$addAction = $instance->i18n_singular_name();
// Get description (convert 'Page' to 'SiteTree' for correct localization lookups)
$description = _t((($class == 'Page') ? 'SiteTree' : $class) . '.DESCRIPTION');
$description = _t((($class == 'Page') ? 'SilverStripe\\CMS\\Model\\SiteTree' : $class) . '.DESCRIPTION');
if(!$description) {
$description = $instance->uninherited('description');
}
if($class == 'Page' && !$description) {
$description = singleton('SiteTree')->uninherited('description');
$description = singleton('SilverStripe\\CMS\\Model\\SiteTree')->uninherited('description');
}
$result->push(new ArrayData(array(
@ -626,8 +674,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
// Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load
if($record instanceof CMSPreviewable && !$fields->fieldByName('SilverStripeNavigator')) {
$navField = new LiteralField('SilverStripeNavigator', $this->getSilverStripeNavigator());
if($record instanceof CMSPreviewable && !$fields->fieldByName('SilverStripe\\CMS\\Controllers\\SilverStripeNavigator')) {
$navField = new LiteralField('SilverStripe\\CMS\\Controllers\\SilverStripeNavigator', $this->getSilverStripeNavigator());
$navField->setAllowHTML(true);
$fields->push($navField);
}
@ -747,7 +795,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
protected function getQueryFilter($params) {
if(empty($params['FilterClass'])) return null;
$filterClass = $params['FilterClass'];
if(!is_subclass_of($filterClass, 'CMSSiteTreeFilter')) {
if(!is_subclass_of($filterClass, 'SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter')) {
throw new InvalidArgumentException("Invalid filter class passed: {$filterClass}");
}
return $filterClass::create($params);
@ -830,7 +878,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
return sprintf(
'<a class="action-detail" href="%s">%s</a>',
Controller::join_links(
singleton('CMSPageEditController')->Link('show'),
singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'),
(int)$item->ID
),
$item->TreeTitle // returns HTML, does its own escaping
@ -1039,13 +1087,13 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
$id = (int) $data['ID'];
$restoredPage = Versioned::get_latest_version("SiteTree", $id);
$restoredPage = Versioned::get_latest_version("SilverStripe\\CMS\\Model\\SiteTree", $id);
if(!$restoredPage) {
throw new SS_HTTPResponse_Exception("SiteTree #$id not found", 400);
}
/** @var SiteTree $record */
$record = Versioned::get_one_by_stage('SiteTree', 'Live', array(
$record = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', array(
'"SiteTree_Live"."ID"' => $id
));
@ -1085,7 +1133,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
*/
public function delete($data, $form) {
$id = $data['ID'];
$record = DataObject::get_by_id("SiteTree", $id);
$record = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $id);
if($record && !$record->canDelete()) {
return Security::permissionFailure();
}
@ -1116,7 +1164,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
public function archive($data, $form) {
$id = $data['ID'];
/** @var SiteTree $record */
$record = DataObject::get_by_id("SiteTree", $id);
$record = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $id);
if(!$record || !$record->exists()) {
throw new SS_HTTPResponse_Exception("Bad record ID #$id", 404);
}
@ -1212,7 +1260,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
// Can be used in different contexts: In normal page edit view, in which case the redirect won't have any effect.
// Or in history view, in which case a revert causes the CMS to re-load the edit view.
// The X-Pjax header forces a "full" content refresh on redirect.
$url = Controller::join_links(singleton('CMSPageEditController')->Link('show'), $record->ID);
$url = Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'), $record->ID);
$this->getResponse()->addHeader('X-ControllerURL', $url);
$this->getRequest()->addHeader('X-Pjax', 'Content');
$this->getResponse()->addHeader('X-Pjax', 'Content');
@ -1279,7 +1327,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
$start = 0;
$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
$pages = DataObject::get("SilverStripe\\CMS\\Model\\SiteTree", "", "", "", "$start,30");
$count = 0;
while($pages) {
foreach($pages as $page) {
@ -1295,7 +1343,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
if($pages->Count() > 29) {
$start += 30;
$pages = DataObject::get("SiteTree", "", "", "", "$start,30");
$pages = DataObject::get("SilverStripe\\CMS\\Model\\SiteTree", "", "", "", "$start,30");
} else {
break;
}
@ -1331,7 +1379,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
$id = (int)$data['ID'];
$restoredPage = Versioned::get_latest_version("SiteTree", $id);
$restoredPage = Versioned::get_latest_version("SilverStripe\\CMS\\Model\\SiteTree", $id);
if(!$restoredPage) return new SS_HTTPResponse("SiteTree #$id not found", 400);
$restoredPage = $restoredPage->doRestoreToStage();
@ -1353,7 +1401,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
if(($id = $this->urlParams['ID']) && is_numeric($id)) {
$page = DataObject::get_by_id("SiteTree", $id);
$page = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $id);
if($page && (!$page->canEdit() || !$page->canCreate(null, array('Parent' => $page->Parent())))) {
return Security::permissionFailure($this);
}
@ -1375,7 +1423,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
array('title' => $newPage->Title)
))
);
$url = Controller::join_links(singleton('CMSPageEditController')->Link('show'), $newPage->ID);
$url = Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'), $newPage->ID);
$this->getResponse()->addHeader('X-ControllerURL', $url);
$this->getRequest()->addHeader('X-Pjax', 'Content');
$this->getResponse()->addHeader('X-Pjax', 'Content');
@ -1391,7 +1439,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if(!SecurityToken::inst()->checkRequest($request)) return $this->httpError(400);
increase_time_limit_to();
if(($id = $this->urlParams['ID']) && is_numeric($id)) {
$page = DataObject::get_by_id("SiteTree", $id);
$page = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $id);
if($page && (!$page->canEdit() || !$page->canCreate(null, array('Parent' => $page->Parent())))) {
return Security::permissionFailure($this);
}
@ -1407,7 +1455,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
array('title' => $newPage->Title)
))
);
$url = Controller::join_links(singleton('CMSPageEditController')->Link('show'), $newPage->ID);
$url = Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'), $newPage->ID);
$this->getResponse()->addHeader('X-ControllerURL', $url);
$this->getRequest()->addHeader('X-Pjax', 'Content');
$this->getResponse()->addHeader('X-Pjax', 'Content');

26
code/Controllers/CMSPageAddController.php
View File

@ -1,10 +1,26 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
use FieldList;
use LiteralField;
use SelectionGroup;
use SelectionGroup_Item;
use TreeDropdownField;
use OptionsetField;
use FormAction;
use Form;
use Session;
use Controller;
use SilverStripe\CMS\Model\SiteTree;
class CMSPageAddController extends CMSPageEditController {
@ -58,7 +74,7 @@ class CMSPageAddController extends CMSPageEditController {
$parentField = new TreeDropdownField(
"ParentID",
"",
'SiteTree',
'SilverStripe\\CMS\\Model\\SiteTree',
'ID',
'TreeTitle'
),
@ -162,7 +178,7 @@ class CMSPageAddController extends CMSPageEditController {
if($page) $parentID = $page->ID;
}
if(is_numeric($parentID) && $parentID > 0) $parentObj = DataObject::get_by_id("SiteTree", $parentID);
if(is_numeric($parentID) && $parentID > 0) $parentObj = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $parentID);
else $parentObj = null;
if(!$parentObj || !$parentObj->ID) $parentID = 0;
@ -181,7 +197,7 @@ class CMSPageAddController extends CMSPageEditController {
return $this->getResponseNegotiator()->respond($this->getRequest());
}
$editController = singleton('CMSPageEditController');
$editController = singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController');
$editController->setCurrentPageID($record->ID);
Session::set(
@ -190,11 +206,11 @@ class CMSPageAddController extends CMSPageEditController {
);
Session::set("FormInfo.Form_EditForm.formError.type", 'good');
return $this->redirect(Controller::join_links(singleton('CMSPageEditController')->Link('show'), $record->ID));
return $this->redirect(Controller::join_links(singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'), $record->ID));
}
public function doCancel($data, $form) {
return $this->redirect(singleton('CMSMain')->Link());
return $this->redirect(singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->Link());
}
}

4
code/Controllers/CMSPageEditController.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Controllers;
/**
* @package cms
*/
@ -9,6 +11,6 @@ class CMSPageEditController extends CMSMain {
private static $url_rule = '/$Action/$ID/$OtherID';
private static $url_priority = 41;
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
private static $session_namespace = 'CMSMain';
private static $session_namespace = 'SilverStripe\\CMS\\Controllers\\CMSMain';
}

18
code/Controllers/CMSPageHistoryController.php
View File

@ -1,8 +1,18 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\Security\Security;
use Form;
use FieldList;
use FormAction;
use HiddenField;
use Controller;
use LiteralField;
use ViewableData;
use CheckboxField;
/**
* @package cms
@ -15,7 +25,7 @@ class CMSPageHistoryController extends CMSMain {
private static $url_priority = 42;
private static $menu_title = 'History';
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
private static $session_namespace = 'CMSMain';
private static $session_namespace = 'SilverStripe\\CMS\\Controllers\\CMSMain';
private static $allowed_actions = array(
'VersionsForm',
@ -378,7 +388,7 @@ class CMSPageHistoryController extends CMSMain {
}
$id = $this->currentPageID();
$page = DataObject::get_by_id("SiteTree", $id);
$page = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $id);
if($page && $page->exists()) {
if(!$page->canView()) {
@ -388,8 +398,8 @@ class CMSPageHistoryController extends CMSMain {
$record = $page->compareVersions($fromVersion, $toVersion);
}
$fromVersionRecord = Versioned::get_version('SiteTree', $id, $fromVersion);
$toVersionRecord = Versioned::get_version('SiteTree', $id, $toVersion);
$fromVersionRecord = Versioned::get_version('SilverStripe\\CMS\\Model\\SiteTree', $id, $fromVersion);
$toVersionRecord = Versioned::get_version('SilverStripe\\CMS\\Model\\SiteTree', $id, $toVersion);
if(!$fromVersionRecord) {
user_error("Can't find version $fromVersion of page $id", E_USER_ERROR);

4
code/Controllers/CMSPageSettingsController.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Controllers;
/**
* @package cms
*/
@ -9,7 +11,7 @@ class CMSPageSettingsController extends CMSMain {
private static $url_rule = '/$Action/$ID/$OtherID';
private static $url_priority = 42;
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
private static $session_namespace = 'CMSMain';
private static $session_namespace = 'SilverStripe\\CMS\\Controllers\\CMSMain';
public function getEditForm($id = null, $fields = null) {
$record = $this->getRecord($id ?: $this->currentPageID());

11
code/Controllers/CMSPagesController.php
View File

@ -1,6 +1,11 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataObject;
use stdClass;
use Controller;
use ArrayData;
/**
* @package cms
@ -12,7 +17,7 @@ class CMSPagesController extends CMSMain {
private static $url_priority = 40;
private static $menu_title = 'Pages';
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
private static $session_namespace = 'CMSMain';
private static $session_namespace = 'SilverStripe\\CMS\\Controllers\\CMSMain';
public function LinkPreview() {
return false;
@ -34,7 +39,7 @@ class CMSPagesController extends CMSMain {
//special case for building the breadcrumbs when calling the listchildren Pages ListView action
if($parentID = $this->getRequest()->getVar('ParentID')) {
$page = DataObject::get_by_id('SiteTree', $parentID);
$page = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $parentID);
//build a reversed list of the parent tree
$pages = array();
@ -50,7 +55,7 @@ class CMSPagesController extends CMSMain {
));
foreach($pages as $page) {
$params['ParentID'] = $page->ID;
$item = new StdClass();
$item = new stdClass();
$item->Title = $page->Title;
$item->Link = Controller::join_links($this->Link(), '?' . http_build_query($params));
$items->push(new ArrayData($item));

4
code/Controllers/CMSSettingsController.php
View File

@ -1,5 +1,9 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SiteConfigLeftAndMain;
/**
* @deprecated 3.3.0
*

26
code/Controllers/CMSSiteTreeFilter.php
View File

@ -1,6 +1,12 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\Versioning\Versioned;
use Object;
use LeftAndMain_SearchFilter;
use ClassInfo;
use DateField;
/**
* Base class for filtering the subtree for certain node statuses.
@ -63,7 +69,7 @@ abstract class CMSSiteTreeFilter extends Object implements LeftAndMain_SearchFil
*/
public static function get_all_filters() {
// get all filter instances
$filters = ClassInfo::subclassesFor('CMSSiteTreeFilter');
$filters = ClassInfo::subclassesFor('SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter');
// remove abstract CMSSiteTreeFilter class
array_shift($filters);
@ -144,7 +150,7 @@ abstract class CMSSiteTreeFilter extends Object implements LeftAndMain_SearchFil
}
while(!empty($parents)) {
$q = Versioned::get_including_deleted('SiteTree', '"RecordID" in ('.implode(',',array_keys($parents)).')');
$q = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree', '"RecordID" in ('.implode(',',array_keys($parents)).')');
$list = $q->map('ID', 'ParentID');
$parents = array();
foreach($list as $id => $parentID) {
@ -171,7 +177,7 @@ abstract class CMSSiteTreeFilter extends Object implements LeftAndMain_SearchFil
* @return DataList Filtered query
*/
protected function applyDefaultFilters($query) {
$sng = singleton('SiteTree');
$sng = singleton('SilverStripe\\CMS\\Model\\SiteTree');
foreach($this->params as $name => $val) {
if(empty($val)) continue;
@ -262,7 +268,7 @@ class CMSSiteTreeFilter_PublishedPages extends CMSSiteTreeFilter {
* @return SS_List
*/
public function getFilteredPages() {
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$pages = $this->applyDefaultFilters($pages);
$pages = $pages->filterByCallback(function($page) {
return $page->getExistsOnLive();
@ -296,7 +302,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
}
public function getFilteredPages() {
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$pages = $this->applyDefaultFilters($pages);
return $pages;
}
@ -315,7 +321,7 @@ class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
}
public function getFilteredPages() {
$pages = Versioned::get_by_stage('SiteTree', 'Stage');
$pages = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage');
$pages = $this->applyDefaultFilters($pages)
->leftJoin('SiteTree_Live', '"SiteTree_Live"."ID" = "SiteTree"."ID"')
->where('"SiteTree"."Version" <> "SiteTree_Live"."Version"');
@ -341,7 +347,7 @@ class CMSSiteTreeFilter_StatusRemovedFromDraftPages extends CMSSiteTreeFilter {
* @return SS_List
*/
public function getFilteredPages() {
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$pages = $this->applyDefaultFilters($pages);
$pages = $pages->filterByCallback(function($page) {
// If page is removed from stage but not live
@ -370,7 +376,7 @@ class CMSSiteTreeFilter_StatusDraftPages extends CMSSiteTreeFilter {
* @return SS_List
*/
public function getFilteredPages() {
$pages = Versioned::get_by_stage('SiteTree', 'Stage');
$pages = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage');
$pages = $this->applyDefaultFilters($pages);
$pages = $pages->filterByCallback(function($page) {
// If page exists on stage but not on live
@ -409,7 +415,7 @@ class CMSSiteTreeFilter_StatusDeletedPages extends CMSSiteTreeFilter {
* @return SS_List
*/
public function getFilteredPages() {
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$pages = $this->applyDefaultFilters($pages);
$pages = $pages->filterByCallback(function($page) {
@ -438,7 +444,7 @@ class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
*/
public function getFilteredPages() {
// Filter default records
$pages = Versioned::get_by_stage('SiteTree', 'Stage');
$pages = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage');
$pages = $this->applyDefaultFilters($pages);
return $pages;
}

28
code/Controllers/ContentController.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataModel;
use SilverStripe\ORM\ArrayList;
@ -12,7 +14,23 @@ use SilverStripe\Security\Security;
use SilverStripe\Security\MemberAuthenticator;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use Controller;
use Page;
use SiteConfig;
use Config;
use SS_HTTPRequest;
use Translatable;
use i18n;
use SS_HTTPResponse;
use SS_HTTPResponse_Exception;
use Director;
use Requirements;
use Convert;
use SSViewer;
use ArrayData;
use Session;
use SilverStripe\CMS\Model\SiteTree;
/**
@ -38,7 +56,7 @@ class ContentController extends Controller {
protected $dataRecord;
private static $extensions = array('OldPageRedirector');
private static $extensions = array('SilverStripe\\CMS\\Controllers\\OldPageRedirector');
private static $allowed_actions = array(
'successfullyinstalled',
@ -89,7 +107,7 @@ class ContentController extends Controller {
$parent = SiteTree::get_by_link($parentRef);
if(!$parent && is_numeric($parentRef)) {
$parent = DataObject::get_by_id('SiteTree', $parentRef);
$parent = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $parentRef);
}
if($parent) return $parent->Children();
@ -119,7 +137,7 @@ class ContentController extends Controller {
}
if($this->dataRecord) $this->dataRecord->extend('contentcontrollerInit', $this);
else singleton('SiteTree')->extend('contentcontrollerInit', $this);
else singleton('SilverStripe\\CMS\\Model\\SiteTree')->extend('contentcontrollerInit', $this);
if($this->redirectedTo()) return;
@ -382,11 +400,11 @@ HTML;
$templates = array_merge(
// Find templates by dataRecord
SSViewer::get_templates_by_class(get_class($this->dataRecord), $action, "SiteTree"),
SSViewer::get_templates_by_class(get_class($this->dataRecord), $action, "SilverStripe\\CMS\\Model\\SiteTree"),
// Next, we need to add templates for all controllers
SSViewer::get_templates_by_class(get_class($this), $action, "Controller"),
// Fail-over to the same for the "index" action
SSViewer::get_templates_by_class(get_class($this->dataRecord), "", "SiteTree"),
SSViewer::get_templates_by_class(get_class($this->dataRecord), "", "SilverStripe\\CMS\\Model\\SiteTree"),
SSViewer::get_templates_by_class(get_class($this), "", "Controller")
);

9
code/Controllers/ErrorPageControllerExtension.php
View File

@ -1,5 +1,14 @@
<?php
namespace SilverStripe\CMS\Controllers;
use Extension;
use SS_HTTPRequest;
use SS_HTTPResponse_Exception;
use SilverStripe\CMS\Model\ErrorPage;
/**
* Enhances error handling for a controller with ErrorPage generated output
*

5
code/Controllers/ErrorPageFileExtension.php
View File

@ -1,8 +1,13 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject;
use SilverStripe\CMS\Model\ErrorPage;
/**
* Decorates {@see File} with ErrorPage support
*/

10
code/Controllers/LeftAndMainPageIconsExtension.php
View File

@ -1,4 +1,12 @@
<?php
namespace SilverStripe\CMS\Controllers;
use Extension;
use Requirements;
use ClassInfo;
use Director;
/**
* Extension to include custom page icons
*
@ -20,7 +28,7 @@ class LeftAndMainPageIconsExtension extends Extension {
public function generatePageIconsCss() {
$css = '';
$classes = ClassInfo::subclassesFor('SiteTree');
$classes = ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\SiteTree');
foreach($classes as $class) {
$obj = singleton($class);
$iconSpec = $obj->stat('icon');

33
code/Controllers/ModelAsController.php
View File

@ -1,8 +1,25 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataModel;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\DataObject;
use Controller;
use ClassInfo;
use Injector;
use SS_HTTPRequest;
use Director;
use RequestHandler;
use SS_HTTPResponse;
use SS_HTTPResponse_Exception;
use Exception;
use Translatable;
use Debug;
use Deprecation;
use SilverStripe\CMS\Model\SiteTree;
/**
* ModelAsController deals with mapping the initial request to the first {@link SiteTree}/{@link ContentController}
@ -12,7 +29,7 @@ use SilverStripe\ORM\DataObject;
* @subpackage control
*/
class ModelAsController extends Controller implements NestedController {
private static $extensions = array('OldPageRedirector');
private static $extensions = array('SilverStripe\\CMS\\Controllers\\OldPageRedirector');
/**
* Get the appropriate {@link ContentController} for handling a {@link SiteTree} object, link it to the object and
@ -23,14 +40,14 @@ class ModelAsController extends Controller implements NestedController {
* @return ContentController
*/
public static function controller_for(SiteTree $sitetree, $action = null) {
if ($sitetree->class == 'SiteTree') {
$controller = "ContentController";
if ($sitetree->class == 'SilverStripe\\CMS\\Model\\SiteTree') {
$controller = "SilverStripe\\CMS\\Controllers\\ContentController";
} else {
$ancestry = ClassInfo::ancestry($sitetree->class);
while ($class = array_pop($ancestry)) {
if (class_exists($class . "_Controller")) break;
}
$controller = ($class !== null) ? "{$class}_Controller" : "ContentController";
$controller = ($class !== null) ? "{$class}_Controller" : "SilverStripe\\CMS\\Controllers\\ContentController";
}
if($action && class_exists($controller . '_' . ucfirst($action))) {
@ -41,14 +58,14 @@ class ModelAsController extends Controller implements NestedController {
}
public function init() {
singleton('SiteTree')->extend('modelascontrollerInit', $this);
singleton('SilverStripe\\CMS\\Model\\SiteTree')->extend('modelascontrollerInit', $this);
parent::init();
}
protected function beforeHandleRequest(SS_HTTPRequest $request, DataModel $model) {
parent::beforeHandleRequest($request, $model);
// If the database has not yet been created, redirect to the build page.
if(!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
if(!DB::is_active() || !ClassInfo::hasTable('SilverStripe\\CMS\\Model\\SiteTree')) {
$this->getResponse()->redirect(Controller::join_links(
Director::absoluteBaseURL(),
'dev/build',
@ -75,7 +92,7 @@ class ModelAsController extends Controller implements NestedController {
}
// If the database has not yet been created, redirect to the build page.
if(!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
if(!DB::is_active() || !ClassInfo::hasTable('SilverStripe\\CMS\\Model\\SiteTree')) {
$this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
$this->popCurrent();
@ -118,7 +135,7 @@ class ModelAsController extends Controller implements NestedController {
if(SiteTree::config()->nested_urls) {
$conditions[] = array('"SiteTree"."ParentID"' => 0);
}
$sitetree = DataObject::get_one('SiteTree', $conditions);
$sitetree = DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', $conditions);
// Check translation module
// @todo Refactor out module specific code

11
code/Controllers/OldPageRedirector.php
View File

@ -1,6 +1,17 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\Queries\SQLSelect;
use Extension;
use Director;
use SS_HTTPRequest;
use SS_HTTPResponse;
use Controller;
use SS_HTTPResponse_Exception;
use SilverStripe\CMS\Model\SiteTree;
class OldPageRedirector extends Extension {

23
code/Controllers/RootURLController.php
View File

@ -1,7 +1,20 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\DataModel;
use SilverStripe\ORM\DB;
use Controller;
use SS_HTTPResponse;
use Translatable;
use Config;
use Deprecation;
use SS_HTTPRequest;
use ClassInfo;
use Director;
use SilverStripe\CMS\Model\SiteTree;
/**
* @package cms
@ -55,7 +68,7 @@ class RootURLController extends Controller {
) {
self::$cached_homepage_link = $link;
} else {
self::$cached_homepage_link = Config::inst()->get('RootURLController', 'default_homepage_link');
self::$cached_homepage_link = Config::inst()->get('SilverStripe\\CMS\\Controllers\\RootURLController', 'default_homepage_link');
}
}
}
@ -72,7 +85,7 @@ class RootURLController extends Controller {
*/
static public function set_default_homepage_link($urlsegment = "home") {
Deprecation::notice('4.0', 'Use the "RootURLController.default_homepage_link" config setting instead');
Config::inst()->update('RootURLController', 'default_homepage_link', $urlsegment);
Config::inst()->update('SilverStripe\\CMS\\Controllers\\RootURLController', 'default_homepage_link', $urlsegment);
}
/**
@ -83,7 +96,7 @@ class RootURLController extends Controller {
*/
static public function get_default_homepage_link() {
Deprecation::notice('4.0', 'Use the "RootURLController.default_homepage_link" config setting instead');
return Config::inst()->get('RootURLController', 'default_homepage_link');
return Config::inst()->get('SilverStripe\\CMS\\Controllers\\RootURLController', 'default_homepage_link');
}
/**
@ -115,7 +128,7 @@ class RootURLController extends Controller {
self::$is_at_root = true;
if(!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
if(!DB::is_active() || !ClassInfo::hasTable('SilverStripe\\CMS\\Model\\SiteTree')) {
$this->getResponse()->redirect(Controller::join_links(
Director::absoluteBaseURL(),
'dev/build',
@ -136,7 +149,7 @@ class RootURLController extends Controller {
$this->beforeHandleRequest($request, $model);
if (!$this->getResponse()->isFinished()) {
if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
if (!DB::is_active() || !ClassInfo::hasTable('SilverStripe\\CMS\\Model\\SiteTree')) {
$this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
return $this->getResponse();
}

15
code/Controllers/SilverStripeNavigator.php
View File

@ -1,10 +1,21 @@
<?php
namespace SilverStripe\CMS\Controllers;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\SS_List;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\FieldType\DBField;
use ViewableData;
use CMSPreviewable;
use ClassInfo;
use LeftAndMain;
use Controller;
use SiteTreeFutureState;
use SilverStripe\CMS\Model\RedirectorPage;
/**
* Utility class representing links to different views of a record
@ -40,8 +51,8 @@ class SilverStripeNavigator extends ViewableData {
public function getItems() {
$items = array();
$classes = ClassInfo::subclassesFor('SilverStripeNavigatorItem');
unset($classes['SilverStripeNavigatorItem']);
$classes = ClassInfo::subclassesFor('SilverStripe\\CMS\\Controllers\\SilverStripeNavigatorItem');
unset($classes['SilverStripe\\CMS\\Controllers\\SilverStripeNavigatorItem']);
// Sort menu items according to priority
foreach($classes as $class) {

8
code/Forms/SiteTreeURLSegmentField.php
View File

@ -1,6 +1,12 @@
<?php
namespace SilverStripe\CMS\Forms;
use SilverStripe\ORM\DataObject;
use TextField;
use Requirements;
use Controller;
use Convert;
/**
* Used to edit the SiteTree->URLSegment property, and suggest input based on the serverside rules
@ -69,7 +75,7 @@ class SiteTreeURLSegmentField extends TextField {
*/
public function getPage() {
$idField = $this->getForm()->Fields()->dataFieldByName('ID');
return ($idField && $idField->Value()) ? DataObject::get_by_id('SiteTree', $idField->Value()) : singleton('SiteTree');
return ($idField && $idField->Value()) ? DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $idField->Value()) : singleton('SilverStripe\\CMS\\Model\\SiteTree');
}
/**

6
code/Logging/ErrorPageErrorFormatter.php
View File

@ -1,9 +1,11 @@
<?php
namespace SilverStripe\Cms\Logging;
namespace SilverStripe\CMS\Logging;
use ErrorPage;
use SilverStripe\Framework\Logging\DebugViewFriendlyErrorFormatter;
use SilverStripe\CMS\Model\ErrorPage;
/**
* Provides {@see ErrorPage}-gnostic error handling

2
code/Model/CurrentPageIdentifier.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DataObject;
/**

16
code/Model/ErrorPage.php
View File

@ -1,9 +1,23 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\Filesystem\Storage\GeneratedAssetHandler;
use SilverStripe\ORM\DataModel;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\DB;
use Page;
use Requirements;
use SilverStripe\CMS\Controllers\ModelAsController;
use SS_HTTPRequest;
use SS_HTTPResponse;
use DropdownField;
use File;
use Config;
use Director;
use Injector;
use Page_Controller;
/**
* ErrorPage holds the content for the page of an error response.
@ -103,7 +117,7 @@ class ErrorPage extends Page {
public function requireDefaultRecords() {
parent::requireDefaultRecords();
if ($this->class === 'ErrorPage' && SiteTree::config()->create_default_pages) {
if ($this->class === 'SilverStripe\\CMS\\Model\\ErrorPage' && SiteTree::config()->create_default_pages) {
$defaultPages = $this->getDefaultRecords();

17
code/Model/RedirectorPage.php
View File

@ -1,6 +1,15 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DataObject;
use Page;
use Requirements;
use HeaderField;
use OptionsetField;
use TreeDropdownField;
use TextField;
use Page_Controller;
/**
* A redirector page redirects when the page is visited.
@ -21,7 +30,7 @@ class RedirectorPage extends Page {
);
private static $has_one = array(
"LinkTo" => "SiteTree",
"LinkTo" => "SilverStripe\\CMS\\Model\\SiteTree",
);
private static $many_many = array(
@ -80,7 +89,7 @@ class RedirectorPage extends Page {
}
} else {
$linkTo = $this->LinkToID ? DataObject::get_by_id("SiteTree", $this->LinkToID) : null;
$linkTo = $this->LinkToID ? DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $this->LinkToID) : null;
if($linkTo) {
// We shouldn't point to ourselves - that would create an infinite loop! Return null since we have a
@ -105,7 +114,7 @@ class RedirectorPage extends Page {
public function syncLinkTracking() {
if ($this->RedirectionType == 'Internal') {
if($this->LinkToID) {
$this->HasBrokenLink = DataObject::get_by_id('SiteTree', $this->LinkToID) ? false : true;
$this->HasBrokenLink = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $this->LinkToID) ? false : true;
} else {
// An incomplete redirector page definitely has a broken link
$this->HasBrokenLink = true;
@ -153,7 +162,7 @@ class RedirectorPage extends Page {
new TreeDropdownField(
"LinkToID",
_t('RedirectorPage.YOURPAGE', "Page on your website"),
"SiteTree"
"SilverStripe\\CMS\\Model\\SiteTree"
),
new TextField("ExternalURL", _t('RedirectorPage.OTHERURL', "Other website URL"))
)

114
code/Model/SiteTree.php
View File

@ -1,5 +1,7 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Hierarchy\Hierarchy;
use SilverStripe\ORM\ManyManyList;
@ -12,7 +14,45 @@ use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Group;
use SilverStripe\Security\PermissionProvider;
use i18nEntityProvider;
use CMSPreviewable;
use Director;
use SilverStripe\CMS\Controllers\RootURLController;
use ClassInfo;
use Convert;
use Controller;
use Deprecation;
use SSViewer;
use ArrayData;
use SiteConfig;
use FormField;
use Config;
use Page;
use UpgradeSiteTreePermissionSchemaTask;
use SS_HTTPRequest;
use URLSegmentFilter;
use SilverStripe\CMS\Controllers\ModelAsController;
use Subsite;
use LiteralField;
use GridField;
use SilverStripe\CMS\Forms\SiteTreeURLSegmentField;
use FieldList;
use TabSet;
use Tab;
use TextField;
use HTMLEditorField;
use ToggleCompositeField;
use TextareaField;
use DropdownField;
use CompositeField;
use OptionsetField;
use TreeDropdownField;
use FieldGroup;
use CheckboxField;
use ListboxField;
use AddToCampaignHandler_FormAction;
use FormAction;
use i18n;
/**
* Basic data-object representing all pages within the site tree. All page types that live within the hierarchy should
@ -64,7 +104,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* @config
* @var array
*/
private static $allowed_children = array("SiteTree");
private static $allowed_children = array("SilverStripe\\CMS\\Model\\SiteTree");
/**
* The default child class for this page.
@ -207,7 +247,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
private static $extensions = array(
'SilverStripe\ORM\Hierarchy\Hierarchy',
'SilverStripe\ORM\Versioning\Versioned',
"SiteTreeLinkTracking"
"SilverStripe\\CMS\\Model\\SiteTreeLinkTracking"
);
private static $searchable_fields = array(
@ -286,12 +326,12 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if(self::config()->nested_urls) {
$conditions[] = array('"SiteTree"."ParentID"' => 0);
}
$sitetree = DataObject::get_one('SiteTree', $conditions, $cache);
$sitetree = DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', $conditions, $cache);
/// Fall back on a unique URLSegment for b/c.
if( !$sitetree
&& self::config()->nested_urls
&& $page = DataObject::get_one('SiteTree', array(
&& $page = DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', array(
'"SiteTree"."URLSegment"' => $URLSegment
), $cache)
) {
@ -302,7 +342,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if(!$sitetree) {
$parentID = self::config()->nested_urls ? 0 : null;
if($alternatives = singleton('SiteTree')->extend('alternateGetByLink', $URLSegment, $parentID)) {
if($alternatives = singleton('SilverStripe\\CMS\\Model\\SiteTree')->extend('alternateGetByLink', $URLSegment, $parentID)) {
foreach($alternatives as $alternative) if($alternative) $sitetree = $alternative;
}
@ -314,7 +354,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Traverse down the remaining URL segments and grab the relevant SiteTree objects.
foreach($parts as $segment) {
$next = DataObject::get_one('SiteTree', array(
$next = DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', array(
'"SiteTree"."URLSegment"' => $segment,
'"SiteTree"."ParentID"' => $sitetree->ID
),
@ -324,7 +364,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if(!$next) {
$parentID = (int) $sitetree->ID;
if($alternatives = singleton('SiteTree')->extend('alternateGetByLink', $segment, $parentID)) {
if($alternatives = singleton('SilverStripe\\CMS\\Model\\SiteTree')->extend('alternateGetByLink', $segment, $parentID)) {
foreach($alternatives as $alternative) if($alternative) $next = $alternative;
}
@ -346,7 +386,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
public static function page_type_classes() {
$classes = ClassInfo::getValidSubClasses();
$baseClassIndex = array_search('SiteTree', $classes);
$baseClassIndex = array_search('SilverStripe\\CMS\\Model\\SiteTree', $classes);
if($baseClassIndex !== FALSE) unset($classes[$baseClassIndex]);
$kill_ancestors = array();
@ -390,8 +430,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if(!isset($arguments['id']) || !is_numeric($arguments['id'])) return;
if (
!($page = DataObject::get_by_id('SiteTree', $arguments['id'])) // Get the current page by ID.
&& !($page = Versioned::get_latest_version('SiteTree', $arguments['id'])) // Attempt link to old version.
!($page = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $arguments['id'])) // Get the current page by ID.
&& !($page = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $arguments['id'])) // Attempt link to old version.
) {
return null; // There were no suitable matches at all.
}
@ -471,7 +511,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$parent = $this->Parent();
// If page is removed select parent from version history (for archive page view)
if((!$parent || !$parent->exists()) && $this->IsDeletedFromStage) {
$parent = Versioned::get_latest_version('SiteTree', $this->ParentID);
$parent = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $this->ParentID);
}
$base = $parent->RelativeLink($this->URLSegment);
} elseif(!$action && $this->URLSegment == RootURLController::get_homepage_link()) {
@ -501,7 +541,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
public function getAbsoluteLiveLink($includeStageEqualsLive = true) {
$oldReadingMode = Versioned::get_reading_mode();
Versioned::set_stage(Versioned::LIVE);
$live = Versioned::get_one_by_stage('SiteTree', Versioned::LIVE, array(
$live = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::LIVE, array(
'"SiteTree"."ID"' => $this->ID
));
if($live) {
@ -524,7 +564,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
*/
public function CMSEditLink() {
$link = Controller::join_links(
singleton('CMSPageEditController')->Link('show'),
singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show'),
$this->ID
);
return Director::absoluteURL($link);
@ -742,7 +782,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
*/
public function getParent() {
if ($parentID = $this->getField("ParentID")) {
return DataObject::get_by_id("SiteTree", $parentID);
return DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $parentID);
}
}
@ -1171,7 +1211,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
foreach(array(Versioned::DRAFT, Versioned::LIVE) as $stage) {
// Start by filling the array with the pages that actually exist
$table = ($stage=='Stage') ? "SiteTree" : "SiteTree_$stage";
$table = ($stage=='Stage') ? "SilverStripe\\CMS\\Model\\SiteTree" : "SiteTree_$stage";
if($ids) {
$idQuery = "SELECT \"ID\" FROM \"$table\" WHERE \"ID\" IN ($idPlaceholders)";
@ -1182,7 +1222,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$result = array_fill_keys($stageIds, false);
// Get the uninherited permissions
$uninheritedPermissions = Versioned::get_by_stage("SiteTree", $stage)
$uninheritedPermissions = Versioned::get_by_stage("SilverStripe\\CMS\\Model\\SiteTree", $stage)
->where(array(
"(\"$typeField\" = 'LoggedInUsers' OR
(\"$typeField\" = 'OnlyTheseUsers' AND \"$groupJoinTable\".\"SiteTreeID\" IS NOT NULL))
@ -1198,7 +1238,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Get permissions that are inherited
$potentiallyInherited = Versioned::get_by_stage(
"SiteTree",
"SilverStripe\\CMS\\Model\\SiteTree",
$stage,
array("\"$typeField\" = 'Inherit' AND \"SiteTree\".\"ID\" IN ($idPlaceholders)" => $ids)
);
@ -1364,7 +1404,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$tags[] = FormField::create_tag('title', array(), $this->obj('Title')->forTemplate());
}
$generator = trim(Config::inst()->get('SiteTree', 'meta_generator'));
$generator = trim(Config::inst()->get('SilverStripe\\CMS\\Model\\SiteTree', 'meta_generator'));
if (!empty($generator)) {
$tags[] = FormField::create_tag('meta', array(
'name' => 'generator',
@ -1431,12 +1471,12 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
parent::requireDefaultRecords();
// default pages
if($this->class == 'SiteTree' && $this->config()->create_default_pages) {
if(!SiteTree::get_by_link(Config::inst()->get('RootURLController', 'default_homepage_link'))) {
if($this->class == 'SilverStripe\\CMS\\Model\\SiteTree' && $this->config()->create_default_pages) {
if(!SiteTree::get_by_link(Config::inst()->get('SilverStripe\\CMS\\Controllers\\RootURLController', 'default_homepage_link'))) {
$homepage = new Page();
$homepage->Title = _t('SiteTree.DEFAULTHOMETITLE', 'Home');
$homepage->Content = _t('SiteTree.DEFAULTHOMECONTENT', '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>You can now access the <a href="http://docs.silverstripe.org">developer documentation</a>, or begin the <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lessons</a>.</p>');
$homepage->URLSegment = Config::inst()->get('RootURLController', 'default_homepage_link');
$homepage->URLSegment = Config::inst()->get('SilverStripe\\CMS\\Controllers\\RootURLController', 'default_homepage_link');
$homepage->Sort = 1;
$homepage->write();
$homepage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
@ -1632,7 +1672,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
}
// Check existence
$existingPage = DataObject::get_one('SiteTree', $filter);
$existingPage = DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', $filter);
if ($existingPage) return false;
return !($existingPage);
@ -1668,7 +1708,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* @return string
*/
public function getStageURLSegment() {
$stageRecord = Versioned::get_one_by_stage('SiteTree', Versioned::DRAFT, array(
$stageRecord = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::DRAFT, array(
'"SiteTree"."ID"' => $this->ID
));
return ($stageRecord) ? $stageRecord->URLSegment : null;
@ -1680,7 +1720,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* @return string
*/
public function getLiveURLSegment() {
$liveRecord = Versioned::get_one_by_stage('SiteTree', Versioned::LIVE, array(
$liveRecord = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::LIVE, array(
'"SiteTree"."ID"' => $this->ID
));
return ($liveRecord) ? $liveRecord->URLSegment : null;
@ -1979,7 +2019,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
"root" => _t("SiteTree.PARENTTYPE_ROOT", "Top-level page"),
"subpage" => _t("SiteTree.PARENTTYPE_SUBPAGE", "Sub-page underneath a parent page"),
)),
$parentIDField = new TreeDropdownField("ParentID", $this->fieldLabel('ParentID'), 'SiteTree', 'ID', 'MenuTitle')
$parentIDField = new TreeDropdownField("ParentID", $this->fieldLabel('ParentID'), 'SilverStripe\\CMS\\Model\\SiteTree', 'ID', 'MenuTitle')
),
$visibility = new FieldGroup(
new CheckboxField("ShowInMenus", $this->fieldLabel('ShowInMenus')),
@ -2136,7 +2176,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$rootTabSet->addExtraClass('ss-ui-action-tabset action-menus noborder');
// Render page information into the "more-options" drop-up, on the top.
$live = Versioned::get_one_by_stage('SiteTree', Versioned::LIVE, array(
$live = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::LIVE, array(
'"SiteTree"."ID"' => $this->ID
));
$moreOptions->push(
@ -2284,7 +2324,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
public function onAfterRevertToLive() {
// Use an alias to get the updates made by $this->publish
/** @var SiteTree $stageSelf */
$stageSelf = Versioned::get_by_stage('SiteTree', Versioned::DRAFT)->byID($this->ID);
$stageSelf = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::DRAFT)->byID($this->ID);
$stageSelf->writeWithoutVersion();
// Need to update pages linking to this one as no longer broken
@ -2301,7 +2341,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
*/
protected function isParentArchived() {
if($parentID = $this->ParentID) {
$parentPage = Versioned::get_latest_version("SiteTree", $parentID);
$parentPage = Versioned::get_latest_version("SilverStripe\\CMS\\Model\\SiteTree", $parentID);
if(!$parentPage || $parentPage->IsDeletedFromStage) {
return true;
}
@ -2326,9 +2366,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// create an empty record
if(!DB::prepared_query("SELECT \"ID\" FROM \"SiteTree\" WHERE \"ID\" = ?", array($this->ID))->value()) {
$conn = DB::get_conn();
if(method_exists($conn, 'allowPrimaryKeyEditing')) $conn->allowPrimaryKeyEditing('SiteTree', true);
if(method_exists($conn, 'allowPrimaryKeyEditing')) $conn->allowPrimaryKeyEditing('SilverStripe\\CMS\\Model\\SiteTree', true);
DB::prepared_query("INSERT INTO \"SiteTree\" (\"ID\") VALUES (?)", array($this->ID));
if(method_exists($conn, 'allowPrimaryKeyEditing')) $conn->allowPrimaryKeyEditing('SiteTree', false);
if(method_exists($conn, 'allowPrimaryKeyEditing')) $conn->allowPrimaryKeyEditing('SilverStripe\\CMS\\Model\\SiteTree', false);
}
$oldReadingMode = Versioned::get_reading_mode();
@ -2665,7 +2705,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if(!$this->ID) return true;
if($this->isNew()) return false;
$stageVersion = Versioned::get_versionnumber_by_stage('SiteTree', Versioned::DRAFT, $this->ID);
$stageVersion = Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::DRAFT, $this->ID);
// Return true for both completely deleted pages and for pages just deleted from stage
return !($stageVersion);
@ -2690,8 +2730,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// New unsaved pages could be never be published
if($this->isNew()) return false;
$stageVersion = Versioned::get_versionnumber_by_stage('SiteTree', 'Stage', $this->ID);
$liveVersion = Versioned::get_versionnumber_by_stage('SiteTree', 'Live', $this->ID);
$stageVersion = Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage', $this->ID);
$liveVersion = Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', $this->ID);
$isModified = ($stageVersion && $stageVersion != $liveVersion);
$this->extend('getIsModifiedOnStage', $isModified);
@ -2709,8 +2749,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// New unsaved pages could be never be published
if($this->isNew()) return false;
$stageVersion = Versioned::get_versionnumber_by_stage('SiteTree', 'Stage', $this->ID);
$liveVersion = Versioned::get_versionnumber_by_stage('SiteTree', 'Live', $this->ID);
$stageVersion = Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage', $this->ID);
$liveVersion = Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', $this->ID);
return ($stageVersion && !$liveVersion);
}
@ -2773,7 +2813,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
*/
public function i18n_singular_name() {
// Convert 'Page' to 'SiteTree' for correct localization lookups
$class = ($this->class == 'Page') ? 'SiteTree' : $this->class;
$class = ($this->class == 'Page') ? 'SilverStripe\\CMS\\Model\\SiteTree' : $this->class;
return _t($class.'.SINGULARNAME', $this->singular_name());
}

3
code/Model/SiteTreeExtension.php
View File

@ -1,6 +1,9 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DataExtension;
use SilverStripe\Security\Member;
/**
* Plug-ins for additional functionality in your SiteTree classes.

8
code/Model/SiteTreeFileExtension.php
View File

@ -1,9 +1,15 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataExtension;
use FieldList;
use ReadonlyField;
use Convert;
use Subsite;
/**
* Extension applied to {@see File} object to track links to {@see SiteTree} records.
@ -123,7 +129,7 @@ class SiteTreeFileExtension extends DataExtension {
$brokenPageIDs = $this->owner->BackLinkTracking()->column("ID");
if($brokenPageIDs) {
// This will syncLinkTracking on the same stage as this file
$brokenPages = DataObject::get('SiteTree')->byIDs($brokenPageIDs);
$brokenPages = DataObject::get('SilverStripe\\CMS\\Model\\SiteTree')->byIDs($brokenPageIDs);
foreach($brokenPages as $brokenPage) {
$brokenPage->write();
}

5
code/Model/SiteTreeFolderExtension.php
View File

@ -1,9 +1,12 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\DataQuery;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataExtension;
use ClassInfo;
/**
* @todo Cleanup, refactor, test this class
@ -22,7 +25,7 @@ class SiteTreeFolderExtension extends DataExtension {
$result = DB::query("SELECT DISTINCT \"FileID\" FROM \"SiteTree_ImageTracking\"");
$usedFiles = array();
$where = '';
$classes = ClassInfo::subclassesFor('SiteTree');
$classes = ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\SiteTree');
if($result->numRecords() > 0) {
while($nextResult = $result->next()) {

11
code/Model/SiteTreeLinkTracking.php
View File

@ -1,17 +1,20 @@
<?php
namespace SilverStripe\CMS\Model;
/**
* @package cms
* @subpackage model
*/
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject;
use Injector;
use SS_HTMLValue;
use Director;
/**
* Adds tracking of links in any HTMLText fields which reference SiteTree or File items.
@ -75,7 +78,7 @@ class SiteTreeLinkTracking extends DataExtension {
);
private static $many_many = array(
"LinkTracking" => "SiteTree",
"LinkTracking" => "SilverStripe\\CMS\\Model\\SiteTree",
"ImageTracking" => "File" // {@see SiteTreeFileExtension}
);
@ -269,7 +272,7 @@ class SiteTreeLinkTracking_Parser {
// Link to a page on this site.
$matches = array();
if(preg_match('/\[sitetree_link(?:\s*|%20|,)?id=(?<id>[0-9]+)\](#(?<anchor>.*))?/i', $href, $matches)) {
$page = DataObject::get_by_id('SiteTree', $matches['id']);
$page = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $matches['id']);
$broken = false;
if (!$page) {

24
code/Model/VirtualPage.php
View File

@ -1,8 +1,18 @@
<?php
namespace SilverStripe\CMS\Model;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Versioning\Versioned;
use Page;
use Convert;
use SilverStripe\Security\Member;
use TreeDropdownField;
use ReadonlyTransformation;
use LiteralField;
use Page_Controller;
use SilverStripe\CMS\Controllers\ModelAsController;
/**
* Virtual Page creates an instance of a page, with the same fields that the original page had, but readonly.
@ -56,7 +66,7 @@ class VirtualPage extends Page {
);
private static $has_one = array(
"CopyContentFrom" => "SiteTree",
"CopyContentFrom" => "SilverStripe\\CMS\\Model\\SiteTree",
);
private static $owns = array(
@ -96,7 +106,7 @@ class VirtualPage extends Page {
public function setCopyContentFromID($val) {
// Sanity check to prevent pages virtualising other virtual pages
if($val && DataObject::get_by_id('SiteTree', $val) instanceof VirtualPage) {
if($val && DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $val) instanceof VirtualPage) {
$val = 0;
}
return $this->setField("CopyContentFromID", $val);
@ -137,7 +147,7 @@ class VirtualPage extends Page {
public function syncLinkTracking() {
if($this->CopyContentFromID) {
$this->HasBrokenLink = !(bool) DataObject::get_by_id('SiteTree', $this->CopyContentFromID);
$this->HasBrokenLink = !(bool) DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $this->CopyContentFromID);
} else {
$this->HasBrokenLink = true;
}
@ -166,7 +176,7 @@ class VirtualPage extends Page {
}
// Unpublished source
if(!Versioned::get_versionnumber_by_stage('SiteTree', 'Live', $this->CopyContentFromID)) {
if(!Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', $this->CopyContentFromID)) {
return false;
}
@ -184,7 +194,7 @@ class VirtualPage extends Page {
$copyContentFromField = new TreeDropdownField(
"CopyContentFromID",
_t('VirtualPage.CHOOSE', "Linked Page"),
"SiteTree"
"SilverStripe\\CMS\\Model\\SiteTree"
);
// filter doesn't let you select children of virtual pages as as source page
//$copyContentFromField->setFilterFunction(create_function('$item', 'return !($item instanceof VirtualPage);'));
@ -224,7 +234,7 @@ class VirtualPage extends Page {
}
if(
$this->CopyContentFromID
&& !Versioned::get_versionnumber_by_stage('SiteTree', 'Live', $this->CopyContentFromID)
&& !Versioned::get_versionnumber_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', $this->CopyContentFromID)
) {
$msgs[] = _t(
'SITETREE.VIRTUALPAGEDRAFTWARNING',
@ -527,7 +537,7 @@ class VirtualPage_Controller extends Page_Controller {
{
// Check if we can safely call this method before passing it back
// to custom methods.
if ($this->getExtraMethodConfig($method)) {
if($this->getExtraMethodConfig($method)) {
return parent::__call($method, $args);
}

23
code/Reports/BrokenFilesReport.php
View File

@ -1,7 +1,13 @@
<?php
namespace SilverStripe\CMS\Reports;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\Versioning\Versioned;
use SS_Report;
use ClassInfo;
use FieldList;
use CheckboxField;
/**
* @package cms
@ -20,9 +26,9 @@ class BrokenFilesReport extends SS_Report {
public function sourceRecords($params = null) {
// Get class names for page types that are not virtual pages or redirector pages
$classes = array_diff(
ClassInfo::subclassesFor('SiteTree'),
ClassInfo::subclassesFor('VirtualPage'),
ClassInfo::subclassesFor('RedirectorPage')
ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\SiteTree'),
ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\VirtualPage'),
ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\RedirectorPage')
);
$classParams = DB::placeholders($classes);
$classFilter = array(
@ -30,7 +36,7 @@ class BrokenFilesReport extends SS_Report {
);
$stage = isset($params['OnLive']) ? 'Live' : 'Stage';
return Versioned::get_by_stage('SiteTree', $stage, $classFilter);
return Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', $stage, $classFilter);
}
public function columns() {
@ -49,12 +55,3 @@ class BrokenFilesReport extends SS_Report {
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_BrokenFiles extends BrokenFilesReport {
public function __construct() {
Deprecation::notice('4.0', 'Use BrokenFilesReport instead');
parent::__construct();
}
}

28
code/Reports/BrokenLinksReport.php
View File

@ -1,8 +1,15 @@
<?php
namespace SilverStripe\CMS\Reports;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ArrayList;
use SS_Report;
use ClassInfo;
use Controller;
use FieldList;
use DropdownField;
/**
* Content side-report listing pages with broken links
@ -37,16 +44,16 @@ class BrokenLinksReport extends SS_Report {
);
$isLive = !isset($params['CheckSite']) || $params['CheckSite'] == 'Published';
if ($isLive) {
$ret = Versioned::get_by_stage('SiteTree', 'Live', $brokenFilter, $sort, $join, $limit);
$ret = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', $brokenFilter, $sort, $join, $limit);
} else {
$ret = DataObject::get('SiteTree', $brokenFilter, $sort, $join, $limit);
$ret = DataObject::get('SilverStripe\\CMS\\Model\\SiteTree', $brokenFilter, $sort, $join, $limit);
}
$returnSet = new ArrayList();
if ($ret) foreach($ret as $record) {
$reason = false;
$isRedirectorPage = in_array($record->ClassName, ClassInfo::subclassesFor('RedirectorPage'));
$isVirtualPage = in_array($record->ClassName, ClassInfo::subclassesFor('VirtualPage'));
$isRedirectorPage = in_array($record->ClassName, ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\RedirectorPage'));
$isVirtualPage = in_array($record->ClassName, ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\VirtualPage'));
if ($isVirtualPage) {
if ($record->HasBrokenLink) {
@ -89,7 +96,7 @@ class BrokenLinksReport extends SS_Report {
$dateTitle = _t('BrokenLinksReport.ColumnDateLastPublished', 'Date last published');
}
$linkBase = singleton('CMSPageEditController')->Link('show');
$linkBase = singleton('SilverStripe\\CMS\\Controllers\\CMSPageEditController')->Link('show');
$fields = array(
"Title" => array(
"title" => _t('BrokenLinksReport.PageName', 'Page name'),
@ -144,14 +151,3 @@ class BrokenLinksReport extends SS_Report {
);
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_BrokenLinks extends BrokenLinksReport {
public function __construct() {
Deprecation::notice('4.0', 'Use BrokenLinksReport instead');
parent::__construct();
}
}

21
code/Reports/BrokenRedirectorPagesReport.php
View File

@ -1,7 +1,14 @@
<?php
namespace SilverStripe\CMS\Reports;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\Versioning\Versioned;
use SS_Report;
use ClassInfo;
use FieldList;
use CheckboxField;
use Deprecation;
/**
* @package cms
@ -18,13 +25,13 @@ class BrokenRedirectorPagesReport extends SS_Report {
}
public function sourceRecords($params = null) {
$classes = ClassInfo::subclassesFor('RedirectorPage');
$classes = ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\RedirectorPage');
$classParams = DB::placeholders($classes);
$classFilter = array(
"\"ClassName\" IN ($classParams) AND \"HasBrokenLink\" = 1" => $classes
);
$stage = isset($params['OnLive']) ? 'Live' : 'Stage';
return Versioned::get_by_stage('SiteTree', $stage, $classFilter);
return Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', $stage, $classFilter);
}
public function columns() {
@ -42,13 +49,3 @@ class BrokenRedirectorPagesReport extends SS_Report {
);
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_BrokenRedirectorPages extends BrokenRedirectorPagesReport {
public function __construct() {
Deprecation::notice('4.0', 'Use BrokenRedirectorPagesReport instead');
parent::__construct();
}
}

20
code/Reports/BrokenVirtualPagesReport.php
View File

@ -1,7 +1,13 @@
<?php
namespace SilverStripe\CMS\Reports;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\Versioning\Versioned;
use SS_Report;
use ClassInfo;
use FieldList;
use CheckboxField;
/**
* @package cms
@ -18,13 +24,13 @@ class BrokenVirtualPagesReport extends SS_Report {
}
public function sourceRecords($params = null) {
$classes = ClassInfo::subclassesFor('VirtualPage');
$classes = ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\VirtualPage');
$classParams = DB::placeholders($classes);
$classFilter = array(
"\"ClassName\" IN ($classParams) AND \"HasBrokenLink\" = 1" => $classes
);
$stage = isset($params['OnLive']) ? 'Live' : 'Stage';
return Versioned::get_by_stage('SiteTree', $stage, $classFilter);
return Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', $stage, $classFilter);
}
public function columns() {
@ -42,13 +48,3 @@ class BrokenVirtualPagesReport extends SS_Report {
);
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_BrokenVirtualPages extends BrokenVirtualPagesReport {
public function __construct() {
Deprecation::notice('4.0', 'Use BrokenVirtualPagesReport instead');
parent::__construct();
}
}

16
code/Reports/EmptyPagesReport.php
View File

@ -1,5 +1,11 @@
<?php
namespace SilverStripe\CMS\Reports;
use SS_Report;
use SilverStripe\CMS\Model\SiteTree;
use Deprecation;
/**
* @package cms
* @subpackage reports
@ -33,13 +39,3 @@ class EmptyPagesReport extends SS_Report {
);
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_EmptyPages extends EmptyPagesReport {
public function __construct() {
Deprecation::notice('4.0', 'Use EmptyPagesReport instead');
parent::__construct();
}
}

15
code/Reports/RecentlyEditedReport.php
View File

@ -1,7 +1,10 @@
<?php
namespace SilverStripe\CMS\Reports;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\DataObject;
use SS_Report;
/**
* @package cms
@ -23,7 +26,7 @@ class RecentlyEditedReport extends SS_Report {
public function sourceRecords($params = null) {
$threshold = strtotime('-14 days', DBDatetime::now()->Format('U'));
return DataObject::get("SiteTree", "\"SiteTree\".\"LastEdited\" > '".date("Y-m-d H:i:s", $threshold)."'", "\"SiteTree\".\"LastEdited\" DESC");
return DataObject::get("SilverStripe\\CMS\\Model\\SiteTree", "\"SiteTree\".\"LastEdited\" > '".date("Y-m-d H:i:s", $threshold)."'", "\"SiteTree\".\"LastEdited\" DESC");
}
public function columns() {
@ -35,13 +38,3 @@ class RecentlyEditedReport extends SS_Report {
);
}
}
/**
* @deprecated 3.2..4.0
*/
class SideReport_RecentlyEdited extends RecentlyEditedReport {
public function __construct() {
Deprecation::notice('4.0', 'Use RecentlyEditedReport instead');
parent::__construct();
}
}

9
code/Search/ContentControllerSearchExtension.php
View File

@ -1,6 +1,13 @@
<?php
namespace SilverStripe\CMS\Search;
use SilverStripe\ORM\FieldType\DBField;
use Extension;
use FieldList;
use TextField;
use FormAction;
use FulltextSearchable;
/**
* Extension to provide a search interface when applied to ContentController
@ -30,7 +37,7 @@ class ContentControllerSearchExtension extends Extension {
$actions = new FieldList(
new FormAction('results', _t('SearchForm.GO', 'Go'))
);
$form = SearchForm::create($this->owner, 'SearchForm', $fields, $actions);
$form = SearchForm::create($this->owner, 'SilverStripe\\CMS\\Search\\SearchForm', $fields, $actions);
$form->classesToSearch(FulltextSearchable::get_searchable_classes());
return $form;
}

23
code/Search/SearchForm.php
View File

@ -1,7 +1,16 @@
<?php
namespace SilverStripe\CMS\Search;
use Controller;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\SS_List;
use Form;
use FieldList;
use TextField;
use HiddenField;
use Translatable;
use FormAction;
/**
* Standard basic search form which conducts a fulltext search on all {@link SiteTree}
@ -28,7 +37,7 @@ class SearchForm extends Form {
* Classes to search
*/
protected $classesToSearch = array(
"SiteTree", "File"
"SilverStripe\\CMS\\Model\\SiteTree", "File"
);
private static $casting = array(
@ -50,7 +59,7 @@ class SearchForm extends Form {
));
}
if(class_exists('Translatable') && singleton('SiteTree')->hasExtension('Translatable')) {
if(class_exists('Translatable') && singleton('SilverStripe\\CMS\\Model\\SiteTree')->hasExtension('Translatable')) {
$fields->push(new HiddenField('searchlocale', 'searchlocale', Translatable::get_current_locale()));
}
@ -77,7 +86,7 @@ class SearchForm extends Form {
public function forTemplate() {
$return = $this->renderWith(array_merge(
(array)$this->getTemplate(),
array('SearchForm', 'Form')
array('SilverStripe\\CMS\\Search\\SearchForm', 'Form')
));
// Now that we're rendered, clear message
@ -91,11 +100,11 @@ class SearchForm extends Form {
* Currently you can only choose from "SiteTree" and "File", but a future version might improve this.
*/
public function classesToSearch($classes) {
$illegalClasses = array_diff($classes, array('SiteTree', 'File'));
$illegalClasses = array_diff($classes, array('SilverStripe\\CMS\\Model\\SiteTree', 'File'));
if($illegalClasses) {
user_error("SearchForm::classesToSearch() passed illegal classes '" . implode("', '", $illegalClasses) . "'. At this stage, only File and SiteTree are allowed", E_USER_WARNING);
}
$legalClasses = array_intersect($classes, array('SiteTree', 'File'));
$legalClasses = array_intersect($classes, array('SilverStripe\\CMS\\Model\\SiteTree', 'File'));
$this->classesToSearch = $legalClasses;
}
@ -122,7 +131,7 @@ class SearchForm extends Form {
// set language (if present)
if(class_exists('Translatable')) {
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['searchlocale'])) {
if(singleton('SilverStripe\\CMS\\Model\\SiteTree')->hasExtension('Translatable') && isset($data['searchlocale'])) {
if($data['searchlocale'] == "ALL") {
Translatable::disable_locale_filter();
} else {
@ -165,7 +174,7 @@ class SearchForm extends Form {
// reset locale
if(class_exists('Translatable')) {
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['searchlocale'])) {
if(singleton('SilverStripe\\CMS\\Model\\SiteTree')->hasExtension('Translatable') && isset($data['searchlocale'])) {
if($data['searchlocale'] == "ALL") {
Translatable::enable_locale_filter();
} else {

4
code/Tasks/MigrateSiteTreeLinkingTask.php
View File

@ -20,7 +20,7 @@ class MigrateSiteTreeLinkingTask extends BuildTask {
$pages = 0;
$links = 0;
$linkedPages = new DataList('SiteTree');
$linkedPages = new DataList('SilverStripe\\CMS\\Model\\SiteTree');
$linkedPages = $linkedPages->innerJoin('SiteTree_LinkTracking', '"SiteTree_LinkTracking"."SiteTreeID" = "SiteTree"."ID"');
if($linkedPages) foreach($linkedPages as $page) {
$tracking = DB::prepared_query(
@ -29,7 +29,7 @@ class MigrateSiteTreeLinkingTask extends BuildTask {
)->map();
foreach($tracking as $childID => $fieldName) {
$linked = DataObject::get_by_id('SiteTree', $childID);
$linked = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $childID);
// TOOD: Replace in all HTMLText fields
$page->Content = preg_replace (

6
code/Tasks/RemoveOrphanedPagesTask.php
View File

@ -5,6 +5,8 @@ use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Security;
use SilverStripe\CMS\Model\SiteTree;
@ -55,7 +57,7 @@ in the other stage:<br />
</p>
";
protected $orphanedSearchClass = 'SiteTree';
protected $orphanedSearchClass = 'SilverStripe\\CMS\\Model\\SiteTree';
public function init() {
parent::init();
@ -309,7 +311,7 @@ in the other stage:<br />
* @param int|array $limit
* @return SS_List
*/
public function getOrphanedPages($class = 'SiteTree', $filter = array(), $sort = null, $join = null, $limit = null) {
public function getOrphanedPages($class = 'SilverStripe\\CMS\\Model\\SiteTree', $filter = array(), $sort = null, $join = null, $limit = null) {
// Alter condition
if(empty($filter)) $where = array();
elseif(is_array($filter)) $where = $filter;

2
code/Tasks/SiteTreeMaintenanceTask.php
View File

@ -14,7 +14,7 @@ class SiteTreeMaintenanceTask extends Controller {
public function makelinksunique() {
$badURLs = "'" . implode("', '", DB::query("SELECT URLSegment, count(*) FROM SiteTree GROUP BY URLSegment HAVING count(*) > 1")->column()) . "'";
$pages = DataObject::get("SiteTree", "\"SiteTree\".\"URLSegment\" IN ($badURLs)");
$pages = DataObject::get("SilverStripe\\CMS\\Model\\SiteTree", "\"SiteTree\".\"URLSegment\" IN ($badURLs)");
foreach($pages as $page) {
echo "<li>$page->Title: ";

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

@ -39,7 +39,7 @@ class FeatureContext extends \SilverStripe\Framework\Test\Behaviour\FeatureConte
// Use blueprints which auto-publish all subclasses of SiteTree
$factory = $fixtureContext->getFixtureFactory();
foreach(\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
foreach(\ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\SiteTree') as $id => $class) {
$blueprint = \Injector::inst()->create('FixtureBlueprint', $class);
$blueprint->addCallback('afterCreate', function($obj, $identifier, &$data, &$fixtures) {
/** @var \SiteTree $obj */

2
tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/FixtureContext.php
View File

@ -26,7 +26,7 @@ class FixtureContext extends \SilverStripe\BehatExtension\Context\FixtureContext
* @Given /^(?:(an|a|the) )"(?<type>[^"]+)" "(?<id>[^"]+)" (:?which )?redirects to (?:(an|a|the) )"(?<targetType>[^"]+)" "(?<targetId>[^"]+)"$/
*/
public function stepCreateRedirectorPage($type, $id, $targetType, $targetId) {
$class = 'RedirectorPage';
$class = 'SilverStripe\\CMS\\Model\\RedirectorPage';
$targetClass = $this->convertTypeToClass($targetType);
$targetObj = $this->fixtureFactory->get($targetClass, $targetId);

2
tests/controller/AssetAdminTest.php
View File

@ -2,6 +2,8 @@
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\SS_List;
use SilverStripe\CMS\Controllers\AssetAdmin;
/**
* Tests {@see AssetAdmin}

74
tests/controller/CMSBatchActionsTest.php
View File

@ -1,6 +1,12 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Restore;
use SilverStripe\CMS\Model\SiteTree;
/**
* Tests CMS Specific subclasses of {@see CMSBatchAction}
@ -15,20 +21,20 @@ class CMSBatchActionsTest extends SapphireTest {
$this->logInWithPermission('ADMIN');
// published page
$published = $this->objFromFixture('SiteTree', 'published');
$published = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'published');
$published->publishSingle();
// Deleted / archived page
$archived = $this->objFromFixture('SiteTree', 'archived');
$archived = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived');
$archived->doArchive(); // should archive all children
// Unpublished
$unpublished = $this->objFromFixture('SiteTree', 'unpublished');
$unpublished = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'unpublished');
$unpublished->publishSingle();
$unpublished->doUnpublish();
// Modified
$modified = $this->objFromFixture('SiteTree', 'modified');
$modified = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'modified');
$modified->publishSingle();
$modified->Title = 'modified2';
$modified->write();
@ -39,18 +45,18 @@ class CMSBatchActionsTest extends SapphireTest {
*/
public function testBatchPublishApplicable() {
$this->logInWithPermission('ADMIN');
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$ids = $pages->column('ID');
$action = new CMSBatchAction_Publish();
// Test applicable pages
$applicable = $action->applicablePages($ids);
$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedx'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedy'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'modified'), $applicable);
}
@ -59,18 +65,18 @@ class CMSBatchActionsTest extends SapphireTest {
*/
public function testBatchUnpublishApplicable() {
$this->logInWithPermission('ADMIN');
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$ids = $pages->column('ID');
$action = new CMSBatchAction_Unpublish();
// Test applicable page
$applicable = $action->applicablePages($ids);
$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedx'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedy'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'modified'), $applicable);
}
/**
@ -78,16 +84,16 @@ class CMSBatchActionsTest extends SapphireTest {
*/
public function testBatchArchiveApplicable() {
$this->logInWithPermission('ADMIN');
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$ids = $pages->column('ID');
$action = new CMSBatchAction_Archive();
// Test applicable pages
$applicable = $action->applicablePages($ids);
$this->assertContains($this->idFromFixture('SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'published'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'unpublished'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'modified'), $applicable);
}
/**
@ -95,27 +101,27 @@ class CMSBatchActionsTest extends SapphireTest {
*/
public function testBatchRestoreApplicable() {
$this->logInWithPermission('ADMIN');
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$ids = $pages->column('ID');
$action = new CMSBatchAction_Restore();
// Test applicable pages
$applicable = $action->applicablePages($ids);
$this->assertNotContains($this->idFromFixture('SiteTree', 'published'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'archived'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'archivedx'), $applicable);
$this->assertContains($this->idFromFixture('SiteTree', 'archivedy'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'unpublished'), $applicable);
$this->assertNotContains($this->idFromFixture('SiteTree', 'modified'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'published'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedx'), $applicable);
$this->assertContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedy'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'unpublished'), $applicable);
$this->assertNotContains($this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'modified'), $applicable);
}
public function testBatchRestore() {
$this->logInWithPermission('ADMIN');
$pages = Versioned::get_including_deleted('SiteTree');
$pages = Versioned::get_including_deleted('SilverStripe\\CMS\\Model\\SiteTree');
$action = new CMSBatchAction_Restore();
$archivedID = $this->idFromFixture('SiteTree', 'archived');
$archivedxID = $this->idFromFixture('SiteTree', 'archivedx');
$archivedyID = $this->idFromFixture('SiteTree', 'archivedy');
$archivedID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archived');
$archivedxID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedx');
$archivedyID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'archivedy');
// Just restore one child
$list = $pages->filter('RecordID', $archivedxID);

23
tests/controller/CMSMainTest.php
View File

@ -4,6 +4,9 @@ use SilverStripe\ORM\DB;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\HiddenClass;
use SilverStripe\CMS\Controllers\CMSMain;
use SilverStripe\CMS\Model\SiteTree;
/**
* @package cms
@ -34,7 +37,7 @@ class CMSMainTest extends FunctionalTest {
$user->logIn();
$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
$rawHints = singleton('CMSMain')->SiteTreeHints();
$rawHints = singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->SiteTreeHints();
$this->assertNotNull($rawHints);
$rawHints = preg_replace('/^"(.*)"$/', '$1', Convert::xml2raw($rawHints));
@ -125,7 +128,7 @@ class CMSMainTest extends FunctionalTest {
}
// Get the latest version of the redirector page
$pageID = $this->idFromFixture('RedirectorPage', 'page5');
$pageID = $this->idFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage', 'page5');
$latestID = DB::prepared_query('select max("Version") from "RedirectorPage_versions" where "RecordID" = ?', array($pageID))->value();
$dsCount = DB::prepared_query('select count("Version") from "RedirectorPage_versions" where "RecordID" = ? and "Version"= ?', array($pageID, $latestID))->value();
$this->assertEquals(1, $dsCount, "Published page has no duplicate version records: it has " . $dsCount . " for version " . $latestID);
@ -175,7 +178,7 @@ class CMSMainTest extends FunctionalTest {
* Mostly, this is just checking that the method doesn't return an error
*/
public function testThatGetCMSFieldsWorksOnEveryPageType() {
$classes = ClassInfo::subclassesFor("SiteTree");
$classes = ClassInfo::subclassesFor("SilverStripe\\CMS\\Model\\SiteTree");
array_shift($classes);
foreach ($classes as $class) {
@ -186,7 +189,7 @@ class CMSMainTest extends FunctionalTest {
$page->Title = "Test $class page";
$page->write();
$page->flushCache();
$page = DataObject::get_by_id("SiteTree", $page->ID);
$page = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $page->ID);
$this->assertTrue($page->getCMSFields() instanceof FieldList);
}
@ -195,7 +198,7 @@ class CMSMainTest extends FunctionalTest {
public function testCanPublishPageWithUnpublishedParentWithStrictHierarchyOff() {
$this->logInWithPermission('ADMIN');
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', true);
$parentPage = $this->objFromFixture('Page', 'page3');
$childPage = $this->objFromFixture('Page', 'page1');
@ -208,7 +211,7 @@ class CMSMainTest extends FunctionalTest {
$actions,
'Can publish a page with an unpublished parent with strict hierarchy off'
);
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', false);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', false);
}
/**
@ -225,10 +228,10 @@ class CMSMainTest extends FunctionalTest {
$response = $this->get('admin/pages/edit/show/' . $pageID);
$livePage = Versioned::get_one_by_stage("SiteTree", "Live", array(
$livePage = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live", array(
'"SiteTree"."ID"' => $pageID
));
$this->assertInstanceOf('SiteTree', $livePage);
$this->assertInstanceOf('SilverStripe\\CMS\\Model\\SiteTree', $livePage);
$this->assertTrue($livePage->canDelete());
// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
@ -469,7 +472,7 @@ class CMSMainTest extends FunctionalTest {
// Test deleted page filter
$params = array(
'FilterClass' => 'CMSSiteTreeFilter_StatusDeletedPages'
'FilterClass' => 'SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter_StatusDeletedPages'
);
$pages = $controller->getList($params);
$this->assertEquals(1, $pages->count());
@ -480,7 +483,7 @@ class CMSMainTest extends FunctionalTest {
// Test live, but not on draft filter
$params = array(
'FilterClass' => 'CMSSiteTreeFilter_StatusRemovedFromDraftPages'
'FilterClass' => 'SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter_StatusRemovedFromDraftPages'
);
$pages = $controller->getList($params);
$this->assertEquals(1, $pages->count());

2
tests/controller/CMSPageHistoryControllerTest.php
View File

@ -1,6 +1,8 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Controllers\CMSPageHistoryController;
/**
* @package cms

15
tests/controller/CMSSiteTreeFilterTest.php
View File

@ -1,6 +1,13 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_ChangedPages;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_DeletedPages;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDraftPages;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusRemovedFromDraftPages;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDeletedPages;
class CMSSiteTreeFilterTest extends SapphireTest {
@ -94,7 +101,7 @@ class CMSSiteTreeFilterTest extends SapphireTest {
$deletedPageID = $deletedPage->ID;
$deletedPage->delete();
$deletedPage = Versioned::get_one_by_stage(
'SiteTree',
'SilverStripe\\CMS\\Model\\SiteTree',
'Live',
array('"SiteTree_Live"."ID"' => $deletedPageID)
);
@ -110,7 +117,7 @@ class CMSSiteTreeFilterTest extends SapphireTest {
public function testStatusDraftPagesFilter() {
$draftPage = $this->objFromFixture('Page', 'page4');
$draftPage = Versioned::get_one_by_stage(
'SiteTree',
'SilverStripe\\CMS\\Model\\SiteTree',
'Stage',
sprintf('"SiteTree"."ID" = %d', $draftPage->ID)
);
@ -146,7 +153,7 @@ class CMSSiteTreeFilterTest extends SapphireTest {
$removedDraftPage->publishRecursive();
$removedDraftPage->deleteFromStage('Stage');
$removedDraftPage = Versioned::get_one_by_stage(
'SiteTree',
'SilverStripe\\CMS\\Model\\SiteTree',
'Live',
sprintf('"SiteTree"."ID" = %d', $removedDraftPage->ID)
);
@ -173,7 +180,7 @@ class CMSSiteTreeFilterTest extends SapphireTest {
// Can't use straight $blah->delete() as that blows it away completely and test fails
$deletedPage->deleteFromStage(Versioned::LIVE);
$deletedPage->deleteFromStage(Versioned::DRAFT);
$checkParentExists = Versioned::get_latest_version('SiteTree', $deletedPageID);
$checkParentExists = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $deletedPageID);
// Check deleted page is included
$f = new CMSSiteTreeFilter_StatusDeletedPages(array('Title' => 'Page'));

4
tests/controller/ContentControllerSearchExtensionTest.php
View File

@ -1,6 +1,8 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Controllers\ContentController;
class ContentControllerSearchExtensionTest extends SapphireTest {
@ -13,7 +15,7 @@ class ContentControllerSearchExtensionTest extends SapphireTest {
$controller = new ContentController($page);
$form = $controller->SearchForm();
if (get_class($form) == 'SearchForm') $this->assertEquals(array('File'), $form->getClassesToSearch());
if (get_class($form) == 'SilverStripe\\CMS\\Search\\SearchForm') $this->assertEquals(array('File'), $form->getClassesToSearch());
}
public function setUpOnce() {

10
tests/controller/ContentControllerTest.php
View File

@ -1,6 +1,10 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Controllers\RootURLController;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Controllers\ContentController;
/**
* @package cms
@ -20,7 +24,7 @@ class ContentControllerTest extends FunctionalTest {
public function testNestedPages() {
RootURLController::reset();
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$this->assertEquals('Home Page', $this->get('/')->getBody());
$this->assertEquals('Home Page', $this->get('/home/index/')->getBody());
@ -56,7 +60,7 @@ class ContentControllerTest extends FunctionalTest {
public function testChildrenOf() {
$controller = new ContentController();
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$this->assertEquals(1, $controller->ChildrenOf('/')->Count());
$this->assertEquals(1, $controller->ChildrenOf('/home/')->Count());
@ -72,7 +76,7 @@ class ContentControllerTest extends FunctionalTest {
}
public function testDeepNestedURLs() {
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$page = new Page();
$page->URLSegment = 'base-page';

8
tests/controller/ModelAsControllerTest.php
View File

@ -1,6 +1,10 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Controllers\OldPageRedirector;
use SilverStripe\CMS\Controllers\RootURLController;
/**
* @package cms
@ -24,7 +28,7 @@ class ModelAsControllerTest extends FunctionalTest {
parent::setUp();
$this->orig['nested_urls'] = SiteTree::config()->nested_urls;
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
}
/**
@ -299,7 +303,7 @@ class ModelAsControllerTest extends FunctionalTest {
*/
public function testChildOfDraft() {
RootURLController::reset();
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$draft = new Page();
$draft->Title = 'Root Leve Draft Page';

5
tests/controller/RootURLControllerTest.php
View File

@ -1,4 +1,7 @@
<?php
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Controllers\RootURLController;
/**
* @package cms
* @subpackage tests
@ -11,7 +14,7 @@ class RootURLControllerTest extends SapphireTest {
SiteTree::config()->nested_urls = false;
$this->assertEquals('home', RootURLController::get_homepage_link());
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$this->assertEquals('home', RootURLController::get_homepage_link());
}

5
tests/controller/SilverStripeNavigatorTest.php
View File

@ -2,6 +2,9 @@
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\CMS\Controllers\SilverStripeNavigator;
use SilverStripe\CMS\Controllers\SilverStripeNavigatorItem;
/**
* @package cms
* @subpackage tests
@ -17,7 +20,7 @@ class SilverStripeNavigatorTest extends SapphireTest {
$items = $navigator->getItems();
$classes = array_map('get_class', $items->toArray());
$this->assertContains('SilverStripeNavigatorItem_StageLink', $classes,
$this->assertContains('SilverStripe\\CMS\\Controllers\\SilverStripeNavigatorItem_StageLink', $classes,
'Adds default classes'
);

4
tests/model/ErrorPageFileExtensionTest.php
View File

@ -26,11 +26,11 @@ class ErrorPageFileExtensionTest extends SapphireTest {
public function testErrorPage() {
// Get and publish records
$notFoundPage = $this->objFromFixture('ErrorPage', '404');
$notFoundPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
$notFoundPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$notFoundLink = $notFoundPage->Link();
$disallowedPage = $this->objFromFixture('ErrorPage', '403');
$disallowedPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '403');
$disallowedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$disallowedLink = $disallowedPage->Link();

14
tests/model/ErrorPageTest.php
View File

@ -1,6 +1,8 @@
<?php
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Model\ErrorPage;
/**
* @package cms
@ -21,7 +23,7 @@ class ErrorPageTest extends FunctionalTest {
parent::setUp();
// Set temporary asset backend store
AssetStoreTest_SpyStore::activate('ErrorPageTest');
Config::inst()->update('ErrorPage', 'enable_static_file', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\ErrorPage', 'enable_static_file', true);
Config::inst()->update('Director', 'environment_type', 'live');
$this->logInWithPermission('ADMIN');
}
@ -32,7 +34,7 @@ class ErrorPageTest extends FunctionalTest {
}
public function test404ErrorPage() {
$page = $this->objFromFixture('ErrorPage', '404');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
// ensure that the errorpage exists as a physical file
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
@ -49,7 +51,7 @@ class ErrorPageTest extends FunctionalTest {
}
public function testBehaviourOfShowInMenuAndShowInSearchFlags() {
$page = $this->objFromFixture('ErrorPage', '404');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
/* Don't show the error page in the menus */
$this->assertEquals($page->ShowInMenus, 0, 'Don\'t show the error page in the menus');
@ -59,7 +61,7 @@ class ErrorPageTest extends FunctionalTest {
}
public function testBehaviourOf403() {
$page = $this->objFromFixture('ErrorPage', '403');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '403');
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$response = $this->get($page->RelativeLink());
@ -70,7 +72,7 @@ class ErrorPageTest extends FunctionalTest {
public function testSecurityError() {
// Generate 404 page
$page = $this->objFromFixture('ErrorPage', '404');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
// Test invalid action
@ -104,7 +106,7 @@ class ErrorPageTest extends FunctionalTest {
* Test fallback to file generation API with enable_static_file disabled
*/
public function testGeneratedFile() {
Config::inst()->update('ErrorPage', 'enable_static_file', false);
Config::inst()->update('SilverStripe\\CMS\\Model\\ErrorPage', 'enable_static_file', false);
$this->logInWithPermission('ADMIN');
$page = new ErrorPage();

6
tests/model/FileLinkTrackingTest.php
View File

@ -2,6 +2,8 @@
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\DataObject;
use SilverStripe\CMS\Model\VirtualPage;
/**
* Tests link tracking to files and images.
@ -157,8 +159,8 @@ class FileLinkTrackingTest extends SapphireTest {
$file->write();
// Caching hack
Versioned::prepopulate_versionnumber_cache('SiteTree', 'Stage', array($page->ID));
Versioned::prepopulate_versionnumber_cache('SiteTree', 'Live', array($page->ID));
Versioned::prepopulate_versionnumber_cache('SilverStripe\\CMS\\Model\\SiteTree', 'Stage', array($page->ID));
Versioned::prepopulate_versionnumber_cache('SilverStripe\\CMS\\Model\\SiteTree', 'Live', array($page->ID));
// Confirm that the page hasn't gone green.
$this->assertFalse($page->getIsModifiedOnStage());

21
tests/model/RedirectorPageTest.php
View File

@ -1,5 +1,8 @@
<?php
use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\CMS\Model\RedirectorPage_Controller;
class RedirectorPageTest extends FunctionalTest {
protected static $fixture_file = 'RedirectorPageTest.yml';
protected static $use_draft_site = true;
@ -7,14 +10,14 @@ class RedirectorPageTest extends FunctionalTest {
public function testGoodRedirectors() {
/* For good redirectors, the final destination URL will be returned */
$this->assertEquals("http://www.google.com", $this->objFromFixture('RedirectorPage','goodexternal')->Link());
$this->assertEquals(Director::baseURL() . "redirection-dest/", $this->objFromFixture('RedirectorPage','goodinternal')->redirectionLink());
$this->assertEquals(Director::baseURL() . "redirection-dest/", $this->objFromFixture('RedirectorPage','goodinternal')->Link());
$this->assertEquals("http://www.google.com", $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','goodexternal')->Link());
$this->assertEquals(Director::baseURL() . "redirection-dest/", $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','goodinternal')->redirectionLink());
$this->assertEquals(Director::baseURL() . "redirection-dest/", $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','goodinternal')->Link());
}
public function testEmptyRedirectors() {
/* If a redirector page is misconfigured, then its link method will just return the usual URLSegment-generated value */
$page1 = $this->objFromFixture('RedirectorPage','badexternal');
$page1 = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','badexternal');
$this->assertEquals(Director::baseURL() . 'bad-external/', $page1->Link());
/* An error message will be shown if you visit it */
@ -22,7 +25,7 @@ class RedirectorPageTest extends FunctionalTest {
$this->assertContains('message-setupWithoutRedirect', $content);
/* This also applies for internal links */
$page2 = $this->objFromFixture('RedirectorPage','badinternal');
$page2 = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','badinternal');
$this->assertEquals(Director::baseURL() . 'bad-internal/', $page2->Link());
$content = $this->get(Director::makeRelative($page2->Link()))->getBody();
$this->assertContains('message-setupWithoutRedirect', $content);
@ -30,14 +33,14 @@ class RedirectorPageTest extends FunctionalTest {
public function testReflexiveAndTransitiveInternalRedirectors() {
/* Reflexive redirectors are those that point to themselves. They should behave the same as an empty redirector */
$page = $this->objFromFixture('RedirectorPage','reflexive');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','reflexive');
$this->assertEquals(Director::baseURL() . 'reflexive/', $page->Link());
$content = $this->get(Director::makeRelative($page->Link()))->getBody();
$this->assertContains('message-setupWithoutRedirect', $content);
/* Transitive redirectors are those that point to another redirector page. They should send people to the URLSegment
* of the destination page - the middle-stop, so to speak. That should redirect to the final destination */
$page = $this->objFromFixture('RedirectorPage','transitive');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage','transitive');
$this->assertEquals(Director::baseURL() . 'good-internal/', $page->Link());
$this->autoFollowRedirection = false;
@ -46,7 +49,7 @@ class RedirectorPageTest extends FunctionalTest {
}
public function testExternalURLGetsPrefixIfNotSet() {
$page = $this->objFromFixture('RedirectorPage', 'externalnoprefix');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage', 'externalnoprefix');
$this->assertEquals($page->ExternalURL, 'http://google.com', 'onBeforeWrite has prefixed with http');
$page->write();
$this->assertEquals($page->ExternalURL, 'http://google.com', 'onBeforeWrite will not double prefix if written again!');
@ -70,7 +73,7 @@ class RedirectorPageTest extends FunctionalTest {
* Test that we can trigger a redirection before RedirectorPage_Controller::init() is called
*/
public function testRedirectRespectsFinishedResponse() {
$page = $this->objFromFixture('RedirectorPage', 'goodinternal');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage', 'goodinternal');
RedirectorPage_Controller::add_extension('RedirectorPageTest_RedirectExtension');
$response = $this->get($page->regularLink());

8
tests/model/SiteTreeActionsTest.php
View File

@ -56,8 +56,8 @@ class SiteTreeActionsTest extends FunctionalTest {
$page->deleteFromStage('Stage');
// Get the live version of the page
$page = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertInstanceOf("SiteTree", $page);
$page = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertInstanceOf("SilverStripe\\CMS\\Model\\SiteTree", $page);
// Check that someone without the right permission can't delete the page
$editor = $this->objFromFixture('SilverStripe\\Security\\Member', 'cmsnodeleteeditor');
@ -108,8 +108,8 @@ class SiteTreeActionsTest extends FunctionalTest {
$page->deleteFromStage('Stage');
// Get the live version of the page
$page = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertInstanceOf('SiteTree', $page);
$page = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertInstanceOf('SilverStripe\\CMS\\Model\\SiteTree', $page);
$actions = $page->getCMSActions();

47
tests/model/SiteTreeBrokenLinksTest.php
View File

@ -3,6 +3,9 @@
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\CMS\Model\RedirectorPage;
/**
* Tests {@see SiteTreeLinkTracking} broken links feature: LinkTracking
@ -94,10 +97,10 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
$this->assertTrue($obj->publishRecursive());
// Confirm that it isn't marked as broken to begin with
$obj->flushCache();
$obj = DataObject::get_by_id("SiteTree", $obj->ID);
$obj = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $obj->ID);
$this->assertEquals(0, $obj->HasBrokenFile);
$liveObj = Versioned::get_one_by_stage("SiteTree", "Live","\"SiteTree\".\"ID\" = $obj->ID");
$liveObj = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live","\"SiteTree\".\"ID\" = $obj->ID");
$this->assertEquals(0, $liveObj->HasBrokenFile);
// Delete the file
@ -105,12 +108,12 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
// Confirm that it is marked as broken in stage
$obj->flushCache();
$obj = DataObject::get_by_id("SiteTree", $obj->ID);
$obj = DataObject::get_by_id("SilverStripe\\CMS\\Model\\SiteTree", $obj->ID);
$this->assertEquals(1, $obj->HasBrokenFile);
// Publishing this page marks it as broken on live too
$obj->publishRecursive();
$liveObj = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $obj->ID");
$liveObj = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live", "\"SiteTree\".\"ID\" = $obj->ID");
$this->assertEquals(1, $liveObj->HasBrokenFile);
}
@ -195,41 +198,41 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
// Unpublish the source page, confirm that the page 2 and RP has a broken link on published
$p->doUnpublish();
$p2Live = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $p2->ID);
$rpLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $rp->ID);
$p2Live = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $p2->ID);
$rpLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $rp->ID);
$this->assertEquals(1, $p2Live->HasBrokenLink);
$this->assertEquals(1, $rpLive->HasBrokenLink);
// Delete the source page, confirm that the VP, RP and page 2 have broken links on draft
$p->delete();
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$p2->flushCache();
$p2 = DataObject::get_by_id('SiteTree', $p2->ID);
$p2 = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $p2->ID);
$rp->flushCache();
$rp = DataObject::get_by_id('SiteTree', $rp->ID);
$rp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $rp->ID);
$this->assertEquals(1, $p2->HasBrokenLink);
$this->assertEquals(1, $vp->HasBrokenLink);
$this->assertEquals(1, $rp->HasBrokenLink);
// Restore the page to stage, confirm that this fixes the links
$p = Versioned::get_latest_version('SiteTree', $pageID);
$p = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $pageID);
$p->doRestoreToStage();
$p2->flushCache();
$p2 = DataObject::get_by_id('SiteTree', $p2->ID);
$p2 = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $p2->ID);
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$rp->flushCache();
$rp = DataObject::get_by_id('SiteTree', $rp->ID);
$rp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $rp->ID);
$this->assertFalse((bool)$p2->HasBrokenLink);
$this->assertFalse((bool)$vp->HasBrokenLink);
$this->assertFalse((bool)$rp->HasBrokenLink);
// Publish and confirm that the p2 and RP broken links are fixed on published
$this->assertTrue($p->publishRecursive());
$p2Live = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $p2->ID);
$rpLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $rp->ID);
$p2Live = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $p2->ID);
$rpLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $rp->ID);
$this->assertFalse((bool)$p2Live->HasBrokenLink);
$this->assertFalse((bool)$rpLive->HasBrokenLink);
@ -273,25 +276,25 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
$p->delete();
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$p2->flushCache();
$p2 = DataObject::get_by_id('SiteTree', $p2->ID);
$p2 = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $p2->ID);
$rp->flushCache();
$rp = DataObject::get_by_id('SiteTree', $rp->ID);
$rp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $rp->ID);
$this->assertEquals(1, $p2->HasBrokenLink);
$this->assertEquals(1, $vp->HasBrokenLink);
$this->assertEquals(1, $rp->HasBrokenLink);
// Call doRevertToLive and confirm that broken links are restored
$pLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $pID);
$pLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $pID);
$pLive->doRevertToLive();
$p2->flushCache();
$p2 = DataObject::get_by_id('SiteTree', $p2->ID);
$p2 = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $p2->ID);
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$rp->flushCache();
$rp = DataObject::get_by_id('SiteTree', $rp->ID);
$rp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $rp->ID);
$this->assertFalse((bool)$p2->HasBrokenLink);
$this->assertFalse((bool)$vp->HasBrokenLink);
$this->assertFalse((bool)$rp->HasBrokenLink);

14
tests/model/SiteTreeHTMLEditorFieldTest.php
View File

@ -1,4 +1,6 @@
<?php
use SilverStripe\CMS\Model\SiteTree;
class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml';
@ -24,11 +26,11 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
}
public function testLinkTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home');
$sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home');
$editor = new HTMLEditorField('Content');
$aboutID = $this->idFromFixture('SiteTree', 'about');
$contactID = $this->idFromFixture('SiteTree', 'contact');
$aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about');
$contactID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'contact');
$editor->setValue("<a href=\"[sitetree_link,id=$aboutID]\">Example Link</a>");
$editor->saveInto($sitetree);
@ -63,7 +65,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
}
public function testFileLinkTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home');
$sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home');
$editor = new HTMLEditorField('Content');
$fileID = $this->idFromFixture('File', 'example_file');
@ -120,7 +122,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
}
public function testImageTracking() {
$sitetree = $this->objFromFixture('SiteTree', 'home');
$sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home');
$editor = new HTMLEditorField('Content');
$file = $this->objFromFixture('Image', 'example_image');
@ -156,7 +158,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
$editor->setValue(sprintf (
'<p><a href="[sitetree_link,id=%d]">Working Link</a></p>',
$this->idFromFixture('SiteTree', 'home')
$this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home')
));
$sitetree->HasBrokenLink = false;
$editor->saveInto($sitetree);

2
tests/model/SiteTreeLinkTrackingTest.php
View File

@ -1,5 +1,7 @@
<?php
use SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser;
class SiteTreeLinkTrackingTest extends SapphireTest {
protected function isBroken($content) {

8
tests/model/SiteTreePermissionsTest.php
View File

@ -2,6 +2,8 @@
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\Security\Member;
use SilverStripe\CMS\Model\SiteTree;
/**
* @package cms
@ -76,7 +78,7 @@ class SiteTreePermissionsTest extends FunctionalTest {
$page->delete();
// Re-fetch the page from the live site
$page = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".\"ID\" = $pageID");
$page = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', "\"SiteTree\".\"ID\" = $pageID");
// subadmin has edit rights on that page
$member = $this->objFromFixture('SilverStripe\\Security\\Member','subadmin');
@ -124,7 +126,7 @@ class SiteTreePermissionsTest extends FunctionalTest {
$page->delete();
// We'll need to resurrect the page from the version cache to test this case
$page = Versioned::get_latest_version('SiteTree', $pageID);
$page = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $pageID);
// subadmin had edit rights on that page, but now it's gone
$member = $this->objFromFixture('SilverStripe\\Security\\Member','subadmin');
@ -390,7 +392,7 @@ class SiteTreePermissionsTest extends FunctionalTest {
$page->deleteFromStage('Stage');
// Get the live version of the page
$page = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$page = Versioned::get_one_by_stage("SilverStripe\\CMS\\Model\\SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertTrue(is_object($page), 'Versioned::get_one_by_stage() is returning an object');
// subadmin users

73
tests/model/SiteTreeTest.php
View File

@ -9,6 +9,9 @@ use SilverStripe\ORM\HiddenClass;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Group;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Model\SiteTreeExtension;
/**
* @package cms
@ -47,14 +50,14 @@ class SiteTreeTest extends SapphireTest {
// Disable the creation
SiteTree::config()->create_default_pages = false;
singleton('SiteTree')->requireDefaultRecords();
singleton('SilverStripe\\CMS\\Model\\SiteTree')->requireDefaultRecords();
// The table should still be empty
$this->assertEquals(DB::query('SELECT COUNT("ID") FROM "SiteTree"')->value(), 0);
// Enable the creation
SiteTree::config()->create_default_pages = true;
singleton('SiteTree')->requireDefaultRecords();
singleton('SilverStripe\\CMS\\Model\\SiteTree')->requireDefaultRecords();
// The table should now have three rows (home, about-us, contact-us)
$this->assertEquals(DB::query('SELECT COUNT("ID") FROM "SiteTree"')->value(), 3);
@ -127,7 +130,7 @@ class SiteTreeTest extends SapphireTest {
$child->Title = 'Page Title';
$child->setParent($parent);
$this->assertInstanceOf("SiteTree", $child->Parent);
$this->assertInstanceOf("SilverStripe\\CMS\\Model\\SiteTree", $child->Parent);
$this->assertEquals("Section Title", $child->Parent->Title);
}
@ -154,7 +157,7 @@ class SiteTreeTest extends SapphireTest {
$oldMode = Versioned::get_reading_mode();
Versioned::set_stage(Versioned::LIVE);
$checkSiteTree = DataObject::get_one("SiteTree", array(
$checkSiteTree = DataObject::get_one("SilverStripe\\CMS\\Model\\SiteTree", array(
'"SiteTree"."URLSegment"' => 'get-one-test-page'
));
$this->assertEquals("V1", $checkSiteTree->Title);
@ -257,7 +260,7 @@ class SiteTreeTest extends SapphireTest {
$page->delete();
$this->assertTrue(!DataObject::get_by_id("Page", $pageID));
$deletedPage = Versioned::get_latest_version('SiteTree', $pageID);
$deletedPage = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $pageID);
$resultPage = $deletedPage->doRestoreToStage();
$requeriedPage = DataObject::get_by_id("Page", $pageID);
@ -276,7 +279,7 @@ class SiteTreeTest extends SapphireTest {
// Check that if we restore while on the live site that the content still gets pushed to
// stage
Versioned::set_stage(Versioned::LIVE);
$deletedPage = Versioned::get_latest_version('SiteTree', $page2ID);
$deletedPage = Versioned::get_latest_version('SilverStripe\\CMS\\Model\\SiteTree', $page2ID);
$deletedPage->doRestoreToStage();
$this->assertFalse((bool)Versioned::get_one_by_stage("Page", "Live", "\"SiteTree\".\"ID\" = " . $page2ID));
@ -292,7 +295,7 @@ class SiteTreeTest extends SapphireTest {
$about = $this->objFromFixture('Page', 'about');
$staff = $this->objFromFixture('Page', 'staff');
$product = $this->objFromFixture('Page', 'product1');
$notFound = $this->objFromFixture('ErrorPage', '404');
$notFound = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
SiteTree::config()->nested_urls = false;
@ -303,7 +306,7 @@ class SiteTreeTest extends SapphireTest {
$this->assertEquals($product->ID, SiteTree::get_by_link($product->Link(), false)->ID);
$this->assertEquals($notFound->ID, SiteTree::get_by_link($notFound->Link(), false)->ID);
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$this->assertEquals($home->ID, SiteTree::get_by_link('/', false)->ID);
$this->assertEquals($home->ID, SiteTree::get_by_link('/home/', false)->ID);
@ -321,7 +324,7 @@ class SiteTreeTest extends SapphireTest {
$about = $this->objFromFixture('Page', 'about');
$staff = $this->objFromFixture('Page', 'staff');
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$this->assertEquals('about-us/', $about->RelativeLink(), 'Matches URLSegment on top level without parameters');
$this->assertEquals('about-us/my-staff/', $staff->RelativeLink(), 'Matches URLSegment plus parent on second level without parameters');
@ -340,7 +343,7 @@ class SiteTreeTest extends SapphireTest {
$parent = $this->objFromFixture('Page', 'about');
$child = $this->objFromFixture('Page', 'staff');
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$child->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$parent->URLSegment = 'changed-on-live';
@ -354,7 +357,7 @@ class SiteTreeTest extends SapphireTest {
}
public function testDeleteFromStageOperatesRecursively() {
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', false);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', false);
$pageAbout = $this->objFromFixture('Page', 'about');
$pageStaff = $this->objFromFixture('Page', 'staff');
$pageStaffDuplicate = $this->objFromFixture('Page', 'staffduplicate');
@ -364,7 +367,7 @@ class SiteTreeTest extends SapphireTest {
$this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID));
$this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page);
$this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page);
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', true);
}
public function testDeleteFromStageOperatesRecursivelyStrict() {
@ -388,7 +391,7 @@ class SiteTreeTest extends SapphireTest {
}
public function testDeleteFromLiveOperatesRecursively() {
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', false);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', false);
$this->logInWithPermission('ADMIN');
$pageAbout = $this->objFromFixture('Page', 'about');
@ -408,11 +411,11 @@ class SiteTreeTest extends SapphireTest {
$this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page);
$this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page);
Versioned::set_stage(Versioned::DRAFT);
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', true);
}
public function testUnpublishDoesNotDeleteChildrenWithLooseHierachyOn() {
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', false);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', false);
$this->logInWithPermission('ADMIN');
$pageAbout = $this->objFromFixture('Page', 'about');
@ -430,7 +433,7 @@ class SiteTreeTest extends SapphireTest {
$this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page);
$this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page);
Versioned::set_stage(Versioned::DRAFT);
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'enforce_strict_hierarchy', true);
}
public function testDeleteFromLiveOperatesRecursivelyStrict() {
@ -509,20 +512,20 @@ class SiteTreeTest extends SapphireTest {
public function testCreatePermissions() {
// Test logged out users cannot create
$this->logOut();
$this->assertFalse(singleton('SiteTree')->canCreate());
$this->assertFalse(singleton('SilverStripe\\CMS\\Model\\SiteTree')->canCreate());
// Login with another permission
$this->logInWithPermission('DUMMY');
$this->assertFalse(singleton('SiteTree')->canCreate());
$this->assertFalse(singleton('SilverStripe\\CMS\\Model\\SiteTree')->canCreate());
// Login with basic CMS permission
$perms = SiteConfig::config()->required_permission;
$this->logInWithPermission(reset($perms));
$this->assertTrue(singleton('SiteTree')->canCreate());
$this->assertTrue(singleton('SilverStripe\\CMS\\Model\\SiteTree')->canCreate());
// Test creation underneath a parent which this user doesn't have access to
$parent = $this->objFromFixture('Page', 'about');
$this->assertFalse(singleton('SiteTree')->canCreate(null, array('Parent' => $parent)));
$this->assertFalse(singleton('SilverStripe\\CMS\\Model\\SiteTree')->canCreate(null, array('Parent' => $parent)));
// Test creation underneath a parent which doesn't allow a certain child
$parentB = new SiteTreeTest_ClassB();
@ -632,10 +635,10 @@ class SiteTreeTest extends SapphireTest {
public function testLinkShortcodeHandler() {
$aboutPage = $this->objFromFixture('Page', 'about');
$redirectPage = $this->objFromFixture('RedirectorPage', 'external');
$redirectPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\RedirectorPage', 'external');
$parser = new ShortcodeParser();
$parser->register('sitetree_link', array('SiteTree', 'link_shortcode_handler'));
$parser->register('sitetree_link', array('SilverStripe\\CMS\\Model\\SiteTree', 'link_shortcode_handler'));
$aboutShortcode = sprintf('[sitetree_link,id=%d]', $aboutPage->ID);
$aboutEnclosed = sprintf('[sitetree_link,id=%d]Example Content[/sitetree_link]', $aboutPage->ID);
@ -671,7 +674,7 @@ class SiteTreeTest extends SapphireTest {
public function testIsCurrent() {
$aboutPage = $this->objFromFixture('Page', 'about');
$errorPage = $this->objFromFixture('ErrorPage', '404');
$errorPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\ErrorPage', '404');
Director::set_current_page($aboutPage);
$this->assertTrue($aboutPage->isCurrent(), 'Assert that basic isSection checks works.');
@ -683,7 +686,7 @@ class SiteTreeTest extends SapphireTest {
Director::set_current_page($aboutPage);
$this->assertTrue (
DataObject::get_one('SiteTree', array(
DataObject::get_one('SilverStripe\\CMS\\Model\\SiteTree', array(
'"SiteTree"."Title"' => 'About Us'
))->isCurrent(),
'Assert that isCurrent works on another instance with the same ID.'
@ -783,7 +786,7 @@ class SiteTreeTest extends SapphireTest {
$sitetree->URLSegment = 'home';
$this->assertFalse($sitetree->validURLSegment(), 'Conflicts are still recognised with a ParentID value');
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$sitetree->ParentID = 0;
$sitetree->URLSegment = 'home';
@ -812,7 +815,7 @@ class SiteTreeTest extends SapphireTest {
* @covers SiteTree::validURLSegment
*/
public function testValidURLSegmentControllerConflicts() {
Config::inst()->update('SiteTree', 'nested_urls', true);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'nested_urls', true);
$sitetree = new SiteTree();
$sitetree->ParentID = $this->idFromFixture('SiteTreeTest_Conflicted', 'parent');
@ -850,13 +853,13 @@ class SiteTreeTest extends SapphireTest {
$sitetree->URLSegment = 'brötchen';
$sitetree->write();
$sitetree = DataObject::get_by_id('SiteTree', $sitetree->ID, false);
$sitetree = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $sitetree->ID, false);
$this->assertEquals($sitetree->URLSegment, rawurlencode('brötchen'));
$sitetree->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$sitetree = DataObject::get_by_id('SiteTree', $sitetree->ID, false);
$sitetree = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $sitetree->ID, false);
$this->assertEquals($sitetree->URLSegment, rawurlencode('brötchen'));
$sitetreeLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' .$sitetree->ID, false);
$sitetreeLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' .$sitetree->ID, false);
$this->assertEquals($sitetreeLive->URLSegment, rawurlencode('brötchen'));
Config::inst()->update('URLSegmentFilter', 'default_allow_multibyte', $origAllow);
@ -891,7 +894,7 @@ class SiteTreeTest extends SapphireTest {
public function testPageTypeClasses() {
$classes = SiteTree::page_type_classes();
$this->assertNotContains('SiteTree', $classes, 'Page types do not include base class');
$this->assertNotContains('SilverStripe\\CMS\\Model\\SiteTree', $classes, 'Page types do not include base class');
$this->assertContains('Page', $classes, 'Page types do contain subclasses');
// Testing what happens in an incorrect config value is set - hide_ancestor should be a string
@ -914,7 +917,7 @@ class SiteTreeTest extends SapphireTest {
$allowedChildren = $page->allowedChildren();
$this->assertContains(
'VirtualPage',
'SilverStripe\\CMS\\Model\\VirtualPage',
$allowedChildren,
'Includes core subclasses by default'
);
@ -1072,7 +1075,7 @@ class SiteTreeTest extends SapphireTest {
}
public function testMetaTagGeneratorDisabling() {
$generator = Config::inst()->get('SiteTree', 'meta_generator');
$generator = Config::inst()->get('SilverStripe\\CMS\\Model\\SiteTree', 'meta_generator');
$page = new SiteTreeTest_PageNode();
@ -1083,7 +1086,7 @@ class SiteTreeTest extends SapphireTest {
'test default functionality - uses value from Config');
// test proper escaping of quotes in attribute value
Config::inst()->update('SiteTree', 'meta_generator', 'Generator with "quotes" in it');
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'meta_generator', 'Generator with "quotes" in it');
$meta = $page->MetaTags();
$this->assertEquals(
1,
@ -1091,7 +1094,7 @@ class SiteTreeTest extends SapphireTest {
'test proper escaping of values from Config');
// test empty generator - no tag should appear at all
Config::inst()->update('SiteTree', 'meta_generator', '');
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'meta_generator', '');
$meta = $page->MetaTags();
$this->assertEquals(
0,
@ -1099,7 +1102,7 @@ class SiteTreeTest extends SapphireTest {
'test blank value means no tag generated');
// reset original value
Config::inst()->update('SiteTree', 'meta_generator', $generator);
Config::inst()->update('SilverStripe\\CMS\\Model\\SiteTree', 'meta_generator', $generator);
}

58
tests/model/VirtualPageTest.php
View File

@ -7,6 +7,10 @@ use SilverStripe\ORM\DB;
use SilverStripe\ORM\ValidationException;
use SilverStripe\ORM\FieldType\DBVarchar;
use SilverStripe\ORM\DataExtension;
use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\CMS\Model\RedirectorPage;
class VirtualPageTest extends FunctionalTest {
@ -40,8 +44,8 @@ class VirtualPageTest extends FunctionalTest {
$this->logInWithPermission("ADMIN");
// Add extra fields
Config::inst()->update('VirtualPage', 'initially_copied_fields', array('MyInitiallyCopiedField'));
Config::inst()->update('VirtualPage', 'non_virtual_fields', array('MyNonVirtualField', 'MySharedNonVirtualField'));
Config::inst()->update('SilverStripe\\CMS\\Model\\VirtualPage', 'initially_copied_fields', array('MyInitiallyCopiedField'));
Config::inst()->update('SilverStripe\\CMS\\Model\\VirtualPage', 'non_virtual_fields', array('MyNonVirtualField', 'MySharedNonVirtualField'));
}
/**
@ -55,8 +59,8 @@ class VirtualPageTest extends FunctionalTest {
$master->Content = "<p>New content</p>";
$master->write();
$vp1 = $this->objFromFixture('VirtualPage', 'vp1');
$vp2 = $this->objFromFixture('VirtualPage', 'vp2');
$vp1 = $this->objFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp1');
$vp2 = $this->objFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp2');
$this->assertEquals("New title", $vp1->Title);
$this->assertEquals("New title", $vp2->Title);
@ -81,16 +85,16 @@ class VirtualPageTest extends FunctionalTest {
$master->Content = "<p>New content</p>";
$master->write();
$vp1 = DataObject::get_by_id("VirtualPage", $this->idFromFixture('VirtualPage', 'vp1'));
$vp2 = DataObject::get_by_id("VirtualPage", $this->idFromFixture('VirtualPage', 'vp2'));
$vp1 = DataObject::get_by_id("SilverStripe\\CMS\\Model\\VirtualPage", $this->idFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp1'));
$vp2 = DataObject::get_by_id("SilverStripe\\CMS\\Model\\VirtualPage", $this->idFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp2'));
$this->assertTrue($vp1->publishRecursive());
$this->assertTrue($vp2->publishRecursive());
$master->publishRecursive();
Versioned::set_stage(Versioned::LIVE);
$vp1 = DataObject::get_by_id("VirtualPage", $this->idFromFixture('VirtualPage', 'vp1'));
$vp2 = DataObject::get_by_id("VirtualPage", $this->idFromFixture('VirtualPage', 'vp2'));
$vp1 = DataObject::get_by_id("SilverStripe\\CMS\\Model\\VirtualPage", $this->idFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp1'));
$vp2 = DataObject::get_by_id("SilverStripe\\CMS\\Model\\VirtualPage", $this->idFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp2'));
$this->assertNotNull($vp1);
$this->assertNotNull($vp2);
@ -148,13 +152,13 @@ class VirtualPageTest extends FunctionalTest {
// The draft content of the virtual page should say 'draft content'
/** @var VirtualPage $vpDraft */
$vpDraft = Versioned::get_by_stage("VirtualPage", Versioned::DRAFT)->byID($vp->ID);
$vpDraft = Versioned::get_by_stage("SilverStripe\\CMS\\Model\\VirtualPage", Versioned::DRAFT)->byID($vp->ID);
$this->assertEquals('draft content', $vpDraft->CopyContentFrom()->Content);
$this->assertEquals('draft content', $vpDraft->Content);
// The published content of the virtual page should say 'published content'
/** @var VirtualPage $vpLive */
$vpLive = Versioned::get_by_stage("VirtualPage", Versioned::LIVE)->byID($vp->ID);
$vpLive = Versioned::get_by_stage("SilverStripe\\CMS\\Model\\VirtualPage", Versioned::LIVE)->byID($vp->ID);
$this->assertEquals('published content', $vpLive->CopyContentFrom()->Content);
$this->assertEquals('published content', $vpLive->Content);
@ -162,7 +166,7 @@ class VirtualPageTest extends FunctionalTest {
$vpDraft->publishRecursive();
// Everything is published live
$vpLive = Versioned::get_by_stage("VirtualPage", Versioned::LIVE)->byID($vp->ID);
$vpLive = Versioned::get_by_stage("SilverStripe\\CMS\\Model\\VirtualPage", Versioned::LIVE)->byID($vp->ID);
$this->assertEquals('draft content', $vpLive->CopyContentFrom()->Content);
$this->assertEquals('draft content', $vpLive->Content);
}
@ -205,7 +209,7 @@ class VirtualPageTest extends FunctionalTest {
// Delete the source page semi-manually, without triggering
// the cascade publish back to the virtual page.
Versioned::set_stage(Versioned::LIVE);
$livePage = Versioned::get_by_stage('SiteTree', Versioned::LIVE)->byID($pID);
$livePage = Versioned::get_by_stage('SilverStripe\\CMS\\Model\\SiteTree', Versioned::LIVE)->byID($pID);
$livePage->delete();
Versioned::set_stage(Versioned::DRAFT);
@ -228,7 +232,7 @@ class VirtualPageTest extends FunctionalTest {
public function testCanEdit() {
$parentPage = $this->objFromFixture('Page', 'master3');
$virtualPage = $this->objFromFixture('VirtualPage', 'vp3');
$virtualPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp3');
$bob = $this->objFromFixture('SilverStripe\\Security\\Member', 'bob');
$andrew = $this->objFromFixture('SilverStripe\\Security\\Member', 'andrew');
@ -246,7 +250,7 @@ class VirtualPageTest extends FunctionalTest {
public function testCanView() {
$parentPage = $this->objFromFixture('Page', 'master3');
$parentPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$virtualPage = $this->objFromFixture('VirtualPage', 'vp3');
$virtualPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\VirtualPage', 'vp3');
$virtualPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$cindy = $this->objFromFixture('SilverStripe\\Security\\Member', 'cindy');
$alice = $this->objFromFixture('SilverStripe\\Security\\Member', 'alice');
@ -329,16 +333,16 @@ class VirtualPageTest extends FunctionalTest {
// The draft VP still has the CopyContentFromID link
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$this->assertEquals($p->ID, $vp->CopyContentFromID);
$vpLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $vp->ID);
$vpLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $vp->ID);
$this->assertNull($vpLive);
// Delete from draft, confirm that the virtual page has a broken link on the draft site
$p->delete();
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$this->assertEquals(1, $vp->HasBrokenLink);
}
@ -360,19 +364,19 @@ class VirtualPageTest extends FunctionalTest {
$pID = $p->ID;
$p->delete();
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$this->assertEquals(1, $vp->HasBrokenLink);
// Delete the source page form live, confirm that the virtual page has also been unpublished
$pLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $pID);
$pLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $pID);
$this->assertTrue($pLive->doUnpublish());
$vpLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree"."ID" = ' . $vp->ID);
$vpLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree"."ID" = ' . $vp->ID);
$this->assertNull($vpLive);
// Delete from draft, confirm that the virtual page has a broken link on the draft site
$pLive->delete();
$vp->flushCache();
$vp = DataObject::get_by_id('SiteTree', $vp->ID);
$vp = DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $vp->ID);
$this->assertEquals(1, $vp->HasBrokenLink);
}
@ -465,7 +469,7 @@ class VirtualPageTest extends FunctionalTest {
$virtual->CopyContentFromID = $page->ID;
$virtual->write();
$virtual = DataObject::get_by_id('VirtualPage', $virtual->ID, false);
$virtual = DataObject::get_by_id('SilverStripe\\CMS\\Model\\VirtualPage', $virtual->ID, false);
$virtual->CopyContentFromID = $notRootPage->ID;
$virtual->flushCache();
@ -505,7 +509,7 @@ class VirtualPageTest extends FunctionalTest {
$nonVirtual->write(); // not publishing the page type change here
// Stage record is changed to the new type and no longer acts as a virtual page
$nonVirtualStage = Versioned::get_one_by_stage('SiteTree', 'Stage', '"SiteTree"."ID" = ' . $nonVirtual->ID, false);
$nonVirtualStage = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Stage', '"SiteTree"."ID" = ' . $nonVirtual->ID, false);
$this->assertNotNull($nonVirtualStage);
$this->assertEquals('VirtualPageTest_ClassA', $nonVirtualStage->ClassName);
$this->assertEquals('changed on new type', $nonVirtualStage->MySharedNonVirtualField);
@ -514,7 +518,7 @@ class VirtualPageTest extends FunctionalTest {
);
// Virtual page on live keeps working as it should
$virtualLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree_Live"."ID" = ' . $virtual->ID, false);
$virtualLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree_Live"."ID" = ' . $virtual->ID, false);
$this->assertNotNull($virtualLive);
$this->assertEquals('VirtualPageTest_VirtualPageSub', $virtualLive->ClassName);
$this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField);
@ -527,7 +531,7 @@ class VirtualPageTest extends FunctionalTest {
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
// Virtual page only notices changes to virtualised fields (Title)
$virtualLive = Versioned::get_one_by_stage('SiteTree', 'Live', '"SiteTree_Live"."ID" = ' . $virtual->ID, false);
$virtualLive = Versioned::get_one_by_stage('SilverStripe\\CMS\\Model\\SiteTree', 'Live', '"SiteTree_Live"."ID" = ' . $virtual->ID, false);
$this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField);
$this->assertEquals('title changed on original', $virtualLive->Title);
}
@ -585,7 +589,7 @@ class VirtualPageTest extends FunctionalTest {
}
public function testVirtualPagePointingToRedirectorPage() {
if (!class_exists('RedirectorPage')) {
if (!class_exists('SilverStripe\\CMS\\Model\\RedirectorPage')) {
$this->markTestSkipped('RedirectorPage required');
}
@ -674,6 +678,6 @@ class VirtualPageTest_PageExtension extends DataExtension implements TestOnly {
class VirtualPageTest_PageWithAllowedChildren extends Page implements TestOnly {
private static $allowed_children = array(
'VirtualPageTest_ClassA',
'VirtualPage'
'SilverStripe\\CMS\\Model\\VirtualPage'
);
}

16
tests/reports/CmsReportsTest.php
View File

@ -2,6 +2,14 @@
use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\CMS\Reports\RecentlyEditedReport;
use SilverStripe\CMS\Reports\BrokenLinksReport;
use SilverStripe\CMS\Reports\BrokenFilesReport;
use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\CMS\Reports\BrokenVirtualPagesReport;
use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\CMS\Reports\BrokenRedirectorPagesReport;
/**
* @package cms
@ -20,8 +28,8 @@ class CmsReportsTest extends SapphireTest {
$afterThreshold = strtotime('-'.(self::$daysAgo-1).' days', strtotime('31-06-2009 00:00:00'));
$beforeThreshold = strtotime('-'.(self::$daysAgo+1).' days', strtotime('31-06-2009 00:00:00'));
$after = $this->objFromFixture('SiteTree', 'after');
$before = $this->objFromFixture('SiteTree', 'before');
$after = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'after');
$before = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'before');
DB::query("UPDATE \"SiteTree\" SET \"Created\"='2009-01-01 00:00:00', \"LastEdited\"='".date('Y-m-d H:i:s', $afterThreshold)."' WHERE \"ID\"='".$after->ID."'");
DB::query("UPDATE \"SiteTree\" SET \"Created\"='2009-01-01 00:00:00', \"LastEdited\"='".date('Y-m-d H:i:s', $beforeThreshold)."' WHERE \"ID\"='".$before->ID."'");
@ -53,8 +61,8 @@ class CmsReportsTest extends SapphireTest {
public function testRecentlyEdited() {
DBDatetime::set_mock_now('31-06-2009 00:00:00');
$after = $this->objFromFixture('SiteTree', 'after');
$before = $this->objFromFixture('SiteTree', 'before');
$after = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'after');
$before = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'before');
$r = new RecentlyEditedReport();

2
tests/search/CMSMainSearchFormTest.php
View File

@ -11,7 +11,7 @@ class CMSMainSearchFormTest extends FunctionalTest {
http_build_query(array(
'q' => array(
'Title' => 'Page 10',
'FilterClass' => 'CMSSiteTreeFilter_Search',
'FilterClass' => 'SilverStripe\\CMS\\Controllers\\CMSSiteTreeFilter_Search',
),
'action_doSearch' => true
))

43
tests/search/SearchFormTest.php
View File

@ -4,6 +4,9 @@ use SilverStripe\ORM\DB;
use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\MSSQL\MSSQLDatabase;
use SilverStripe\PostgreSQL\PostgreSQLDatabase;
use SilverStripe\CMS\Controllers\ContentController;
use SilverStripe\CMS\Search\SearchForm;
/**
@ -43,7 +46,7 @@ class ZZZSearchFormTest extends FunctionalTest {
public function setUp() {
parent::setUp();
$holderPage = $this->objFromFixture('SiteTree', 'searchformholder');
$holderPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'searchformholder');
$this->mockController = new ContentController($holderPage);
$this->waitUntilIndexingFinished();
@ -66,7 +69,7 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testSearchFormTemplateCanBeChanged() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$sf->setTemplate('BlankPage');
@ -79,9 +82,9 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testPublishedPagesMatchedByTitle() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$publishedPage = $this->objFromFixture('SiteTree', 'publicPublishedPage');
$publishedPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'publicPublishedPage');
$publishedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$this->waitUntilIndexingFinished();
@ -96,9 +99,9 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testDoubleQuotesPublishedPagesMatchedByTitle() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$publishedPage = $this->objFromFixture('SiteTree', 'publicPublishedPage');
$publishedPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'publicPublishedPage');
$publishedPage->Title = "finding butterflies";
$publishedPage->write();
$publishedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
@ -115,10 +118,10 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testUnpublishedPagesNotIncluded() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$results = $sf->getResults(null, array('Search'=>'publicUnpublishedPage'));
$unpublishedPage = $this->objFromFixture('SiteTree', 'publicUnpublishedPage');
$unpublishedPage = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'publicUnpublishedPage');
$this->assertNotContains(
$unpublishedPage->ID,
$results->column('ID'),
@ -129,9 +132,9 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testPagesRestrictedToLoggedinUsersNotIncluded() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$page = $this->objFromFixture('SiteTree', 'restrictedViewLoggedInUsers');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'restrictedViewLoggedInUsers');
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$results = $sf->getResults(null, array('Search'=>'restrictedViewLoggedInUsers'));
$this->assertNotContains(
@ -154,9 +157,9 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testPagesRestrictedToSpecificGroupNotIncluded() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$page = $this->objFromFixture('SiteTree', 'restrictedViewOnlyWebsiteUsers');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'restrictedViewOnlyWebsiteUsers');
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$results = $sf->getResults(null, array('Search'=>'restrictedViewOnlyWebsiteUsers'));
$this->assertNotContains(
@ -187,12 +190,12 @@ class ZZZSearchFormTest extends FunctionalTest {
}
public function testInheritedRestrictedPagesNotIncluded() {
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$parent = $this->objFromFixture('SiteTree', 'restrictedViewLoggedInUsers');
$parent = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'restrictedViewLoggedInUsers');
$parent->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$page = $this->objFromFixture('SiteTree', 'inheritRestrictedView');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'inheritRestrictedView');
$page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$results = $sf->getResults(null, array('Search'=>'inheritRestrictedView'));
$this->assertNotContains(
@ -215,9 +218,9 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testDisabledShowInSearchFlagNotIncludedForSiteTree() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$page = $this->objFromFixture('SiteTree', 'dontShowInSearchPage');
$page = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'dontShowInSearchPage');
$results = $sf->getResults(null, array('Search'=>'dontShowInSearchPage'));
$this->assertNotContains(
$page->ID,
@ -229,7 +232,7 @@ class ZZZSearchFormTest extends FunctionalTest {
public function testDisabledShowInSearchFlagNotIncludedForFiles() {
if(!$this->checkFulltextSupport()) return;
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$dontShowInSearchFile = $this->objFromFixture('File', 'dontShowInSearchFile');
$dontShowInSearchFile->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
@ -258,9 +261,9 @@ class ZZZSearchFormTest extends FunctionalTest {
$this->markTestSkipped("PostgreSQLDatabase doesn't support entity-encoded searches");
}
$sf = new SearchForm($this->mockController, 'SearchForm');
$sf = new SearchForm($this->mockController, 'SilverStripe\\CMS\\Search\\SearchForm');
$pageWithSpecialChars = $this->objFromFixture('SiteTree', 'pageWithSpecialChars');
$pageWithSpecialChars = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'pageWithSpecialChars');
$pageWithSpecialChars->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$results = $sf->getResults(null, array('Search'=>'Brötchen'));

20
tests/tasks/MigrateSiteTreeLinkingTaskTest.php
View File

@ -25,11 +25,11 @@ class MigrateSiteTreeLinkingTaskTest extends SapphireTest {
);
ob_end_clean();
$homeID = $this->idFromFixture('SiteTree', 'home');
$aboutID = $this->idFromFixture('SiteTree', 'about');
$staffID = $this->idFromFixture('SiteTree', 'staff');
$actionID = $this->idFromFixture('SiteTree', 'action');
$hashID = $this->idFromFixture('SiteTree', 'hash_link');
$homeID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home');
$aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about');
$staffID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'staff');
$actionID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'action');
$hashID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'hash_link');
$homeContent = sprintf (
'<a href="[sitetree_link,id=%d]">About</a><a href="[sitetree_link,id=%d]">Staff</a><a href="http://silverstripe.org/">External Link</a><a name="anchor"></a>',
@ -57,25 +57,25 @@ class MigrateSiteTreeLinkingTaskTest extends SapphireTest {
$this->assertEquals (
$homeContent,
DataObject::get_by_id('SiteTree', $homeID)->Content,
DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $homeID)->Content,
'HTML URLSegment links are rewritten.'
);
$this->assertEquals (
$aboutContent,
DataObject::get_by_id('SiteTree', $aboutID)->Content
DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $aboutID)->Content
);
$this->assertEquals (
$staffContent,
DataObject::get_by_id('SiteTree', $staffID)->Content
DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $staffID)->Content
);
$this->assertEquals (
$actionContent,
DataObject::get_by_id('SiteTree', $actionID)->Content,
DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $actionID)->Content,
'Links to actions on pages are rewritten correctly.'
);
$this->assertEquals (
$hashLinkContent,
DataObject::get_by_id('SiteTree', $hashID)->Content,
DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $hashID)->Content,
'Hash/anchor links are correctly handled.'
);
}