@@ -538,6 +538,10 @@ |
||
| 538 | 538 | return new Folder(); |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | + /** |
|
| 542 | + * @param string $childrenMethod |
|
| 543 | + * @param string $numChildrenMethod |
|
| 544 | + */ |
|
| 541 | 545 | public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) { |
| 542 | 546 | if (!$childrenMethod) $childrenMethod = 'ChildFolders'; |
| 543 | 547 | if (!$numChildrenMethod) $numChildrenMethod = 'numChildFolders'; |
@@ -283,6 +283,9 @@ discard block |
||
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | + /** |
|
| 287 | + * @param string $link |
|
| 288 | + */ |
|
| 286 | 289 | public function LinkWithSearch($link) { |
| 287 | 290 | // Whitelist to avoid side effects |
| 288 | 291 | $params = array( |
@@ -757,7 +760,7 @@ discard block |
||
| 757 | 760 | |
| 758 | 761 | /** |
| 759 | 762 | * @param SS_HTTPRequest $request |
| 760 | - * @return string HTML |
|
| 763 | + * @return DBHTMLText HTML |
|
| 761 | 764 | */ |
| 762 | 765 | public function treeview($request) { |
| 763 | 766 | return $this->renderWith($this->getTemplatesWithSuffix('_TreeView')); |
@@ -765,7 +768,7 @@ discard block |
||
| 765 | 768 | |
| 766 | 769 | /** |
| 767 | 770 | * @param SS_HTTPRequest $request |
| 768 | - * @return string HTML |
|
| 771 | + * @return DBHTMLText HTML |
|
| 769 | 772 | */ |
| 770 | 773 | public function listview($request) { |
| 771 | 774 | return $this->renderWith($this->getTemplatesWithSuffix('_ListView')); |
@@ -1078,7 +1081,7 @@ discard block |
||
| 1078 | 1081 | * Actually perform the publication step |
| 1079 | 1082 | * |
| 1080 | 1083 | * @param Versioned|DataObject $record |
| 1081 | - * @return mixed |
|
| 1084 | + * @return SS_HTTPResponse|null |
|
| 1082 | 1085 | */ |
| 1083 | 1086 | public function performPublish($record) { |
| 1084 | 1087 | if($record && !$record->canPublish()) { |
@@ -1232,7 +1235,7 @@ discard block |
||
| 1232 | 1235 | } |
| 1233 | 1236 | |
| 1234 | 1237 | /** |
| 1235 | - * @return array |
|
| 1238 | + * @return SS_HTTPResponse|null |
|
| 1236 | 1239 | */ |
| 1237 | 1240 | public function rollback() { |
| 1238 | 1241 | return $this->doRollback(array( |
@@ -17,8 +17,6 @@ discard block |
||
| 17 | 17 | use SilverStripe\Security\Permission; |
| 18 | 18 | use SilverStripe\Security\PermissionProvider; |
| 19 | 19 | use LeftAndMain; |
| 20 | - |
|
| 21 | - |
|
| 22 | 20 | use SS_HTTPRequest; |
| 23 | 21 | use Translatable; |
| 24 | 22 | use Requirements; |
@@ -27,15 +25,12 @@ discard block |
||
| 27 | 25 | use AdminRootController; |
| 28 | 26 | use Director; |
| 29 | 27 | use Page; |
| 30 | - |
|
| 31 | 28 | use TextField; |
| 32 | -use HeaderField; |
|
| 33 | 29 | use DateField; |
| 34 | 30 | use DropdownField; |
| 35 | 31 | use FieldGroup; |
| 36 | 32 | use FieldList; |
| 37 | 33 | use FormAction; |
| 38 | -use Object; |
|
| 39 | 34 | use Form; |
| 40 | 35 | use SS_Cache; |
| 41 | 36 | use Zend_Cache; |
@@ -56,7 +51,6 @@ discard block |
||
| 56 | 51 | use SS_HTTPResponse_Exception; |
| 57 | 52 | use Session; |
| 58 | 53 | use AddToCampaignHandler; |
| 59 | -use HTMLEditorField; |
|
| 60 | 54 | use SS_HTTPResponse; |
| 61 | 55 | use SilverStripe\CMS\Model\SiteTree; |
| 62 | 56 | use SilverStripe\CMS\Model\RedirectorPage; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * @param SS_HTTPRequest $request |
| 64 | - * @return array |
|
| 64 | + * @return SS_HTTPResponse |
|
| 65 | 65 | */ |
| 66 | 66 | public function show($request) { |
| 67 | 67 | $form = $this->ShowVersionForm($request->param('VersionID')); |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * @param SS_HTTPRequest $request |
| 83 | - * @return array |
|
| 83 | + * @return SS_HTTPResponse |
|
| 84 | 84 | */ |
| 85 | 85 | public function compare($request) { |
| 86 | 86 | $form = $this->CompareVersionsForm( |
@@ -17,9 +17,7 @@ |
||
| 17 | 17 | use SilverStripe\Security\Permission; |
| 18 | 18 | use Controller; |
| 19 | 19 | use Page; |
| 20 | - |
|
| 21 | 20 | use SiteConfig; |
| 22 | -use Config; |
|
| 23 | 21 | use SS_HTTPRequest; |
| 24 | 22 | use Translatable; |
| 25 | 23 | use i18n; |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | protected $record; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * @param DataObject|CMSPreviewable $record |
|
| 23 | + * @param CMSPreviewable $record |
|
| 24 | 24 | */ |
| 25 | 25 | public function __construct(CMSPreviewable $record) { |
| 26 | 26 | parent::__construct(); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | protected $record; |
| 107 | 107 | |
| 108 | 108 | /** |
| 109 | - * @param DataObject|CMSPreviewable $record |
|
| 109 | + * @param CMSPreviewable $record |
|
| 110 | 110 | */ |
| 111 | 111 | public function __construct(CMSPreviewable $record) { |
| 112 | 112 | parent::__construct(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | public function getMessage() {} |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | - * @return DataObject |
|
| 152 | + * @return CMSPreviewable |
|
| 153 | 153 | */ |
| 154 | 154 | public function getRecord() { |
| 155 | 155 | return $this->record; |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use ClassInfo; |
| 14 | 14 | use LeftAndMain; |
| 15 | 15 | use Controller; |
| 16 | - |
|
| 17 | 16 | use SiteTreeFutureState; |
| 18 | 17 | use SilverStripe\CMS\Model\RedirectorPage; |
| 19 | 18 | |
@@ -118,6 +118,9 @@ |
||
| 118 | 118 | return $this->defaultUrl; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | + /** |
|
| 122 | + * @param string $url |
|
| 123 | + */ |
|
| 121 | 124 | public function setDefaultURL($url) { |
| 122 | 125 | $this->defaultUrl = $url; |
| 123 | 126 | return $this; |
@@ -252,7 +252,7 @@ |
||
| 252 | 252 | /** |
| 253 | 253 | * Write out the published version of the page to the filesystem |
| 254 | 254 | * |
| 255 | - * @return true if the page write was successful |
|
| 255 | + * @return boolean if the page write was successful |
|
| 256 | 256 | */ |
| 257 | 257 | public function writeStaticPage() { |
| 258 | 258 | if(!self::config()->enable_static_file) { |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | * @param boolean $unlinked Whether to link page titles. |
| 750 | 750 | * @param boolean|string $stopAtPageType ClassName of a page to stop the upwards traversal. |
| 751 | 751 | * @param boolean $showHidden Include pages marked with the attribute ShowInMenus = 0 |
| 752 | - * @return string The breadcrumb trail. |
|
| 752 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText The breadcrumb trail. |
|
| 753 | 753 | */ |
| 754 | 754 | public function Breadcrumbs($maxDepth = 20, $unlinked = false, $stopAtPageType = false, $showHidden = false) { |
| 755 | 755 | $pages = $this->getBreadcrumbItems($maxDepth, $stopAtPageType, $showHidden); |
@@ -1343,7 +1343,7 @@ discard block |
||
| 1343 | 1343 | /** |
| 1344 | 1344 | * Get the 'can edit' information for a number of SiteTree pages. |
| 1345 | 1345 | * |
| 1346 | - * @param array $ids An array of IDs of the SiteTree pages to look up |
|
| 1346 | + * @param integer[] $ids An array of IDs of the SiteTree pages to look up |
|
| 1347 | 1347 | * @param int $memberID ID of member |
| 1348 | 1348 | * @param bool $useCached Return values from the permission cache if they exist |
| 1349 | 1349 | * @return array |
@@ -341,6 +341,9 @@ |
||
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | + /** |
|
| 345 | + * @param string $field |
|
| 346 | + */ |
|
| 344 | 347 | public function getField($field) { |
| 345 | 348 | if($this->isFieldVirtualised($field)) { |
| 346 | 349 | return $this->CopyContentFrom()->getField($field); |