@@ -190,6 +190,10 @@ |
||
| 190 | 190 | return $return; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | + /** |
|
| 194 | + * @param integer $level |
|
| 195 | + * @param string $opr |
|
| 196 | + */ |
|
| 193 | 197 | private function parseRightExpression($level, $opr) { |
| 194 | 198 | switch ($opr) { |
| 195 | 199 | case 'between': return $this->parseBetween(); |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | |
| 27 | 27 | namespace ntentan\nibii\relationships; |
| 28 | 28 | |
| 29 | -use ntentan\utils\Text; |
|
| 30 | 29 | use ntentan\nibii\ORMContext; |
| 30 | +use ntentan\utils\Text; |
|
| 31 | 31 | |
| 32 | 32 | class BelongsToRelationship extends \ntentan\nibii\Relationship { |
| 33 | 33 | |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | |
| 27 | 27 | namespace ntentan\nibii\relationships; |
| 28 | 28 | |
| 29 | -use ntentan\utils\Text; |
|
| 30 | 29 | use ntentan\nibii\ORMContext; |
| 30 | +use ntentan\utils\Text; |
|
| 31 | 31 | |
| 32 | 32 | class HasManyRelationship extends \ntentan\nibii\Relationship { |
| 33 | 33 | |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use ntentan\nibii\interfaces\ModelClassResolverInterface; |
| 6 | 6 | use ntentan\nibii\interfaces\ModelJoinerInterface; |
| 7 | 7 | use ntentan\nibii\interfaces\TableNameResolverInterface; |
| 8 | -use ntentan\config\Config; |
|
| 9 | 8 | use ntentan\utils\Text; |
| 10 | 9 | |
| 11 | 10 | /** |
@@ -26,9 +26,9 @@ |
||
| 26 | 26 | |
| 27 | 27 | namespace ntentan\nibii\relationships; |
| 28 | 28 | |
| 29 | -use ntentan\utils\Text; |
|
| 30 | -use ntentan\nibii\ORMContext; |
|
| 31 | 29 | use ntentan\nibii\NibiiException; |
| 30 | +use ntentan\nibii\ORMContext; |
|
| 31 | +use ntentan\utils\Text; |
|
| 32 | 32 | |
| 33 | 33 | class ManyHaveManyRelationship extends \ntentan\nibii\Relationship |
| 34 | 34 | { |
@@ -103,6 +103,9 @@ |
||
| 103 | 103 | return $relationshipDetails; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | + /** |
|
| 107 | + * @param string $type |
|
| 108 | + */ |
|
| 106 | 109 | private function createRelationships($type, $relationships) |
| 107 | 110 | { |
| 108 | 111 | foreach ($relationships as $relationship) { |
@@ -99,6 +99,9 @@ |
||
| 99 | 99 | return $this->config; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | + /** |
|
| 103 | + * @param RecordWrapper $model |
|
| 104 | + */ |
|
| 102 | 105 | public function getModelDescription($model) |
| 103 | 106 | { |
| 104 | 107 | return new ModelDescription($model); |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use ntentan\atiaa\DbContext; |
| 6 | 6 | use ntentan\kaikai\Cache; |
| 7 | -use ntentan\nibii\interfaces\ModelFactoryInterface; |
|
| 8 | 7 | use ntentan\nibii\interfaces\DriverAdapterFactoryInterface; |
| 8 | +use ntentan\nibii\interfaces\ModelFactoryInterface; |
|
| 9 | 9 | use ntentan\nibii\interfaces\ValidatorFactoryInterface; |
| 10 | 10 | |
| 11 | 11 | /** |
@@ -50,7 +50,6 @@ |
||
| 50 | 50 | /** |
| 51 | 51 | * |
| 52 | 52 | * @param RecordWrapper $wrapper |
| 53 | - * @param DriverAdapter $adapter |
|
| 54 | 53 | * @param DataOperations $dataOperations |
| 55 | 54 | */ |
| 56 | 55 | public function __construct(RecordWrapper $wrapper, DataOperations $dataOperations, Driver $driver) { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | /** |
| 150 | 150 | * @method |
| 151 | - * @param type $name |
|
| 151 | + * @param string $name |
|
| 152 | 152 | * @param type $arguments |
| 153 | 153 | * @return type |
| 154 | 154 | */ |
@@ -172,6 +172,10 @@ discard block |
||
| 172 | 172 | return $this->retrieveItem($name); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | + /** |
|
| 176 | + * @param Relationship[] $relationships |
|
| 177 | + * @param integer $depth |
|
| 178 | + */ |
|
| 175 | 179 | private function expandArrayValue($array, $relationships, $depth, $index = null) |
| 176 | 180 | { |
| 177 | 181 | foreach ($relationships as $name => $relationship) { |
@@ -359,6 +363,9 @@ discard block |
||
| 359 | 363 | |
| 360 | 364 | } |
| 361 | 365 | |
| 366 | + /** |
|
| 367 | + * @param string $id |
|
| 368 | + */ |
|
| 362 | 369 | public function postSaveCallback($id) |
| 363 | 370 | { |
| 364 | 371 | |
@@ -387,7 +394,7 @@ discard block |
||
| 387 | 394 | |
| 388 | 395 | /** |
| 389 | 396 | * |
| 390 | - * @return DataAdapter |
|
| 397 | + * @return DriverAdapter |
|
| 391 | 398 | */ |
| 392 | 399 | public function getAdapter() |
| 393 | 400 | { |