Skip to content

從官方那邊抓了新版homestead.md翻譯 #337

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.

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

Merged
merged 269 commits into from
Jul 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
269 commits
Select commit Hold shift + click to select a range
7f632e3
Merge pull request #3074 from eklundkristoffer/patch-1
taylorotwell Feb 3, 2017
323b60b
Correct the note regarding assertJson
KKSzymanowski Feb 3, 2017
bc717a5
Merge pull request #3076 from KKSzymanowski/assert-json-correction
taylorotwell Feb 4, 2017
1cc782d
Add view() usage information to notifications
garygreen Feb 4, 2017
e6cd3ec
Add note about assertJsonStructure()
jerguslejko Feb 5, 2017
61723a2
adjust wordin
taylorotwell Feb 5, 2017
572b1db
Merge branch 'fix/asset-json-structure' of https://github.com/jergusl…
taylorotwell Feb 5, 2017
1c7422c
remove second param
taylorotwell Feb 5, 2017
aa83d2a
Fix typo in Filesystem doc
Feb 5, 2017
794ba7f
Merge pull request #3081 from afolson/filefix
taylorotwell Feb 6, 2017
7df7753
Document Passport::actingAs()
themsaid Feb 6, 2017
50685be
update wording
taylorotwell Feb 6, 2017
6f387d1
document the changes in model create and forceCreate
themsaid Feb 6, 2017
78e703d
update wording
taylorotwell Feb 6, 2017
ca8c32d
add notes about bind and instance
themsaid Feb 7, 2017
5fb69c2
update wording
taylorotwell Feb 7, 2017
368547c
add note on optional fields
taylorotwell Feb 7, 2017
d7bb2c5
remove word
taylorotwell Feb 7, 2017
7f603e1
add note on normaliation
taylorotwell Feb 7, 2017
63b7991
add note about autoloading
taylorotwell Feb 7, 2017
f65d055
document assertJsonFragment
themsaid Feb 8, 2017
c655174
minor edit
themsaid Feb 8, 2017
89916e6
Update Mix documentation about `version`
kohenkatz Feb 8, 2017
ac2b5c5
spelling
kohenkatz Feb 8, 2017
4e9805a
Example for redirectTo() Method
caseydwyer Feb 8, 2017
4bb81a1
Merge pull request #3097 from dwyer14/patch-1
taylorotwell Feb 8, 2017
e39705e
document intersect method
taylorotwell Feb 8, 2017
f11dc3b
Added changes to Event Fake changes
ninjaparade Feb 9, 2017
0a49680
Document Route::resourceVerbs() method
paulofreitas Feb 9, 2017
b3d99e9
Update upgrade.md
taylorotwell Feb 9, 2017
1cfc440
Merge pull request #3098 from ninjaparade/patch-1
taylorotwell Feb 9, 2017
ec1fa26
Merge branch 'patch-1' of https://github.com/kohenkatz/laravel-docs i…
taylorotwell Feb 9, 2017
a8db549
fix wording
taylorotwell Feb 9, 2017
cde0117
Merge remote-tracking branch 'origin/5.4' into 5.4
taylorotwell Feb 9, 2017
91cc7ed
Merge branch 'patch-2' of https://github.com/paulofreitas/docs into p…
taylorotwell Feb 9, 2017
bda731b
wording
taylorotwell Feb 9, 2017
c05a897
use BrowserKitTestCase
themsaid Feb 9, 2017
4b0ec4f
Merge pull request #3102 from themsaid/BrowserKitTestCase
taylorotwell Feb 9, 2017
8fa4073
fix: remove comma
milkmeowo Feb 10, 2017
3f856a1
Better wording for Cashier warning
KristofMorva Feb 10, 2017
2c40cf3
Merge pull request #3105 from kmorva/cashier-warning
taylorotwell Feb 10, 2017
128ad8f
Merge pull request #3104 from milkmeowo/patch-1
taylorotwell Feb 10, 2017
74d355b
update docs
taylorotwell Feb 10, 2017
c6f0ebb
Remove compiled.php to upgrade guide
loganhenson Feb 10, 2017
8c72e18
Update upgrade.md
taylorotwell Feb 10, 2017
a414568
Merge pull request #3106 from loganhenson/patch-2
taylorotwell Feb 10, 2017
6a96b68
Fix method name in dusk.md
henriquebremenkanp Feb 10, 2017
885af71
Merge pull request #3107 from henriquebremenkanp/patch-1
taylorotwell Feb 10, 2017
f373b4e
Change PHPUnit to 5.7
Erulezz Feb 11, 2017
406f6e1
give more clarity
taylorotwell Feb 11, 2017
2625444
Merge pull request #3109 from Erulezz/patch-1
taylorotwell Feb 11, 2017
58ba3d9
Correct reference to resources directory name
bjuppa Feb 14, 2017
18df44c
Merge pull request #3116 from bjuppa/5.4
taylorotwell Feb 14, 2017
25f6ca6
Update http-tests.md
dabuno Feb 14, 2017
a8ba9d5
import class
taylorotwell Feb 14, 2017
df8f4a3
:memo: add documentation for collection when method
michaeldyrynda Feb 14, 2017
63892a2
update wording
taylorotwell Feb 15, 2017
d117111
added to docs
taylorotwell Feb 15, 2017
6f25a85
Merge remote-tracking branch 'laravel/5.4' into 5.4
browner12 Feb 16, 2017
089ce9d
use correct name of method
browner12 Feb 16, 2017
972c3a1
Adding brackets.
tomopongrac Feb 17, 2017
bca001d
Merge pull request #3122 from tomopongrac/5.4
taylorotwell Feb 17, 2017
6260ab6
Merge pull request #3120 from browner12/brower-page
taylorotwell Feb 17, 2017
edadeb1
Merge remote-tracking branch 'laravel/5.4' into 5.4
browner12 Feb 17, 2017
e73e0bd
Changing heading
tomopongrac Feb 17, 2017
fca6933
Removing references to the .homestead directory.
DaveBagler Feb 17, 2017
59658c3
Merge pull request #3124 from tomopongrac/patch-1
taylorotwell Feb 17, 2017
61d5d33
Merge pull request #3125 from DaveBagler/patch-1
taylorotwell Feb 18, 2017
ac59510
Add missing config entry.
henriquebremenkanp Feb 19, 2017
46d9166
Merge pull request #3128 from henriquebremenkanp/patch-2
taylorotwell Feb 19, 2017
f78c0b3
Update notifications.md
laurencei Feb 21, 2017
5196f3f
Merge pull request #3131 from lioannou/patch-1
taylorotwell Feb 21, 2017
84ae9f0
work on docs
taylorotwell Feb 21, 2017
f99f9c9
Merge remote-tracking branch 'laravel/5.4' into 5.4
browner12 Feb 21, 2017
08e36c2
add notes for random dropdown selection
browner12 Feb 21, 2017
60398d7
Update dusk.md
taylorotwell Feb 21, 2017
c3b9f20
Merge pull request #3132 from browner12/select-random
taylorotwell Feb 21, 2017
d454d22
Updated dusk.md
devinfd Feb 21, 2017
e591dbd
Merge pull request #3133 from devinfd/patch-2
taylorotwell Feb 22, 2017
85aab64
Added note about indentation level on markdown emails
garygreen Feb 22, 2017
bebb332
adjust wording
taylorotwell Feb 22, 2017
ba2af91
Removes PM2 from homestead docs
karljakober Feb 22, 2017
d8fd022
Merge pull request #3136 from KarlJakober/patch-1
taylorotwell Feb 22, 2017
4cf3465
Extend Mix docs
JeffreyWay Feb 22, 2017
4c12e05
fix formatting and wording
taylorotwell Feb 22, 2017
c4b8147
fix mistake in stylus
merodiro Feb 24, 2017
167e145
Merge pull request #3142 from merodiro/patch-1
taylorotwell Feb 24, 2017
9f4910c
Fix typo in Homestead doc
saulotoledo Feb 26, 2017
e89d042
Merge pull request #3148 from saulotoledo/homestead_typo_fix
taylorotwell Feb 26, 2017
0b133f9
✨ 📚 Add JSON Config info, share() docs, notes about using stable vers…
svpernova09 Feb 26, 2017
57ba9cc
Replace htmlentities with htmlspecialchars
guidocella Feb 27, 2017
627da50
Merge pull request #3150 from guidocella/blade-echoes-use-htmlspecial…
taylorotwell Feb 27, 2017
e134c38
Merge branch 'feature/homestead-5-updates' of https://github.com/svpe…
taylorotwell Feb 27, 2017
c80cdeb
fix various errors and problems
taylorotwell Feb 27, 2017
87ad109
Use path to sass instead of less
aziev Feb 27, 2017
43291d7
use uri() instead of getPath() for Route
bdanchilla Feb 27, 2017
b8a8bf8
Merge pull request #1 from bdanchilla/upgrade-route-getpath
bdanchilla Feb 27, 2017
35b7be3
Merge pull request #3152 from bdanchilla/5.4
taylorotwell Feb 27, 2017
41d0924
Merge pull request #3151 from aziev/patch-1
taylorotwell Feb 27, 2017
0e920ba
Replace "login" with "log in"
Feb 28, 2017
c2599e0
Merge pull request #3153 from phanan/fix-login-typo-1
taylorotwell Feb 28, 2017
e28b51a
Add note about the removal of the ConfigureLogging
Mar 1, 2017
d7088da
Merge pull request #3159 from johnboy-leeds/patch-1
taylorotwell Mar 1, 2017
8f0020f
update dusk.md
devinfd Mar 1, 2017
4ee827b
Update homestead.md
Mar 1, 2017
d86886d
added docs for testing file uploads
taylorotwell Mar 1, 2017
85cb006
More clarification of the example commands used.
Mar 2, 2017
48c9bb3
Document Collection::whereNotIn()
guidocella Mar 2, 2017
77bef4e
Update mix.md
ttomdewit Mar 2, 2017
82dd58c
Merge pull request #3163 from ttomdewit/5.4
taylorotwell Mar 2, 2017
6589ceb
Update collections.md
taylorotwell Mar 2, 2017
23bc63a
Merge pull request #3162 from guidocella/collection-wherenotin
taylorotwell Mar 2, 2017
7641cb9
Merge branch '5.4' of https://github.com/vblinden/docs into vblinden-5.4
taylorotwell Mar 2, 2017
60908e3
fix wording
taylorotwell Mar 2, 2017
b809bfd
Change dot to semicolon
guidocella Mar 2, 2017
66c345b
Merge pull request #3160 from devinfd/patch-1
taylorotwell Mar 2, 2017
7ad0ff0
Merge pull request #3164 from guidocella/wherein-semicolon
taylorotwell Mar 2, 2017
5a6f001
Merge branch 'testing-file-uploads' into 5.4
taylorotwell Mar 2, 2017
a6a299f
Merge remote-tracking branch 'origin/5.4' into 5.4
taylorotwell Mar 2, 2017
7041274
Update mix.md
richeklein Mar 4, 2017
7d6e811
Merge pull request #3169 from neovive/5.4
taylorotwell Mar 4, 2017
c788353
Update structure
JellyBool Mar 6, 2017
0115cb4
Update structure.md
taylorotwell Mar 6, 2017
f8e09eb
Merge pull request #3174 from JellyBool/patch-1
taylorotwell Mar 6, 2017
32e3884
Add new drag methods to documentation
helmut Mar 7, 2017
40f4d92
fix formatting
taylorotwell Mar 7, 2017
bd69113
Terminable route middleware clarification
orrd Mar 8, 2017
0c0eddc
Update middleware.md
taylorotwell Mar 8, 2017
e03b6fc
Merge pull request #3178 from orrd/5.4
taylorotwell Mar 8, 2017
92d3795
e function sets double_encode to false
Benestar Mar 8, 2017
95ceb4d
Fixed typo error.
roquie Mar 9, 2017
2e58993
Added kebab_case() to the string helpers
TJSoler Mar 9, 2017
51f0c2e
Merge pull request #3184 from roquie/patch-1
taylorotwell Mar 9, 2017
364f245
Added kebab_case() to the string helpers
TJSoler Mar 9, 2017
8aeb4a1
Merge pull request #3185 from TJSoler/patch-1
taylorotwell Mar 9, 2017
2a008a2
Update helpers.md
taylorotwell Mar 9, 2017
cbf9be4
Merge pull request #3183 from Benestar/patch-1
taylorotwell Mar 9, 2017
4d0905b
Mention the array_wrap helper
mikevrind Mar 9, 2017
8a99ff3
tweak wording
taylorotwell Mar 9, 2017
7a82fa8
changes for custom pivot table model
qurius Mar 9, 2017
2fee145
Merge pull request #3187 from qurius/patch-1
taylorotwell Mar 9, 2017
3b903b2
Adding semicolon.
tomopongrac Mar 10, 2017
e06fc92
Merge pull request #3188 from tomopongrac/patch-1
taylorotwell Mar 10, 2017
1921733
Fixed typo
jrhenderson1988 Mar 10, 2017
eda0677
Merge pull request #3190 from jrhenderson1988/typo
taylorotwell Mar 10, 2017
fc9ab30
Update authorization.md
kerrinhardy Mar 13, 2017
0fabc54
Added description for getMessage() in Error pages
ron4stoppable Mar 13, 2017
c90a5f7
Update queries.md
ihsanberahim Mar 13, 2017
e6f7615
Update queries.md
taylorotwell Mar 13, 2017
f40f50f
Merge pull request #3194 from ihsanberahim/patch-1
taylorotwell Mar 13, 2017
e2c40e0
Update errors.md
taylorotwell Mar 13, 2017
49c9733
Update errors.md
taylorotwell Mar 13, 2017
329b56a
Merge pull request #3193 from ron4stoppable/patch-1
taylorotwell Mar 13, 2017
b23f086
Merge pull request #3192 from kerrinhardy/5.4
taylorotwell Mar 13, 2017
1f4247b
Document Eloquent\Builder::withCount() aliasing support
paulofreitas Mar 13, 2017
bfa5f97
tweak formatting
taylorotwell Mar 13, 2017
e405428
update example
taylorotwell Mar 14, 2017
fb7e3c3
document csrf
taylorotwell Mar 16, 2017
012cb15
clear up wording
taylorotwell Mar 16, 2017
77c99fc
Fixes syntax error
lostincode Mar 17, 2017
ee8bfab
Merge pull request #3205 from lostincode/lostincode-patch-1
taylorotwell Mar 17, 2017
6f59023
Adding getForeignKey rename to upgrade guide
jamierumbelow Mar 18, 2017
c25fd2e
move docs
taylorotwell Mar 18, 2017
514dfc6
document customization
taylorotwell Mar 19, 2017
c421646
Update views.md
alexeydemin Mar 21, 2017
8a0d5c9
Merge pull request #3214 from alexeydemin/patch-1
taylorotwell Mar 21, 2017
e4b4ec8
Corrected wrong example code (in sync with master)
connectkushal Mar 21, 2017
47113e2
Merge pull request #3215 from connectkushal/patch-1
taylorotwell Mar 21, 2017
e8fcb1c
Fix React anchor link. Updated to #react to match section heading
Mar 21, 2017
16ca784
Update v5.4 Upgrade Guide
michaelshaffer37 Mar 21, 2017
08fbf38
Merge pull request #3217 from michaelshaffer37/patch-1
taylorotwell Mar 21, 2017
6cf0ac5
Merge pull request #3216 from chrisgeary92/fix-mix-react-anchor
taylorotwell Mar 21, 2017
8b0fa5b
Document Collection::isNotEmpty() method
paulofreitas Mar 25, 2017
b346638
Document Collection::containsStrict() method
paulofreitas Mar 25, 2017
7a7678b
Document Collection::median() and Collection::mode() methods
paulofreitas Mar 25, 2017
eb77479
[5.4] Document Collection::uniqueStrict() method
paulofreitas Mar 25, 2017
083293b
[5.4] Document Collection::tap() method
paulofreitas Mar 25, 2017
c5a77a3
[5.4] Sync Eloquent\Collection available methods
paulofreitas Mar 25, 2017
b645d7a
Merge pull request #3226 from paulofreitas/eloquent-collections
taylorotwell Mar 25, 2017
728fe36
Merge pull request #3225 from paulofreitas/collection-tap
taylorotwell Mar 25, 2017
543dfbe
Merge pull request #3224 from paulofreitas/collection-uniquestrict
taylorotwell Mar 25, 2017
befea2f
Merge pull request #3223 from paulofreitas/collection-median-and-mode
taylorotwell Mar 25, 2017
b7c11ba
Merge pull request #3222 from paulofreitas/collection-containsstrict
taylorotwell Mar 25, 2017
e793353
Merge pull request #3221 from paulofreitas/collection-isnotempty
taylorotwell Mar 25, 2017
540555c
Fix reference to getMessage in exception
Mar 26, 2017
dd6d6a1
Improvements to collections documentation
paulofreitas Mar 26, 2017
b03f7ac
Correct example for sending markdown slack attachements
themsaid Mar 26, 2017
730073f
Update use statement
lbausch Mar 26, 2017
b385115
Merge pull request #3231 from lbausch/patch-1
taylorotwell Mar 26, 2017
e6dc8f6
Merge pull request #3229 from themsaid/correctTypo
taylorotwell Mar 26, 2017
7dcca4c
Merge pull request #3228 from paulofreitas/collections-improvements
taylorotwell Mar 26, 2017
8ec87f2
Merge pull request #3227 from jameslkingsley/patch-1
taylorotwell Mar 26, 2017
a961d8f
Update scheduling.md file
k3bra Mar 28, 2017
d0be3c4
add notes on laravel version scheme
taylorotwell Mar 28, 2017
523b1f7
Clarifies tests namespace change
paulofreitas Mar 29, 2017
a743d8c
[5.4] Change user_id to unsigned integer
Floxxx Mar 29, 2017
7d28b46
Merge pull request #3237 from Floxxx/5.4
taylorotwell Mar 29, 2017
b128097
Merge pull request #3236 from paulofreitas/upgrade-5.4
taylorotwell Mar 29, 2017
fb4c611
Merge pull request #3234 from k3bra/patch-1
taylorotwell Mar 29, 2017
78b4712
add docs for running dusk on travis and circleci
themsaid Mar 29, 2017
8cfea6a
fix
themsaid Mar 29, 2017
0902513
Semantic Versioning paragraph small typo fix.
budmc29 Mar 30, 2017
03a9cfd
Merge pull request #3239 from budmc29/patch-1
taylorotwell Mar 30, 2017
bc381ea
Merge branch 'duskCI' of https://github.com/themsaid/docs into themsa…
taylorotwell Mar 30, 2017
22602f6
tweak wording
taylorotwell Mar 30, 2017
cc4ba39
fix CircleCI formatting
themsaid Mar 30, 2017
ed3f4f1
Merge pull request #3241 from themsaid/fixdocs
taylorotwell Mar 30, 2017
db3916c
Update facades.md
connectkushal Apr 2, 2017
8407316
Update facades.md
taylorotwell Apr 2, 2017
233beac
Merge pull request #3243 from connectkushal/patch-1
taylorotwell Apr 2, 2017
1255c35
Added `deleteFileAfterSend()` back in the docs
wotta Apr 3, 2017
c3c2fd8
Merge pull request #3244 from concept-core/patch-1
taylorotwell Apr 3, 2017
25e40a7
wip
taylorotwell Apr 3, 2017
eb004fe
Document Collection::times() method and flatMap shortcut
paulofreitas Apr 3, 2017
2fa62cf
Update collections.md
taylorotwell Apr 3, 2017
0b1a14c
Merge pull request #3248 from paulofreitas/new-collection-features
taylorotwell Apr 3, 2017
e22286a
Improve the environment configuration documentation
paulofreitas Apr 4, 2017
4a74557
Change word.
taylorotwell Apr 4, 2017
a755916
adjust wording and tips
taylorotwell Apr 4, 2017
136bd64
remove section from docs... php has built in ?? operator
taylorotwell Apr 5, 2017
d5e7e9e
Clarify 2nd argument of firstOrNew & firstOrCreate
wmcmurray Apr 5, 2017
cd30526
Update charset/collation
susanBuck Apr 6, 2017
13b1c3f
Merge pull request #3255 from susanBuck/patch-3
taylorotwell Apr 6, 2017
2176ced
Merge branch '5.4' of github.com:laravel/docs into 5.4
taylorotwell Apr 6, 2017
d2a568c
Merge branch 'patch-1' of https://github.com/wmcmurray/docs into wmcm…
taylorotwell Apr 6, 2017
bb63c6c
adjust wording
taylorotwell Apr 6, 2017
f25fea2
Document the Mailable callbacks functionality
hskrasek Apr 7, 2017
2f9a4c5
Fix event-fake link
ThibaudDauce Apr 7, 2017
a7149c1
Merge pull request #3259 from ThibaudDauce/fix-event-fake-link-anchor
taylorotwell Apr 7, 2017
74953d4
clean up some documentation
taylorotwell Apr 7, 2017
a357e58
clarify `optional` and `present`
bmatt468 Apr 7, 2017
12167d1
clarify note
taylorotwell Apr 8, 2017
7e26e76
Add Documentation for new Blade directives @empty & @isset
Apr 9, 2017
e7a17d1
Adds `assertJsonFragmentMission()` to the list of available testing m…
jesseschutt Apr 10, 2017
c8ecdc4
Update http-tests.md
taylorotwell Apr 10, 2017
f54744a
Merge pull request #3262 from jschutt/feature/assertJsonFragmentMissing
taylorotwell Apr 10, 2017
bd3ae74
Merge branch 'patch-1' of https://github.com/LKDevelopment/docs into …
taylorotwell Apr 10, 2017
44a744a
adjust wording
taylorotwell Apr 10, 2017
65ee060
Merge branch '5.4' of https://github.com/LaravelAustin/docs into Lara…
taylorotwell Apr 10, 2017
8a206a4
adjust wording
taylorotwell Apr 10, 2017
f43825d
@empty checks if $records is empty
Apr 10, 2017
b9567a1
Merge pull request #3264 from LKDevelopment/patch-1
taylorotwell Apr 10, 2017
c17544d
Update query builder JSON docs
Apr 11, 2017
97b3cc3
Merge pull request #3265 from HipsterJazzbo/patch-8
taylorotwell Apr 11, 2017
893457b
Update homestead.md
asadman1523 Apr 15, 2017
720a78f
Document "flatten" parameter of mix.copy()
Apr 15, 2017
89d0370
fix example
taylorotwell Apr 15, 2017
a32230a
add note
taylorotwell Apr 15, 2017
582b472
Merge pull request #1 from asadman1523/asadman1523-patch-2
asadman1523 Apr 17, 2017
6ba539b
Merge branch '5.4' into 5.4
asadman1523 Apr 17, 2017
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
4 changes: 2 additions & 2 deletions authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ If the redirect path needs custom generation logic you may define a `redirectTo`

protected function redirectTo()
{
//
return '/path';
}

> {tip} The `redirectTo` method will take precedence over the `redirectTo` attribute.
Expand Down Expand Up @@ -403,7 +403,7 @@ If you are not using a traditional relational database to store your users, you

use Illuminate\Support\Facades\Auth;
use App\Extensions\RiakUserProvider;
use Illuminate\Support\ServiceProvider;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;

class AuthServiceProvider extends ServiceProvider
{
Expand Down
4 changes: 2 additions & 2 deletions authorization.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,10 @@ These directives are convenient shortcuts for writing `@if` and `@unless` statem

Like most of the other authorization methods, you may pass a class name to the `@can` and `@cannot` directives if the action does not require a model instance:

@can('create', Post::class)
@can('create', App\Post::class)
<!-- The Current User Can Create Posts -->
@endcan

@cannot('create', Post::class)
@cannot('create', App\Post::class)
<!-- The Current User Can't Create Posts -->
@endcannot
15 changes: 8 additions & 7 deletions billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

Laravel Cashier provides an expressive, fluent interface to [Stripe's](https://stripe.com) and [Braintree's](https://www.braintreepayments.com) subscription billing services. It handles almost all of the boilerplate subscription billing code you are dreading writing. In addition to basic subscription management, Cashier can handle coupons, swapping subscription, subscription "quantities", cancellation grace periods, and even generate invoice PDFs.

> {note} If you're only performing "one-off" charges and do not offer subscriptions. You should not use Cashier. You should use the Stripe and Braintree SDKs directly.
> {note} If you're only performing "one-off" charges and do not offer subscriptions, you should not use Cashier. Instead, use the Stripe and Braintree SDKs directly.

<a name="configuration"></a>
## Configuration
Expand Down Expand Up @@ -92,6 +92,7 @@ Finally, you should configure your Stripe key in your `services.php` configurati

'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],

Expand Down Expand Up @@ -199,7 +200,7 @@ To create a subscription, first retrieve an instance of your billable model, whi

$user = User::find(1);

$user->newSubscription('main', 'monthly')->create($creditCardToken);
$user->newSubscription('main', 'monthly')->create($stripeToken);

The first argument passed to the `newSubscription` method should be the name of the subscription. If your application only offers a single subscription, you might call this `main` or `primary`. The second argument is the specific Stripe / Braintree plan the user is subscribing to. This value should correspond to the plan's identifier in Stripe or Braintree.

Expand All @@ -209,7 +210,7 @@ The `create` method will begin the subscription as well as update your database

If you would like to specify additional customer details, you may do so by passing them as the second argument to the `create` method:

$user->newSubscription('main', 'monthly')->create($creditCardToken, [
$user->newSubscription('main', 'monthly')->create($stripeToken, [
'email' => $email,
]);

Expand All @@ -221,7 +222,7 @@ If you would like to apply a coupon when creating the subscription, you may use

$user->newSubscription('main', 'monthly')
->withCoupon('code')
->create($creditCardToken);
->create($stripeToken);

<a name="checking-subscription-status"></a>
### Checking Subscription Status
Expand Down Expand Up @@ -358,7 +359,7 @@ If the user cancels a subscription and then resumes that subscription before the

The `updateCard` method may be used to update a customer's credit card information. This method accepts a Stripe token and will assign the new credit card as the default billing source:

$user->updateCard($creditCardToken);
$user->updateCard($stripeToken);

<a name="subscription-trials"></a>
## Subscription Trials
Expand All @@ -372,7 +373,7 @@ If you would like to offer trial periods to your customers while still collectin

$user->newSubscription('main', 'monthly')
->trialDays(10)
->create($creditCardToken);
->create($stripeToken);

This method will set the trial period ending date on the subscription record within the database, as well as instruct Stripe / Braintree to not begin billing the customer until after this date.

Expand Down Expand Up @@ -416,7 +417,7 @@ Once you are ready to create an actual subscription for the user, you may use th

$user = User::find(1);

$user->newSubscription('main', 'monthly')->create($creditCardToken);
$user->newSubscription('main', 'monthly')->create($stripeToken);

<a name="handling-stripe-webhooks"></a>
## Handling Stripe Webhooks
Expand Down
26 changes: 12 additions & 14 deletions blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,23 +144,11 @@ Of course, you are not limited to displaying the contents of the variables passe

The current UNIX timestamp is {{ time() }}.

> {note} Blade `{{ }}` statements are automatically sent through PHP's `htmlentities` function to prevent XSS attacks.

#### Echoing Data If It Exists

Sometimes you may wish to echo a variable, but you aren't sure if the variable has been set. We can express this in verbose PHP code like so:

{{ isset($name) ? $name : 'Default' }}

However, instead of writing a ternary statement, Blade provides you with the following convenient shortcut, which will be compiled to the ternary statement above:

{{ $name or 'Default' }}

In this example, if the `$name` variable exists, its value will be displayed. However, if it does not exist, the word `Default` will be displayed.
> {note} Blade `{{ }}` statements are automatically sent through PHP's `htmlspecialchars` function to prevent XSS attacks.

#### Displaying Unescaped Data

By default, Blade `{{ }}` statements are automatically sent through PHP's `htmlentities` function to prevent XSS attacks. If you do not want your data to be escaped, you may use the following syntax:
By default, Blade `{{ }}` statements are automatically sent through PHP's `htmlspecialchars` function to prevent XSS attacks. If you do not want your data to be escaped, you may use the following syntax:

Hello, {!! $name !!}.

Expand Down Expand Up @@ -211,6 +199,16 @@ For convenience, Blade also provides an `@unless` directive:
You are not signed in.
@endunless

In addition to the conditional directives already discussed, the `@isset` and `@empty` directives may be used as convenient shortcuts for their respective PHP functions:

@isset($records)
// $records is defined and is not null...
@endisset

@empty($records)
// $records is "empty"...
@endempty

<a name="loops"></a>
### Loops

Expand Down
2 changes: 2 additions & 0 deletions broadcasting.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ When using Pusher and [Laravel Echo](#installing-laravel-echo), you should speci

import Echo from "laravel-echo"

window.Pusher = require('pusher-js');

window.Echo = new Echo({
broadcaster: 'pusher',
key: 'your-pusher-key'
Expand Down
Loading