Change property name in Pivot class (#17933)

Make it possible to use ‘parent’ as a relation

Author: riesjart

src/Illuminate/Database/Eloquent/Relations/Pivot.php

@@ -12,7 +12,7 @@ class Pivot extends Model
      *
      * @var \Illuminate\Database\Eloquent\Model
      */
-    protected $parent;
+    protected $pivotParent;
 
     /**
      * The name of the foreign key column.
@@ -59,7 +59,7 @@ public function __construct(Model $parent, $attributes, $table, $exists = false)
         // We store off the parent instance so we will access the timestamp column names
         // for the model, since the pivot model timestamps aren't easily configurable
         // from the developer's point of view. We can use the parents to get these.
-        $this->parent = $parent;
+        $this->pivotParent = $parent;
 
         $this->exists = $exists;
 
@@ -183,7 +183,7 @@ public function hasTimestampAttributes()
      */
     public function getCreatedAtColumn()
     {
-        return $this->parent->getCreatedAtColumn();
+        return $this->pivotParent->getCreatedAtColumn();
     }
 
     /**
@@ -193,6 +193,6 @@ public function getCreatedAtColumn()
      */
     public function getUpdatedAtColumn()
     {
-        return $this->parent->getUpdatedAtColumn();
+        return $this->pivotParent->getUpdatedAtColumn();
     }
 }