Skip to content

Commit c36078d

Browse files
committed
Merged last new laravel commits: Simplify exception handler, tweak ignores, tweak artisan. Updated read me.
1 parent 499e895 commit c36078d

File tree

5 files changed

+27
-32
lines changed

5 files changed

+27
-32
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
* text=auto
2+
*.css linguist-vendored
3+
*.less linguist-vendored

app/Exceptions/Handler.php

+4-10
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,12 @@ public function report(Exception $e)
3636
*/
3737
public function render($request, Exception $e)
3838
{
39-
if ($this->isHttpException($e))
40-
{
41-
return $this->renderHttpException($e);
42-
}
43-
else if ($e instanceof Exception)
39+
if ($e instanceof Exception)
4440
{
4541
return redirect()->back()->withInput()->withFlashDanger($e->getMessage());
4642
}
47-
else
48-
{
49-
return parent::render($request, $e);
50-
}
43+
44+
return parent::render($request, $e);
5145
}
5246

53-
}
47+
}

artisan

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ $status = $kernel->handle(
4848

4949
$kernel->terminate($input, $status);
5050

51-
exit($status);
51+
exit($status);

composer.lock

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readme.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
- Frontend and Backend Controllers
1010
- Form/HTML Facades Included
1111
- Default Forms Converted to Form Helper Methods
12-
- Default Master Layout
13-
- Master layout file has useful sections to extend
12+
- Master Layout File with common sections
1413
- Elixir Compilation and Auto-Prefixation of CSS in header
1514
- Elixir Compilation and Auto-Prefixation of JS in footer
1615
- Set up perfectly for use with [Laravel 5 Vault Package](https://github.com/rappasoft/vault)
1716
- Helper functions
18-
- Bootstrap 3 (LESS/SASS)
19-
- HTML5 Boilerplate v5.0
20-
- Font Awesome (LESS/SASS)
17+
- [Bootstrap 3 (LESS/SASS)](http://www.getbootstrap.com)
18+
- [HTML5 Boilerplate v5.0](http://www.html5boilerplate.com)
19+
- [Font Awesome (LESS/SASS)](http://fortawesome.github.io/Font-Awesome/)
2120
- Global Messages/Exception Handling
2221

2322
### Installation:

0 commit comments

Comments
 (0)