Skip to content

Commit

Permalink
Merge branch '5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jul 11, 2016
2 parents 3d5c8c7 + 63dac67 commit dff9d13
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ Next, You should configure the following options in your `services.php` file:

Then you should add the following Braintree SDK calls to your `AppServiceProvider` service provider's `boot` method:

Braintree_Configuration::environment(env('BRAINTREE_ENV'));
Braintree_Configuration::merchantId(env('BRAINTREE_MERCHANT_ID'));
Braintree_Configuration::publicKey(env('BRAINTREE_PUBLIC_KEY'));
Braintree_Configuration::privateKey(env('BRAINTREE_PRIVATE_KEY'));
\Braintree_Configuration::environment(env('BRAINTREE_ENV'));
\Braintree_Configuration::merchantId(env('BRAINTREE_MERCHANT_ID'));
\Braintree_Configuration::publicKey(env('BRAINTREE_PUBLIC_KEY'));
\Braintree_Configuration::privateKey(env('BRAINTREE_PRIVATE_KEY'));

<a name="subscriptions"></a>
## Subscriptions
Expand Down
6 changes: 3 additions & 3 deletions blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ For convenience, Blade also provides an `@unless` directive:
You may also determine if a given layout section has any content using the `@hasSection` directive:

<title>
@hasSection('title')
@hasSection ('title')
@yield('title') - App Name
@else
App Name
Expand Down Expand Up @@ -180,13 +180,13 @@ In addition to conditional statements, Blade provides simple directives for work
When using loops you might need to end the loop or skip the current iteration:

@foreach ($users as $user)
@if($user->type == 1)
@if ($user->type == 1)
@continue
@endif

<li>{{ $user->name }}</li>

@if($user->number == 5)
@if ($user->number == 5)
@break
@endif
@endforeach
Expand Down
2 changes: 1 addition & 1 deletion helpers.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Laravel includes a variety of "helper" PHP functions. Many of these functions ar
[database_path](#method-database-path)
[elixir](#method-elixir)
[public_path](#method-public-path)
[resource_path](#method-resource_path)
[resource_path](#method-resource-path)
[storage_path](#method-storage-path)

</div>
Expand Down
2 changes: 1 addition & 1 deletion testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ You may even persist multiple models to the database. In this example, we'll eve

$users = factory(App\User::class, 3)
->create()
->each(function($u) {
->each(function ($u) {
$u->posts()->save(factory(App\Post::class)->make());
});

Expand Down

0 comments on commit dff9d13

Please sign in to comment.