@@ -25,7 +25,6 @@ |
||
25 | 25 | |
26 | 26 | namespace ntentan\nibii; |
27 | 27 | |
28 | -use ntentan\utils\Utils; |
|
29 | 28 | use ntentan\kaikai\Cache; |
30 | 29 | |
31 | 30 | class RecordWrapper implements \ArrayAccess, \Countable, \Iterator |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | { |
50 | 50 | $this->table = Nibii::getModelTable($this); |
51 | 51 | $this->adapter = $adapter; |
52 | - foreach($this->behaviours as $behaviour) { |
|
52 | + foreach ($this->behaviours as $behaviour) { |
|
53 | 53 | $behaviourInstance = $this->getComponentInstance($behaviour); |
54 | 54 | $behaviourInstance->setModel($this); |
55 | 55 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function getDescription() |
77 | 77 | { |
78 | 78 | return Cache::read( |
79 | - (new \ReflectionClass($this))->getName() . '::desc', |
|
79 | + (new \ReflectionClass($this))->getName().'::desc', |
|
80 | 80 | function() |
81 | 81 | { |
82 | 82 | return new ModelDescription($this); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | private function retrieveItem($key) |
97 | 97 | { |
98 | 98 | $relationships = $this->getDescription()->getRelationships(); |
99 | - if(isset($relationships[$key])) { |
|
99 | + if (isset($relationships[$key])) { |
|
100 | 100 | return $this->fetchRelatedFields($relationships[$key]); |
101 | 101 | } else { |
102 | 102 | return isset($this->modelData[$key]) ? $this->modelData[$key] : null; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function __call($name, $arguments) |
123 | 123 | { |
124 | - if($this->dynamicOperations === null) { |
|
124 | + if ($this->dynamicOperations === null) { |
|
125 | 125 | $this->dynamicOperations = new Operations($this, InjectionContainer::singleton(DriverAdapter::class)); |
126 | 126 | } |
127 | 127 | return $this->dynamicOperations->perform($name, $arguments); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | |
151 | 151 | private function expandArrayValue($array, $relationships, $depth, $index = null) |
152 | 152 | { |
153 | - foreach($relationships as $name => $relationship) { |
|
153 | + foreach ($relationships as $name => $relationship) { |
|
154 | 154 | $array[$name] = $this->fetchRelatedFields($relationship, $index)->toArray($depth); |
155 | 155 | } |
156 | 156 | return $array; |
@@ -160,9 +160,9 @@ discard block |
||
160 | 160 | { |
161 | 161 | $relationships = $this->getDescription()->getRelationships(); |
162 | 162 | $array = $this->modelData; |
163 | - if($depth > 0) { |
|
164 | - if($this->hasMultipleData()) { |
|
165 | - foreach($array as $i => $value) { |
|
163 | + if ($depth > 0) { |
|
164 | + if ($this->hasMultipleData()) { |
|
165 | + foreach ($array as $i => $value) { |
|
166 | 166 | $array[$i] = $this->expandArrayValue($value, $relationships, $depth - 1, $i); |
167 | 167 | } |
168 | 168 | } else { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | private function hasMultipleData() |
188 | 188 | { |
189 | - if(count($this->modelData) > 0) { |
|
189 | + if (count($this->modelData) > 0) { |
|
190 | 190 | return is_numeric(array_keys($this->modelData)[0]); |
191 | 191 | } else { |
192 | 192 | return false; |
@@ -197,11 +197,11 @@ discard block |
||
197 | 197 | { |
198 | 198 | $data = []; |
199 | 199 | |
200 | - if(count($this->modelData) == 0) { |
|
200 | + if (count($this->modelData) == 0) { |
|
201 | 201 | $data = $this->modelData; |
202 | - } else if($this->hasMultipleData()) { |
|
202 | + } else if ($this->hasMultipleData()) { |
|
203 | 203 | $data = $this->modelData; |
204 | - } else if(count($this->modelData) > 0) { |
|
204 | + } else if (count($this->modelData) > 0) { |
|
205 | 205 | $data[] = $this->modelData; |
206 | 206 | } |
207 | 207 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | public function mergeData($data) |
218 | 218 | { |
219 | - foreach($data as $key => $value) { |
|
219 | + foreach ($data as $key => $value) { |
|
220 | 220 | $this->modelData[$key] = $value; |
221 | 221 | } |
222 | 222 | $this->dataSet = true; |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | |
250 | 250 | private function wrap($offset) |
251 | 251 | { |
252 | - if(isset($this->modelData[$offset])) { |
|
252 | + if (isset($this->modelData[$offset])) { |
|
253 | 253 | $newInstance = $this->createNew(); |
254 | 254 | $newInstance->setData($this->modelData[$offset]); |
255 | 255 | return $newInstance; |
@@ -300,13 +300,13 @@ discard block |
||
300 | 300 | |
301 | 301 | private function fetchRelatedFields($relationship, $index = null) |
302 | 302 | { |
303 | - if($index === null) { |
|
303 | + if ($index === null) { |
|
304 | 304 | $data = $this->modelData; |
305 | 305 | } else { |
306 | 306 | $data = $this->modelData[$index]; |
307 | 307 | } |
308 | 308 | $model = $relationship->getModelInstance(); |
309 | - if(empty($data)) { |
|
309 | + if (empty($data)) { |
|
310 | 310 | return $model; |
311 | 311 | } else { |
312 | 312 | return $model->fetch($relationship->getQuery($data)); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | /** |
103 | 103 | * @method |
104 | - * @param type $name |
|
104 | + * @param string $name |
|
105 | 105 | * @param type $arguments |
106 | 106 | * @return type |
107 | 107 | */ |
@@ -136,6 +136,10 @@ discard block |
||
136 | 136 | return $this->table; |
137 | 137 | } |
138 | 138 | |
139 | + /** |
|
140 | + * @param Relationship[] $relationships |
|
141 | + * @param integer $depth |
|
142 | + */ |
|
139 | 143 | private function expandArrayValue($array, $relationships, $depth, $index = null) |
140 | 144 | { |
141 | 145 | foreach($relationships as $name => $relationship) { |
@@ -8,10 +8,10 @@ |
||
8 | 8 | |
9 | 9 | namespace ntentan\nibii; |
10 | 10 | |
11 | +use ntentan\config\Config; |
|
11 | 12 | use ntentan\nibii\interfaces\ClassResolverInterface; |
12 | 13 | use ntentan\nibii\interfaces\ModelJoinerInterface; |
13 | 14 | use ntentan\nibii\interfaces\TableNameResolverInterface; |
14 | -use ntentan\config\Config; |
|
15 | 15 | use ntentan\utils\Text; |
16 | 16 | |
17 | 17 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $arrayed = explode('\\', $className); |
33 | 33 | $class = array_pop($arrayed); |
34 | - if($arrayed[0] == '') { |
|
34 | + if ($arrayed[0] == '') { |
|
35 | 35 | array_shift($arrayed); |
36 | 36 | } |
37 | 37 | return ['class' => $class, 'namespace' => implode('\\', $arrayed)]; |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | { |
42 | 42 | $classA = $this->getClassFileDetails($classA); |
43 | 43 | $classB = $this->getClassFileDetails($classB); |
44 | - if($classA['namespace'] != $classB['namespace']) { |
|
44 | + if ($classA['namespace'] != $classB['namespace']) { |
|
45 | 45 | throw new NibiiException( |
46 | 46 | "Cannot automatically join two classes of different " |
47 | 47 | . "namespaces. Please provide a model joiner or " |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | } |
51 | 51 | $classes = [$classA['class'], $classB['class']]; |
52 | 52 | sort($classes); |
53 | - return "{$classA['namespace']}\\" . implode('', $classes); |
|
53 | + return "{$classA['namespace']}\\".implode('', $classes); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | public function getTableName($instance) |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | public static function getDriverAdapterClassName() |
64 | 64 | { |
65 | 65 | $driver = Config::get('ntentan:db.driver', false); |
66 | - if($driver) { |
|
67 | - return __NAMESPACE__ . '\adapters\\' . Text::ucamelize(Config::get('ntentan:db.driver')) . 'Adapter'; |
|
66 | + if ($driver) { |
|
67 | + return __NAMESPACE__.'\adapters\\'.Text::ucamelize(Config::get('ntentan:db.driver')).'Adapter'; |
|
68 | 68 | } |
69 | 69 | throw new NibiiException("Please specify a driver"); |
70 | 70 | } |