@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * |
| 49 | 49 | * @param array|string|resource $streamOrUrl Stream or URL to open as a stream |
| 50 | 50 | * @param string|null $mode Mode, only applicable if a URL is given |
| 51 | - * @return void |
|
| 51 | + * @return null|Zend_Log_Writer_Abstract |
|
| 52 | 52 | * @throws Zend_Log_Exception |
| 53 | 53 | */ |
| 54 | 54 | public function __construct($streamOrUrl, $mode = null) |
@@ -49,6 +49,7 @@ discard block |
||
| 49 | 49 | * while automatically busting this cache every time the file is changed. |
| 50 | 50 | * |
| 51 | 51 | * @param bool |
| 52 | + * @param boolean $var |
|
| 52 | 53 | */ |
| 53 | 54 | public static function set_suffix_requirements($var) { |
| 54 | 55 | self::backend()->set_suffix_requirements($var); |
@@ -109,7 +110,7 @@ discard block |
||
| 109 | 110 | /** |
| 110 | 111 | * Return all registered custom scripts |
| 111 | 112 | * |
| 112 | - * @return array |
|
| 113 | + * @return string |
|
| 113 | 114 | */ |
| 114 | 115 | public static function get_custom_scripts() { |
| 115 | 116 | return self::backend()->get_custom_scripts(); |
@@ -517,7 +518,7 @@ discard block |
||
| 517 | 518 | /** |
| 518 | 519 | * Enable or disable the combination of CSS and JavaScript files |
| 519 | 520 | * |
| 520 | - * @param $enable |
|
| 521 | + * @param boolean $enable |
|
| 521 | 522 | */ |
| 522 | 523 | public function set_combined_files_enabled($enable) { |
| 523 | 524 | $this->combined_files_enabled = (bool) $enable; |
@@ -585,6 +586,7 @@ discard block |
||
| 585 | 586 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
| 586 | 587 | * |
| 587 | 588 | * @param bool |
| 589 | + * @param boolean $var |
|
| 588 | 590 | */ |
| 589 | 591 | public function set_force_js_to_bottom($var) { |
| 590 | 592 | $this->force_js_to_bottom = $var; |
@@ -624,7 +626,7 @@ discard block |
||
| 624 | 626 | /** |
| 625 | 627 | * Return all registered custom scripts |
| 626 | 628 | * |
| 627 | - * @return array |
|
| 629 | + * @return string |
|
| 628 | 630 | */ |
| 629 | 631 | public function get_custom_scripts() { |
| 630 | 632 | $requirements = ""; |
@@ -1037,7 +1039,7 @@ discard block |
||
| 1037 | 1039 | * @param array $files Array of filenames relative to docroot |
| 1038 | 1040 | * @param string $media |
| 1039 | 1041 | * |
| 1040 | - * @return bool|void |
|
| 1042 | + * @return false|null |
|
| 1041 | 1043 | */ |
| 1042 | 1044 | public function combine_files($combinedFileName, $files, $media = null) { |
| 1043 | 1045 | // duplicate check |
@@ -306,6 +306,9 @@ discard block |
||
| 306 | 306 | return new SSViewer($templates); |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | + /** |
|
| 310 | + * @param string $action |
|
| 311 | + */ |
|
| 309 | 312 | public function hasAction($action) { |
| 310 | 313 | return parent::hasAction($action) || $this->hasActionTemplate($action); |
| 311 | 314 | } |
@@ -369,7 +372,7 @@ discard block |
||
| 369 | 372 | * by {@link getViewer()}. |
| 370 | 373 | * |
| 371 | 374 | * @param array $params Key-value array for custom template variables (Optional) |
| 372 | - * @return string Parsed template content |
|
| 375 | + * @return HTMLText Parsed template content |
|
| 373 | 376 | */ |
| 374 | 377 | public function render($params = null) { |
| 375 | 378 | $template = $this->getViewer($this->getAction()); |
@@ -394,6 +397,7 @@ discard block |
||
| 394 | 397 | /** |
| 395 | 398 | * Returns the current controller |
| 396 | 399 | * @returns Controller |
| 400 | + * @return Controller |
|
| 397 | 401 | */ |
| 398 | 402 | public static function curr() { |
| 399 | 403 | if(Controller::$controller_stack) { |
@@ -525,7 +529,7 @@ discard block |
||
| 525 | 529 | |
| 526 | 530 | /** |
| 527 | 531 | * Tests whether a redirection has been requested. |
| 528 | - * @return string If redirect() has been called, it will return the URL redirected to. Otherwise, it will |
|
| 532 | + * @return boolean If redirect() has been called, it will return the URL redirected to. Otherwise, it will |
|
| 529 | 533 | * return null; |
| 530 | 534 | */ |
| 531 | 535 | public function redirectedTo() { |
@@ -94,6 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * @param string |
| 97 | + * @param string $tag |
|
| 97 | 98 | */ |
| 98 | 99 | public function setTag($tag) { |
| 99 | 100 | $this->tag = $tag; |
@@ -110,6 +111,7 @@ discard block |
||
| 110 | 111 | |
| 111 | 112 | /** |
| 112 | 113 | * @param string |
| 114 | + * @param string $legend |
|
| 113 | 115 | */ |
| 114 | 116 | public function setLegend($legend) { |
| 115 | 117 | $this->legend = $legend; |
@@ -200,6 +202,9 @@ discard block |
||
| 200 | 202 | return false; |
| 201 | 203 | } |
| 202 | 204 | |
| 205 | + /** |
|
| 206 | + * @param string $name |
|
| 207 | + */ |
|
| 203 | 208 | public function fieldByName($name) { |
| 204 | 209 | return $this->children->fieldByName($name); |
| 205 | 210 | } |
@@ -306,6 +311,7 @@ discard block |
||
| 306 | 311 | * the children collection. Doesn't work recursively. |
| 307 | 312 | * |
| 308 | 313 | * @param string|FormField |
| 314 | + * @param string $field |
|
| 309 | 315 | * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't |
| 310 | 316 | * be found. |
| 311 | 317 | */ |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @param string $name The internal field name, passed to forms. |
| 47 | 47 | * @param string $title The human-readable field label. |
| 48 | - * @param mixed $value The value of the field. |
|
| 48 | + * @param integer $value The value of the field. |
|
| 49 | 49 | * @param string $config HTMLEditorConfig identifier to be used. Default to the active one. |
| 50 | 50 | */ |
| 51 | 51 | public function __construct($name, $title = null, $value = '', $config = null) { |
@@ -169,6 +169,9 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | protected $controller, $name; |
| 171 | 171 | |
| 172 | + /** |
|
| 173 | + * @param string $name |
|
| 174 | + */ |
|
| 172 | 175 | public function __construct($controller, $name) { |
| 173 | 176 | parent::__construct(); |
| 174 | 177 | |
@@ -197,7 +200,7 @@ discard block |
||
| 197 | 200 | /** |
| 198 | 201 | * Searches the SiteTree for display in the dropdown |
| 199 | 202 | * |
| 200 | - * @return callback |
|
| 203 | + * @return DataList |
|
| 201 | 204 | */ |
| 202 | 205 | public function siteTreeSearchCallback($sourceObject, $labelField, $search) { |
| 203 | 206 | return DataObject::get($sourceObject)->filterAny(array( |
@@ -559,7 +562,7 @@ discard block |
||
| 559 | 562 | /** |
| 560 | 563 | * Find all anchors available on the given page. |
| 561 | 564 | * |
| 562 | - * @return array |
|
| 565 | + * @return string |
|
| 563 | 566 | */ |
| 564 | 567 | public function getanchors() { |
| 565 | 568 | $id = (int)$this->getRequest()->getVar('PageID'); |
@@ -597,6 +600,7 @@ discard block |
||
| 597 | 600 | * not the "master record" in the database - hence there's no form or saving logic. |
| 598 | 601 | * |
| 599 | 602 | * @param String Relative or absolute URL to file |
| 603 | + * @param HtmlEditorField_File $file |
|
| 600 | 604 | * @return FieldList |
| 601 | 605 | */ |
| 602 | 606 | protected function getFieldsForFile($url, $file) { |
@@ -618,6 +622,7 @@ discard block |
||
| 618 | 622 | } |
| 619 | 623 | |
| 620 | 624 | /** |
| 625 | + * @param HtmlEditorField_Embed $file |
|
| 621 | 626 | * @return FieldList |
| 622 | 627 | */ |
| 623 | 628 | protected function getFieldsForOembed($url, $file) { |
@@ -827,6 +832,7 @@ discard block |
||
| 827 | 832 | |
| 828 | 833 | /** |
| 829 | 834 | * @param Int |
| 835 | + * @param integer $parentID |
|
| 830 | 836 | * @return DataList |
| 831 | 837 | */ |
| 832 | 838 | protected function getFiles($parentID = null) { |
@@ -29,8 +29,6 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * @param string $name Identifier |
| 32 | - * @param string $title (Optional) Natural language title of the tabset |
|
| 33 | - * @param Tab|TabSet $unknown All further parameters are inserted as children into the TabSet |
|
| 34 | 32 | */ |
| 35 | 33 | public function __construct($name) { |
| 36 | 34 | $args = func_get_args(); |
@@ -148,8 +146,8 @@ discard block |
||
| 148 | 146 | /** |
| 149 | 147 | * Inserts a field before a particular field in a FieldList. |
| 150 | 148 | * |
| 151 | - * @param FormField $item The form field to insert |
|
| 152 | - * @param string $name Name of the field to insert before |
|
| 149 | + * @param TextField $insertBefore |
|
| 150 | + * @param string $field |
|
| 153 | 151 | */ |
| 154 | 152 | public function insertBefore($insertBefore, $field) { |
| 155 | 153 | parent::insertBefore($insertBefore, $field); |
@@ -157,6 +155,10 @@ discard block |
||
| 157 | 155 | $this->sequentialSet = null; |
| 158 | 156 | } |
| 159 | 157 | |
| 158 | + /** |
|
| 159 | + * @param TextField $insertAfter |
|
| 160 | + * @param string $field |
|
| 161 | + */ |
|
| 160 | 162 | public function insertAfter($insertAfter, $field) { |
| 161 | 163 | parent::insertAfter($insertAfter, $field); |
| 162 | 164 | if($field instanceof Tab) $field->setTabSet($this); |
@@ -5,10 +5,16 @@ |
||
| 5 | 5 | return parent::viewfile_getLocalFileByID($id); |
| 6 | 6 | } |
| 7 | 7 | |
| 8 | + /** |
|
| 9 | + * @param string $fileUrl |
|
| 10 | + */ |
|
| 8 | 11 | public function viewfile_getLocalFileByURL($fileUrl) { |
| 9 | 12 | return parent::viewfile_getLocalFileByURL($fileUrl); |
| 10 | 13 | } |
| 11 | 14 | |
| 15 | + /** |
|
| 16 | + * @param string $fileUrl |
|
| 17 | + */ |
|
| 12 | 18 | public function viewfile_getRemoteFileByURL($fileUrl) { |
| 13 | 19 | return parent::viewfile_getRemoteFileByURL($fileUrl); |
| 14 | 20 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)") |
| 234 | 234 | * |
| 235 | 235 | * @param string $field |
| 236 | - * @return array |
|
| 236 | + * @return string |
|
| 237 | 237 | */ |
| 238 | 238 | public function castingHelperPair($field) { |
| 239 | 239 | Deprecation::notice('2.5', 'use castingHelper() instead'); |
@@ -485,6 +485,7 @@ discard block |
||
| 485 | 485 | |
| 486 | 486 | /** |
| 487 | 487 | * Return the value of a field in an SQL-safe format. |
| 488 | + * @param string $field |
|
| 488 | 489 | */ |
| 489 | 490 | public function SQL_val($field, $arguments = null, $cache = true) { |
| 490 | 491 | return Convert::raw2sql($this->RAW_val($field, $arguments, $cache)); |
@@ -492,6 +493,7 @@ discard block |
||
| 492 | 493 | |
| 493 | 494 | /** |
| 494 | 495 | * Return the value of a field in a JavaScript-save format. |
| 496 | + * @param string $field |
|
| 495 | 497 | */ |
| 496 | 498 | public function JS_val($field, $arguments = null, $cache = true) { |
| 497 | 499 | return Convert::raw2js($this->RAW_val($field, $arguments, $cache)); |
@@ -499,6 +501,7 @@ discard block |
||
| 499 | 501 | |
| 500 | 502 | /** |
| 501 | 503 | * Return the value of a field escaped suitable to be inserted into an XML node attribute. |
| 504 | + * @param string $field |
|
| 502 | 505 | */ |
| 503 | 506 | public function ATT_val($field, $arguments = null, $cache = true) { |
| 504 | 507 | return Convert::raw2att($this->RAW_val($field, $arguments, $cache)); |
@@ -509,7 +512,6 @@ discard block |
||
| 509 | 512 | /** |
| 510 | 513 | * Get an array of XML-escaped values by field name |
| 511 | 514 | * |
| 512 | - * @param array $elements an array of field names |
|
| 513 | 515 | * @return array |
| 514 | 516 | */ |
| 515 | 517 | public function getXMLValues($fields) { |
@@ -732,6 +732,9 @@ discard block |
||
| 732 | 732 | return $result; |
| 733 | 733 | } |
| 734 | 734 | |
| 735 | + /** |
|
| 736 | + * @param string $mode |
|
| 737 | + */ |
|
| 735 | 738 | protected function _get($dir, $mode, $tags = array()) |
| 736 | 739 | { |
| 737 | 740 | if (!is_dir($dir)) { |
@@ -819,6 +822,7 @@ discard block |
||
| 819 | 822 | /** |
| 820 | 823 | * Compute & return the expire time |
| 821 | 824 | * |
| 825 | + * @param integer $lifetime |
|
| 822 | 826 | * @return int expire time (unix timestamp) |
| 823 | 827 | */ |
| 824 | 828 | protected function _expireTime($lifetime) |