@@ -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) |
@@ -108,7 +108,7 @@ |
||
108 | 108 | * Return a date and time formatted as per a CMS user's settings. |
109 | 109 | * |
110 | 110 | * @param Member $member |
111 | - * @return boolean | string A time and date pair formatted as per user-defined settings. |
|
111 | + * @return false|string | string A time and date pair formatted as per user-defined settings. |
|
112 | 112 | */ |
113 | 113 | public function FormatFromSettings($member = null) { |
114 | 114 | require_once 'Zend/Date.php'; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * Returns a <select> tag containing all the appropriate <option> tags |
60 | 60 | * |
61 | 61 | * @param array $properties |
62 | - * @return string |
|
62 | + * @return HTMLText |
|
63 | 63 | */ |
64 | 64 | public function Field($properties = array()) { |
65 | 65 | $properties = array_merge($properties, array( |
@@ -52,6 +52,7 @@ discard block |
||
52 | 52 | * Create a new UnsavedRelationList |
53 | 53 | * |
54 | 54 | * @param string $dataClass The DataObject class used in the relation |
55 | + * @param string $relationName |
|
55 | 56 | */ |
56 | 57 | public function __construct($baseClass, $relationName, $dataClass) { |
57 | 58 | $this->baseClass = $baseClass; |
@@ -144,7 +145,7 @@ discard block |
||
144 | 145 | * Add a number of items to the relation. |
145 | 146 | * |
146 | 147 | * @param array $items Items to add, as either DataObjects or IDs. |
147 | - * @return DataList |
|
148 | + * @return UnsavedRelationList |
|
148 | 149 | */ |
149 | 150 | public function addMany($items) { |
150 | 151 | foreach($items as $item) { |
@@ -37,6 +37,9 @@ discard block |
||
37 | 37 | ] |
38 | 38 | ); |
39 | 39 | |
40 | + /** |
|
41 | + * @param string $root |
|
42 | + */ |
|
40 | 43 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) { |
41 | 44 | // Get root path |
42 | 45 | $root = $this->findRoot($root); |
@@ -117,7 +120,7 @@ discard block |
||
117 | 120 | * Render server configuration file from a template file |
118 | 121 | * |
119 | 122 | * @param string $template |
120 | - * @return \HTMLText Rendered results |
|
123 | + * @return string Rendered results |
|
121 | 124 | */ |
122 | 125 | protected function renderTemplate($template) { |
123 | 126 | // Build allowed extensions |
@@ -42,7 +42,7 @@ |
||
42 | 42 | * Provide secure downloadable |
43 | 43 | * |
44 | 44 | * @param string $path |
45 | - * @return string|null |
|
45 | + * @return string |
|
46 | 46 | */ |
47 | 47 | public function getProtectedUrl($path) { |
48 | 48 | // Public URLs are handled via a request handler within /assets. |
@@ -21,6 +21,7 @@ |
||
21 | 21 | /** |
22 | 22 | * Create a new ValidationResult. |
23 | 23 | * By default, it is a successful result. Call $this->error() to record errors. |
24 | + * @param string $message |
|
24 | 25 | */ |
25 | 26 | public function __construct($valid = true, $message = null) { |
26 | 27 | $this->isValid = $valid; |
@@ -625,6 +625,9 @@ discard block |
||
625 | 625 | } |
626 | 626 | |
627 | 627 | |
628 | + /** |
|
629 | + * @param string $fileID |
|
630 | + */ |
|
628 | 631 | public function getOriginalFilename($fileID) { |
629 | 632 | return parent::getOriginalFilename($fileID); |
630 | 633 | } |
@@ -633,6 +636,9 @@ discard block |
||
633 | 636 | return parent::removeVariant($fileID); |
634 | 637 | } |
635 | 638 | |
639 | + /** |
|
640 | + * @param null|string $variant |
|
641 | + */ |
|
636 | 642 | public function getDefaultConflictResolution($variant) { |
637 | 643 | return parent::getDefaultConflictResolution($variant); |
638 | 644 | } |
@@ -65,6 +65,7 @@ discard block |
||
65 | 65 | * while automatically busting this cache every time the file is changed. |
66 | 66 | * |
67 | 67 | * @param bool |
68 | + * @param boolean $var |
|
68 | 69 | */ |
69 | 70 | public static function set_suffix_requirements($var) { |
70 | 71 | self::backend()->setSuffixRequirements($var); |
@@ -329,7 +330,7 @@ discard block |
||
329 | 330 | * </code> |
330 | 331 | * |
331 | 332 | * @param string $combinedFileName Filename of the combined file relative to docroot |
332 | - * @param array $files Array of filenames relative to docroot |
|
333 | + * @param string[] $files Array of filenames relative to docroot |
|
333 | 334 | * @param string $media |
334 | 335 | * |
335 | 336 | * @return bool|void |
@@ -754,6 +755,7 @@ discard block |
||
754 | 755 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
755 | 756 | * |
756 | 757 | * @param bool |
758 | + * @param boolean $var |
|
757 | 759 | * @return $this |
758 | 760 | */ |
759 | 761 | public function setForceJSToBottom($var) { |
@@ -1611,8 +1613,8 @@ discard block |
||
1611 | 1613 | /** |
1612 | 1614 | * Given a filename and list of files, generate a new filename unique to these files |
1613 | 1615 | * |
1614 | - * @param string $name |
|
1615 | - * @param array $files |
|
1616 | + * @param array $fileList |
|
1617 | + * @param string $combinedFile |
|
1616 | 1618 | * @return string |
1617 | 1619 | */ |
1618 | 1620 | protected function hashedCombinedFilename($combinedFile, $fileList) { |