@@ -257,10 +257,10 @@ |
||
257 | 257 | |
258 | 258 | private static $fieldOrderCache = [ |
259 | 259 | 'BelongsTo' => ['foreignKey', 'ownerKey'], |
260 | - 'BelongsToMany' => ['parentKey','foreignPivotKey','relatedPivotKey','relatedKey'], |
|
261 | - 'HasOneOrMany' => ['localKey', 'foreignKey' ], |
|
260 | + 'BelongsToMany' => ['parentKey', 'foreignPivotKey', 'relatedPivotKey', 'relatedKey'], |
|
261 | + 'HasOneOrMany' => ['localKey', 'foreignKey'], |
|
262 | 262 | 'HasManyThrough' => ['localKey', 'firstKey', 'secondLocalKey', 'secondKey'], |
263 | - 'MorphToMany' => ['parentKey','foreignPivotKey','morphType', 'relatedPivotKey','relatedKey'], |
|
263 | + 'MorphToMany' => ['parentKey', 'foreignPivotKey', 'morphType', 'relatedPivotKey', 'relatedKey'], |
|
264 | 264 | 'MorphTo' => ['foreignKey', 'morphType', 'ownerKey'], |
265 | 265 | 'MorphOneOrMany' => ['localKey', 'morphType', 'foreignKey'], |
266 | 266 | ]; |
@@ -206,7 +206,7 @@ |
||
206 | 206 | |
207 | 207 | $isOk = true; |
208 | 208 | $isOk &= $required == $requireResult; |
209 | - $isOk &= (null === $this->targType) === (null === $this->foreignFieldName); |
|
209 | + $isOk &= (null === $this->targType) === (null === $this->foreignFieldName); |
|
210 | 210 | $isOk &= count($this->throughFieldChain) >= 2; |
211 | 211 | |
212 | 212 | return boolval($isOk); |
@@ -122,13 +122,13 @@ discard block |
||
122 | 122 | public function setFields(array $fields): void |
123 | 123 | { |
124 | 124 | if (0 == count($fields)) { |
125 | - $msg = 'Fields array must not be empty for '.$this->getClassName(); |
|
125 | + $msg = 'Fields array must not be empty for ' . $this->getClassName(); |
|
126 | 126 | throw new \Exception($msg); |
127 | 127 | } |
128 | 128 | $keys = []; |
129 | 129 | foreach ($fields as $propName => $field) { |
130 | 130 | if (!$field instanceof EntityField) { |
131 | - $msg = 'Fields array must only have EntityField objects for '.$this->getClassName(); |
|
131 | + $msg = 'Fields array must only have EntityField objects for ' . $this->getClassName(); |
|
132 | 132 | throw new \Exception($msg); |
133 | 133 | } |
134 | 134 | if ($field->getIsKeyField()) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | } |
138 | 138 | if (0 == count($keys)) { |
139 | - $msg = 'No key field supplied in fields array for '.$this->getClassName(); |
|
139 | + $msg = 'No key field supplied in fields array for ' . $this->getClassName(); |
|
140 | 140 | throw new \Exception($msg); |
141 | 141 | } |
142 | 142 | $this->fields = $fields; |