@@ -247,6 +247,10 @@ discard block |
||
247 | 247 | * match. The caller must trim matching lines from the beginning and end |
248 | 248 | * of the portions it is going to specify. |
249 | 249 | */ |
250 | + |
|
251 | + /** |
|
252 | + * @param double $nchunks |
|
253 | + */ |
|
250 | 254 | public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { |
251 | 255 | $flip = false; |
252 | 256 | |
@@ -357,6 +361,11 @@ discard block |
||
357 | 361 | * Note that XLIM, YLIM are exclusive bounds. |
358 | 362 | * All line numbers are origin-0 and discarded lines are not counted. |
359 | 363 | */ |
364 | + |
|
365 | + /** |
|
366 | + * @param integer $xoff |
|
367 | + * @param integer $yoff |
|
368 | + */ |
|
360 | 369 | public function _compareseq ($xoff, $xlim, $yoff, $ylim) { |
361 | 370 | // Slide down the bottom initial diagonal. |
362 | 371 | while ($xoff < $xlim && $yoff < $ylim |
@@ -554,7 +563,7 @@ discard block |
||
554 | 563 | * |
555 | 564 | * $diff = new Diff($lines1, $lines2); |
556 | 565 | * $rev = $diff->reverse(); |
557 | - * @return object A Diff object representing the inverse of the |
|
566 | + * @return Diff A Diff object representing the inverse of the |
|
558 | 567 | * original diff. |
559 | 568 | */ |
560 | 569 | public function reverse () { |
@@ -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 | */ |
@@ -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) { |
@@ -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 | */ |
@@ -142,6 +142,8 @@ |
||
142 | 142 | |
143 | 143 | /** |
144 | 144 | * @deprecated 4.0.0:5.0.0 Use renderInfo() instead |
145 | + * @param string $title |
|
146 | + * @param string|false $subtitle |
|
145 | 147 | */ |
146 | 148 | public function writeInfo($title, $subtitle, $description=false) { |
147 | 149 | Deprecation::notice('4.0', 'Use renderInfo() instead'); |
@@ -72,7 +72,7 @@ |
||
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 |
@@ -117,6 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * Return all of the IDs in the fixture of a particular class name. |
119 | 119 | * |
120 | + * @param string $class |
|
120 | 121 | * @return A map of fixture-identifier => object-id |
121 | 122 | */ |
122 | 123 | public function getIds($class) { |
@@ -131,6 +132,7 @@ discard block |
||
131 | 132 | * @param String |
132 | 133 | * @param String $identifier |
133 | 134 | * @param Int $databaseId |
135 | + * @param string $class |
|
134 | 136 | */ |
135 | 137 | public function setId($class, $identifier, $databaseId) { |
136 | 138 | $this->fixtures[$class][$identifier] = $databaseId; |
@@ -140,8 +142,8 @@ discard block |
||
140 | 142 | /** |
141 | 143 | * Get an object from the fixture. |
142 | 144 | * |
143 | - * @param $class The data class, as specified in your fixture file. Parent classes won't work |
|
144 | - * @param $identifier The identifier string, as provided in your fixture file |
|
145 | + * @param string $class The data class, as specified in your fixture file. Parent classes won't work |
|
146 | + * @param string $identifier The identifier string, as provided in your fixture file |
|
145 | 147 | */ |
146 | 148 | public function get($class, $identifier) { |
147 | 149 | $id = $this->getId($class, $identifier); |
@@ -161,7 +163,7 @@ discard block |
||
161 | 163 | * or {@link createRaw()}, both from the internal fixture mapping and the database. |
162 | 164 | * If the $class argument is set, limit clearing to items of this class. |
163 | 165 | * |
164 | - * @param String $class |
|
166 | + * @param string $limitToClass |
|
165 | 167 | */ |
166 | 168 | public function clear($limitToClass = null) { |
167 | 169 | $classes = ($limitToClass) ? array($limitToClass) : array_keys($this->fixtures); |
@@ -202,7 +204,6 @@ discard block |
||
202 | 204 | * Parse a value from a fixture file. If it starts with => |
203 | 205 | * it will get an ID from the fixture dictionary |
204 | 206 | * |
205 | - * @param String $fieldVal |
|
206 | 207 | * @return String Fixture database ID, or the original value |
207 | 208 | */ |
208 | 209 | protected function parseValue($value) { |