@@ -95,7 +95,7 @@  | 
                                                    ||
| 95 | 95 | /**  | 
                                                        
| 96 | 96 | * Retrieve entities from database.  | 
                                                        
| 97 | 97 | *  | 
                                                        
| 98 | - * @param string|array $relationID Relation entity identifier or collection  | 
                                                        |
| 98 | + * @param string $relationID Relation entity identifier or collection  | 
                                                        |
| 99 | 99 | * @param mixed $relationValue Relation entity value  | 
                                                        
| 100 | 100 | * @param string $executor Query execution function name  | 
                                                        
| 101 | 101 | * @return mixed[] Collection of entity instances for this relation identifier  | 
                                                        
@@ -7,7 +7,6 @@  | 
                                                    ||
| 7 | 7 | */  | 
                                                        
| 8 | 8 | namespace samsoncms\api\query;  | 
                                                        
| 9 | 9 | |
| 10 | -use samson\activerecord\dbQuery;  | 
                                                        |
| 11 | 10 | use samsoncms\api\Field;  | 
                                                        
| 12 | 11 | use samsonframework\orm\ArgumentInterface;  | 
                                                        
| 13 | 12 | use samsonframework\orm\Condition;  | 
                                                        
@@ -12,7 +12,6 @@  | 
                                                    ||
| 12 | 12 | use samsoncms\api\Field;  | 
                                                        
| 13 | 13 | use samsoncms\api\CMS;  | 
                                                        
| 14 | 14 | use samsonframework\orm\Condition;  | 
                                                        
| 15 | -use samsonframework\orm\ArgumentInterface;  | 
                                                        |
| 16 | 15 | use samsonframework\orm\ConditionInterface;  | 
                                                        
| 17 | 16 | |
| 18 | 17 | /**  | 
                                                        
@@ -42,7 +42,7 @@  | 
                                                    ||
| 42 | 42 | * Get current entity identifiers collection by relation identifier ans its value.  | 
                                                        
| 43 | 43 | *  | 
                                                        
| 44 | 44 | * @param string $relationID Relation entity identifier  | 
                                                        
| 45 | - * @param mixed|Condition $relationValue Relation entity value or relation condition  | 
                                                        |
| 45 | + * @param Condition $relationValue Relation entity value or relation condition  | 
                                                        |
| 46 | 46 | * @param array $filteringIDs Collection of entity identifiers for filtering query  | 
                                                        
| 47 | 47 | * @return array Collection of entity identifiers filtered by navigation identifier.  | 
                                                        
| 48 | 48 | */  | 
                                                        
@@ -340,7 +340,7 @@  | 
                                                    ||
| 340 | 340 | *  | 
                                                        
| 341 | 341 | * @param \samsoncms\api\Entity $entity Entity instance for filling  | 
                                                        
| 342 | 342 | * @param array $additionalFields Collection of additional field values  | 
                                                        
| 343 | - * @return Entity With filled additional field values  | 
                                                        |
| 343 | + * @return \samsoncms\api\Entity With filled additional field values  | 
                                                        |
| 344 | 344 | */  | 
                                                        
| 345 | 345 | protected function fillEntityFields(\samsoncms\api\Entity $entity, array $additionalFields)  | 
                                                        
| 346 | 346 |      { | 
                                                        
@@ -28,7 +28,6 @@ discard block  | 
                                                    ||
| 28 | 28 | * OOP constructor.  | 
                                                        
| 29 | 29 | *  | 
                                                        
| 30 | 30 | * @param Generator $generator Code generation instance  | 
                                                        
| 31 | - * @param \samsoncms\api\generator\metadata\GenericMetadata $Generic Entity query metadata  | 
                                                        |
| 32 | 31 | */  | 
                                                        
| 33 | 32 | public function __construct(Generator $generator, $metadata)  | 
                                                        
| 34 | 33 |      { | 
                                                        
@@ -40,7 +39,7 @@ discard block  | 
                                                    ||
| 40 | 39 | /**  | 
                                                        
| 41 | 40 | * Generic class generation.  | 
                                                        
| 42 | 41 | *  | 
                                                        
| 43 | - * @param Generic|metadata\GenericMetadata $metadata Entity metadata  | 
                                                        |
| 42 | + * @param Generic $metadata Entity metadata  | 
                                                        |
| 44 | 43 | *  | 
                                                        
| 45 | 44 | * @return string Generated PHP class code  | 
                                                        
| 46 | 45 | */  | 
                                                        
@@ -6,7 +6,6 @@  | 
                                                    ||
| 6 | 6 | */  | 
                                                        
| 7 | 7 | namespace samsoncms\api\generator;  | 
                                                        
| 8 | 8 | |
| 9 | -use samsonframework\orm\DatabaseInterface;  | 
                                                        |
| 10 | 9 | use samsonphp\generator\Generator;  | 
                                                        
| 11 | 10 | |
| 12 | 11 | /**  |