Completed
Pull Request — master (#5771)
by Florian
11:17
created
Security/SecurityToken.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	protected $name = null;
63 63
 
64 64
 	/**
65
-	 * @param $name
65
+	 * @param string $name
66 66
 	 */
67 67
 	public function __construct($name = null) {
68 68
 		$this->name = ($name) ? $name : self::get_default_name();
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 	/**
115 115
 	 * Returns the value of an the global SecurityToken in the current session
116
-	 * @return int
116
+	 * @return string
117 117
 	 */
118 118
 	public static function getSecurityID() {
119 119
 		$token = SecurityToken::inst();
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	/**
197 197
 	 * Get security token from request
198 198
 	 *
199
-	 * @param SS_HTTPREquest $request
199
+	 * @param SS_HTTPRequest $request
200 200
 	 * @return string
201 201
 	 */
202 202
 	protected function getRequestToken($request) {
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 * care of this yourself.
217 217
 	 *
218 218
 	 * @param FieldList $fieldset
219
-	 * @return HiddenField|false
219
+	 * @return \Form
220 220
 	 */
221 221
 	public function updateFieldSet(&$fieldset) {
222 222
 		if(!$fieldset->fieldByName($this->getName())) {
Please login to merge, or discard this patch.
core/Extensible.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -369,8 +369,8 @@
 block discarded – undo
369 369
 	 *
370 370
 	 * @param string $method the method name to call
371 371
 	 * @param mixed $a1
372
-	 * @param mixed $a2
373
-	 * @param mixed $a3
372
+	 * @param string $a2
373
+	 * @param boolean $a3
374 374
 	 * @param mixed $a4
375 375
 	 * @param mixed $a5
376 376
 	 * @param mixed $a6
Please login to merge, or discard this patch.
ORM/Connect/DBSchemaManager.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,6 +112,7 @@  discard block
 block discarded – undo
112 112
 	 *
113 113
 	 * @var callable $callback
114 114
 	 * @throws Exception
115
+	 * @param \Closure $callback
115 116
 	 */
116 117
 	public function schemaUpdate($callback) {
117 118
 		// Begin schema update
@@ -484,7 +485,7 @@  discard block
 block discarded – undo
484 485
 	/**
485 486
 	 * Given an index spec determines the index type
486 487
 	 *
487
-	 * @param array|string $spec
488
+	 * @param string $spec
488 489
 	 * @return string
489 490
 	 */
490 491
 	protected function determineIndexType($spec) {
Please login to merge, or discard this patch.
ORM/FieldType/DBDate.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	private static $nice_format = 'd/m/Y';
40 40
 
41
+	/**
42
+	 * @param string|null $value
43
+	 */
41 44
 	public function setValue($value, $record = null, $markChanged = true) {
42 45
 		if($value === false || $value === null || (is_string($value) && !strlen($value))) {
43 46
 			// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be
@@ -194,7 +197,7 @@  discard block
 block discarded – undo
194 197
 	 * Return a date formatted as per a CMS user's settings.
195 198
 	 *
196 199
 	 * @param Member $member
197
-	 * @return boolean | string A date formatted as per user-defined settings.
200
+	 * @return false|string | string A date formatted as per user-defined settings.
198 201
 	 */
199 202
 	public function FormatFromSettings($member = null) {
200 203
 		require_once 'Zend/Date.php';
Please login to merge, or discard this patch.
ORM/FieldType/DBDecimal.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * @param string $name
22 22
 	 * @param int $wholeSize
23 23
 	 * @param int $decimalSize
24
-	 * @param float|int $defaultValue
24
+	 * @param integer $defaultValue
25 25
 	 */
26 26
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
27 27
 		$this->wholeSize = is_int($wholeSize) ? $wholeSize : 9;
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	/**
36
-	 * @return float
36
+	 * @return string
37 37
 	 */
38 38
 	public function Nice() {
39 39
 		return number_format($this->value, $this->decimalSize);
40 40
 	}
41 41
 
42 42
 	/**
43
-	 * @return int
43
+	 * @return double
44 44
 	 */
45 45
 	public function Int() {
46 46
 		return floor($this->value);
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	}
84 84
 
85 85
 	/**
86
-	 * @return float
86
+	 * @return integer
87 87
 	 */
88 88
 	public function nullValue() {
89 89
 		return 0;
Please login to merge, or discard this patch.
forms/MemberDatetimeOptionsetField.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -105,6 +105,9 @@
 block discarded – undo
105 105
 		return $this->descriptionTemplate;
106 106
 	}
107 107
 
108
+	/**
109
+	 * @param string $template
110
+	 */
108 111
 	public function setDescriptionTemplate($template) {
109 112
 		$this->descriptionTemplate = $template;
110 113
 	}
Please login to merge, or discard this patch.
ORM/ArrayList.php 1 patch
Doc Comments   +2 added lines, -6 removed lines patch added patch discarded remove patch
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 	 *
380 380
 	 * Note that columns may be double quoted as per ANSI sql standard
381 381
 	 *
382
-	 * @return DataList
382
+	 * @return ArrayList
383 383
 	 * @see SS_List::sort()
384 384
 	 * @example $list->sort('Name'); // default ASC sorting
385 385
 	 * @example $list->sort('Name DESC'); // DESC sorting
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 	 *          $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43)));
516 516
 	 *
517 517
 	 * @param string|array See {@link filter()}
518
-	 * @return DataList
518
+	 * @return ArrayList
519 519
 	 */
520 520
 	public function filterAny() {
521 521
 		$keepUs = call_user_func_array(array($this, 'normaliseFilterArgs'), func_get_args());
@@ -666,7 +666,6 @@  discard block
 block discarded – undo
666 666
 	/**
667 667
 	 * Returns whether an item with $key exists
668 668
 	 *
669
-	 * @param mixed $key
670 669
 	 * @return bool
671 670
 	 */
672 671
 	public function offsetExists($offset) {
@@ -676,7 +675,6 @@  discard block
 block discarded – undo
676 675
 	/**
677 676
 	 * Returns item stored in list with index $key
678 677
 	 *
679
-	 * @param mixed $key
680 678
 	 * @return DataObject
681 679
 	 */
682 680
 	public function offsetGet($offset) {
@@ -686,7 +684,6 @@  discard block
 block discarded – undo
686 684
 	/**
687 685
 	 * Set an item with the key in $key
688 686
 	 *
689
-	 * @param mixed $key
690 687
 	 * @param mixed $value
691 688
 	 */
692 689
 	public function offsetSet($offset, $value) {
@@ -700,7 +697,6 @@  discard block
 block discarded – undo
700 697
 	/**
701 698
 	 * Unset an item with the key in $key
702 699
 	 *
703
-	 * @param mixed $key
704 700
 	 */
705 701
 	public function offsetUnset($offset) {
706 702
 		unset($this->items[$offset]);
Please login to merge, or discard this patch.
tests/forms/RequirementsTest.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -118,6 +118,11 @@  discard block
 block discarded – undo
118 118
 		);
119 119
 	}
120 120
 	
121
+	/**
122
+	 * @param Requirements_Backend $backend
123
+	 * @param boolean $async
124
+	 * @param boolean $defer
125
+	 */
121 126
 	protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) {
122 127
         $basePath = $this->getCurrentRelativePath();
123 128
         $this->setupRequirements($backend);
@@ -805,6 +810,10 @@  discard block
 block discarded – undo
805 810
 		}
806 811
 	}
807 812
 
813
+	/**
814
+	 * @param Requirements_Backend $backend
815
+	 * @param string $type
816
+	 */
808 817
 	public function assertFileNotIncluded($backend, $type, $files) {
809 818
 		$includedFiles = $this->getBackendFiles($backend, $type);
810 819
 		if(is_array($files)) {
Please login to merge, or discard this patch.