Completed
Pull Request — master (#6266)
by Sam
14:39 queued 17s
created
src/Core/CustomMethods.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 	/**
145 145
 	 * Get meta-data details on a named method
146 146
 	 *
147
-	 * @param array $method
147
+	 * @param string $method
148 148
 	 * @return array List of custom method details, if defined for this method
149 149
 	 */
150 150
 	protected function getExtraMethodConfig($method) {
Please login to merge, or discard this patch.
src/Core/Injector/Injector.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	 *
358 358
 	 * @param string $property
359 359
 	 *                the name of the property
360
-	 * @param object $object
360
+	 * @param string $object
361 361
 	 *                the object to be set
362 362
 	 * @return $this
363 363
 	 */
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 	 *				The name of the service to update the definition for
452 452
 	 * @param string $property
453 453
 	 *				The name of the property to update.
454
-	 * @param mixed $value
454
+	 * @param string $value
455 455
 	 *				The value to set
456 456
 	 * @param boolean $append
457 457
 	 *				Whether to append (the default) when the property is an array
Please login to merge, or discard this patch.
src/Core/Manifest/ClassManifest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
 	 * Returns an array containing all the descendants (direct and indirect)
236 236
 	 * of a class.
237 237
 	 *
238
-	 * @param  string|object $class
238
+	 * @param  string $class
239 239
 	 * @return array
240 240
 	 */
241 241
 	public function getDescendantsOf($class) {
Please login to merge, or discard this patch.
src/Core/Manifest/ConfigManifest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -500,7 +500,7 @@
 block discarded – undo
500 500
 	 * Returns false if the prefilterable parts of the rule aren't met, and true if they are
501 501
 	 *
502 502
 	 * @param  $rules array - A hash of rules as allowed in the only or except portion of a config fragment header
503
-	 * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an
503
+	 * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an
504 504
 	 *                only or an except rule,
505 505
 	 * which values means accept or reject a fragment
506 506
 	 */
Please login to merge, or discard this patch.
src/Core/Startup/ErrorControlChain.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	/**
101 101
 	 * Get value of display_errors ini value
102 102
 	 *
103
-	 * @return mixed
103
+	 * @return string
104 104
 	 */
105 105
 	protected function getDisplayErrors() {
106 106
 		return ini_get('display_errors');
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * Add this callback to the chain of callbacks to call along with the state
111 111
 	 * that $error must be in this point in the chain for the callback to be called
112 112
 	 *
113
-	 * @param $callback - The callback to call
113
+	 * @param callable $callback - The callback to call
114 114
 	 * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either
115 115
 	 * @return $this
116 116
 	 */
Please login to merge, or discard this patch.
src/Core/Startup/ParameterConfirmationToken.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	protected $token = null;
38 38
 
39
+	/**
40
+	 * @param string $token
41
+	 */
39 42
 	protected function pathForToken($token) {
40 43
 		return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
41 44
 	}
@@ -235,7 +238,7 @@  discard block
 block discarded – undo
235 238
 	 * Given a list of token names, suppress all tokens that have not been validated, and
236 239
 	 * return the non-validated token with the highest priority
237 240
 	 *
238
-	 * @param array $keys List of token keys in ascending priority (low to high)
241
+	 * @param string[] $keys List of token keys in ascending priority (low to high)
239 242
 	 * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority
240 243
 	 */
241 244
 	public static function prepare_tokens($keys) {
Please login to merge, or discard this patch.
src/Dev/Backtrace.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 	 * @param mixed $returnVal
117 117
 	 * @param bool $ignoreAjax
118 118
 	 * @param array $ignoredFunctions
119
-	 * @return mixed
119
+	 * @return string|null
120 120
 	 */
121 121
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
122 122
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);
Please login to merge, or discard this patch.
src/Dev/BulkLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@
 block discarded – undo
211 211
 	 *
212 212
 	 * @todo Mix in custom column mappings
213 213
 	 *
214
-	 * @return array
214
+	 * @return string
215 215
 	 **/
216 216
 	public function getImportSpec() {
217 217
 		$spec = array();
Please login to merge, or discard this patch.
src/Dev/BulkLoader_Result.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
 	}
133 133
 
134 134
 	/**
135
-	 * @param $obj DataObject
136
-	 * @param $message string
135
+	 * @param DataObject $obj DataObject
136
+	 * @param string $message string
137 137
 	 */
138 138
 	public function addCreated($obj, $message = null)
139 139
 	{
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
 	}
147 147
 
148 148
 	/**
149
-	 * @param $obj DataObject
150
-	 * @param $message string
149
+	 * @param DataObject $obj DataObject
150
+	 * @param string $message string
151 151
 	 */
152 152
 	public function addUpdated($obj, $message = null)
153 153
 	{
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param $obj DataObject
164
-	 * @param $message string
163
+	 * @param DataObject|null $obj DataObject
164
+	 * @param string $message string
165 165
 	 */
166 166
 	public function addDeleted($obj, $message = null)
167 167
 	{
Please login to merge, or discard this patch.