Skip to content

Commit

Permalink
Merge branch '5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Apr 15, 2015
2 parents 282b060 + 920eeb4 commit 5a4a3b2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Laravel Cashier provides an expressive, fluent interface to [Stripe's](https://s

First, add the Cashier package to your `composer.json` file:

"laravel/cashier": "~5.0" (For Stripe SDK ~2.0, and Stripe APIs on 2015-02-18 version and later)
"laravel/cashier": "~4.0" (For Stripe APIs on 2015-02-18 version and later)
"laravel/cashier": "~3.0" (For Stripe APIs up to and including 2015-02-16 version)

Expand Down
1 change: 1 addition & 0 deletions homestead.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ The following ports are forwarded to your Homestead environment:

- **SSH:** 2222 → Forwards To 22
- **HTTP:** 8000 → Forwards To 80
- **HTTPS:** 44300 → Forwards To 443
- **MySQL:** 33060 → Forwards To 3306
- **Postgres:** 54320 → Forwards To 5432

Expand Down
2 changes: 2 additions & 0 deletions routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ Of course, you can capture segments of the request URI within your route:
return 'User '.$id;
});

> **Note:** Route parameters cannot contain the `-` character. Use an underscore (`_`) instead.
#### Optional Route Parameters

Route::get('user/{name?}', function($name = null)
Expand Down
4 changes: 2 additions & 2 deletions views.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Let's organize our view composers within a [service provider](/docs/master/provi
View::composer('profile', 'App\Http\ViewComposers\ProfileComposer');

// Using Closure based composers...
View::composer('dashboard', function()
View::composer('dashboard', function($view)
{

});
Expand Down Expand Up @@ -176,7 +176,7 @@ Just before the view is rendered, the composer's `compose` method is called with

The `composer` method accepts the `*` character as a wildcard, so you may attach a composer to all views like so:

View::composer('*', function()
View::composer('*', function($view)
{
//
});
Expand Down

0 comments on commit 5a4a3b2

Please sign in to comment.