@@ -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) { |
@@ -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( |
@@ -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); |
@@ -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) { |