@@ -424,7 +424,7 @@ |
||
| 424 | 424 | |
| 425 | 425 | /** |
| 426 | 426 | * Set conditions |
| 427 | - * @param array|Conditions $conditions |
|
| 427 | + * @param Conditions $conditions |
|
| 428 | 428 | * @return Criteria |
| 429 | 429 | */ |
| 430 | 430 | public function setConditions($conditions) |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Returns the given object as an associative array |
| 30 | - * @param AnnotatedInterface|object $model |
|
| 30 | + * @param AnnotatedInterface $model |
|
| 31 | 31 | * @param string[] $fields Fields to transform |
| 32 | 32 | * @param int $options json_encode options |
| 33 | - * @return array an associative array of the contents of this object |
|
| 33 | + * @return string an associative array of the contents of this object |
|
| 34 | 34 | */ |
| 35 | 35 | public static function fromModel(AnnotatedInterface $model, $fields = [], $options = null) |
| 36 | 36 | { |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * Returns the given object as an associative array |
| 36 | - * @param AnnotatedInterface|object $model |
|
| 36 | + * @param AnnotatedInterface $model |
|
| 37 | 37 | * @param string[] $fields Fields to transform |
| 38 | 38 | * @return array an associative array of the contents of this object |
| 39 | 39 | */ |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * Each call will be grouped with previous calls |
| 35 | 35 | * @param string $fieldName |
| 36 | 36 | * @param integer $order |
| 37 | - * @return CriteriaInterface |
|
| 37 | + * @return SortableTrait |
|
| 38 | 38 | * @since v1.0 |
| 39 | 39 | */ |
| 40 | 40 | public function sort($fieldName, $order = SortInterface::SortAsc) |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | * |
| 119 | 119 | * |
| 120 | 120 | * @param mixed[]|SortInterface |
| 121 | - * @return CriteriaInterface |
|
| 121 | + * @return SortableTrait |
|
| 122 | 122 | */ |
| 123 | 123 | public function setSort($sort) |
| 124 | 124 | { |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Maslosoft\Mangan\Helpers\Decorator; |
| 15 | 15 | |
| 16 | -use Maslosoft\Mangan\Decorators\Undecorated; |
|
| 17 | 16 | use Maslosoft\Mangan\Exceptions\ManganException; |
| 18 | 17 | use Maslosoft\Mangan\Interfaces\Decorators\Model\ModelDecoratorInterface; |
| 19 | 18 | use Maslosoft\Mangan\Interfaces\Decorators\Property\DecoratorInterface; |
@@ -83,6 +83,10 @@ |
||
| 83 | 83 | */ |
| 84 | 84 | public $msgLength = ''; |
| 85 | 85 | |
| 86 | + /** |
|
| 87 | + * @param \Maslosoft\Addendum\Interfaces\AnnotatedInterface $model |
|
| 88 | + * @param integer $value |
|
| 89 | + */ |
|
| 86 | 90 | protected function isValidValueOf($model, $attribute, $value, $label = '') |
| 87 | 91 | { |
| 88 | 92 | if ($this->allowEmpty && empty($value)) |
@@ -15,8 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Maslosoft\Addendum\Interfaces\AnnotatedInterface; |
| 17 | 17 | use Maslosoft\Addendum\Utilities\ClassChecker; |
| 18 | -use Maslosoft\Hi5Edit\Models\Href; |
|
| 19 | -use Maslosoft\Mangan\Interfaces\EntityManagerInterface; |
|
| 20 | 18 | use Maslosoft\Mangan\Interfaces\Events\EventInterface; |
| 21 | 19 | use Maslosoft\Mangan\Meta\ManganMeta; |
| 22 | 20 | use ReflectionClass; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | * |
| 74 | 74 | * @param mixed $pk primary key value. Use array for composite key. |
| 75 | 75 | * @param array|CriteriaInterface $criteria |
| 76 | - * @return AnnotatedInterface|static|null |
|
| 76 | + * @return AnnotatedInterface|null |
|
| 77 | 77 | * @Ignored |
| 78 | 78 | */ |
| 79 | 79 | public function findByPk($pk, $criteria = null) |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * ``` |
| 96 | 96 | * |
| 97 | 97 | * @param mixed[] Array of stributes and values in form of ['attributeName' => 'value'] |
| 98 | - * @return AnnotatedInterface|static|null |
|
| 98 | + * @return AnnotatedInterface|null |
|
| 99 | 99 | * @Ignored |
| 100 | 100 | */ |
| 101 | 101 | public function findByAttributes(array $attributes) |
@@ -137,6 +137,9 @@ |
||
| 137 | 137 | return array_sum($results) === count($results); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | + /** |
|
| 141 | + * @param string $className |
|
| 142 | + */ |
|
| 140 | 143 | public function getStoragePath(AnnotatedInterface $model = null, $className = null) |
| 141 | 144 | { |
| 142 | 145 | if(empty($className)) |