@@ -100,7 +100,7 @@ discard block |
||
| 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 |
||
| 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 | */ |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | /** |
| 380 | 380 | * Return the IDs of all the marked nodes. |
| 381 | 381 | * |
| 382 | - * @return array |
|
| 382 | + * @return integer[] |
|
| 383 | 383 | */ |
| 384 | 384 | public function markedNodeIDs() { |
| 385 | 385 | return array_keys($this->markedNodes); |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | * Get the next node in the tree of the type. If there is no instance of the className descended from this node, |
| 757 | 757 | * then search the parents. |
| 758 | 758 | * @param string $className Class name of the node to find. |
| 759 | - * @param string|int $root ID/ClassName of the node to limit the search to |
|
| 759 | + * @param integer $root ID/ClassName of the node to limit the search to |
|
| 760 | 760 | * @param DataObject $afterNode Used for recursive calls to this function |
| 761 | 761 | * @return DataObject |
| 762 | 762 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | /** |
| 25 | 25 | * Modify method visibility to public for testing |
| 26 | 26 | * |
| 27 | - * @param mixed $errors |
|
| 27 | + * @param string $errors |
|
| 28 | 28 | */ |
| 29 | 29 | public function setDisplayErrors($errors) |
| 30 | 30 | { |
@@ -33,6 +33,10 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Change function visibility to be testable directly |
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * @param string $memstring |
|
| 39 | + */ |
|
| 36 | 40 | public function translateMemstring($memstring) { |
| 37 | 41 | return parent::translateMemstring($memstring); |
| 38 | 42 | } |
@@ -200,7 +200,7 @@ |
||
| 200 | 200 | * |
| 201 | 201 | * @todo refactor this into GridFieldComponent |
| 202 | 202 | * |
| 203 | - * @param mixed $value |
|
| 203 | + * @param string $value |
|
| 204 | 204 | * @param string|array $castingDefinition |
| 205 | 205 | * |
| 206 | 206 | * @return mixed |
@@ -211,7 +211,7 @@ discard block |
||
| 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(); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * so this is mainly a customization method. |
| 238 | 238 | * |
| 239 | 239 | * @param mixed $val |
| 240 | - * @param string $field Name of the field as specified in the array-values for {@link self::$columnMap}. |
|
| 240 | + * @param string $fieldName Name of the field as specified in the array-values for {@link self::$columnMap}. |
|
| 241 | 241 | * @return boolean |
| 242 | 242 | */ |
| 243 | 243 | protected function isNullValue($val, $fieldName = null) { |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | |
| 362 | 362 | /** |
| 363 | 363 | * @param $obj DataObject |
| 364 | - * @param $message string |
|
| 364 | + * @param string $message string |
|
| 365 | 365 | */ |
| 366 | 366 | public function addCreated($obj, $message = null) { |
| 367 | 367 | $this->created[] = $this->lastChange = array( |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | |
| 375 | 375 | /** |
| 376 | 376 | * @param $obj DataObject |
| 377 | - * @param $message string |
|
| 377 | + * @param string $message string |
|
| 378 | 378 | */ |
| 379 | 379 | public function addUpdated($obj, $message = null) { |
| 380 | 380 | $this->updated[] = $this->lastChange = array( |
@@ -386,8 +386,8 @@ discard block |
||
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
| 389 | - * @param $obj DataObject |
|
| 390 | - * @param $message string |
|
| 389 | + * @param DataObject|null $obj DataObject |
|
| 390 | + * @param string $message string |
|
| 391 | 391 | */ |
| 392 | 392 | public function addDeleted($obj, $message = null) { |
| 393 | 393 | $data = $obj->toMap(); |
@@ -385,9 +385,9 @@ discard block |
||
| 385 | 385 | * it's only advisable to send small files through this method. |
| 386 | 386 | * |
| 387 | 387 | * @static |
| 388 | - * @param $fileData |
|
| 388 | + * @param string $fileData |
|
| 389 | 389 | * @param $fileName |
| 390 | - * @param null $mimeType |
|
| 390 | + * @param string $mimeType |
|
| 391 | 391 | * @return SS_HTTPResponse |
| 392 | 392 | */ |
| 393 | 393 | public static function send_file($fileData, $fileName, $mimeType = null) { |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | * This is used by the request handler to prevent infinite parsing loops. |
| 606 | 606 | * |
| 607 | 607 | * @param $pattern |
| 608 | - * @return bool |
|
| 608 | + * @return boolean|null |
|
| 609 | 609 | */ |
| 610 | 610 | public function isEmptyPattern($pattern) { |
| 611 | 611 | if(preg_match('/^([A-Za-z]+) +(.*)$/', $pattern, $matches)) { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | * No newlines are allowed in the description. |
| 110 | 110 | * If omitted, will default to the standard HTTP description |
| 111 | 111 | * for the given $code value (see {@link $status_codes}). |
| 112 | - * @return SS_HTTPRequest $this |
|
| 112 | + * @return SS_HTTPResponse $this |
|
| 113 | 113 | */ |
| 114 | 114 | public function setStatusCode($code, $description = null) { |
| 115 | 115 | if(isset(self::$status_codes[$code])) $this->statusCode = $code; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * Caution: Will be overwritten by {@link setStatusCode()}. |
| 126 | 126 | * |
| 127 | 127 | * @param string $description |
| 128 | - * @return SS_HTTPRequest $this |
|
| 128 | + * @return SS_HTTPResponse $this |
|
| 129 | 129 | */ |
| 130 | 130 | public function setStatusDescription($description) { |
| 131 | 131 | $this->statusDescription = $description; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | /** |
| 159 | 159 | * @param string $body |
| 160 | - * @return SS_HTTPRequest $this |
|
| 160 | + * @return SS_HTTPResponse $this |
|
| 161 | 161 | */ |
| 162 | 162 | public function setBody($body) { |
| 163 | 163 | $this->body = $body ? (string) $body : $body; // Don't type-cast false-ish values, eg null is null not '' |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * |
| 177 | 177 | * @param string $header Example: "Content-Type" |
| 178 | 178 | * @param string $value Example: "text/xml" |
| 179 | - * @return SS_HTTPRequest $this |
|
| 179 | + * @return SS_HTTPResponse $this |
|
| 180 | 180 | */ |
| 181 | 181 | public function addHeader($header, $value) { |
| 182 | 182 | $this->headers[$header] = $value; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | * e.g. "Content-Type". |
| 207 | 207 | * |
| 208 | 208 | * @param string $header |
| 209 | - * @return SS_HTTPRequest $this |
|
| 209 | + * @return SS_HTTPResponse $this |
|
| 210 | 210 | */ |
| 211 | 211 | public function removeHeader($header) { |
| 212 | 212 | if(isset($this->headers[$header])) unset($this->headers[$header]); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | /** |
| 217 | 217 | * @param string $dest |
| 218 | 218 | * @param int $code |
| 219 | - * @return SS_HTTPRequest $this |
|
| 219 | + * @return SS_HTTPResponse $this |
|
| 220 | 220 | */ |
| 221 | 221 | public function redirect($dest, $code=302) { |
| 222 | 222 | if(!in_array($code, self::$redirect_codes)) $code = 302; |
@@ -316,6 +316,7 @@ discard block |
||
| 316 | 316 | * @param string|SS_HTTPResponse body Either the plaintext content of the error message, or an SS_HTTPResponse |
| 317 | 317 | * object representing it. In either case, the $statusCode and |
| 318 | 318 | * $statusDescription will be the HTTP status of the resulting response. |
| 319 | + * @param string $statusDescription |
|
| 319 | 320 | * @see SS_HTTPResponse::__construct(); |
| 320 | 321 | */ |
| 321 | 322 | public function __construct($body = null, $statusCode = null, $statusDescription = null) { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * Test if a cache is available or not (for the given id) |
| 57 | 57 | * |
| 58 | 58 | * @param string $id cache id |
| 59 | - * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record |
|
| 59 | + * @return boolean false (a cache is not available) or "last modified" timestamp (int) of the available cache record |
|
| 60 | 60 | */ |
| 61 | 61 | public function test($id) |
| 62 | 62 | { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * - mtime : timestamp of last modification time |
| 193 | 193 | * |
| 194 | 194 | * @param string $id cache id |
| 195 | - * @return array array of metadatas (false if the cache id is not found) |
|
| 195 | + * @return boolean array of metadatas (false if the cache id is not found) |
|
| 196 | 196 | */ |
| 197 | 197 | public function getMetadatas($id) |
| 198 | 198 | { |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * Helper method to calculate the correct class path |
| 137 | 137 | * |
| 138 | 138 | * @param string $class |
| 139 | - * @return False if not matched other wise the correct path |
|
| 139 | + * @return false|string if not matched other wise the correct path |
|
| 140 | 140 | */ |
| 141 | 141 | public function getClassPath($class) |
| 142 | 142 | { |