Skip to content

Commit 7151f32

Browse files
committed
Merge branch '5.7'
2 parents 49cd7f6 + ff2b257 commit 7151f32

File tree

9 files changed

+24
-23
lines changed

9 files changed

+24
-23
lines changed

billing.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@ First, add the Cashier package for Braintree to your dependencies:
128128

129129
composer require "laravel/cashier-braintree":"~2.0"
130130

131-
#### Service Provider
132-
133-
Next, register the `Laravel\Cashier\CashierServiceProvider` [service provider](/docs/{{version}}/providers) in your `config/app.php` configuration file:
134-
135-
Laravel\Cashier\CashierServiceProvider::class
136-
137131
#### Plan Credit Coupon
138132

139133
Before using Cashier with Braintree, you will need to define a `plan-credit` discount in your Braintree control panel. This discount will be used to properly prorate subscriptions that change from yearly to monthly billing, or from monthly to yearly billing.

blade.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ You may display the contents of the `name` variable like so:
167167

168168
Hello, {{ $name }}.
169169

170-
171170
> {tip} Blade `{{ }}` statements are automatically sent through PHP's `htmlspecialchars` function to prevent XSS attacks.
172171
173172
Of course, you are not limited to displaying the contents of the variables passed to the view. You may also echo the results of any PHP function. In fact, you can put any PHP code you wish inside of a Blade echo statement:

collections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,8 +1026,8 @@ The `mapSpread` method iterates over the collection's items, passing each nested
10261026

10271027
$chunks = $collection->chunk(2);
10281028

1029-
$sequence = $chunks->mapSpread(function ($odd, $even) {
1030-
return $odd + $even;
1029+
$sequence = $chunks->mapSpread(function ($even, $odd) {
1030+
return $even + $odd;
10311031
});
10321032

10331033
$sequence->all();

deployment.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ If you are deploying your application to a server that is running Nginx, you may
4545
error_page 404 /index.php;
4646

4747
location ~ \.php$ {
48-
fastcgi_split_path_info ^(.+\.php)(/.+)$;
4948
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
5049
fastcgi_index index.php;
5150
include fastcgi_params;

dusk.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,10 +1253,10 @@ As shown above, a "date picker" is an example of a component that might exist th
12531253
*
12541254
* @param \Laravel\Dusk\Browser $browser
12551255
* @param int $month
1256-
* @param int $year
1256+
* @param int $day
12571257
* @return void
12581258
*/
1259-
public function selectDate($browser, $month, $year)
1259+
public function selectDate($browser, $month, $day)
12601260
{
12611261
$browser->click('@date-field')
12621262
->within('@month-list', function ($browser) use ($month) {
@@ -1339,10 +1339,11 @@ If you are using CircleCI to run your Dusk tests, you may use this configuration
13391339

13401340
To run Dusk tests on [Codeship](https://codeship.com), add the following commands to your Codeship project. Of course, these commands are a starting point and you are free to add additional commands as needed:
13411341

1342-
phpenv local 7.1
1342+
phpenv local 7.2
13431343
cp .env.testing .env
1344-
composer install --no-interaction
1345-
nohup bash -c "./vendor/laravel/dusk/bin/chromedriver-linux 2>&1 &"
1344+
mkdir -p ./bootstrap/cache
1345+
composer install --no-interaction --prefer-dist
1346+
php artisan key:generate
13461347
nohup bash -c "php artisan serve 2>&1 &" && sleep 5
13471348
php artisan dusk
13481349

@@ -1369,14 +1370,12 @@ To run Dusk tests on [Heroku CI](https://www.heroku.com/continuous-integration),
13691370
<a name="running-tests-on-travis-ci"></a>
13701371
### Travis CI
13711372

1372-
To run your Dusk tests on [Travis CI](https://travis-ci.org), we will need to use the "sudo-enabled" Ubuntu 14.04 (Trusty) environment. Since Travis CI is not a graphical environment, we will need to take some extra steps in order to launch a Chrome browser. In addition, we will use `php artisan serve` to launch PHP's built-in web server:
1373+
To run your Dusk tests on [Travis CI](https://travis-ci.org), use the following `.travis.yml` configuration. Since Travis CI is not a graphical environment, we will need to take some extra steps in order to launch a Chrome browser. In addition, we will use `php artisan serve` to launch PHP's built-in web server:
13731374

13741375
language: php
1375-
sudo: required
1376-
dist: trusty
13771376

13781377
php:
1379-
- 7.2
1378+
- 7.3
13801379

13811380
addons:
13821381
chrome: stable

http-tests.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ Laravel provides a variety of custom assertion methods for your [PHPUnit](https:
242242
[assertJsonFragment](#assert-json-fragment)
243243
[assertJsonMissing](#assert-json-missing)
244244
[assertJsonMissingExact](#assert-json-missing-exact)
245+
[assertJsonMissingValidationErrors](#assert-json-missing-validation-errors)
245246
[assertJsonStructure](#assert-json-structure)
246247
[assertJsonValidationErrors](#assert-json-validation-errors)
247248
[assertLocation](#assert-location)
@@ -373,6 +374,13 @@ Assert that the response does not contain the exact JSON fragment:
373374

374375
$response->assertJsonMissingExact(array $data);
375376

377+
<a name="assert-json-missing-validation-errors"></a>
378+
#### assertJsonMissingValidationErrors
379+
380+
Assert that the response has no JSON validation errors for the given keys:
381+
382+
$response->assertJsonMissingValidationErrors($keys);
383+
376384
<a name="assert-json-structure"></a>
377385
#### assertJsonStructure
378386

mail.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,10 @@ If you have mailable classes that you want to always be queued, you may implemen
617617

618618
Laravel allows you to send mailables in a locale other than the current language, and will even remember this locale if the mail is queued.
619619

620-
To accomplish this, the `Illuminate\Mail\Mailable` class offers a `locale` method to set the desired language. The application will change into this locale when the mailable is being formatted and then revert back to the previous locale when formatting is complete:
620+
To accomplish this, the `Mail` facade offers a `locale` method to set the desired language. The application will change into this locale when the mailable is being formatted and then revert back to the previous locale when formatting is complete:
621621

622-
Mail::to($request->user())->send(
623-
(new OrderShipped($order))->locale('es')
622+
Mail::to($request->user())->locale('es')->send(
623+
new OrderShipped($order)
624624
);
625625

626626
### User Preferred Locales

routing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ If you would like to determine if the current request was routed to a given name
235235

236236
Route groups allow you to share route attributes, such as middleware or namespaces, across a large number of routes without needing to define those attributes on each individual route. Shared attributes are specified in an array format as the first parameter to the `Route::group` method.
237237

238+
Nested groups attempt to intelligently "merge" attributes with their parent group. Middleware and `where` conditions are merged while names, namespaces, and prefixes are appended. Namespace delimiters and slashes in URI prefixes are automatically added where appropriate.
239+
238240
<a name="route-group-middleware"></a>
239241
### Middleware
240242

valet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Both Valet and Homestead are great choices for configuring your Laravel developm
6666

6767
<div class="content-list" markdown="1">
6868
- Install or update [Homebrew](http://brew.sh/) to the latest version using `brew update`.
69-
- Install PHP 7.2 using Homebrew via `brew install php@7.2`.
69+
- Install PHP 7.3 using Homebrew via `brew install php`.
7070
- Install [Composer](https://getcomposer.org).
7171
- Install Valet with Composer via `composer global require laravel/valet`. Make sure the `~/.composer/vendor/bin` directory is in your system's "PATH".
7272
- Run the `valet install` command. This will configure and install Valet and DnsMasq, and register Valet's daemon to launch when your system starts.

0 commit comments

Comments
 (0)