fix conflicts

Author: taylorotwell

src/Illuminate/Cache/ArrayLock.php

@@ -67,6 +67,10 @@ protected function exists()
      */
     public function release()
     {
+        if (! $this->exists()) {
+            return false;
+        }
+
         if (! $this->isOwnedByCurrentProcess()) {
             return false;
         }

src/Illuminate/Database/Eloquent/SoftDeletes.php

@@ -92,6 +92,8 @@ protected function runSoftDelete()
         }
 
         $query->update($columns);
+
+        $this->syncOriginalAttributes(array_keys($columns));
     }
 
     /**

tests/Cache/CacheArrayStoreTest.php

@@ -218,4 +218,15 @@ public function testValuesAreStoredByReferenceIfSerializationIsDisabled()
 
         $this->assertObjectHasAttribute('bar', $store->get('object'));
     }
+
+    public function testReleasingLockAfterAlreadyForceReleasedByAnotherOwnerFails()
+    {
+        $store = new ArrayStore;
+        $owner = $store->lock('foo', 10);
+        $wannabeOwner = $store->lock('foo', 10);
+        $owner->acquire();
+        $wannabeOwner->forceRelease();
+
+        $this->assertFalse($wannabeOwner->release());
+    }
 }

tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php

@@ -269,7 +269,6 @@ public function testUpdateModelAfterSoftDeleting()
         /** @var SoftDeletesTestUser $userModel */
         $userModel = SoftDeletesTestUser::find(2);
         $userModel->delete();
-        $userModel->syncOriginal();
         $this->assertEquals($now->toDateTimeString(), $userModel->getOriginal('deleted_at'));
         $this->assertNull(SoftDeletesTestUser::find(2));
         $this->assertEquals($userModel, SoftDeletesTestUser::withTrashed()->find(2));
@@ -285,7 +284,6 @@ public function testRestoreAfterSoftDelete()
         /** @var SoftDeletesTestUser $userModel */
         $userModel = SoftDeletesTestUser::find(2);
         $userModel->delete();
-        $userModel->syncOriginal();
         $userModel->restore();
 
         $this->assertEquals($userModel->id, SoftDeletesTestUser::find(2)->id);
@@ -304,12 +302,25 @@ public function testSoftDeleteAfterRestoring()
         $this->assertEquals($userModel->deleted_at, SoftDeletesTestUser::find(1)->deleted_at);
         $this->assertEquals($userModel->getOriginal('deleted_at'), SoftDeletesTestUser::find(1)->deleted_at);
         $userModel->delete();
-        $userModel->syncOriginal();
         $this->assertNull(SoftDeletesTestUser::find(1));
         $this->assertEquals($userModel->deleted_at, SoftDeletesTestUser::withTrashed()->find(1)->deleted_at);
         $this->assertEquals($userModel->getOriginal('deleted_at'), SoftDeletesTestUser::withTrashed()->find(1)->deleted_at);
     }
 
+    public function testModifyingBeforeSoftDeletingAndRestoring()
+    {
+        $this->createUsers();
+
+        /** @var SoftDeletesTestUser $userModel */
+        $userModel = SoftDeletesTestUser::find(2);
+        $userModel->email = '[email protected]';
+        $userModel->delete();
+        $userModel->restore();
+
+        $this->assertEquals($userModel->id, SoftDeletesTestUser::find(2)->id);
+        $this->assertSame('[email protected]', SoftDeletesTestUser::find(2)->email);
+    }
+
     public function testUpdateOrCreate()
     {
         $this->createUsers();

tests/Database/DatabaseSoftDeletingTraitTest.php

@@ -24,6 +24,10 @@ public function testDeleteSetsSoftDeletedColumn()
             'deleted_at' => 'date-time',
             'updated_at' => 'date-time',
         ]);
+        $model->shouldReceive('syncOriginalAttributes')->once()->with([
+            'deleted_at',
+            'updated_at',
+        ]);
         $model->delete();
 
         $this->assertInstanceOf(Carbon::class, $model->deleted_at);