Skip to content

Commit

Permalink
Merge pull request laravel#2754 from GrahamCampbell/fixes
Browse files Browse the repository at this point in the history
Minor CS Fixes
  • Loading branch information
taylorotwell committed Apr 11, 2014
2 parents 7a7835f + 7533706 commit cb21cb8
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* text=auto
* text=auto
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ composer.lock
.env.local.php
.env.php
.DS_Store
Thumbs.db
Thumbs.db
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Contribution Guidelines

Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
2 changes: 1 addition & 1 deletion app/config/compile.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@



);
);
2 changes: 1 addition & 1 deletion app/config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@

'pretend' => false,

);
);
2 changes: 1 addition & 1 deletion app/config/remote.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@

),

);
);
2 changes: 1 addition & 1 deletion app/config/testing/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

'driver' => 'array',

);
);
2 changes: 1 addition & 1 deletion app/config/testing/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

'driver' => 'array',

);
);
2 changes: 1 addition & 1 deletion app/config/workbench.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@

'email' => '',

);
);
2 changes: 1 addition & 1 deletion app/controllers/BaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ protected function setupLayout()
}
}

}
}
2 changes: 1 addition & 1 deletion app/controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public function showWelcome()
return View::make('hello');
}

}
}
2 changes: 1 addition & 1 deletion app/database/seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public function run()
// $this->call('UserTableSeeder');
}

}
}
2 changes: 1 addition & 1 deletion app/filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@
{
throw new Illuminate\Session\TokenMismatchException;
}
});
});
4 changes: 2 additions & 2 deletions app/lang/en/pagination.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
<?php

return array(

Expand All @@ -17,4 +17,4 @@

'next' => 'Next &raquo;',

);
);
2 changes: 1 addition & 1 deletion app/models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ public function getReminderEmail()
return $this->email;
}

}
}
2 changes: 1 addition & 1 deletion app/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
Route::get('/', function()
{
return View::make('hello');
});
});
2 changes: 1 addition & 1 deletion app/tests/ExampleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public function testBasicExample()
$this->assertTrue($this->client->getResponse()->isOk());
}

}
}
2 changes: 1 addition & 1 deletion app/views/emails/auth/reminder.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion artisan
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ $status = $artisan->run();

$app->shutdown();

exit($status);
exit($status);
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<directory>./app/tests/</directory>
</testsuite>
</testsuites>
</phpunit>
</phpunit>
2 changes: 1 addition & 1 deletion public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
User-agent: *
Disallow:
Disallow:
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Laravel PHP Framework

[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)

Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.

Expand Down

0 comments on commit cb21cb8

Please sign in to comment.