Skip to content
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

Fix more typos #51039

Merged
merged 3 commits into from
Apr 12, 2024
Merged

Fix more typos #51039

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
50502e9
Fix more typos
szepeviktor Apr 12, 2024
2108944
Merge branch '11.x' into typos2
szepeviktor Apr 12, 2024
6fa13ce
Fix more typos
szepeviktor Apr 12, 2024
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
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Configuration/ApplicationBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function withEvents(array|bool $discover = [])
}

/**
* Register the braodcasting services for the application.
* Register the broadcasting services for the application.
*
* @param string $channels
* @param array $attributes
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class EventServiceProvider extends ServiceProvider
protected $observers = [];

/**
* Indiates if events should be discovered.
* Indicates if events should be discovered.
*
* @var bool
*/
Expand Down
18 changes: 9 additions & 9 deletions tests/Database/DatabaseQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2479,19 +2479,19 @@ public function testJoinsWithNestedJoins()
public function testJoinsWithMultipleNestedJoins()
{
$builder = $this->getBuilder();
$builder->select('users.id', 'contacts.id', 'contact_types.id', 'countrys.id', 'planets.id')->from('users')->leftJoin('contacts', function ($j) {
$builder->select('users.id', 'contacts.id', 'contact_types.id', 'countries.id', 'planets.id')->from('users')->leftJoin('contacts', function ($j) {
$j->on('users.id', 'contacts.id')
->join('contact_types', 'contacts.contact_type_id', '=', 'contact_types.id')
->leftJoin('countrys', function ($q) {
$q->on('contacts.country', '=', 'countrys.country')
->leftJoin('countries', function ($q) {
$q->on('contacts.country', '=', 'countries.country')
->join('planets', function ($q) {
$q->on('countrys.planet_id', '=', 'planet.id')
$q->on('countries.planet_id', '=', 'planet.id')
->where('planet.is_settled', '=', 1)
->where('planet.population', '>=', 10000);
});
});
});
$this->assertSame('select "users"."id", "contacts"."id", "contact_types"."id", "countrys"."id", "planets"."id" from "users" left join ("contacts" inner join "contact_types" on "contacts"."contact_type_id" = "contact_types"."id" left join ("countrys" inner join "planets" on "countrys"."planet_id" = "planet"."id" and "planet"."is_settled" = ? and "planet"."population" >= ?) on "contacts"."country" = "countrys"."country") on "users"."id" = "contacts"."id"', $builder->toSql());
$this->assertSame('select "users"."id", "contacts"."id", "contact_types"."id", "countries"."id", "planets"."id" from "users" left join ("contacts" inner join "contact_types" on "contacts"."contact_type_id" = "contact_types"."id" left join ("countries" inner join "planets" on "countries"."planet_id" = "planet"."id" and "planet"."is_settled" = ? and "planet"."population" >= ?) on "contacts"."country" = "countries"."country") on "users"."id" = "contacts"."id"', $builder->toSql());
$this->assertEquals(['1', 10000], $builder->getBindings());
}

Expand All @@ -2502,16 +2502,16 @@ public function testJoinsWithNestedJoinWithAdvancedSubqueryCondition()
$j->on('users.id', 'contacts.id')
->join('contact_types', 'contacts.contact_type_id', '=', 'contact_types.id')
->whereExists(function ($q) {
$q->select('*')->from('countrys')
->whereColumn('contacts.country', '=', 'countrys.country')
$q->select('*')->from('countries')
->whereColumn('contacts.country', '=', 'countries.country')
->join('planets', function ($q) {
$q->on('countrys.planet_id', '=', 'planet.id')
$q->on('countries.planet_id', '=', 'planet.id')
->where('planet.is_settled', '=', 1);
})
->where('planet.population', '>=', 10000);
});
});
$this->assertSame('select "users"."id", "contacts"."id", "contact_types"."id" from "users" left join ("contacts" inner join "contact_types" on "contacts"."contact_type_id" = "contact_types"."id") on "users"."id" = "contacts"."id" and exists (select * from "countrys" inner join "planets" on "countrys"."planet_id" = "planet"."id" and "planet"."is_settled" = ? where "contacts"."country" = "countrys"."country" and "planet"."population" >= ?)', $builder->toSql());
$this->assertSame('select "users"."id", "contacts"."id", "contact_types"."id" from "users" left join ("contacts" inner join "contact_types" on "contacts"."contact_type_id" = "contact_types"."id") on "users"."id" = "contacts"."id" and exists (select * from "countries" inner join "planets" on "countries"."planet_id" = "planet"."id" and "planet"."is_settled" = ? where "contacts"."country" = "countries"."country" and "planet"."population" >= ?)', $builder->toSql());
$this->assertEquals(['1', 10000], $builder->getBindings());
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Foundation/FoundationDocsCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public function testItBubblesUpAskStrategyExceptions()
$this->artisan('docs');
}

public function testItBubblesUpNonProcessInterruptExceptionsInAskStratgies()
public function testItBubblesUpNonProcessInterruptExceptionsInAskStrategies()
{
putenv('ARTISAN_DOCS_ASK_STRATEGY='.__DIR__.'/fixtures/process-failure-strategy.php');

Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/Events/ShouldDispatchAfterCommitEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function testItOnlyDispatchesNestedTransactionsEventsAfterTheRootTransact
$this->assertTrue(AnotherShouldDispatchAfterCommitTestEvent::$ran);
}

public function testItOnlyDispatchesNestedTransactionsEventsAfterTheRootTransactionIsCommitedDifferentOrder()
public function testItOnlyDispatchesNestedTransactionsEventsAfterTheRootTransactionIsCommittedDifferentOrder()
{
Event::listen(ShouldDispatchAfterCommitTestEvent::class, ShouldDispatchAfterCommitListener::class);
Event::listen(AnotherShouldDispatchAfterCommitTestEvent::class, AnotherShouldDispatchAfterCommitListener::class);
Expand Down
20 changes: 10 additions & 10 deletions tests/Integration/Foundation/RoutingServiceProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGe

$response = $this->withoutExceptionHandling()->get('test-route?'.http_build_query([
'sent' => 'sent-data',
'overridden' => 'overriden-sent-data',
'overridden' => 'overridden-sent-data',
]));

$response->assertOk();
Expand Down Expand Up @@ -48,7 +48,7 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGe

$response = $this->getJson('test-route?'.http_build_query([
'sent' => 'sent-data',
'overridden' => 'overriden-sent-data',
'overridden' => 'overridden-sent-data',
]), [
'content-type' => 'application/json',
]);
Expand All @@ -57,7 +57,7 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGe
$response->assertExactJson([
'json-data' => 'json-data',
'merged' => 'replaced-merged-data',
'overridden' => 'overriden-merged-data',
'overridden' => 'overridden-merged-data',
'request-data' => 'request-data',
]);
}
Expand All @@ -70,14 +70,14 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGe

$response = $this->getJson('test-route?'.http_build_query([
'sent' => 'sent-data',
'overridden' => 'overriden-sent-data',
'overridden' => 'overridden-sent-data',
]));

$response->assertOk();
$response->assertExactJson([
'json-data' => 'json-data',
'merged' => 'replaced-merged-data',
'overridden' => 'overriden-merged-data',
'overridden' => 'overridden-merged-data',
'request-data' => 'request-data',
]);
}
Expand All @@ -90,14 +90,14 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingPo

$response = $this->post('test-route', [
'sent' => 'sent-data',
'overridden' => 'overriden-sent-data',
'overridden' => 'overridden-sent-data',
]);

$response->assertOk();
$response->assertExactJson([
'sent' => 'sent-data',
'merged' => 'replaced-merged-data',
'overridden' => 'overriden-merged-data',
'overridden' => 'overridden-merged-data',
'request-data' => 'request-data',
]);
}
Expand All @@ -110,15 +110,15 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingPo

$response = $this->postJson('test-route', [
'sent' => 'sent-data',
'overridden' => 'overriden-sent-data',
'overridden' => 'overridden-sent-data',
]);

$response->assertOk();
$response->assertExactJson([
'json-data' => 'json-data',
'sent' => 'sent-data',
'merged' => 'replaced-merged-data',
'overridden' => 'overriden-merged-data',
'overridden' => 'overridden-merged-data',
'request-data' => 'request-data',
]);
}
Expand All @@ -144,7 +144,7 @@ public function handle(Request $request, $next)

$request->merge(['merged' => 'replaced-merged-data']);

$request->merge(['overridden' => 'overriden-merged-data']);
$request->merge(['overridden' => 'overridden-merged-data']);

$request->request->set('request-data', 'request-data');

Expand Down
4 changes: 2 additions & 2 deletions tests/Integration/Http/ThrottleRequestsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public function testItFallbacksToUserPropertyWhenThereIsNoNamedLimiterWhenAuthen

public function testItFallbacksToUserAccessorWhenThereIsNoNamedLimiterWhenAuthenticated()
{
$user = UserWithAcessor::make();
$user = UserWithAccessor::make();

Carbon::setTestNow(Carbon::create(2018, 1, 1, 0, 0, 0));

Expand Down Expand Up @@ -333,7 +333,7 @@ public function testItFallbacksToUserAccessorWhenThereIsNoNamedLimiterWhenAuthen
}
}

class UserWithAcessor extends User
class UserWithAccessor extends User
{
public function getRateLimitingAttribute(): int
{
Expand Down