@@ -199,6 +199,7 @@ discard block |
||
| 199 | 199 | * |
| 200 | 200 | * @param Model|string model class |
| 201 | 201 | * @param array $values |
| 202 | + * @param Model $model |
|
| 202 | 203 | * |
| 203 | 204 | * @return array |
| 204 | 205 | */ |
@@ -232,7 +233,6 @@ discard block |
||
| 232 | 233 | /** |
| 233 | 234 | * Returns a prefixed where statement. |
| 234 | 235 | * |
| 235 | - * @param string $columns |
|
| 236 | 236 | * @param string $tablename |
| 237 | 237 | * |
| 238 | 238 | * @return string |
@@ -260,7 +260,6 @@ discard block |
||
| 260 | 260 | /** |
| 261 | 261 | * Returns a prefixed sort statement. |
| 262 | 262 | * |
| 263 | - * @param string $columns |
|
| 264 | 263 | * @param string $tablename |
| 265 | 264 | * |
| 266 | 265 | * @return string |
@@ -546,46 +546,46 @@ |
||
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 | switch ($type) { |
| 549 | - case self::TYPE_STRING: |
|
| 550 | - return (string) $value; |
|
| 549 | + case self::TYPE_STRING: |
|
| 550 | + return (string) $value; |
|
| 551 | 551 | |
| 552 | - case self::TYPE_INTEGER: |
|
| 553 | - return (int) $value; |
|
| 552 | + case self::TYPE_INTEGER: |
|
| 553 | + return (int) $value; |
|
| 554 | 554 | |
| 555 | - case self::TYPE_FLOAT: |
|
| 556 | - return (float) $value; |
|
| 555 | + case self::TYPE_FLOAT: |
|
| 556 | + return (float) $value; |
|
| 557 | 557 | |
| 558 | - case self::TYPE_BOOLEAN: |
|
| 559 | - return filter_var($value, FILTER_VALIDATE_BOOLEAN); |
|
| 558 | + case self::TYPE_BOOLEAN: |
|
| 559 | + return filter_var($value, FILTER_VALIDATE_BOOLEAN); |
|
| 560 | 560 | |
| 561 | - case self::TYPE_DATE: |
|
| 562 | - // cast dates into Carbon objects |
|
| 563 | - if ($value instanceof Carbon) { |
|
| 564 | - return $value; |
|
| 565 | - } else { |
|
| 566 | - $format = self::getDateFormat($property); |
|
| 561 | + case self::TYPE_DATE: |
|
| 562 | + // cast dates into Carbon objects |
|
| 563 | + if ($value instanceof Carbon) { |
|
| 564 | + return $value; |
|
| 565 | + } else { |
|
| 566 | + $format = self::getDateFormat($property); |
|
| 567 | 567 | |
| 568 | - return Carbon::createFromFormat($format, $value); |
|
| 569 | - } |
|
| 568 | + return Carbon::createFromFormat($format, $value); |
|
| 569 | + } |
|
| 570 | 570 | |
| 571 | - case self::TYPE_ARRAY: |
|
| 572 | - // decode JSON into an array |
|
| 573 | - if (is_string($value)) { |
|
| 574 | - return json_decode($value, true); |
|
| 575 | - } else { |
|
| 576 | - return (array) $value; |
|
| 577 | - } |
|
| 571 | + case self::TYPE_ARRAY: |
|
| 572 | + // decode JSON into an array |
|
| 573 | + if (is_string($value)) { |
|
| 574 | + return json_decode($value, true); |
|
| 575 | + } else { |
|
| 576 | + return (array) $value; |
|
| 577 | + } |
|
| 578 | 578 | |
| 579 | - case self::TYPE_OBJECT: |
|
| 580 | - // decode JSON into an object |
|
| 581 | - if (is_string($value)) { |
|
| 582 | - return (object) json_decode($value); |
|
| 583 | - } else { |
|
| 584 | - return (object) $value; |
|
| 585 | - } |
|
| 579 | + case self::TYPE_OBJECT: |
|
| 580 | + // decode JSON into an object |
|
| 581 | + if (is_string($value)) { |
|
| 582 | + return (object) json_decode($value); |
|
| 583 | + } else { |
|
| 584 | + return (object) $value; |
|
| 585 | + } |
|
| 586 | 586 | |
| 587 | - default: |
|
| 588 | - return $value; |
|
| 587 | + default: |
|
| 588 | + return $value; |
|
| 589 | 589 | } |
| 590 | 590 | } |
| 591 | 591 | |