refactor(eloquent): SoftDeletes/Scope rename + Model L13 contracts (task 2.5e)

src/Illuminate/Database/Eloquent/Model.php

@@ -15,8 +15,8 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Contracts\JsonableInterface;
-use Illuminate\Support\Contracts\ArrayableInterface;
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -27,7 +27,7 @@
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 
-abstract class Model implements ArrayAccess, ArrayableInterface, JsonableInterface, JsonSerializable {
+abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializable {
 
 	/**
 	 * The connection name for the model.
@@ -265,19 +265,19 @@ protected static function bootTraits(): void
 	/**
 	 * Register a new global scope on the model.
 	 *
-	 * @param ScopeInterface $scope
+	 * @param Scope $scope
 	 *
 	 * @return void
 	 */
-	public static function addGlobalScope(ScopeInterface $scope): void
+	public static function addGlobalScope(Scope $scope): void
     {
 		static::$globalScopes[get_called_class()][get_class($scope)] = $scope;
 	}
 
 	/**
 	 * Determine if a model has a global scope.
 	 *
-	 * @param ScopeInterface $scope
+	 * @param Scope $scope
 	 *
 	 * @return bool
 	 */
@@ -289,11 +289,11 @@ public static function hasGlobalScope($scope): bool
 	/**
 	 * Get a global scope registered with the model.
 	 *
-	 * @param ScopeInterface $scope
+	 * @param Scope $scope
 	 *
-     * @return ScopeInterface|null
+     * @return Scope|null
 	 */
-	public static function getGlobalScope($scope): ?ScopeInterface
+	public static function getGlobalScope($scope): ?Scope
     {
 		return Arr::first(static::$globalScopes[get_called_class()], function($value, $key) use ($scope)
 		{
@@ -304,7 +304,7 @@ public static function getGlobalScope($scope): ?ScopeInterface
 	/**
 	 * Get the global scopes for this class instance.
 	 *
-     * @return ScopeInterface[]
+     * @return Scope[]
 	 */
 	public function getGlobalScopes(): array
     {
@@ -1740,7 +1740,7 @@ public function newQuery()
     /**
      * Get a new query instance without a given scope.
 	 *
-	 * @param  ScopeInterface  $scope
+	 * @param  Scope  $scope
 	 *
 	 * @return Builder
 	 */
@@ -2317,7 +2317,7 @@ public function relationsToArray():array
 			// If the values implements the Arrayable interface we can just call this
 			// toArray method on the instances which will convert both models and
 			// collections to their proper array form and we'll set the values.
-			if ($value instanceof ArrayableInterface)
+			if ($value instanceof Arrayable)
 			{
 				$relation = $value->toArray();
 			}
@@ -2515,7 +2515,7 @@ protected function mutateAttributeForArray($key, $value)
 	{
 		$value = $this->mutateAttribute($key, $value);
 
-		return $value instanceof ArrayableInterface ? $value->toArray() : $value;
+		return $value instanceof Arrayable ? $value->toArray() : $value;
 	}
 
 	/**

src/Illuminate/Database/Eloquent/ScopeInterface.php → src/Illuminate/Database/Eloquent/Scope.php

@@ -1,6 +1,6 @@
 <?php namespace Illuminate\Database\Eloquent;
 
-interface ScopeInterface {
+interface Scope {
 
 	/**
 	 * Apply the scope to a given Eloquent query builder.

src/Illuminate/Database/Eloquent/SoftDeletingTrait.php → src/Illuminate/Database/Eloquent/SoftDeletes.php

@@ -1,6 +1,6 @@
 <?php namespace Illuminate\Database\Eloquent;
 
-trait SoftDeletingTrait {
+trait SoftDeletes {
 
 	/**
 	 * Indicates if the model is currently force deleting.
@@ -14,7 +14,7 @@ trait SoftDeletingTrait {
 	 *
 	 * @return void
 	 */
-	public static function bootSoftDeletingTrait()
+	public static function bootSoftDeletes()
 	{
 		static::addGlobalScope(new SoftDeletingScope);
 	}

src/Illuminate/Database/Eloquent/SoftDeletingScope.php

@@ -1,6 +1,6 @@
 <?php namespace Illuminate\Database\Eloquent;
 
-class SoftDeletingScope implements ScopeInterface {
+class SoftDeletingScope implements Scope {
 
 	/**
 	 * All of the extensions to be added to the builder.

tests/Database/DatabaseEloquentBuilderTest.php

@@ -589,15 +589,15 @@ public function scopeApproved($query)
 }
 
 class EloquentBuilderTestWithTrashedStub extends Illuminate\Database\Eloquent\Model {
-	use Illuminate\Database\Eloquent\SoftDeletingTrait;
+	use Illuminate\Database\Eloquent\SoftDeletes;
 	protected string $table = 'table';
 	#[\Override]
     public function getKeyName(): string { return 'foo'; }
 }
 
 class EloquentBuilderTestNestedStub extends Illuminate\Database\Eloquent\Model {
 	protected string $table = 'table';
-	use Illuminate\Database\Eloquent\SoftDeletingTrait;
+	use Illuminate\Database\Eloquent\SoftDeletes;
 }
 
 class EloquentBuilderTestListsStub {

tests/Database/DatabaseSoftDeletingTraitTest.php

@@ -54,7 +54,7 @@ public function testRestoreCancel()
 
 
 class DatabaseSoftDeletingTraitStub {
-	use Illuminate\Database\Eloquent\SoftDeletingTrait;
+	use Illuminate\Database\Eloquent\SoftDeletes;
 	public $deleted_at;
 	public function newQuery()
 	{