@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | * @param mixed $data Data context |
649 | 649 | * @param array $arguments Additional arguments |
650 | 650 | * @param Object $scope |
651 | - * @return string Evaluated result |
|
651 | + * @return DBHTMLText Evaluated result |
|
652 | 652 | */ |
653 | 653 | public static function execute_template($template, $data, $arguments = null, $scope = null) |
654 | 654 | { |
@@ -676,6 +676,9 @@ discard block |
||
676 | 676 | return $v->process($data, $arguments); |
677 | 677 | } |
678 | 678 | |
679 | + /** |
|
680 | + * @param string $content |
|
681 | + */ |
|
679 | 682 | public function parseTemplateContent($content, $template = "") |
680 | 683 | { |
681 | 684 | return $this->getParser()->compileString( |
@@ -30,6 +30,9 @@ |
||
30 | 30 | */ |
31 | 31 | protected $cacheTemplate; |
32 | 32 | |
33 | + /** |
|
34 | + * @param string $content |
|
35 | + */ |
|
33 | 36 | public function __construct($content, TemplateParser $parser = null) |
34 | 37 | { |
35 | 38 | if ($parser) { |
@@ -238,7 +238,7 @@ |
||
238 | 238 | |
239 | 239 | /** |
240 | 240 | * @param array $properties |
241 | - * @return string |
|
241 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
242 | 242 | */ |
243 | 243 | public function Field($properties = array()) |
244 | 244 | { |
@@ -97,7 +97,6 @@ |
||
97 | 97 | * for each of these categories |
98 | 98 | * |
99 | 99 | * @param string $category Category name |
100 | - * @param string,... $categories Additional category names |
|
101 | 100 | * @return $this |
102 | 101 | */ |
103 | 102 | public function setAllowedFileCategories($category) |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * greater than or equal to this version, a message will be raised |
76 | 76 | * |
77 | 77 | * @static |
78 | - * @param $ver string - |
|
78 | + * @param string $ver string - |
|
79 | 79 | * A php standard version string, see http://php.net/manual/en/function.version-compare.php for details. |
80 | 80 | * @param null $forModule string - |
81 | 81 | * The name of a module. The passed version will be used as the check value for |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | /** |
142 | 142 | * Determine if deprecation notices should be displayed |
143 | 143 | * |
144 | - * @return bool |
|
144 | + * @return boolean|string |
|
145 | 145 | */ |
146 | 146 | public static function get_enabled() |
147 | 147 | { |
@@ -38,6 +38,7 @@ |
||
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Get Mink session from MinkContext |
41 | + * @return \Behat\Mink\Session |
|
41 | 42 | */ |
42 | 43 | public function getSession($name = null) |
43 | 44 | { |
@@ -135,12 +135,12 @@ discard block |
||
135 | 135 | |
136 | 136 | /** |
137 | 137 | * Email constructor. |
138 | - * @param string|array|null $from |
|
139 | - * @param string|array|null $to |
|
138 | + * @param string $from |
|
139 | + * @param string $to |
|
140 | 140 | * @param string|null $subject |
141 | 141 | * @param string|null $body |
142 | - * @param string|array|null $cc |
|
143 | - * @param string|array|null $bcc |
|
142 | + * @param string $cc |
|
143 | + * @param string $bcc |
|
144 | 144 | * @param string|null $returnPath |
145 | 145 | */ |
146 | 146 | public function __construct( |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
229 | - * @param string|array $address |
|
229 | + * @param string $address |
|
230 | 230 | * @param string|null $name |
231 | 231 | * @return $this |
232 | 232 | */ |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | } |
239 | 239 | |
240 | 240 | /** |
241 | - * @return array |
|
241 | + * @return string |
|
242 | 242 | */ |
243 | 243 | public function getSender() |
244 | 244 | { |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | } |
304 | 304 | |
305 | 305 | /** |
306 | - * @param string|array $address |
|
306 | + * @param string $address |
|
307 | 307 | * @param string|null $name |
308 | 308 | * @return $this |
309 | 309 | */ |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | } |
336 | 336 | |
337 | 337 | /** |
338 | - * @param string|array $address |
|
338 | + * @param string $address |
|
339 | 339 | * @param string|null $name |
340 | 340 | * @return $this |
341 | 341 | */ |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
370 | - * @param string|array $address |
|
370 | + * @param string $address |
|
371 | 371 | * @param string|null $name |
372 | 372 | * @return $this |
373 | 373 | */ |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | } |
385 | 385 | |
386 | 386 | /** |
387 | - * @param string|array $address |
|
387 | + * @param string $address |
|
388 | 388 | * @param string|null $name |
389 | 389 | * @return $this |
390 | 390 | */ |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | } |
397 | 397 | |
398 | 398 | /** |
399 | - * @param string|array $address |
|
399 | + * @param string $address |
|
400 | 400 | * @param string|null $name |
401 | 401 | * @return $this |
402 | 402 | */ |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | } |
503 | 503 | |
504 | 504 | /** |
505 | - * @param string|array $name The data name to add or array to names => value |
|
505 | + * @param string $name The data name to add or array to names => value |
|
506 | 506 | * @param string|null $value The value of the data to add |
507 | 507 | * @return $this |
508 | 508 | */ |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | } |
673 | 673 | |
674 | 674 | /** |
675 | - * @return array|bool |
|
675 | + * @return boolean |
|
676 | 676 | */ |
677 | 677 | public function sendPlain() |
678 | 678 | { |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | } |
729 | 729 | |
730 | 730 | /** |
731 | - * @return Swift_MimePart|false |
|
731 | + * @return \Swift_Mime_MimeEntity |
|
732 | 732 | */ |
733 | 733 | public function findPlainPart() |
734 | 734 | { |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | /** |
156 | 156 | * |
157 | 157 | * @param GridField $gridField |
158 | - * @return array |
|
158 | + * @return string[] |
|
159 | 159 | */ |
160 | 160 | public function getActions($gridField) |
161 | 161 | { |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | * |
220 | 220 | * @param GridField $gridField |
221 | 221 | * @param HTTPRequest $request |
222 | - * @return string |
|
222 | + * @return HTTPResponse |
|
223 | 223 | */ |
224 | 224 | public function doSearch($gridField, $request) |
225 | 225 | { |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
302 | - * @param array $fields |
|
302 | + * @param string[] $fields |
|
303 | 303 | * @return $this |
304 | 304 | */ |
305 | 305 | public function setSearchFields($fields) |
@@ -33,6 +33,10 @@ discard block |
||
33 | 33 | */ |
34 | 34 | protected $underlay; |
35 | 35 | |
36 | + /** |
|
37 | + * @param ViewableData $item |
|
38 | + * @param ViewableData $inheritedScope |
|
39 | + */ |
|
36 | 40 | public function __construct($item, $overlay = null, $underlay = null, $inheritedScope = null) |
37 | 41 | { |
38 | 42 | parent::__construct($item, $inheritedScope); |
@@ -65,6 +69,9 @@ discard block |
||
65 | 69 | $this->underlay = $underlay ? $underlay : array(); |
66 | 70 | } |
67 | 71 | |
72 | + /** |
|
73 | + * @param string $variableMethod |
|
74 | + */ |
|
68 | 75 | protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false) |
69 | 76 | { |
70 | 77 | $implementers = ClassInfo::implementorsOf($interfaceToQuery); |