Use unguarded method for forceFill and forceCreate

JosephSilber · JosephSilber · commit 705ccb731cd6 · 2015-04-07T21:42:10.000-04:00
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -416,13 +416,15 @@ public function fill(array $attributes)
 	 */
 	public function forceFill(array $attributes)
 	{
-		static::unguard();
-
-		$this->fill($attributes);
-
-		static::reguard();
+		// Since some versions of PHP have a bug that prevents it from properly
+		// binding the late static context in a closure, we will first store
+		// the model in a variable, which we will then use in the closure.
+		$model = $this;
 
-		return $this;
+		return static::unguarded(function() use ($model, $attributes)
+		{
+			return $model->fill($attributes);
+		});
 	}
 
 	/**
@@ -537,18 +539,15 @@ public static function create(array $attributes)
 	 */
 	public static function forceCreate(array $attributes)
 	{
-		if (static::$unguarded)
-		{
-			return static::create($attributes);
-		}
-
-		static::unguard();
+		// Since some versions of PHP have a bug that prevents it from properly
+		// binding the late static context in a closure, we will first store
+		// the model in a variable, which we will then use in the closure.
+		$model = new static;
 
-		$model = static::create($attributes);
-
-		static::reguard();
-
-		return $model;
+		return static::unguarded(function() use ($model, $attributes)
+		{
+			return $model->create($attributes);
+		});
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -105,6 +105,15 @@ public function testCreateMethodSavesNewModel()
 	}
 
 
+	public function testForceCreateMethodSavesNewModelWithGuardedAttributes()
+	{
+		$_SERVER['__eloquent.saved'] = false;
+		$model = EloquentModelSaveStub::forceCreate(['id' => 21]);
+		$this->assertTrue($_SERVER['__eloquent.saved']);
+		$this->assertEquals(21, $model->id);
+	}
+
+
 	public function testFindMethodCallsQueryBuilderCorrectly()
 	{
 		$result = EloquentModelFindStub::find(1);
@@ -705,6 +714,13 @@ public function testFillable()
 	}
 
 
+	public function testForceFillMethodFillsGuardedAttributes()
+	{
+		$model = (new EloquentModelSaveStub)->forceFill(['id' => 21]);
+		$this->assertEquals(21, $model->id);
+	}
+
+
 	public function testUnguardAllowsAnythingToBeSet()
 	{
 		$model = new EloquentModelStub;
@@ -1300,7 +1316,7 @@ public function getDates()
 
 class EloquentModelSaveStub extends Model {
 	protected $table = 'save_stub';
-	protected $guarded = array();
+	protected $guarded = ['id'];
 	public function save(array $options = array()) { $_SERVER['__eloquent.saved'] = true; }
 	public function setIncrementing($value)
 	{
