Skip to content

Commit e48166c

Browse files
committed
Merge branch '5.5' of github.com:laravel/docs into 5.5
2 parents 3299217 + 187beef commit e48166c

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

collections.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,8 @@ You may optionally pass an integer to `random` to specify how many items you wou
13591359

13601360
// [2, 4, 5] - (retrieved randomly)
13611361

1362+
If the Collection has fewer items than requested, the method will throw an `InvalidArgumentException`.
1363+
13621364
<a name="method-reduce"></a>
13631365
#### `reduce()` {#collection-method}
13641366

dusk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Laravel Dusk provides an expressive, easy-to-use browser automation and testing
4646

4747
To get started, you should add the `laravel/dusk` Composer dependency to your project:
4848

49-
composer require --dev laravel/dusk:^2.0
49+
composer require --dev laravel/dusk:"^2.0"
5050

5151
Once Dusk is installed, you should register the `Laravel\Dusk\DuskServiceProvider` service provider. Typically, this will be done automatically via Laravel's automatic service provider registration.
5252

helpers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ The `tap` function accepts two arguments: an arbitrary `$value` and a Closure. T
14771477
$user->save();
14781478
});
14791479

1480-
If no Closure is passed to the `tap` function, you may call any method on the given `$value`. The return value of the method you call will always be `$value`, regardless of the what the method actually returns in its definition. For example, the Eloquent `update` method typically returns an integer. However, we can force the method to return the model itself by chaining the `update` method call through the `tap` function:
1480+
If no Closure is passed to the `tap` function, you may call any method on the given `$value`. The return value of the method you call will always be `$value`, regardless of what the method actually returns in its definition. For example, the Eloquent `update` method typically returns an integer. However, we can force the method to return the model itself by chaining the `update` method call through the `tap` function:
14811481

14821482
$user = tap($user)->update([
14831483
'name' => $name,

http-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ Assert that the session contains the given piece of data:
393393

394394
Assert that the session has a given list of values:
395395

396-
$response->assertSessionHasAll($key, $value = null);
396+
$response->assertSessionHasAll(array $data);
397397

398398
<a name="assert-session-has-errors"></a>
399399
#### assertSessionHasErrors

passport.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Laravel already makes it easy to perform authentication via traditional login fo
4242

4343
To get started, install Passport via the Composer package manager:
4444

45-
composer require laravel/passport
45+
composer require laravel/passport=~4.0
4646

4747
The Passport service provider registers its own database migration directory with the framework, so you should migrate your database after registering the provider. The Passport migrations will create the tables your application needs to store clients and access tokens:
4848

routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ To register an explicit binding, use the router's `model` method to specify the
317317

318318
Next, define a route that contains a `{user}` parameter:
319319

320-
Route::get('profile/{user}', function (App\User $user) {
320+
Route::get('profile/{user}', function ($user) {
321321
//
322322
});
323323

upgrade.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ Update your `laravel/framework` dependency to `5.5.*` in your `composer.json` fi
5252
],
5353
}
5454

55+
If you are using the `laravel/browser-kit-testing` package, you should update the package to `2.*` in your `composer.json` file.
56+
5557
Of course, don't forget to examine any 3rd party packages consumed by your application and verify you are using the proper version for Laravel 5.5 support.
5658

5759
#### Laravel Installer

0 commit comments

Comments
 (0)