@@ -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); |