Completed
Pull Request — master (#6233)
by David
09:20
created
Dev/Deprecation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 * greater than or equal to this version, a message will be raised
73 73
 	 *
74 74
 	 * @static
75
-	 * @param $ver string -
75
+	 * @param string $ver string -
76 76
 	 *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
77 77
 	 * @param null $forModule string -
78 78
 	 *    The name of a module. The passed version will be used as the check value for
Please login to merge, or discard this patch.
Dev/FixtureBlueprint.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -260,6 +260,9 @@  discard block
 block discarded – undo
260 260
 		return $this;
261 261
 	}
262 262
 
263
+	/**
264
+	 * @param string $type
265
+	 */
263 266
 	protected function invokeCallbacks($type, $args = array()) {
264 267
 		foreach($this->callbacks[$type] as $callback) {
265 268
 			call_user_func_array($callback, $args);
@@ -299,6 +302,9 @@  discard block
 block discarded – undo
299 302
 		$obj->$name = $this->parseValue($value, $fixtures);
300 303
 	}
301 304
 
305
+	/**
306
+	 * @param string $fieldName
307
+	 */
302 308
 	protected function overrideField($obj, $fieldName, $value, $fixtures = null) {
303 309
 		$class = get_class($obj);
304 310
 		$table = DataObject::getSchema()->tableForField($class, $fieldName);
Please login to merge, or discard this patch.
Dev/SapphireTest.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -617,10 +617,10 @@  discard block
 block discarded – undo
617 617
 	/**
618 618
 	 * Assert that the matching email was sent since the last call to clearEmails()
619 619
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
620
-	 * @param $to
620
+	 * @param string $to
621 621
 	 * @param $from
622
-	 * @param $subject
623
-	 * @param $content
622
+	 * @param string $subject
623
+	 * @param string $content
624 624
 	 * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles',
625 625
 	 *               'customHeaders', 'htmlContent', inlineImages'
626 626
 	 */
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 	 * @param string $expectedSQL
795 795
 	 * @param string $actualSQL
796 796
 	 * @param string $message
797
-	 * @param float|int $delta
797
+	 * @param integer $delta
798 798
 	 * @param integer $maxDepth
799 799
 	 * @param boolean $canonicalize
800 800
 	 * @param boolean $ignoreCase
Please login to merge, or discard this patch.
Dev/SapphireTestReporter.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @access private
320 320
 	 * @param obj PHPUnit_Framework_Test, current test that is being run
321 321
 	 * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error
322
-	 * @return array
322
+	 * @return string
323 323
 	 */
324 324
 	private function getTestException(PHPUnit_Framework_Test $test, Exception $e) {
325 325
 		// get the name of the testFile from the test
@@ -406,6 +406,9 @@  discard block
 block discarded – undo
406 406
 
407 407
 	}
408 408
 
409
+	/**
410
+	 * @param string $name
411
+	 */
409 412
 	protected function testNameToPhrase($name) {
410 413
 		return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
411 414
 	}
Please login to merge, or discard this patch.
Forms/AssetField.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	/**
196 196
 	 * Determine if the target folder for new uploads in is visible the field UI.
197 197
 	 *
198
-	 * @return boolean
198
+	 * @return boolean|string
199 199
 	 */
200 200
 	public function canPreviewFolder() {
201 201
 		if(!$this->isActive()) {
@@ -264,6 +264,10 @@  discard block
 block discarded – undo
264 264
 		return $this->record;
265 265
 	}
266 266
 
267
+	/**
268
+	 * @param null|DataObject $value
269
+	 * @param DataObject $record
270
+	 */
267 271
 	public function setValue($value, $record = null) {
268 272
 		// Extract value from underlying record
269 273
 		if(empty($value) && $this->getName() && $record instanceof DataObject) {
@@ -370,7 +374,7 @@  discard block
 block discarded – undo
370 374
 	/**
371 375
 	 * Determine if the user has permission to upload.
372 376
 	 *
373
-	 * @return boolean
377
+	 * @return boolean|string
374 378
 	 */
375 379
 	public function canUpload() {
376 380
 		if(!$this->isActive()) {
Please login to merge, or discard this patch.
Forms/CompositeField.php 1 patch
Doc Comments   +14 added lines patch added patch discarded remove patch
@@ -209,6 +209,9 @@  discard block
 block discarded – undo
209 209
 
210 210
 
211 211
 
212
+	/**
213
+	 * @param boolean $disabled
214
+	 */
212 215
 	public function setDisabled($disabled) {
213 216
 		parent::setDisabled($disabled);
214 217
 		foreach($this->getChildren() as $child) {
@@ -217,6 +220,9 @@  discard block
 block discarded – undo
217 220
 		return $this;
218 221
 	}
219 222
 
223
+	/**
224
+	 * @param boolean $readonly
225
+	 */
220 226
 	public function setReadonly($readonly)
221 227
 	{
222 228
 		parent::setReadonly($readonly);
@@ -299,6 +305,10 @@  discard block
 block discarded – undo
299 305
 		$this->children->removeByName($fieldName, $dataFieldOnly);
300 306
 	}
301 307
 
308
+	/**
309
+	 * @param string $fieldName
310
+	 * @param FormField $newField
311
+	 */
302 312
 	public function replaceField($fieldName, $newField) {
303 313
 		return $this->children->replaceField($fieldName, $newField);
304 314
 	}
@@ -362,6 +372,9 @@  discard block
 block discarded – undo
362 372
 		return $clone;
363 373
 	}
364 374
 
375
+	/**
376
+	 * @return boolean
377
+	 */
365 378
 	public function IsReadonly() {
366 379
 		return $this->readonly;
367 380
 	}
@@ -371,6 +384,7 @@  discard block
 block discarded – undo
371 384
 	 * the children collection. Doesn't work recursively.
372 385
 	 *
373 386
 	 * @param string|FormField
387
+	 * @param string $field
374 388
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
375 389
 	 *             be found.
376 390
 	 */
Please login to merge, or discard this patch.
Forms/DateField.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,6 +99,11 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	protected $valueObj = null;
101 101
 
102
+	/**
103
+	 * @param string $name
104
+	 * @param string $title
105
+	 * @param string $value
106
+	 */
102 107
 	public function __construct($name, $title = null, $value = null) {
103 108
 		if(!$this->locale) {
104 109
 			$this->locale = i18n::get_locale();
@@ -300,7 +305,7 @@  discard block
 block discarded – undo
300 305
 	}
301 306
 
302 307
 	/**
303
-	 * @param mixed $class
308
+	 * @param string $class
304 309
 	 * @return FormField
305 310
 	 */
306 311
 	public function castedCopy($class) {
Please login to merge, or discard this patch.
Forms/DatetimeField.php 1 patch
Doc Comments   +20 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,6 +69,10 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	protected $config;
71 71
 
72
+	/**
73
+	 * @param string $name
74
+	 * @param string $title
75
+	 */
72 76
 	public function __construct($name, $title = null, $value = ""){
73 77
 		$this->config = $this->config()->default_config;
74 78
 
@@ -79,6 +83,9 @@  discard block
 block discarded – undo
79 83
 		parent::__construct($name, $title, $value);
80 84
 	}
81 85
 
86
+	/**
87
+	 * @param Form $form
88
+	 */
82 89
 	public function setForm($form) {
83 90
 		parent::setForm($form);
84 91
 
@@ -89,6 +96,9 @@  discard block
 block discarded – undo
89 96
 		return $this;
90 97
 	}
91 98
 
99
+	/**
100
+	 * @param string $name
101
+	 */
92 102
 	public function setName($name) {
93 103
 		parent::setName($name);
94 104
 
@@ -101,7 +111,7 @@  discard block
 block discarded – undo
101 111
 
102 112
 	/**
103 113
 	 * @param array $properties
104
-	 * @return string
114
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
105 115
 	 */
106 116
 	public function FieldHolder($properties = array()) {
107 117
 		$config = array(
@@ -115,7 +125,7 @@  discard block
 block discarded – undo
115 125
 
116 126
 	/**
117 127
 	 * @param array $properties
118
-	 * @return string
128
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
119 129
 	 */
120 130
 	public function Field($properties = array()) {
121 131
 		Requirements::css(FRAMEWORK_DIR . '/client/dist/styles/DatetimeField.css');
@@ -228,6 +238,9 @@  discard block
 block discarded – undo
228 238
 		return $this;
229 239
 	}
230 240
 
241
+	/**
242
+	 * @param boolean $bool
243
+	 */
231 244
 	public function setReadonly($bool) {
232 245
 		parent::setReadonly($bool);
233 246
 		$this->dateField->setReadonly($bool);
@@ -317,7 +330,7 @@  discard block
 block discarded – undo
317 330
 	 * to set field-specific config options.
318 331
 	 *
319 332
 	 * @param string $name
320
-	 * @param mixed $val
333
+	 * @param string $val
321 334
 	 * @return $this
322 335
 	 */
323 336
 	public function setConfig($name, $val) {
@@ -336,7 +349,7 @@  discard block
 block discarded – undo
336 349
 	 * to get field-specific config options.
337 350
 	 *
338 351
 	 * @param String $name Optional, returns the whole configuration array if empty
339
-	 * @return mixed
352
+	 * @return string|null
340 353
 	 */
341 354
 	public function getConfig($name = null) {
342 355
 		if($name) {
@@ -346,6 +359,9 @@  discard block
 block discarded – undo
346 359
 		}
347 360
 	}
348 361
 
362
+	/**
363
+	 * @param RequiredFields $validator
364
+	 */
349 365
 	public function validate($validator) {
350 366
 		$dateValid = $this->dateField->validate($validator);
351 367
 		$timeValid = $this->timeField->validate($validator);
Please login to merge, or discard this patch.
Forms/FieldList.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,6 +79,9 @@  discard block
 block discarded – undo
79 79
 		$this->sequentialSaveableSet = null;
80 80
 	}
81 81
 
82
+	/**
83
+	 * @param FormField[] $list
84
+	 */
82 85
 	protected function collateDataFields(&$list, $saveableOnly = false) {
83 86
 		foreach($this as $field) {
84 87
 			if($field instanceof CompositeField) {
@@ -175,7 +178,7 @@  discard block
 block discarded – undo
175 178
 	 * Removes a number of fields from a Tab/TabSet within this FieldList.
176 179
 	 *
177 180
 	 * @param string $tabName The name of the Tab or TabSet field
178
-	 * @param array $fields A list of fields, e.g. array('Name', 'Email')
181
+	 * @param string[] $fields A list of fields, e.g. array('Name', 'Email')
179 182
 	 */
180 183
 	public function removeFieldsFromTab($tabName, $fields) {
181 184
 		$this->flushFieldsCache();
@@ -568,7 +571,7 @@  discard block
 block discarded – undo
568 571
 	}
569 572
 
570 573
 	/**
571
-	 * @param $field
574
+	 * @param CompositeField $field
572 575
 	 * @return $this
573 576
 	 */
574 577
 	public function setContainerField($field) {
@@ -638,6 +641,7 @@  discard block
 block discarded – undo
638 641
 	 * the children collection. Doesn't work recursively.
639 642
 	 *
640 643
 	 * @param string|FormField
644
+	 * @param string $field
641 645
 	 * @return int Position in children collection (first position starts with 0).
642 646
 	 * Returns FALSE if the field can't be found.
643 647
 	 */
Please login to merge, or discard this patch.