changed check with regard to useAlias

jonneroelofs · jonneroelofs · commit a2e3cc20bef3 · 2021-11-18T13:37:50.000+01:00
diff --git a/src/PowerJoins.php b/src/PowerJoins.php
@@ -40,7 +40,7 @@ trait PowerJoins
     public function scopeJoinRelationship(Builder $query, $relationName, $callback = null, $joinType = 'join', $useAlias = false, bool $disableExtraConditions = false): void
     {
         $joinType = PowerJoins::$joinMethodsMap[$joinType] ?? $joinType;
-        $useAlias = $useAlias && !is_string($callback);
+        $useAlias = is_string($callback) ? false : $useAlias;
         $callback = $this->formatJoinCallback($relationName, $callback);
 
         if (is_null($query->getSelect())) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ trait PowerJoins`
`40`	`40`	`public function scopeJoinRelationship(Builder $query, $relationName, $callback = null, $joinType = 'join', $useAlias = false, bool $disableExtraConditions = false): void`
`41`	`41`	`{`
`42`	`42`	`$joinType = PowerJoins::$joinMethodsMap[$joinType] ?? $joinType;`
`43`		`- $useAlias = $useAlias && !is_string($callback);`
	`43`	`+ $useAlias = is_string($callback) ? false : $useAlias;`
`44`	`44`	`$callback = $this->formatJoinCallback($relationName, $callback);`
`45`	`45`
`46`	`46`	`if (is_null($query->getSelect())) {`