@@ -36,6 +36,9 @@ discard block |
||
36 | 36 | $this->error = (bool)$error; |
37 | 37 | } |
38 | 38 | |
39 | + /** |
|
40 | + * @param boolean $suppression |
|
41 | + */ |
|
39 | 42 | public function setSuppression($suppression) { |
40 | 43 | $this->suppression = (bool)$suppression; |
41 | 44 | if ($this->handleFatalErrors) ini_set('display_errors', !$suppression); |
@@ -61,10 +64,16 @@ discard block |
||
61 | 64 | return $this->then($callback, false); |
62 | 65 | } |
63 | 66 | |
67 | + /** |
|
68 | + * @param Closure $callback |
|
69 | + */ |
|
64 | 70 | public function thenIfErrored($callback) { |
65 | 71 | return $this->then($callback, true); |
66 | 72 | } |
67 | 73 | |
74 | + /** |
|
75 | + * @param Closure $callback |
|
76 | + */ |
|
68 | 77 | public function thenAlways($callback) { |
69 | 78 | return $this->then($callback, null); |
70 | 79 | } |
@@ -245,6 +245,9 @@ discard block |
||
245 | 245 | return $this; |
246 | 246 | } |
247 | 247 | |
248 | + /** |
|
249 | + * @param string $type |
|
250 | + */ |
|
248 | 251 | protected function invokeCallbacks($type, $args = array()) { |
249 | 252 | foreach($this->callbacks[$type] as $callback) { |
250 | 253 | call_user_func_array($callback, $args); |
@@ -255,7 +258,6 @@ discard block |
||
255 | 258 | * Parse a value from a fixture file. If it starts with => |
256 | 259 | * it will get an ID from the fixture dictionary |
257 | 260 | * |
258 | - * @param String $fieldVal |
|
259 | 261 | * @param Array $fixtures See {@link createObject()} |
260 | 262 | * @return String Fixture database ID, or the original value |
261 | 263 | */ |
@@ -282,6 +284,9 @@ discard block |
||
282 | 284 | $obj->$name = $this->parseValue($value, $fixtures); |
283 | 285 | } |
284 | 286 | |
287 | + /** |
|
288 | + * @param string $fieldName |
|
289 | + */ |
|
285 | 290 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
286 | 291 | $table = ClassInfo::table_for_object_field(get_class($obj), $fieldName); |
287 | 292 | $value = $this->parseValue($value, $fixtures); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | /** |
47 | 47 | * Get the database version for the MySQL connection, given the |
48 | 48 | * database parameters. |
49 | - * @return mixed string Version number as string | boolean FALSE on failure |
|
49 | + * @return string string Version number as string | boolean FALSE on failure |
|
50 | 50 | */ |
51 | 51 | public function getDatabaseVersion($databaseConfig) { |
52 | 52 | $conn = new MySQLi($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password']); |
@@ -138,6 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | /** |
140 | 140 | * Set the manifest to be used to look up test classes by helper functions |
141 | + * @param SS_ClassManifest $manifest |
|
141 | 142 | */ |
142 | 143 | public static function set_test_class_manifest($manifest) { |
143 | 144 | self::$test_class_manifest = $manifest; |
@@ -389,7 +390,7 @@ discard block |
||
389 | 390 | /** |
390 | 391 | * Get the ID of an object from the fixture. |
391 | 392 | * |
392 | - * @param $className The data class, as specified in your fixture file. Parent classes won't work |
|
393 | + * @param string $className The data class, as specified in your fixture file. Parent classes won't work |
|
393 | 394 | * @param $identifier The identifier string, as provided in your fixture file |
394 | 395 | * @return int |
395 | 396 | */ |
@@ -412,7 +413,7 @@ discard block |
||
412 | 413 | * Will collate all IDs form all fixtures if multiple fixtures are provided. |
413 | 414 | * |
414 | 415 | * @param string $className |
415 | - * @return array A map of fixture-identifier => object-id |
|
416 | + * @return A A map of fixture-identifier => object-id |
|
416 | 417 | */ |
417 | 418 | protected function allFixtureIDs($className) { |
418 | 419 | return $this->getFixtureFactory()->getIds($className); |
@@ -572,7 +573,7 @@ discard block |
||
572 | 573 | /** |
573 | 574 | * Assert that the matching email was sent since the last call to clearEmails() |
574 | 575 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
575 | - * @param $to |
|
576 | + * @param string $to |
|
576 | 577 | * @param $from |
577 | 578 | * @param $subject |
578 | 579 | * @param $content |
@@ -871,6 +872,7 @@ discard block |
||
871 | 872 | /** |
872 | 873 | * Create a member and group with the given permission code, and log in with it. |
873 | 874 | * Returns the member ID. |
875 | + * @return integer |
|
874 | 876 | */ |
875 | 877 | public function logInWithPermission($permCode = "ADMIN") { |
876 | 878 | if(!isset($this->cache_generatedMembers[$permCode])) { |
@@ -110,6 +110,7 @@ discard block |
||
110 | 110 | * - if you pass the entire $_FILES entry, the user-uploaded filename will be preserved |
111 | 111 | * use $plainContent to override default plain-content generation |
112 | 112 | * |
113 | + * @param string $htmlContent |
|
113 | 114 | * @return bool |
114 | 115 | */ |
115 | 116 | public function sendHTML($to, $from, $subject, $htmlContent, $attachedFiles = false, $customheaders = false, |
@@ -233,6 +234,7 @@ discard block |
||
233 | 234 | |
234 | 235 | /** |
235 | 236 | * @todo Make visibility protected in 3.2 |
237 | + * @param string $contentType |
|
236 | 238 | */ |
237 | 239 | function encodeMultipart($parts, $contentType, $headers = false) { |
238 | 240 | $separator = "----=_NextPart_" . preg_replace('/[^0-9]/', '', rand() * 10000000000); |
@@ -466,6 +468,7 @@ discard block |
||
466 | 468 | * @package framework |
467 | 469 | * @subpackage email |
468 | 470 | * @deprecated 3.1 |
471 | + * @param string $contentType |
|
469 | 472 | */ |
470 | 473 | function encodeMultipart($parts, $contentType, $headers = false) { |
471 | 474 | Deprecation::notice('3.1', 'Use Email->$this->encodeMultipart() instead'); |
@@ -515,6 +518,7 @@ discard block |
||
515 | 518 | * @package framework |
516 | 519 | * @subpackage email |
517 | 520 | * @deprecated 3.1 |
521 | + * @param string $disposition |
|
518 | 522 | */ |
519 | 523 | function encodeFileForEmail($file, $destFileName = false, $disposition = NULL, $extraHeaders = "") { |
520 | 524 | Deprecation::notice('3.1', 'Please add files through Email->attachFile()'); |
@@ -527,6 +531,7 @@ discard block |
||
527 | 531 | * @package framework |
528 | 532 | * @subpackage email |
529 | 533 | * @deprecated 3.1 |
534 | + * @return boolean |
|
530 | 535 | */ |
531 | 536 | function QuotedPrintable_encode($quotprint) { |
532 | 537 | Deprecation::notice('3.1', 'No longer available, handled internally'); |
@@ -342,6 +342,10 @@ discard block |
||
342 | 342 | return $useAsMinimum ? $this->resizeByWidth( $maxWidth ) : $this->resizeByHeight( $maxHeight ); |
343 | 343 | } |
344 | 344 | |
345 | + /** |
|
346 | + * @param resource $image |
|
347 | + * @param string $webColor |
|
348 | + */ |
|
345 | 349 | public static function color_web2gd($image, $webColor) { |
346 | 350 | if(substr($webColor,0,1) == "#") $webColor = substr($webColor,1); |
347 | 351 | $r = hexdec(substr($webColor,0,2)); |
@@ -446,6 +450,9 @@ discard block |
||
446 | 450 | return $output; |
447 | 451 | } |
448 | 452 | |
453 | + /** |
|
454 | + * @param string $dirname |
|
455 | + */ |
|
449 | 456 | public function makeDir($dirname) { |
450 | 457 | if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname)); |
451 | 458 | if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask')); |
@@ -93,7 +93,8 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
96 | - * @param string |
|
96 | + * @param string |
|
97 | + * @param string $tag |
|
97 | 98 | */ |
98 | 99 | public function setTag($tag) { |
99 | 100 | $this->tag = $tag; |
@@ -109,7 +110,8 @@ discard block |
||
109 | 110 | } |
110 | 111 | |
111 | 112 | /** |
112 | - * @param string |
|
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 | */ |
@@ -409,7 +409,7 @@ |
||
409 | 409 | * |
410 | 410 | * @param DataObjectInterface $record |
411 | 411 | * |
412 | - * @return boolean |
|
412 | + * @return false|null |
|
413 | 413 | */ |
414 | 414 | public function saveInto(DataObjectInterface $record) { |
415 | 415 | if(!$this->isSaveable()) { |
@@ -56,6 +56,10 @@ discard block |
||
56 | 56 | */ |
57 | 57 | protected $config; |
58 | 58 | |
59 | + /** |
|
60 | + * @param string $name |
|
61 | + * @param string $title |
|
62 | + */ |
|
59 | 63 | public function __construct($name, $title = null, $value = ""){ |
60 | 64 | $this->config = $this->config()->default_config; |
61 | 65 | |
@@ -68,6 +72,9 @@ discard block |
||
68 | 72 | parent::__construct($name, $title, $value); |
69 | 73 | } |
70 | 74 | |
75 | + /** |
|
76 | + * @param Form $form |
|
77 | + */ |
|
71 | 78 | public function setForm($form) { |
72 | 79 | parent::setForm($form); |
73 | 80 | |
@@ -78,6 +85,9 @@ discard block |
||
78 | 85 | return $this; |
79 | 86 | } |
80 | 87 | |
88 | + /** |
|
89 | + * @param string $name |
|
90 | + */ |
|
81 | 91 | public function setName($name) { |
82 | 92 | parent::setName($name); |
83 | 93 | |
@@ -229,6 +239,7 @@ discard block |
||
229 | 239 | |
230 | 240 | /** |
231 | 241 | * @param FormField |
242 | + * @param DateField $field |
|
232 | 243 | */ |
233 | 244 | public function setDateField($field) { |
234 | 245 | $expected = $this->getName() . '[date]'; |
@@ -254,6 +265,7 @@ discard block |
||
254 | 265 | |
255 | 266 | /** |
256 | 267 | * @param FormField |
268 | + * @param TimeField $field |
|
257 | 269 | */ |
258 | 270 | public function setTimeField($field) { |
259 | 271 | $expected = $this->getName() . '[time]'; |
@@ -292,7 +304,7 @@ discard block |
||
292 | 304 | * to set field-specific config options. |
293 | 305 | * |
294 | 306 | * @param string $name |
295 | - * @param mixed $val |
|
307 | + * @param string $val |
|
296 | 308 | */ |
297 | 309 | public function setConfig($name, $val) { |
298 | 310 | $this->config[$name] = $val; |
@@ -310,7 +322,7 @@ discard block |
||
310 | 322 | * to get field-specific config options. |
311 | 323 | * |
312 | 324 | * @param String $name Optional, returns the whole configuration array if empty |
313 | - * @return mixed |
|
325 | + * @return string|null |
|
314 | 326 | */ |
315 | 327 | public function getConfig($name = null) { |
316 | 328 | if($name) { |
@@ -320,6 +332,9 @@ discard block |
||
320 | 332 | } |
321 | 333 | } |
322 | 334 | |
335 | + /** |
|
336 | + * @param RequiredFields $validator |
|
337 | + */ |
|
323 | 338 | public function validate($validator) { |
324 | 339 | $dateValid = $this->dateField->validate($validator); |
325 | 340 | $timeValid = $this->timeField->validate($validator); |