@@ -145,10 +145,10 @@ discard block |
||
145 | 145 | $stub->setRelationName($name); |
146 | 146 | $stub->setThroughFieldChain($keyChain); |
147 | 147 | $stub->setKeyFieldName($keyChain[0]); |
148 | - $stub->setForeignFieldName( $keyChain[4]); |
|
148 | + $stub->setForeignFieldName($keyChain[4]); |
|
149 | 149 | $stub->setMultiplicity(AssociationStubRelationType::MANY()); |
150 | 150 | $stub->setMorphType($keyChain[2]); |
151 | - $stub->setTargType( get_class($relation->getRelated())); |
|
151 | + $stub->setTargType(get_class($relation->getRelated())); |
|
152 | 152 | return $stub; |
153 | 153 | } |
154 | 154 | |
@@ -257,10 +257,10 @@ discard block |
||
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 | ]; |
@@ -44,11 +44,11 @@ |
||
44 | 44 | if ($thisNull == $thatNull && null === $thatTarg) { |
45 | 45 | return false; |
46 | 46 | } |
47 | - if((!$thisNull && |
|
47 | + if ((!$thisNull && |
|
48 | 48 | !$thatNull) && |
49 | 49 | ($this->getBaseType() !== $otherStub->getTargType() || |
50 | 50 | $otherStub->getBaseType() !== $this->getTargType()) |
51 | - ){ |
|
51 | + ) { |
|
52 | 52 | return false; |
53 | 53 | } |
54 | 54 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $first = -1 === $stubOne->compare($stubTwo); |
23 | 23 | |
24 | 24 | $association = new AssociationMonomorphic(); |
25 | - if($stubOne->getTargType() == null && self::$marshalPolymorphics){ |
|
25 | + if ($stubOne->getTargType() == null && self::$marshalPolymorphics) { |
|
26 | 26 | $stubOne->addAssociation($association); |
27 | 27 | $stubOne = self::marshalPolyToMono($stubOne, $stubTwo); |
28 | 28 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | private static function marshalPolyToMono(AssociationStubBase $stub, AssociationStubBase $stubTwo): AssociationStubBase{ |
37 | 37 | $stubNew = clone $stub; |
38 | 38 | $relPolyTypeName = substr($stubTwo->getBaseType(), strrpos($stubTwo->getBaseType(), '\\')+1); |
39 | - $relPolyTypeName = Str::plural($relPolyTypeName, 1); |
|
39 | + $relPolyTypeName = Str::plural($relPolyTypeName, 1); |
|
40 | 40 | $stubNew->setRelationName($stub->getRelationName() . '_' . $relPolyTypeName); |
41 | 41 | $stubNew->setTargType($stubTwo->getBaseType()); |
42 | 42 | $stubNew->setForeignFieldName($stubTwo->getKeyFieldName()); |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | private static function checkAssocations(AssociationStubBase $stubOne, AssociationStubBase $stubTwo): ?Association{ |
52 | 52 | $assocOne = $stubOne->getAssocations(); |
53 | - foreach($assocOne as $association){ |
|
53 | + foreach ($assocOne as $association) { |
|
54 | 54 | $isFirst = $association->getFirst() === $stubOne; |
55 | - if($association->{$isFirst ? 'getLast' : 'getFirst'}() == $stubTwo){ |
|
55 | + if ($association->{$isFirst ? 'getLast' : 'getFirst'}() == $stubTwo) { |
|
56 | 56 | return $association; |
57 | 57 | } |
58 | 58 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | } |
203 | 203 | } |
204 | 204 | |
205 | - if(null === $this->throughFieldChain){ |
|
205 | + if (null === $this->throughFieldChain) { |
|
206 | 206 | return false; |
207 | 207 | } |
208 | 208 | return (null === $targType) === (null === $foreignField); |
@@ -282,10 +282,10 @@ discard block |
||
282 | 282 | { |
283 | 283 | $thisFirst = $this->getKeyFieldName() === '' ? false : $this->getKeyField()->getIsKeyField(); |
284 | 284 | $otherFirst = $other->getKeyFieldName() === '' ? false : $other->getKeyField()->getIsKeyField(); |
285 | - if( |
|
285 | + if ( |
|
286 | 286 | ($thisFirst || $otherFirst) && |
287 | 287 | !($thisFirst && $otherFirst) |
288 | - ){ |
|
288 | + ) { |
|
289 | 289 | return $thisFirst ? -1 : 1; |
290 | 290 | } |
291 | 291 | $thisClass = get_class($this); |