From aec5cca4ace65bc4b4ca054170b645f1073ac9ca Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 27 Nov 2020 13:21:45 -0600
Subject: [PATCH] formatting

---
 .../Database/Eloquent/Concerns/QueriesRelationships.php     | 6 ++++--
 src/Illuminate/Database/Eloquent/Relations/BelongsTo.php    | 6 +++---
 .../Database/Eloquent/Relations/BelongsToMany.php           | 6 +++---
 .../Database/Eloquent/Relations/HasManyThrough.php          | 6 +++---
 src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php | 6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
index 0cfcf6517bb9..4fbc2f90ebd1 100644
--- a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
+++ b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -383,10 +383,12 @@ public function withAggregate($relations, $column, $function = null)
             $relation = $this->getRelationWithoutConstraints($name);
 
             if ($function) {
-                $predictedColumn = $this->getQuery()->from === $relation->getQuery()->getQuery()->from ? "{$relation->getRelationCountHash(true)}.$column" : $column;
+                $hashedColumn = $this->getQuery()->from === $relation->getQuery()->getQuery()->from
+                                            ? "{$relation->getRelationCountHash(false)}.$column"
+                                            : $column;
 
                 $expression = sprintf('%s(%s)', $function, $this->getQuery()->getGrammar()->wrap(
-                    $column === '*' ? $column : $relation->getRelated()->qualifyColumn($predictedColumn)
+                    $column === '*' ? $column : $relation->getRelated()->qualifyColumn($hashedColumn)
                 ));
             } else {
                 $expression = $column;
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
index e438d8854490..92a559b393cd 100755
--- a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
+++ b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -282,12 +282,12 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
index ae82ac02ddce..6f9bf6aa9821 100755
--- a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+++ b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -1170,12 +1170,12 @@ public function getExistenceCompareKey()
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
index 7d5008d782c2..48c8172194c9 100644
--- a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
+++ b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -599,12 +599,12 @@ public function getRelationExistenceQueryForThroughSelfRelation(Builder $query,
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
index 18dc09094886..ac48606dabe9 100755
--- a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
+++ b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -366,12 +366,12 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**