@@ -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 | /** |
@@ -89,6 +89,9 @@ |
||
89 | 89 | return $this->config; |
90 | 90 | } |
91 | 91 | |
92 | + /** |
|
93 | + * @param RecordWrapper $model |
|
94 | + */ |
|
92 | 95 | public function getModelDescription($model) : ModelDescription |
93 | 96 | { |
94 | 97 | return new ModelDescription($model); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | |
24 | 24 | public function createDriverAdapter() |
25 | 25 | { |
26 | - $class = 'ntentan\nibii\adapters\\' . Text::ucamelize($this->driverName) . 'Adapter'; |
|
26 | + $class = 'ntentan\nibii\adapters\\'.Text::ucamelize($this->driverName).'Adapter'; |
|
27 | 27 | return new $class(); |
28 | 28 | } |
29 | 29 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | } |
34 | 34 | $classes = [$classA['class'], $classB['class']]; |
35 | 35 | sort($classes); |
36 | - return "{$classA['namespace']}\\" . implode('', $classes); |
|
36 | + return "{$classA['namespace']}\\".implode('', $classes); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | private function getClassFileDetails($className) { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace ntentan\nibii\factories; |
4 | 4 | |
5 | -use ntentan\utils\Text; |
|
6 | 5 | use ntentan\nibii\interfaces\ModelFactoryInterface; |
6 | +use ntentan\utils\Text; |
|
7 | 7 | |
8 | 8 | class DefaultModelFactory implements ModelFactoryInterface |
9 | 9 | { |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | $this->table = $table['table']; |
85 | 85 | $this->schema = $table['schema']; |
86 | 86 | } |
87 | - $this->quotedTable = ($this->schema ? "{$driver->quoteIdentifier($this->schema)}." : "") . $driver->quoteIdentifier($this->table); |
|
88 | - $this->unquotedTable = ($this->schema ? "{$this->schema}." : "") . $this->table; |
|
87 | + $this->quotedTable = ($this->schema ? "{$driver->quoteIdentifier($this->schema)}." : "").$driver->quoteIdentifier($this->table); |
|
88 | + $this->unquotedTable = ($this->schema ? "{$this->schema}." : "").$this->table; |
|
89 | 89 | $this->adapter->setModel($this, $this->quotedTable); |
90 | 90 | $this->initialized = true; |
91 | 91 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | { |
105 | 105 | $this->initialize(); |
106 | 106 | return $this->context->getCache()->read( |
107 | - "{$this->className}::desc", function () { |
|
107 | + "{$this->className}::desc", function() { |
|
108 | 108 | return $this->context->getModelDescription($this); |
109 | 109 | } |
110 | 110 | ); |
@@ -171,6 +171,10 @@ discard block |
||
171 | 171 | return $this->retrieveItem($name); |
172 | 172 | } |
173 | 173 | |
174 | + /** |
|
175 | + * @param Relationship[] $relationships |
|
176 | + * @param integer $depth |
|
177 | + */ |
|
174 | 178 | private function expandArrayValue($array, $relationships, $depth, $index = null) |
175 | 179 | { |
176 | 180 | 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 |
@@ -17,5 +17,10 @@ |
||
17 | 17 | */ |
18 | 18 | interface ValidatorFactoryInterface |
19 | 19 | { |
20 | + /** |
|
21 | + * @param integer $mode |
|
22 | + * |
|
23 | + * @return \ntentan\nibii\DefaultValidator |
|
24 | + */ |
|
20 | 25 | public function createModelValidator(RecordWrapper $model, $mode); |
21 | 26 | } |
@@ -12,7 +12,17 @@ |
||
12 | 12 | interface ModelFactoryInterface |
13 | 13 | { |
14 | 14 | public function createModel($name, $context); |
15 | + |
|
16 | + /** |
|
17 | + * @param \ntentan\nibii\RecordWrapper $instance |
|
18 | + * |
|
19 | + * @return string |
|
20 | + */ |
|
15 | 21 | public function getModelTable($instance); |
16 | 22 | public function getClassName($model); |
23 | + |
|
24 | + /** |
|
25 | + * @return string |
|
26 | + */ |
|
17 | 27 | public function getJunctionClassName($classA, $classB); |
18 | 28 | } |
19 | 29 | \ No newline at end of file |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | $valueFields[] = ":{$field}"; |
33 | 33 | } |
34 | 34 | |
35 | - return "INSERT INTO " . $table . |
|
36 | - " (" . implode(", ", $quotedFields) . ") VALUES (" . implode(', ', $valueFields) . ")"; |
|
35 | + return "INSERT INTO ".$table. |
|
36 | + " (".implode(", ", $quotedFields).") VALUES (".implode(', ', $valueFields).")"; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function getBulkUpdateQuery($data, $parameters) |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | - return "UPDATE " . |
|
80 | - $model->getDBStoreInformation()['quoted_table'] . |
|
81 | - " SET " . implode(', ', $valueFields) . |
|
82 | - " WHERE " . implode(' AND ', $conditions); |
|
79 | + return "UPDATE ". |
|
80 | + $model->getDBStoreInformation()['quoted_table']. |
|
81 | + " SET ".implode(', ', $valueFields). |
|
82 | + " WHERE ".implode(' AND ', $conditions); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | public function getSelectQuery($parameters) |
@@ -127,7 +127,7 @@ |
||
127 | 127 | |
128 | 128 | public function getSorts() |
129 | 129 | { |
130 | - return count($this->sorts) ? " ORDER BY " . implode(", ", $this->sorts) : null; |
|
130 | + return count($this->sorts) ? " ORDER BY ".implode(", ", $this->sorts) : null; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | public function addFilter($field, $values = null) |
@@ -113,7 +113,7 @@ |
||
113 | 113 | public function describe($model, $relationships) |
114 | 114 | { |
115 | 115 | return new ModelDescription( |
116 | - $this->driver->describeTable($table)[$table], $relationships, function ($type) { |
|
116 | + $this->driver->describeTable($table)[$table], $relationships, function($type) { |
|
117 | 117 | return $this->mapDataTypes($type); |
118 | 118 | } |
119 | 119 | ); |