@@ -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 | |
@@ -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 | */ |
@@ -253,6 +253,9 @@ discard block |
||
| 253 | 253 | return $this; |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | + /** |
|
| 257 | + * @param string $type |
|
| 258 | + */ |
|
| 256 | 259 | protected function invokeCallbacks($type, $args = array()) { |
| 257 | 260 | foreach($this->callbacks[$type] as $callback) { |
| 258 | 261 | call_user_func_array($callback, $args); |
@@ -263,7 +266,6 @@ discard block |
||
| 263 | 266 | * Parse a value from a fixture file. If it starts with => |
| 264 | 267 | * it will get an ID from the fixture dictionary |
| 265 | 268 | * |
| 266 | - * @param string $fieldVal |
|
| 267 | 269 | * @param array $fixtures See {@link createObject()} |
| 268 | 270 | * @param string $class If the value parsed is a class relation, this parameter |
| 269 | 271 | * will be given the value of that class's name |
@@ -292,6 +294,9 @@ discard block |
||
| 292 | 294 | $obj->$name = $this->parseValue($value, $fixtures); |
| 293 | 295 | } |
| 294 | 296 | |
| 297 | + /** |
|
| 298 | + * @param string $fieldName |
|
| 299 | + */ |
|
| 295 | 300 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
| 296 | 301 | $table = ClassInfo::table_for_object_field(get_class($obj), $fieldName); |
| 297 | 302 | $value = $this->parseValue($value, $fixtures); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | * Find an attribute in a SimpleXMLElement object by name. |
| 216 | 216 | * @param SimpleXMLElement $object |
| 217 | 217 | * @param string $attribute Name of attribute to find |
| 218 | - * @return SimpleXMLElement object of the attribute |
|
| 218 | + * @return boolean object of the attribute |
|
| 219 | 219 | */ |
| 220 | 220 | public function findAttribute($object, $attribute) { |
| 221 | 221 | $found = false; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
| 246 | 246 | * |
| 247 | 247 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 248 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
| 248 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
| 249 | 249 | * @throws PHPUnit_Framework_AssertionFailedError |
| 250 | 250 | * @return boolean |
| 251 | 251 | */ |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 343 | 343 | * @param array|string $expectedMatches The content of *all* matched tags as an array |
| 344 | 344 | * @throws PHPUnit_Framework_AssertionFailedError |
| 345 | - * @return boolean |
|
| 345 | + * @return boolean|null |
|
| 346 | 346 | */ |
| 347 | 347 | public function assertExactHTMLMatchBySelector($selector, $expectedMatches) { |
| 348 | 348 | $items = $this->cssParser()->getBySelector($selector); |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | * @access private |
| 320 | 320 | * @param obj PHPUnit_Framework_Test, current test that is being run |
| 321 | 321 | * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error |
| 322 | - * @return array |
|
| 322 | + * @return string |
|
| 323 | 323 | */ |
| 324 | 324 | private function getTestException(PHPUnit_Framework_Test $test, Exception $e) { |
| 325 | 325 | // get the name of the testFile from the test |
@@ -406,6 +406,9 @@ discard block |
||
| 406 | 406 | |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | + /** |
|
| 410 | + * @param string $name |
|
| 411 | + */ |
|
| 409 | 412 | protected function testNameToPhrase($name) { |
| 410 | 413 | return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name)); |
| 411 | 414 | } |