@@ -43,6 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | /** |
45 | 45 | * @todo Move this to SS_Database or DB |
46 | + * @param string $class |
|
46 | 47 | */ |
47 | 48 | public static function hasTable($class) { |
48 | 49 | // Cache the list of all table names to reduce on DB traffic |
@@ -80,7 +81,7 @@ discard block |
||
80 | 81 | * |
81 | 82 | * @todo Move this into {@see DataObjectSchema} |
82 | 83 | * |
83 | - * @param string|object $class |
|
84 | + * @param string $class |
|
84 | 85 | * @return array |
85 | 86 | */ |
86 | 87 | public static function dataClassesFor($class) { |
@@ -205,6 +206,7 @@ discard block |
||
205 | 206 | |
206 | 207 | /** |
207 | 208 | * Returns true if the given class implements the given interface |
209 | + * @param string $interfaceName |
|
208 | 210 | */ |
209 | 211 | public static function classImplements($className, $interfaceName) { |
210 | 212 | return in_array($className, self::implementorsOf($interfaceName)); |
@@ -255,6 +257,9 @@ discard block |
||
255 | 257 | |
256 | 258 | private static $method_from_cache = array(); |
257 | 259 | |
260 | + /** |
|
261 | + * @param string $method |
|
262 | + */ |
|
258 | 263 | public static function has_method_from($class, $method, $compclass) { |
259 | 264 | $lClass = strtolower($class); |
260 | 265 | $lMethod = strtolower($method); |
@@ -260,6 +260,9 @@ discard block |
||
260 | 260 | return $this; |
261 | 261 | } |
262 | 262 | |
263 | + /** |
|
264 | + * @param string $type |
|
265 | + */ |
|
263 | 266 | protected function invokeCallbacks($type, $args = array()) { |
264 | 267 | foreach($this->callbacks[$type] as $callback) { |
265 | 268 | call_user_func_array($callback, $args); |
@@ -299,6 +302,9 @@ discard block |
||
299 | 302 | $obj->$name = $this->parseValue($value, $fixtures); |
300 | 303 | } |
301 | 304 | |
305 | + /** |
|
306 | + * @param string $fieldName |
|
307 | + */ |
|
302 | 308 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
303 | 309 | $class = get_class($obj); |
304 | 310 | $table = DataObject::getSchema()->tableForField($class, $fieldName); |
@@ -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(); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @param array|string $val String to escape, or array of strings |
52 | 52 | * |
53 | - * @return array|string |
|
53 | + * @return string |
|
54 | 54 | */ |
55 | 55 | public static function raw2htmlname($val) { |
56 | 56 | if(is_array($val)) { |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | * table, or column name. Supports encoding of multi identfiers separated by |
177 | 177 | * a delimiter (e.g. ".") |
178 | 178 | * |
179 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
179 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
180 | 180 | * to be joined via the separator. |
181 | 181 | * @param string $separator The string that delimits subsequent identifiers |
182 | 182 | * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
@@ -257,6 +257,7 @@ discard block |
||
257 | 257 | * call this function directly, Please use {@link Convert::xml2array()} |
258 | 258 | * |
259 | 259 | * @param SimpleXMLElement |
260 | + * @param SimpleXMLElement $xml |
|
260 | 261 | * |
261 | 262 | * @return mixed |
262 | 263 | */ |
@@ -450,7 +451,7 @@ discard block |
||
450 | 451 | * - IDField => idField |
451 | 452 | * - iDField => iDField |
452 | 453 | * |
453 | - * @param $str |
|
454 | + * @param string $str |
|
454 | 455 | * @return string |
455 | 456 | */ |
456 | 457 | public static function upperCamelToLowerCamel($str) { |
@@ -337,7 +337,7 @@ |
||
337 | 337 | /** |
338 | 338 | * Gets viewable list of campaigns |
339 | 339 | * |
340 | - * @return SS_List |
|
340 | + * @return SilverStripe\ORM\ArrayList |
|
341 | 341 | */ |
342 | 342 | protected function getListItems() { |
343 | 343 | return ChangeSet::get() |
@@ -89,7 +89,7 @@ |
||
89 | 89 | /** |
90 | 90 | * Get list of File dataobjects to import |
91 | 91 | * |
92 | - * @return DataList |
|
92 | + * @return SilverStripe\ORM\DataList |
|
93 | 93 | */ |
94 | 94 | protected function getFileQuery() { |
95 | 95 | // Select all records which have a Filename value, but not FileFilename. |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * Find the given folder or create it as a database record |
48 | 48 | * |
49 | 49 | * @param string $folderPath Directory path relative to assets root |
50 | - * @return Folder|null |
|
50 | + * @return null|SilverStripe\ORM\DataObject |
|
51 | 51 | */ |
52 | 52 | public static function find_or_make($folderPath) { |
53 | 53 | // replace leading and trailing slashes |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | /** |
150 | 150 | * Returns all children of this folder |
151 | 151 | * |
152 | - * @return DataList |
|
152 | + * @return SilverStripe\ORM\DataList |
|
153 | 153 | */ |
154 | 154 | public function myChildren() { |
155 | 155 | return File::get()->filter("ParentID", $this->ID); |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | /** |
201 | 201 | * Get the children of this folder that are also folders. |
202 | 202 | * |
203 | - * @return DataList |
|
203 | + * @return SilverStripe\ORM\DataList |
|
204 | 204 | */ |
205 | 205 | public function ChildFolders() { |
206 | 206 | return Folder::get()->filter('ParentID', $this->ID); |
@@ -513,7 +513,7 @@ |
||
513 | 513 | /** |
514 | 514 | * Get HTML for img containing the icon for this file |
515 | 515 | * |
516 | - * @return DBHTMLText |
|
516 | + * @return DBField |
|
517 | 517 | */ |
518 | 518 | public function IconTag() { |
519 | 519 | return DBField::create_field( |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | |
195 | 195 | /** |
196 | - * @return ArrayList |
|
196 | + * @return SilverStripe\ORM\ArrayList |
|
197 | 197 | */ |
198 | 198 | public function getComponents() { |
199 | 199 | return $this->config->getComponents(); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * |
205 | 205 | * @todo refactor this into GridFieldComponent |
206 | 206 | * |
207 | - * @param mixed $value |
|
207 | + * @param string $value |
|
208 | 208 | * @param string|array $castingDefinition |
209 | 209 | * |
210 | 210 | * @return mixed |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | * |
292 | 292 | * @param array $properties |
293 | 293 | * |
294 | - * @return HTMLText |
|
294 | + * @return DBField |
|
295 | 295 | */ |
296 | 296 | public function FieldHolder($properties = array()) { |
297 | 297 | Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css'); |
@@ -605,7 +605,7 @@ discard block |
||
605 | 605 | /** |
606 | 606 | * @param array $properties |
607 | 607 | * |
608 | - * @return HTMLText |
|
608 | + * @return DBField |
|
609 | 609 | */ |
610 | 610 | public function Field($properties = array()) { |
611 | 611 | $this->extend('onBeforeRender', $this); |