@@ -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 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | |
54 | 54 | public function runSetup() { |
55 | 55 | if ($this->options['foreign_key'] == null) { |
56 | - $this->options['foreign_key'] = Text::singularize($this->setupTable) . '_id'; |
|
56 | + $this->options['foreign_key'] = Text::singularize($this->setupTable).'_id'; |
|
57 | 57 | } |
58 | 58 | if ($this->options['local_key'] == null) { |
59 | 59 | $this->options['local_key'] = $this->setupPrimaryKey[0]; |
@@ -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 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $filter = $junctionModel->fields($this->options['junction_foreign_key']) |
47 | 47 | ->filterBy($this->options['junction_local_key'], $data[$this->options['local_key']]) |
48 | 48 | ->fetch(); |
49 | - if($filter->count() == 0) { |
|
49 | + if ($filter->count() == 0) { |
|
50 | 50 | return null; |
51 | 51 | } |
52 | 52 | $foreignKeys = []; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | // @todo throw an exception when the data doesn't have the local key |
58 | 58 | $query = $this->getQuery(); |
59 | - if($this->queryPrepared){ |
|
59 | + if ($this->queryPrepared) { |
|
60 | 60 | $query->setBoundData($this->options['foreign_key'], $foreignKeys); |
61 | 61 | } else { |
62 | 62 | $query = $this->getQuery() |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | |
91 | 91 | if (!isset($this->options['junction_local_key'])) { |
92 | 92 | $this->options['junction_local_key'] = |
93 | - Text::singularize($this->setupTable) . '_id'; |
|
93 | + Text::singularize($this->setupTable).'_id'; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | if (!isset($this->options['junction_foreign_key'])) { |
97 | 97 | $this->options['junction_foreign_key'] = |
98 | - Text::singularize($foreignModel->getDBStoreInformation()['table']) . '_id'; |
|
98 | + Text::singularize($foreignModel->getDBStoreInformation()['table']).'_id'; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | |
111 | 111 | public function postSave(&$wrapper) { |
112 | 112 | $jointModelRecords = []; |
113 | - foreach($this->tempdata as $relatedRecord) { |
|
113 | + foreach ($this->tempdata as $relatedRecord) { |
|
114 | 114 | $data = $relatedRecord->toArray(); |
115 | - if(!isset($data[$this->options['foreign_key']]) || (isset($data[$this->options['foreign_key']]) && count($data) > 1)) { |
|
116 | - if(!$relatedRecord->save()) { |
|
115 | + if (!isset($data[$this->options['foreign_key']]) || (isset($data[$this->options['foreign_key']]) && count($data) > 1)) { |
|
116 | + if (!$relatedRecord->save()) { |
|
117 | 117 | throw new NibiiException("Failed to save related model {$this->options['model']}"); |
118 | 118 | } |
119 | 119 | } |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | $relationships = $this->wrapper->getDescription()->getRelationships(); |
157 | 157 | $presentRelationships = []; |
158 | 158 | |
159 | - foreach($relationships ?? [] as $model => $relationship) { |
|
160 | - if(isset($record[$model])) { |
|
159 | + foreach ($relationships ?? [] as $model => $relationship) { |
|
160 | + if (isset($record[$model])) { |
|
161 | 161 | $relationship->preSave($record, $record[$model]); |
162 | 162 | $presentRelationships[$model] = $relationship; |
163 | 163 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | // Reset the data so it contains any modifications made by callbacks |
183 | 183 | $record = $this->wrapper->getData()[0]; |
184 | - foreach($presentRelationships as $model => $relationship) { |
|
184 | + foreach ($presentRelationships as $model => $relationship) { |
|
185 | 185 | $relationship->postSave($record); |
186 | 186 | } |
187 | 187 |
@@ -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 | /** |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | $classes = [$classA['class'], $classB['class']]; |
42 | 42 | sort($classes); |
43 | - return "{$classA['namespace']}\\" . implode('', $classes); |
|
43 | + return "{$classA['namespace']}\\".implode('', $classes); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function getTableName($instance) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | public static function getDriverAdapterClassName($driver = false) { |
53 | 53 | if ($driver) { |
54 | - return __NAMESPACE__ . '\adapters\\' . Text::ucamelize($driver) . 'Adapter'; |
|
54 | + return __NAMESPACE__.'\adapters\\'.Text::ucamelize($driver).'Adapter'; |
|
55 | 55 | } |
56 | 56 | throw new NibiiException("Please specify a driver"); |
57 | 57 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | /** |
148 | 148 | * @method |
149 | - * @param type $name |
|
149 | + * @param string $name |
|
150 | 150 | * @param type $arguments |
151 | 151 | * @return type |
152 | 152 | */ |
@@ -176,6 +176,10 @@ discard block |
||
176 | 176 | return $this->retrieveItem($name); |
177 | 177 | } |
178 | 178 | |
179 | + /** |
|
180 | + * @param Relationship[] $relationships |
|
181 | + * @param integer $depth |
|
182 | + */ |
|
179 | 183 | private function expandArrayValue($array, $relationships, $depth, $index = null) { |
180 | 184 | foreach ($relationships as $name => $relationship) { |
181 | 185 | $array[$name] = $this->fetchRelatedFields($relationship, $index)->toArray($depth); |
@@ -336,6 +340,9 @@ discard block |
||
336 | 340 | |
337 | 341 | } |
338 | 342 | |
343 | + /** |
|
344 | + * @param string $id |
|
345 | + */ |
|
339 | 346 | public function postSaveCallback($id) { |
340 | 347 | |
341 | 348 | } |
@@ -360,7 +367,7 @@ discard block |
||
360 | 367 | |
361 | 368 | /** |
362 | 369 | * |
363 | - * @return DataAdapter |
|
370 | + * @return DriverAdapter |
|
364 | 371 | */ |
365 | 372 | public function getAdapter() { |
366 | 373 | $this->initialize(); |
@@ -61,7 +61,7 @@ |
||
61 | 61 | private $initialized = false; |
62 | 62 | |
63 | 63 | protected function initialize() { |
64 | - if($this->initialized) return; |
|
64 | + if ($this->initialized) return; |
|
65 | 65 | $this->context = ORMContext::getInstance(); |
66 | 66 | $this->container = $this->context->getContainer(); |
67 | 67 | $this->adapter = $this->container->resolve(DriverAdapter::class); |
@@ -61,7 +61,9 @@ |
||
61 | 61 | private $initialized = false; |
62 | 62 | |
63 | 63 | protected function initialize() { |
64 | - if($this->initialized) return; |
|
64 | + if($this->initialized) { |
|
65 | + return; |
|
66 | + } |
|
65 | 67 | $this->context = ORMContext::getInstance(); |
66 | 68 | $this->container = $this->context->getContainer(); |
67 | 69 | $this->adapter = $this->container->resolve(DriverAdapter::class); |
@@ -68,7 +68,7 @@ |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | return $this->evaluateResult( |
71 | - $field, $testItem->count() === 0, "The value of " . implode(', ', $field['name']) . " must be unique" |
|
71 | + $field, $testItem->count() === 0, "The value of ".implode(', ', $field['name'])." must be unique" |
|
72 | 72 | ); |
73 | 73 | } |
74 | 74 |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | $valueFields[] = ":{$field}"; |
30 | 30 | } |
31 | 31 | |
32 | - return "INSERT INTO " . $table . |
|
33 | - " (" . implode(", ", $quotedFields) . ") VALUES (" . implode(', ', $valueFields) . ")"; |
|
32 | + return "INSERT INTO ".$table. |
|
33 | + " (".implode(", ", $quotedFields).") VALUES (".implode(', ', $valueFields).")"; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function getBulkUpdateQuery($data, $parameters) { |
@@ -71,10 +71,10 @@ discard block |
||
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
74 | - return "UPDATE " . |
|
75 | - $model->getDBStoreInformation()['quoted_table'] . |
|
76 | - " SET " . implode(', ', $valueFields) . |
|
77 | - " WHERE " . implode(' AND ', $conditions); |
|
74 | + return "UPDATE ". |
|
75 | + $model->getDBStoreInformation()['quoted_table']. |
|
76 | + " SET ".implode(', ', $valueFields). |
|
77 | + " WHERE ".implode(' AND ', $conditions); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | public function getSelectQuery($parameters) { |
@@ -80,7 +80,7 @@ |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | public static function getInstance() { |
83 | - if(self::$instance === null){ |
|
83 | + if (self::$instance === null) { |
|
84 | 84 | throw new NibiiException("A context has not yet been initialized"); |
85 | 85 | } |
86 | 86 | return self::$instance; |