Commit 62aa4f46 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'develop' into staging

parents 98535868 d29c5bfd
* text=auto
\ No newline at end of file
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache
# OS or Editor folders
.DS_Store
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
# Dreamweaver added files
_notes
dwsync.xml
# Komodo
*.komodoproject
.komodotools
# Folders to ignore
.hg
.svn
.CVS
intermediate
publish
.idea
\ No newline at end of file
......@@ -19,29 +19,43 @@ Laravel is a clean and classy framework for PHP web development. Freeing you fro
**Hello World:**
Route::get('/', function()
{
return "Hello World!":
});
```php
<?php
Route::get('/', function()
{
return "Hello World!":
});
```
**Passing Data To Views:**
Route::get('user/(:num)', function($id)
{
$user = DB::table('users')->find($id);
```php
<?php
Route::get('user/(:num)', function($id)
{
$user = DB::table('users')->find($id);
return View::make('profile')->with('user', $user);
});
return View::make('profile')->with('user', $user);
});
```
**Redirecting & Flashing Data To The Session:**
return Redirect::to('profile')->with('message', 'Welcome Back!');
```php
<?php
return Redirect::to('profile')->with('message', 'Welcome Back!');
```
### Contributing to Laravel
Contributions are encouraged and welcome; however, please review the Developer Certificate of Origin in the "license.txt" file included in the repository. All commits must be signed off using the "-s" switch.
git commit -s -m "this commit will be signed off automatically!"
```bash
git commit -s -m "this commit will be signed off automatically!"
```
### License
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment