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 Feb 27, 2015
2 parents 817e0d9 + 125083e commit 43ac56f
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bus.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ A command pipe is defined with a `handle` method, just like a middleware:
return DB::transaction(function() use ($command, $next)
{
return $next($command);
}
});
}

}
Expand All @@ -150,5 +150,5 @@ You may even define a `Closure` as a command pipe:
return DB::transaction(function() use ($command, $next)
{
return $next($command);
}
});
}]);
4 changes: 4 additions & 0 deletions cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ If you need to retrieve an item from the cache and then delete it, you may use t

Cache::forget('key');

When using multiple cache stores, you may access them via the `store` method:

$value = Cache::store('foo')->get('foo');

<a name="increments-and-decrements"></a>
## Increments & Decrements

Expand Down
11 changes: 11 additions & 0 deletions elixir.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ elixir(function(mix) {

In the example above, Elixir assumes that your Less files are stored in `resources/assets/less`.

#### Compiling Multiple Less Files

```javascript
elixir(function(mix) {
mix.less([
'app.less',
'something-else.less'
]);
});
```

#### Compile Sass

```javascript
Expand Down
4 changes: 2 additions & 2 deletions extending.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ For example, the `HashServiceProvider` binds a `hash` key into the service conta

public function boot()
{
parent::boot();
$this->app->bindShared('hash', function()
{
return new \Snappy\Hashing\ScryptHasher;
});

parent::boot();
}

}
Expand Down
24 changes: 24 additions & 0 deletions helpers.md
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,36 @@ Dump the given variable and end execution of the script.

dd($value);

### elixir

Get the path to a versioned Elixir file.

elixir($file);

### env

Gets the value of an environment variable or return a default value.

env('APP_ENV', 'production')

### event

Fire an event.

event('my.event');

### value

If the given value is a `Closure`, return the value returned by the `Closure`. Otherwise, return the value.

$value = value(function() { return 'bar'; });

### view

Get a View instance for the given view path.

return view('auth.login');

### with

Return the given object. Useful for method chaining constructors in PHP 5.3.x.
Expand Down
2 changes: 1 addition & 1 deletion homestead.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ If you wish, you may forward additional ports to the Vagrant box, as well as spe

[Blackfire Profiler](https://blackfire.io) by SensioLabs automatically gathers data about your code's execution, such as RAM, CPU time, and disk I/O. Homestead makes it a breeze to use this profiler for your own applications.

All of the proper packages have already been installed on your Homestead box, you simply need to set a Blackfire ID and token in your `Homestead.yaml` file:
All of the proper packages have already been installed on your Homestead box, you simply need to set a Blackfire Server ID and token in your `Homestead.yaml` file:

blackfire:
- id: your-id
Expand Down
2 changes: 1 addition & 1 deletion upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ You may move your Sass, Less, or CoffeeScript to any location you wish. The `res

### Form & HTML Helpers

If you're using Form or HTML helpers, you will see an error stating `class 'Form' not found` or `class 'Html' not found`. The Form and HTML helpers have been deprecated in Laravel 5.0; however, there are community-driven replacements such as those maintained by the [Laravel Collective]([LaravelCollective.com](http:https://laravelcollective.com/docs/5.0/html).
If you're using Form or HTML helpers, you will see an error stating `class 'Form' not found` or `class 'Html' not found`. The Form and HTML helpers have been deprecated in Laravel 5.0; however, there are community-driven replacements such as those maintained by the [Laravel Collective](http:https://laravelcollective.com/docs/5.0/html).

For example, you may add `"laravelcollective/html": "~5.0"` to your `composer.json` file's `require` section.

Expand Down

0 comments on commit 43ac56f

Please sign in to comment.