@@ -261,6 +261,9 @@ discard block |
||
| 261 | 261 | return $this->_collection; |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | + /** |
|
| 265 | + * @param string $field |
|
| 266 | + */ |
|
| 264 | 267 | public function validator($field, $options) |
| 265 | 268 | { |
| 266 | 269 | $fields = func_get_args(); |
@@ -403,7 +406,7 @@ discard block |
||
| 403 | 406 | * |
| 404 | 407 | * @param string $name name of the field |
| 405 | 408 | * @param mixed $field the field alias or object |
| 406 | - * @return Jam_Field|Jam_Meta|null |
|
| 409 | + * @return string |
|
| 407 | 410 | */ |
| 408 | 411 | public function field($name, $field = NULL, $prepend = FALSE) |
| 409 | 412 | { |
@@ -629,7 +632,6 @@ discard block |
||
| 629 | 632 | * Get / Set individual behaviors. |
| 630 | 633 | * |
| 631 | 634 | * @param string $name name of the association |
| 632 | - * @param mixed $association the association alias or object |
|
| 633 | 635 | * @return Jam_Association|Jam_Meta|null |
| 634 | 636 | */ |
| 635 | 637 | public function behavior($name, $behavior = NULL, $prepend = FALSE) |
@@ -666,7 +668,7 @@ discard block |
||
| 666 | 668 | /** |
| 667 | 669 | * Gets the events attached to the object. |
| 668 | 670 | * |
| 669 | - * @return array|Jam_Event |
|
| 671 | + * @return Jam_Event |
|
| 670 | 672 | */ |
| 671 | 673 | public function events() |
| 672 | 674 | { |
@@ -677,7 +679,7 @@ discard block |
||
| 677 | 679 | * Gets or sets the model's primary key. |
| 678 | 680 | * |
| 679 | 681 | * @param string $value |
| 680 | - * @return mixed |
|
| 682 | + * @return string |
|
| 681 | 683 | */ |
| 682 | 684 | public function primary_key($value = NULL) |
| 683 | 685 | { |
@@ -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,8 +189,7 @@ 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 | - * @return Kohana_Jam_Model |
|
| 192 | + * @return boolean |
|
| 195 | 193 | */ |
| 196 | 194 | public function check($force = FALSE) |
| 197 | 195 | { |
@@ -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); |
@@ -89,6 +89,7 @@ |
||
| 89 | 89 | * |
| 90 | 90 | * @param string column for associative keys |
| 91 | 91 | * @param string column for values |
| 92 | + * @param string $value |
|
| 92 | 93 | * @return array |
| 93 | 94 | */ |
| 94 | 95 | public function as_array($key = NULL, $value = NULL) |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | * |
| 42 | 42 | * @throws Kohana_Exception |
| 43 | 43 | * @param string|null $model |
| 44 | - * @param mixed|null $key |
|
| 44 | + * @param string|null $key |
|
| 45 | 45 | */ |
| 46 | 46 | public function __construct($model, $key = NULL) |
| 47 | 47 | { |
@@ -98,6 +98,9 @@ |
||
| 98 | 98 | return $compiled; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | + /** |
|
| 102 | + * @param string $context_model |
|
| 103 | + */ |
|
| 101 | 104 | public function context_model($context_model = NULL) |
| 102 | 105 | { |
| 103 | 106 | if ($context_model !== NULL) |
@@ -42,7 +42,6 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @throws Kohana_Exception |
| 44 | 44 | * @param string|null $model |
| 45 | - * @param mixed|null $key |
|
| 46 | 45 | */ |
| 47 | 46 | public function __construct($model) |
| 48 | 47 | { |
@@ -140,6 +139,11 @@ discard block |
||
| 140 | 139 | return $this; |
| 141 | 140 | } |
| 142 | 141 | |
| 142 | + /** |
|
| 143 | + * @param string $c1 |
|
| 144 | + * @param string $op |
|
| 145 | + * @param string $c2 |
|
| 146 | + */ |
|
| 143 | 147 | public function on($c1, $op, $c2) |
| 144 | 148 | { |
| 145 | 149 | if ( ! $this->_last_join) |
@@ -154,6 +158,9 @@ discard block |
||
| 154 | 158 | return $this->_join($association, $type)->end($this); |
| 155 | 159 | } |
| 156 | 160 | |
| 161 | + /** |
|
| 162 | + * @param string $table |
|
| 163 | + */ |
|
| 157 | 164 | public function join_table($table, $type = NULL) |
| 158 | 165 | { |
| 159 | 166 | return $this->_join($table, $type, FALSE)->end($this); |
@@ -308,6 +315,9 @@ discard block |
||
| 308 | 315 | } |
| 309 | 316 | } |
| 310 | 317 | |
| 318 | + /** |
|
| 319 | + * @param string $name |
|
| 320 | + */ |
|
| 311 | 321 | public function except($name) |
| 312 | 322 | { |
| 313 | 323 | $except = func_get_args(); |
@@ -37,6 +37,9 @@ discard block |
||
| 37 | 37 | protected $_master_timezone = NULL; |
| 38 | 38 | protected $_default_timezone = NULL; |
| 39 | 39 | |
| 40 | + /** |
|
| 41 | + * @return DateTimeZone |
|
| 42 | + */ |
|
| 40 | 43 | public function master_timezone($timezone = NULL) |
| 41 | 44 | { |
| 42 | 45 | if ($timezone !== NULL) |
@@ -53,6 +56,9 @@ discard block |
||
| 53 | 56 | return $this->_master_timezone; |
| 54 | 57 | } |
| 55 | 58 | |
| 59 | + /** |
|
| 60 | + * @return DateTimeZone |
|
| 61 | + */ |
|
| 56 | 62 | public function default_timezone($timezone = NULL) |
| 57 | 63 | { |
| 58 | 64 | if ($timezone !== NULL) |
@@ -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 | { |
@@ -114,7 +113,7 @@ discard block |
||
| 114 | 113 | * |
| 115 | 114 | * @param string $method |
| 116 | 115 | * @param array $args |
| 117 | - * @return mixed |
|
| 116 | + * @return string|null |
|
| 118 | 117 | **/ |
| 119 | 118 | public function __call($method, $args) |
| 120 | 119 | { |
@@ -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,8 +319,7 @@ 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 | - * @return Kohana_Jam_Model |
|
| 322 | + * @return boolean |
|
| 326 | 323 | */ |
| 327 | 324 | public function check($force = FALSE) |
| 328 | 325 | { |
@@ -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) |
@@ -47,7 +47,6 @@ |
||
| 47 | 47 | protected $_permit = array(); |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * @param array $data |
|
| 51 | 50 | */ |
| 52 | 51 | public function __construct($permit) |
| 53 | 52 | { |