Skip to content

Commit 8accaf4

Browse files
committed
Merge branch '5.4'
2 parents 3477940 + 8969436 commit 8accaf4

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

Diff for: broadcasting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ All presence channels are also private channels; therefore, users must be [autho
472472

473473
The data returned by the authorization callback will be made available to the presence channel event listeners in your JavaScript application. If the user is not authorized to join the presence channel, you should return `false` or `null`:
474474

475-
Broadcast::channel('chat.*', function ($user, $roomId) {
475+
Broadcast::channel('chat.{roomId}', function ($user, $roomId) {
476476
if ($user->canJoinRoom($roomId)) {
477477
return ['id' => $user->id, 'name' => $user->name];
478478
}

Diff for: dusk.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ To run your Dusk tests on Travis CI, we will need to use the "sudo-enabled" Ubun
673673
<a name="running-tests-on-circle-ci"></a>
674674
### CircleCI
675675

676-
If you are using CircleCI to run your Dusk tests, you may use this configuration file as a starting point. Like TravisCI, we will use the `php artisan serve` command to launch PHP's built-in web server:
676+
#### CircleCI 1.0
677+
678+
If you are using CircleCI 1.0 to run your Dusk tests, you may use this configuration file as a starting point. Like TravisCI, we will use the `php artisan serve` command to launch PHP's built-in web server:
677679

678680
test:
679681
pre:
@@ -685,3 +687,23 @@ If you are using CircleCI to run your Dusk tests, you may use this configuration
685687

686688
override:
687689
- php artisan dusk
690+
691+
#### CircleCI 2.0
692+
693+
If you are using CircleCI 2.0 to run your Dusk tests, you may add these steps to your build:
694+
695+
version: 2
696+
jobs:
697+
build:
698+
steps:
699+
- run:
700+
name: Start Chrome Driver
701+
command: ./vendor/laravel/dusk/bin/chromedriver-linux
702+
background: true
703+
- run:
704+
name: Run Laravel Server
705+
command: php artisan serve
706+
background: true
707+
- run:
708+
name: Run Laravel Dusk Tests
709+
command: php artisan dusk

Diff for: mocking.md

+2
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ The `Storage` facade's `fake` method allows you to easily generate a fake disk t
239239
}
240240
}
241241

242+
> {tip} By default, the `fake` method will delete all files in its temporary directory. If you would like to keep these files, you may use the "persistentFake" method instead.
243+
242244
<a name="mocking-facades"></a>
243245
## Facades
244246

Diff for: scout.md

+6
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,12 @@ If you would like to get the raw results before they are converted to Eloquent m
239239

240240
$orders = App\Order::search('Star Trek')->raw();
241241

242+
Search queries will typically be performed on the index specified by the model's [`searchableAs`](#configuring-model-indexes) method. However, you may use the `within` method to specify a custom index that should be searched instead:
243+
244+
$orders = App\Order::search('Star Trek')
245+
->within('tv_shows_popularity_desc')
246+
->get();
247+
242248
<a name="where-clauses"></a>
243249
### Where Clauses
244250

0 commit comments

Comments
 (0)