@@ -244,6 +244,9 @@ discard block |
||
244 | 244 | * splt/complete before and after matchers) |
245 | 245 | * |
246 | 246 | * Public so that ManifestFileFinder can call it. Not for general use. |
247 | + * @param string $basename |
|
248 | + * @param string $pathname |
|
249 | + * @param boolean $depth |
|
247 | 250 | */ |
248 | 251 | public function addYAMLConfigFile($basename, $pathname, $depth) { |
249 | 252 | if (!preg_match('{/([^/]+)/_config/}', $pathname, $match)) return; |
@@ -467,7 +470,7 @@ discard block |
||
467 | 470 | * Returns false if the prefilterable parts of the rule aren't met, and true if they are |
468 | 471 | * |
469 | 472 | * @param $rules array - A hash of rules as allowed in the only or except portion of a config fragment header |
470 | - * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
473 | + * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
471 | 474 | * only or an except rule, |
472 | 475 | * which values means accept or reject a fragment |
473 | 476 | */ |
@@ -7,9 +7,21 @@ |
||
7 | 7 | * @subpackage manifest |
8 | 8 | */ |
9 | 9 | interface ManifestCache { |
10 | + |
|
11 | + /** |
|
12 | + * @return void |
|
13 | + */ |
|
10 | 14 | public function __construct($name); |
11 | 15 | public function load($key); |
16 | + |
|
17 | + /** |
|
18 | + * @return void |
|
19 | + */ |
|
12 | 20 | public function save($data, $key); |
21 | + |
|
22 | + /** |
|
23 | + * @return void |
|
24 | + */ |
|
13 | 25 | public function clear(); |
14 | 26 | } |
15 | 27 |
@@ -67,6 +67,9 @@ discard block |
||
67 | 67 | $this->error = (bool)$error; |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @param boolean $suppression |
|
72 | + */ |
|
70 | 73 | public function setSuppression($suppression) { |
71 | 74 | $this->suppression = (bool)$suppression; |
72 | 75 | if ($this->handleFatalErrors) ini_set('display_errors', !$suppression); |
@@ -76,7 +79,7 @@ discard block |
||
76 | 79 | * Add this callback to the chain of callbacks to call along with the state |
77 | 80 | * that $error must be in this point in the chain for the callback to be called |
78 | 81 | * |
79 | - * @param $callback - The callback to call |
|
82 | + * @param callable $callback - The callback to call |
|
80 | 83 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
81 | 84 | * @return $this |
82 | 85 | */ |
@@ -36,6 +36,9 @@ discard block |
||
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 |
||
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) { |
@@ -5,7 +5,7 @@ |
||
5 | 5 | * @package framework |
6 | 6 | * @subpackage core |
7 | 7 | * |
8 | - * @param $base The base path to use for determining the temporary path |
|
8 | + * @param string $base The base path to use for determining the temporary path |
|
9 | 9 | * @return string Path to temp |
10 | 10 | */ |
11 | 11 | function getTempFolder($base = null) { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param unknown_type $returnVal |
116 | 116 | * @param unknown_type $ignoreAjax |
117 | - * @return unknown |
|
117 | + * @return string|null |
|
118 | 118 | */ |
119 | 119 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) { |
120 | 120 | $plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * shown |
132 | 132 | * |
133 | 133 | * @param Object $item |
134 | - * @param boolean $showArg |
|
134 | + * @param boolean $showArgs |
|
135 | 135 | * @param Int $argCharLimit |
136 | 136 | * @return String |
137 | 137 | */ |
@@ -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) { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | |
358 | 358 | /** |
359 | 359 | * @param $obj DataObject |
360 | - * @param $message string |
|
360 | + * @param string $message string |
|
361 | 361 | */ |
362 | 362 | public function addCreated($obj, $message = null) { |
363 | 363 | $this->created[] = $this->lastChange = array( |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | |
371 | 371 | /** |
372 | 372 | * @param $obj DataObject |
373 | - * @param $message string |
|
373 | + * @param string $message string |
|
374 | 374 | */ |
375 | 375 | public function addUpdated($obj, $message = null) { |
376 | 376 | $this->updated[] = $this->lastChange = array( |
@@ -93,7 +93,7 @@ |
||
93 | 93 | * @param string $path Path to large file to split |
94 | 94 | * @param int $lines Number of lines per file |
95 | 95 | * |
96 | - * @return array List of file paths |
|
96 | + * @return string[] List of file paths |
|
97 | 97 | */ |
98 | 98 | protected function splitFile($path, $lines = null) { |
99 | 99 | $previous = ini_get('auto_detect_line_endings'); |
@@ -101,7 +101,7 @@ |
||
101 | 101 | * |
102 | 102 | * You can use the object returned in a foreach loop to extract the data. |
103 | 103 | * |
104 | - * @param $filename The name of the file. If relative, it will be relative to the site's base dir |
|
104 | + * @param string $filename The name of the file. If relative, it will be relative to the site's base dir |
|
105 | 105 | * @param $delimiter The character for seperating columns |
106 | 106 | * @param $enclosure The character for quoting or enclosing columns |
107 | 107 | */ |