@@ -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) |
@@ -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 | { |
@@ -28,6 +28,10 @@ discard block |
||
| 28 | 28 | protected $_extracted_from_source = FALSE; |
| 29 | 29 | |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param string $server |
|
| 33 | + * @param string $path |
|
| 34 | + */ |
|
| 31 | 35 | public function __construct($server, $path, $filename = NULL) |
| 32 | 36 | { |
| 33 | 37 | $this->server($server); |
@@ -320,7 +324,6 @@ discard block |
||
| 320 | 324 | /** |
| 321 | 325 | * Get the current url (temp or server) |
| 322 | 326 | * @param string $thumbnail |
| 323 | - * @param mixed $protocol |
|
| 324 | 327 | * @return string |
| 325 | 328 | */ |
| 326 | 329 | public function url($thumbnail = NULL) |
@@ -346,6 +349,10 @@ discard block |
||
| 346 | 349 | return $this->temp()->directory().'/'.$this->filename(); |
| 347 | 350 | } |
| 348 | 351 | |
| 352 | + /** |
|
| 353 | + * @param string $method |
|
| 354 | + * @param string $thumbnail |
|
| 355 | + */ |
|
| 349 | 356 | protected function location($method, $thumbnail = NULL) |
| 350 | 357 | { |
| 351 | 358 | if ( ! $this->filename()) |
@@ -14,6 +14,9 @@ discard block |
||
| 14 | 14 | return new Upload_Temp; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param string $name |
|
| 19 | + */ |
|
| 17 | 20 | public static function config($name = NULL) |
| 18 | 21 | { |
| 19 | 22 | if ($name !== NULL) |
@@ -33,6 +36,9 @@ discard block |
||
| 33 | 36 | |
| 34 | 37 | protected $_directory; |
| 35 | 38 | |
| 39 | + /** |
|
| 40 | + * @param string $directory |
|
| 41 | + */ |
|
| 36 | 42 | public function directory($directory = NULL) |
| 37 | 43 | { |
| 38 | 44 | if ($directory !== NULL) |
@@ -11,6 +11,9 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | class Kohana_Upload_Util { |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @param string $directory |
|
| 16 | + */ |
|
| 14 | 17 | public static function download($url, $directory, $filename = NULL) |
| 15 | 18 | { |
| 16 | 19 | $url = str_replace(' ', '%20', $url); |
@@ -63,8 +66,7 @@ discard block |
||
| 63 | 66 | * Move the contents of the stream to a specified directory with a given name |
| 64 | 67 | * |
| 65 | 68 | * @param string $stream |
| 66 | - * @param string $directory |
|
| 67 | - * @param string $filename |
|
| 69 | + * @param string $file |
|
| 68 | 70 | */ |
| 69 | 71 | public static function stream_copy_to_file($stream, $file) |
| 70 | 72 | { |
@@ -146,7 +148,7 @@ discard block |
||
| 146 | 148 | * Filenames can be in the query or the url of the file itself |
| 147 | 149 | * |
| 148 | 150 | * @param string $url |
| 149 | - * @return array |
|
| 151 | + * @return string[] |
|
| 150 | 152 | */ |
| 151 | 153 | public static function filenames_candidates_from_url($url) |
| 152 | 154 | { |
@@ -43,7 +43,6 @@ |
||
| 43 | 43 | /** |
| 44 | 44 | * Automatically sets foreign to sensible defaults. |
| 45 | 45 | * |
| 46 | - * @param string $model |
|
| 47 | 46 | * @param string $name |
| 48 | 47 | * @return void |
| 49 | 48 | */ |
@@ -48,7 +48,6 @@ discard block |
||
| 48 | 48 | /** |
| 49 | 49 | * Initialize foreign_key, as, and polymorphic_key with default values |
| 50 | 50 | * |
| 51 | - * @param string $model |
|
| 52 | 51 | * @param string $name |
| 53 | 52 | */ |
| 54 | 53 | public function initialize(Jam_Meta $meta, $name) |
@@ -174,7 +173,7 @@ discard block |
||
| 174 | 173 | /** |
| 175 | 174 | * Generate a query to delete associated models in the database |
| 176 | 175 | * @param Jam_Model $model |
| 177 | - * @return Database_Query |
|
| 176 | + * @return null|Jam_Query_Builder_Delete |
|
| 178 | 177 | */ |
| 179 | 178 | public function erase_query(Jam_Model $model) |
| 180 | 179 | { |
@@ -197,7 +196,7 @@ discard block |
||
| 197 | 196 | /** |
| 198 | 197 | * Generate a query to remove models from this association (without deleting them) |
| 199 | 198 | * @param Jam_Model $model |
| 200 | - * @return Database_Query |
|
| 199 | + * @return null|Jam_Query_Builder_Update |
|
| 201 | 200 | */ |
| 202 | 201 | public function nullify_query(Jam_Model $model) |
| 203 | 202 | { |
@@ -280,6 +279,10 @@ discard block |
||
| 280 | 279 | } |
| 281 | 280 | |
| 282 | 281 | |
| 282 | + /** |
|
| 283 | + * @param string|null $polymorphic_key |
|
| 284 | + * @param Jam_Validated|null $inverse_of |
|
| 285 | + */ |
|
| 283 | 286 | protected function assign_item(Jam_Model $item, $foreign_key, $polymorphic_key, $inverse_of) |
| 284 | 287 | { |
| 285 | 288 | $item->{$this->foreign_key} = $foreign_key; |
@@ -63,8 +63,7 @@ discard block |
||
| 63 | 63 | /** |
| 64 | 64 | * Tracks a database result |
| 65 | 65 | * |
| 66 | - * @param mixed $result |
|
| 67 | - * @param mixed $model |
|
| 66 | + * @param Jam_Validated $model |
|
| 68 | 67 | */ |
| 69 | 68 | public function __construct(Jam_Validated $model, $error_filename) |
| 70 | 69 | { |
@@ -78,6 +77,9 @@ discard block |
||
| 78 | 77 | return $this->_container; |
| 79 | 78 | } |
| 80 | 79 | |
| 80 | + /** |
|
| 81 | + * @param string $error |
|
| 82 | + */ |
|
| 81 | 83 | public function add($attribute, $error, array $params = array()) |
| 82 | 84 | { |
| 83 | 85 | if ( ! isset($this->_container[$attribute])) |
@@ -90,6 +92,9 @@ discard block |
||
| 90 | 92 | return $this; |
| 91 | 93 | } |
| 92 | 94 | |
| 95 | + /** |
|
| 96 | + * @param string $attribute |
|
| 97 | + */ |
|
| 93 | 98 | public function messages($attribute = NULL) |
| 94 | 99 | { |
| 95 | 100 | $messages = array(); |
@@ -243,6 +248,9 @@ discard block |
||
| 243 | 248 | throw new Kohana_Exception('Cannot set the errors directly, must use add() method'); |
| 244 | 249 | } |
| 245 | 250 | |
| 251 | + /** |
|
| 252 | + * @param integer $offset |
|
| 253 | + */ |
|
| 246 | 254 | public function offsetExists($offset) |
| 247 | 255 | { |
| 248 | 256 | return isset($this->_container[$offset]); |