From 5c14bb9345dc5f5a6ea5b69058430ebd5776383a Mon Sep 17 00:00:00 2001 From: Pauline Vos Date: Mon, 16 Jun 2025 15:12:36 +0200 Subject: [PATCH 1/3] Deprecate Mongo soft deletes trait In favor of the Laravel one. Ours is now obsolete; the SoftDeletes trait is only necessary to remove the call to qualifyColumn in the parent trait. But the DocumentModel::qualifyColumn is already disabled --- docs/includes/eloquent-models/PlanetSoftDelete.php | 2 +- src/Eloquent/MassPrunable.php | 1 + src/Eloquent/SoftDeletes.php | 1 + tests/Models/Soft.php | 2 +- tests/Scout/Models/ScoutUser.php | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/includes/eloquent-models/PlanetSoftDelete.php b/docs/includes/eloquent-models/PlanetSoftDelete.php index 05d106206..70ccba24b 100644 --- a/docs/includes/eloquent-models/PlanetSoftDelete.php +++ b/docs/includes/eloquent-models/PlanetSoftDelete.php @@ -2,8 +2,8 @@ namespace App\Models; +use Illuminate\Database\Eloquent\SoftDeletes; use MongoDB\Laravel\Eloquent\Model; -use MongoDB\Laravel\Eloquent\SoftDeletes; class Planet extends Model { diff --git a/src/Eloquent/MassPrunable.php b/src/Eloquent/MassPrunable.php index 98e947842..ecf033a3b 100644 --- a/src/Eloquent/MassPrunable.php +++ b/src/Eloquent/MassPrunable.php @@ -5,6 +5,7 @@ namespace MongoDB\Laravel\Eloquent; use Illuminate\Database\Eloquent\MassPrunable as EloquentMassPrunable; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Events\ModelsPruned; use function class_uses_recursive; diff --git a/src/Eloquent/SoftDeletes.php b/src/Eloquent/SoftDeletes.php index 135c55dcf..41745cb7d 100644 --- a/src/Eloquent/SoftDeletes.php +++ b/src/Eloquent/SoftDeletes.php @@ -4,6 +4,7 @@ namespace MongoDB\Laravel\Eloquent; +/** @deprecated 6.0.0 in favor of \Illuminate\Database\Eloquent\SoftDeletes */ trait SoftDeletes { use \Illuminate\Database\Eloquent\SoftDeletes; diff --git a/tests/Models/Soft.php b/tests/Models/Soft.php index f887d05a9..999d13fd4 100644 --- a/tests/Models/Soft.php +++ b/tests/Models/Soft.php @@ -6,10 +6,10 @@ use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; use MongoDB\Laravel\Eloquent\Builder; use MongoDB\Laravel\Eloquent\DocumentModel; use MongoDB\Laravel\Eloquent\MassPrunable; -use MongoDB\Laravel\Eloquent\SoftDeletes; /** @property Carbon $deleted_at */ class Soft extends Model diff --git a/tests/Scout/Models/ScoutUser.php b/tests/Scout/Models/ScoutUser.php index 50fa39a94..581606f75 100644 --- a/tests/Scout/Models/ScoutUser.php +++ b/tests/Scout/Models/ScoutUser.php @@ -5,11 +5,11 @@ namespace MongoDB\Laravel\Tests\Scout\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\SQLiteBuilder; use Illuminate\Support\Facades\Schema; use Laravel\Scout\Searchable; -use MongoDB\Laravel\Eloquent\SoftDeletes; use function assert; From 058e795a7ca7498a26384516ebf4cd0b04c41283 Mon Sep 17 00:00:00 2001 From: Pauline Vos Date: Mon, 30 Jun 2025 12:05:05 +0200 Subject: [PATCH 2/3] Update src/Eloquent/SoftDeletes.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérôme Tamarelle --- src/Eloquent/SoftDeletes.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Eloquent/SoftDeletes.php b/src/Eloquent/SoftDeletes.php index 41745cb7d..4724553b9 100644 --- a/src/Eloquent/SoftDeletes.php +++ b/src/Eloquent/SoftDeletes.php @@ -4,7 +4,9 @@ namespace MongoDB\Laravel\Eloquent; -/** @deprecated 6.0.0 in favor of \Illuminate\Database\Eloquent\SoftDeletes */ +trigger_error(sprintf('Since mongodb/laravel-mongodb:5.5, trait "%s" is deprecated, use "%s" instead.', SoftDeletes::class, \Illuminate\Database\Eloquent\SoftDeletes::class), E_USER_DEPRECATED); + +/** @deprecated since mongodb/laravel-mongodb:5.5, use \Illuminate\Database\Eloquent\SoftDeletes instead */ trait SoftDeletes { use \Illuminate\Database\Eloquent\SoftDeletes; From e99646ed838a9689e770c8df47ef7be5b845d11f Mon Sep 17 00:00:00 2001 From: paulinevos <5345273+paulinevos@users.noreply.github.com> Date: Mon, 30 Jun 2025 10:05:45 +0000 Subject: [PATCH 3/3] apply phpcbf formatting --- src/Eloquent/SoftDeletes.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Eloquent/SoftDeletes.php b/src/Eloquent/SoftDeletes.php index 4724553b9..438219f3c 100644 --- a/src/Eloquent/SoftDeletes.php +++ b/src/Eloquent/SoftDeletes.php @@ -4,6 +4,11 @@ namespace MongoDB\Laravel\Eloquent; +use function sprintf; +use function trigger_error; + +use const E_USER_DEPRECATED; + trigger_error(sprintf('Since mongodb/laravel-mongodb:5.5, trait "%s" is deprecated, use "%s" instead.', SoftDeletes::class, \Illuminate\Database\Eloquent\SoftDeletes::class), E_USER_DEPRECATED); /** @deprecated since mongodb/laravel-mongodb:5.5, use \Illuminate\Database\Eloquent\SoftDeletes instead */