Skip to content

[12.x] Rename NamedScope to Scope #57478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 22, 2025
+8 −8
Merged

[12.x] Rename NamedScope to Scope #57478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e302d69
Update EloquentNamedScopeAttributeTest.php
AhmedAlaa4611 Oct 21, 2025
ee33e10
Update NamedScopeUser.php
AhmedAlaa4611 Oct 21, 2025
86df66b
Update EloquentModelScopeTest.php
AhmedAlaa4611 Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/Integration/Database/EloquentModelScopeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Illuminate\Tests\Integration\Database;

use Illuminate\Contracts\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Attributes\Scope as NamedScope;
use Illuminate\Database\Eloquent\Attributes\Scope;
use Illuminate\Database\Eloquent\Model;

class EloquentModelScopeTest extends DatabaseTestCase
Expand Down Expand Up @@ -37,7 +37,7 @@ public function scopeExists(Builder $builder)
return $builder;
}

#[NamedScope]
#[Scope]
protected function existsAsWell(Builder $builder)
{
return $builder;
Expand Down
6 changes: 3 additions & 3 deletions tests/Integration/Database/EloquentNamedScopeAttributeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ protected function setUp(): void
);
}

#[DataProvider('namedScopeDataProvider')]
#[DataProvider('scopeDataProvider')]
public function test_it_can_query_named_scoped_from_the_query_builder(string $methodName)
{
$query = Fixtures\NamedScopeUser::query()->{$methodName}(true);

$this->assertSame($this->query, $query->toRawSql());
}

#[DataProvider('namedScopeDataProvider')]
#[DataProvider('scopeDataProvider')]
public function test_it_can_query_named_scoped_from_static_query(string $methodName)
{
$query = Fixtures\NamedScopeUser::{$methodName}(true);

$this->assertSame($this->query, $query->toRawSql());
}

public static function namedScopeDataProvider(): array
public static function scopeDataProvider(): array
{
return [
'scope with return' => ['verified'],
Expand Down
6 changes: 3 additions & 3 deletions tests/Integration/Database/Fixtures/NamedScopeUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Illuminate\Tests\Integration\Database\Fixtures;

use Illuminate\Database\Eloquent\Attributes\Scope as NamedScope;
use Illuminate\Database\Eloquent\Attributes\Scope;
use Illuminate\Database\Eloquent\Builder;

class NamedScopeUser extends User
Expand All @@ -17,7 +17,7 @@ protected function casts(): array
];
}

#[NamedScope]
#[Scope]
protected function verified(Builder $builder, bool $email = true)
{
return $builder->when(
Expand All @@ -27,7 +27,7 @@ protected function verified(Builder $builder, bool $email = true)
);
}

#[NamedScope]
#[Scope]
protected function verifiedWithoutReturn(Builder $builder, bool $email = true)
{
$this->verified($builder, $email);
Expand Down