Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

API CHANGE Changed name from DataObjectSet to either ArrayList or Dat…

…aList
  • Loading branch information...
commit d799c80cc52ba08d3bf46a06ec3b6466fcf973c9 1 parent 05e9083
@slindqvist slindqvist authored stojg committed
View
4 code/controller/SilverStripeNavigator.php
@@ -31,7 +31,7 @@ function __construct($record) {
}
/**
- * @return DataObjectSet of SilverStripeNavigatorItem
+ * @return SS_List of SilverStripeNavigatorItem
*/
function getItems() {
$items = array();
@@ -59,7 +59,7 @@ function getItems() {
}
ksort($items);
- return new DataObjectSet($items);
+ return new ArrayList($items);
}
/**
View
2  code/controllers/CMSMain.php
@@ -284,7 +284,7 @@ public function generateTreeStylingJS() {
* Populates an array of classes in the CMS
* which allows the user to change the page type.
*
- * @return DataObjectSet
+ * @return SS_List
*/
public function PageTypes() {
$classes = SiteTree::page_type_classes();
View
6 code/controllers/ContentController.php
@@ -65,7 +65,7 @@ public function Link($action = null) {
* Return the children of a given page. The parent reference can either be a page link or an ID.
*
* @param string|int $parentRef
- * @return DataObjectSet
+ * @return SS_List
*/
public function ChildrenOf($parentRef) {
$parent = SiteTree::get_by_link($parentRef);
@@ -78,7 +78,7 @@ public function ChildrenOf($parentRef) {
}
/**
- * @return DataObjectSet
+ * @return SS_List
*/
public function Page($link) {
return SiteTree::get_by_link($link);
@@ -283,7 +283,7 @@ public function data() {
/**
* Returns a fixed navigation menu of the given level.
- * @return DataObjectSet
+ * @return SS_List
*/
public function getMenu($level = 1) {
if($level == 1) {
View
2  code/model/SiteTree.php
@@ -1670,7 +1670,7 @@ function DependentPages($includeVirtuals = true) {
// Content links
$items = new ArrayList();
- // We merge all into a regular DataObjectSet, because DataList doesn't support merge
+ // We merge all into a regular SS_List, because DataList doesn't support merge
if($contentLinks = $this->BackLinkTracking()) {
foreach($contentLinks as $item) $item->DependentLinkType = 'Content link';
$items->merge($contentLinks);
View
4 code/reports/Report.php
@@ -9,7 +9,7 @@
*
* {@link title()}: Return the title - i18n is your responsibility
* {@link description()}: Return the description - i18n is your responsibility
- * {@link sourceQuery()}: Return a DataObjectSet of the search results
+ * {@link sourceQuery()}: Return a SS_List of the search results
* {@link columns()}: Return information about the columns in this report.
* {@link parameterFields()}: Return a FieldList of the fields that can be used to filter this
* report.
@@ -116,7 +116,7 @@ function sourceQuery($params) {
}
/**
- * Return a DataObjectSet records for this report.
+ * Return a SS_List records for this report.
*/
function records($params) {
if($this->hasMethod('sourceRecords')) return $this->sourceRecords($params, null, null);
View
2  code/widgets/WidgetArea.php
@@ -26,7 +26,7 @@ class WidgetArea extends DataObject {
* it easier to access and process form logic
* and actions stored in {@link Widget_Controller}.
*
- * @return DataObjectSet Collection of {@link Widget_Controller}
+ * @return SS_List Collection of {@link Widget_Controller}
*/
function WidgetControllers() {
$controllers = new ArrayList();
View
2  tasks/RemoveOrphanedPagesTask.php
@@ -319,7 +319,7 @@ protected function rebaseOrphans($orphanIDs) {
* @param string $sort
* @param string $join
* @param int|array $limit
- * @return DataObjectSet
+ * @return SS_List
*/
function getOrphanedPages($class = 'SiteTree', $filter = '', $sort = null, $join = null, $limit = null) {
$filter .= ($filter) ? ' AND ' : '';
Please sign in to comment.
Something went wrong with that request. Please try again.