formatting

laravel · Jun 27, 2017 · 1137d86 · 1137d86
1 parent f2adbe2
commit 1137d86
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 84 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -5,11 +5,11 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Relations\Concerns\HasDefault;
+use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
 
 class BelongsTo extends Relation
 {
-    use HasDefault;
+    use SupportsDefaultModels;
 
     /**
      * The child model instance of the relation.
@@ -296,6 +296,17 @@ protected function relationHasIncrementingId()
                                 $this->related->getKeyType() === 'int';
     }
 
+    /**
+     * Make a new related instance for the given model.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $parent
+     * @return \Illuminate\Database\Eloquent\Model
+     */
+    protected function newRelatedInstanceFor(Model $parent)
+    {
+        return $this->related->newInstance();
+    }
+
     /**
      * Get the foreign key of the relationship.
      *
@@ -345,15 +356,4 @@ public function getRelation()
     {
         return $this->relation;
     }
-
-    /**
-     * Make a new related instance for the given model.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $parent
-     * @return \Illuminate\Database\Eloquent\Model
-     */
-    protected function newRelatedInstanceFor(Model $parent)
-    {
-        return $this->related->newInstance();
-    }
 }
diff --git a/src/Illuminate/Database/Eloquent/Relations/Concerns/HasDefault.php b/src/Illuminate/Database/Eloquent/Relations/Concerns/HasDefault.php
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOne.php b/src/Illuminate/Database/Eloquent/Relations/HasOne.php
@@ -4,11 +4,11 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Relations\Concerns\HasDefault;
+use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
 
 class HasOne extends HasOneOrMany
 {
-    use HasDefault;
+    use SupportsDefaultModels;
 
     /**
      * Get the results of the relationship.
@@ -57,7 +57,8 @@ public function match(array $models, Collection $results, $relation)
      */
     public function newRelatedInstanceFor(Model $parent)
     {
-        return $this->related->newInstance()
-            ->setAttribute($this->getForeignKeyName(), $parent->{$this->localKey});
+        return $this->related->newInstance()->setAttribute(
+            $this->getForeignKeyName(), $parent->{$this->localKey}
+        );
     }
 }
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphOne.php b/src/Illuminate/Database/Eloquent/Relations/MorphOne.php
@@ -4,11 +4,11 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Relations\Concerns\HasDefault;
+use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
 
 class MorphOne extends MorphOneOrMany
 {
-    use HasDefault;
+    use SupportsDefaultModels;
 
     /**
      * Get the results of the relationship.
@@ -58,7 +58,7 @@ public function match(array $models, Collection $results, $relation)
     public function newRelatedInstanceFor(Model $parent)
     {
         return $this->related->newInstance()
-            ->setAttribute($this->getForeignKeyName(), $parent->{$this->localKey})
-            ->setAttribute($this->getMorphType(), $this->morphClass);
+                    ->setAttribute($this->getForeignKeyName(), $parent->{$this->localKey})
+                    ->setAttribute($this->getMorphType(), $this->morphClass);
     }
 }