@@ -260,6 +260,9 @@ discard block |
||
260 | 260 | return $this->_collection; |
261 | 261 | } |
262 | 262 | |
263 | + /** |
|
264 | + * @param string $field |
|
265 | + */ |
|
263 | 266 | public function validator($field, $options) |
264 | 267 | { |
265 | 268 | $fields = func_get_args(); |
@@ -402,7 +405,7 @@ discard block |
||
402 | 405 | * |
403 | 406 | * @param string $name name of the field |
404 | 407 | * @param mixed $field the field alias or object |
405 | - * @return Jam_Field|$this|null |
|
408 | + * @return string |
|
406 | 409 | */ |
407 | 410 | public function field($name, $field = NULL, $prepend = FALSE) |
408 | 411 | { |
@@ -628,7 +631,6 @@ discard block |
||
628 | 631 | * Get / Set individual behaviors. |
629 | 632 | * |
630 | 633 | * @param string $name name of the association |
631 | - * @param mixed $association the association alias or object |
|
632 | 634 | * @return Jam_Behavior|$this|null |
633 | 635 | */ |
634 | 636 | public function behavior($name, $behavior = NULL, $prepend = FALSE) |
@@ -676,7 +678,7 @@ discard block |
||
676 | 678 | * Gets or sets the model's primary key. |
677 | 679 | * |
678 | 680 | * @param string $value |
679 | - * @return mixed |
|
681 | + * @return string |
|
680 | 682 | */ |
681 | 683 | public function primary_key($value = NULL) |
682 | 684 | { |
@@ -692,7 +694,7 @@ discard block |
||
692 | 694 | * Gets or sets the model's name key |
693 | 695 | * |
694 | 696 | * @param string $value |
695 | - * @return string|$this |
|
697 | + * @return string |
|
696 | 698 | */ |
697 | 699 | public function name_key($value = NULL) |
698 | 700 | { |
@@ -39,7 +39,6 @@ discard block |
||
39 | 39 | * A key can be passed to automatically load a model by its |
40 | 40 | * unique key. |
41 | 41 | * |
42 | - * @param mixed|null $key |
|
43 | 42 | */ |
44 | 43 | public function __construct($meta_name = NULL) |
45 | 44 | { |
@@ -190,7 +189,6 @@ discard block |
||
190 | 189 | * Validates the current model's data |
191 | 190 | * |
192 | 191 | * @throws Jam_Exception_Validation |
193 | - * @param Validation|null $extra_validation |
|
194 | 192 | * @return bool |
195 | 193 | */ |
196 | 194 | public function check($force = FALSE) |
@@ -436,6 +434,9 @@ discard block |
||
436 | 434 | return $attribute; |
437 | 435 | } |
438 | 436 | |
437 | + /** |
|
438 | + * @param string $association_name |
|
439 | + */ |
|
439 | 440 | public function build($association_name, array $attributes = array()) |
440 | 441 | { |
441 | 442 | $association = $this->meta()->association($association_name); |
@@ -54,7 +54,6 @@ discard block |
||
54 | 54 | * A key can be passed to automatically load a model by its |
55 | 55 | * unique key. |
56 | 56 | * |
57 | - * @param mixed|null $key |
|
58 | 57 | */ |
59 | 58 | public function __construct($meta_name = NULL) |
60 | 59 | { |
@@ -204,7 +203,6 @@ discard block |
||
204 | 203 | * This method—combined with get(), which first searches for changed |
205 | 204 | * values—is useful for comparing changes that occurred on a model. |
206 | 205 | * |
207 | - * @param string $field The field's or alias name |
|
208 | 206 | * @return mixed |
209 | 207 | */ |
210 | 208 | public function original($field_name = NULL) |
@@ -321,7 +319,6 @@ discard block |
||
321 | 319 | * Validates the current model's data |
322 | 320 | * |
323 | 321 | * @throws Jam_Exception_Validation |
324 | - * @param Validation|null $extra_validation |
|
325 | 322 | * @return bool |
326 | 323 | */ |
327 | 324 | public function check($force = FALSE) |
@@ -437,7 +434,6 @@ discard block |
||
437 | 434 | * If $field is NULL, the method returns whether or not any |
438 | 435 | * data whatsoever was changed on the model. |
439 | 436 | * |
440 | - * @param string $field |
|
441 | 437 | * @return boolean |
442 | 438 | */ |
443 | 439 | public function changed($name = NULL) |