wip

Author: brendt

packages/database/src/BelongsTo.php

@@ -35,7 +35,7 @@ public function setParent(string $name): self
     public function getOwnerFieldName(): string
     {
         if ($this->ownerJoin) {
-            if (strpos($this->ownerJoin, '.') !== false) {
+            if (str_contains($this->ownerJoin, '.')) {
                 return explode('.', $this->ownerJoin)[1];
             } else {
                 return $this->ownerJoin;
@@ -54,8 +54,10 @@ public function getSelectFields(): ImmutableArray
         return $relationModel
             ->getSelectFields()
             ->map(fn ($field) => new FieldStatement(
-                $relationModel->getTableName() . '.' . $field
-            )->withAlias()->withAliasPrefix($this->parent));
+                $relationModel->getTableName() . '.' . $field,
+            )
+                ->withAlias()
+                ->withAliasPrefix($this->parent));
     }
 
     public function getJoinStatement(): JoinStatement

packages/database/src/HasMany.php

@@ -40,7 +40,9 @@ public function getSelectFields(): ImmutableArray
             ->getSelectFields()
             ->map(fn ($field) => new FieldStatement(
                 $relationModel->getTableName() . '.' . $field,
-            )->withAlias()->withAliasPrefix($this->parent));
+            )
+                ->withAlias()
+                ->withAliasPrefix($this->parent));
     }
 
     public function idField(): string

packages/database/src/HasOne.php

@@ -40,7 +40,9 @@ public function getSelectFields(): ImmutableArray
             ->getSelectFields()
             ->map(fn ($field) => new FieldStatement(
                 $relationModel->getTableName() . '.' . $field,
-            )->withAlias()->withAliasPrefix($this->parent));
+            )
+                ->withAlias()
+                ->withAliasPrefix($this->parent));
     }
 
     public function getJoinStatement(): JoinStatement

packages/database/src/QueryStatements/FieldStatement.php

@@ -29,7 +29,7 @@ public function compile(DatabaseDialect $dialect): string
             if ($this->withAlias) {
                 $alias = sprintf(
                     '`%s%s`',
-                    $this->aliasPrefix ? "$this->aliasPrefix." : "",
+                    $this->aliasPrefix ? "{$this->aliasPrefix}." : '',
                     str_replace('`', '', $field),
                 );
             }