Merge pull request laravel#2754 from GrahamCampbell/fixes

taylorotwell · taylorotwell · commit cb21cb8aa8b9 · 2014-04-11T17:17:01.000-05:00
Minor CS Fixes
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-* text=auto
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ composer.lock
 .env.local.php
 .env.php
 .DS_Store
-Thumbs.db
+Thumbs.db
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -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!
diff --git a/app/config/compile.php b/app/config/compile.php
@@ -15,4 +15,4 @@
 
 
 
-);
+);
diff --git a/app/config/mail.php b/app/config/mail.php
@@ -121,4 +121,4 @@
 
 	'pretend' => false,
 
-);
+);
diff --git a/app/config/remote.php b/app/config/remote.php
@@ -56,4 +56,4 @@
 
 	),
 
-);
+);
diff --git a/app/config/testing/cache.php b/app/config/testing/cache.php
@@ -17,4 +17,4 @@
 
 	'driver' => 'array',
 
-);
+);
diff --git a/app/config/testing/session.php b/app/config/testing/session.php
@@ -18,4 +18,4 @@
 
 	'driver' => 'array',
 
-);
+);
diff --git a/app/config/workbench.php b/app/config/workbench.php
@@ -28,4 +28,4 @@
 
 	'email' => '',
 
-);
+);
diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php
@@ -15,4 +15,4 @@ protected function setupLayout()
 		}
 	}
 
-}
+}
diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
@@ -20,4 +20,4 @@ public function showWelcome()
 		return View::make('hello');
 	}
 
-}
+}
diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
@@ -14,4 +14,4 @@ public function run()
 		// $this->call('UserTableSeeder');
 	}
 
-}
+}
diff --git a/app/filters.php b/app/filters.php
@@ -77,4 +77,4 @@
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}
-});
+});
diff --git a/app/lang/en/pagination.php b/app/lang/en/pagination.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 return array(
 
@@ -17,4 +17,4 @@
 
 	'next'     => 'Next &raquo;',
 
-);
+);
diff --git a/app/models/User.php b/app/models/User.php
@@ -49,4 +49,4 @@ public function getReminderEmail()
 		return $this->email;
 	}
 
-}
+}
diff --git a/app/routes.php b/app/routes.php
@@ -14,4 +14,4 @@
 Route::get('/', function()
 {
 	return View::make('hello');
-});
+});
diff --git a/app/tests/ExampleTest.php b/app/tests/ExampleTest.php
@@ -14,4 +14,4 @@ public function testBasicExample()
 		$this->assertTrue($this->client->getResponse()->isOk());
 	}
 
-}
+}
diff --git a/app/views/emails/auth/reminder.blade.php b/app/views/emails/auth/reminder.blade.php
@@ -10,4 +10,4 @@
 			To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
 		</div>
 	</body>
-</html>
+</html>
diff --git a/artisan b/artisan
@@ -71,4 +71,4 @@ $status = $artisan->run();
 
 $app->shutdown();
 
-exit($status);
+exit($status);
diff --git a/phpunit.xml b/phpunit.xml
@@ -15,4 +15,4 @@
             <directory>./app/tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: 
+Disallow:
diff --git a/readme.md b/readme.md
@@ -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.
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Contribution Guidelines`
`2`	`2`
`3`		`-Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!`
	`3`	`+Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`
`16`	`16`
`17`	`17`
`18`		`-);`
	`18`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,4 @@`
`121`	`121`
`122`	`122`	`'pretend' => false,`
`123`	`123`
`124`		`-);`
	`124`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@`
`56`	`56`
`57`	`57`	`),`
`58`	`58`
`59`		`-);`
	`59`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`
`18`	`18`	`'driver' => 'array',`
`19`	`19`
`20`		`-);`
	`20`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`
`19`	`19`	`'driver' => 'array',`
`20`	`20`
`21`		`-);`
	`21`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@`
`28`	`28`
`29`	`29`	`'email' => '',`
`30`	`30`
`31`		`-);`
	`31`	`+);`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ protected function setupLayout()`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ public function showWelcome()`
`20`	`20`	`return View::make('hello');`
`21`	`21`	`}`
`22`	`22`
`23`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public function run()`
`14`	`14`	`// $this->call('UserTableSeeder');`
`15`	`15`	`}`
`16`	`16`
`17`		`-}`
	`17`	`+}`