From 8909013751145b282d28d047bb07440eff8894cb Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 13 Dec 2014 17:31:00 +0000 Subject: [PATCH] CS fixes Signed-off-by: Graham Campbell --- src/Illuminate/Cache/CacheServiceProvider.php | 2 +- src/Illuminate/Console/Scheduling/Event.php | 2 +- src/Illuminate/Contracts/Debug/ExceptionHandler.php | 1 - src/Illuminate/Cookie/CookieServiceProvider.php | 2 +- src/Illuminate/Database/DatabaseManager.php | 2 +- src/Illuminate/Database/SeedServiceProvider.php | 2 +- src/Illuminate/Encryption/EncryptionServiceProvider.php | 2 +- src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php | 1 - src/Illuminate/Foundation/Bootstrap/HandleExceptions.php | 1 - src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php | 2 -- src/Illuminate/Foundation/Console/AppNameCommand.php | 2 +- src/Illuminate/Hashing/HashServiceProvider.php | 2 +- src/Illuminate/Pagination/PaginationServiceProvider.php | 2 +- src/Illuminate/Queue/Console/ListenCommand.php | 2 +- src/Illuminate/Redis/RedisServiceProvider.php | 2 +- src/Illuminate/Routing/Matching/HostValidator.php | 2 +- src/Illuminate/Routing/Matching/MethodValidator.php | 2 +- src/Illuminate/Routing/Matching/SchemeValidator.php | 2 +- src/Illuminate/Routing/Matching/UriValidator.php | 2 +- src/Illuminate/Routing/Matching/ValidatorInterface.php | 2 +- src/Illuminate/Session/SessionManager.php | 2 +- src/Illuminate/Session/SessionServiceProvider.php | 2 +- src/Illuminate/Support/Facades/App.php | 2 +- src/Illuminate/Support/Facades/Artisan.php | 2 +- src/Illuminate/Support/Facades/Auth.php | 2 +- src/Illuminate/Support/Facades/Cache.php | 2 +- src/Illuminate/Support/Facades/Config.php | 2 +- src/Illuminate/Support/Facades/Cookie.php | 2 +- src/Illuminate/Support/Facades/Crypt.php | 2 +- src/Illuminate/Support/Facades/DB.php | 2 +- src/Illuminate/Support/Facades/Event.php | 2 +- src/Illuminate/Support/Facades/File.php | 2 +- src/Illuminate/Support/Facades/Hash.php | 2 +- src/Illuminate/Support/Facades/Input.php | 2 +- src/Illuminate/Support/Facades/Lang.php | 2 +- src/Illuminate/Support/Facades/Log.php | 2 +- src/Illuminate/Support/Facades/Mail.php | 2 +- src/Illuminate/Support/Facades/Paginator.php | 2 +- src/Illuminate/Support/Facades/Redirect.php | 2 +- src/Illuminate/Support/Facades/Redis.php | 2 +- src/Illuminate/Support/Facades/Request.php | 2 +- src/Illuminate/Support/Facades/Route.php | 2 +- src/Illuminate/Support/Facades/Schema.php | 2 +- src/Illuminate/Support/Facades/Session.php | 2 +- src/Illuminate/Support/Facades/URL.php | 2 +- src/Illuminate/Support/Facades/Validator.php | 2 +- src/Illuminate/Support/Facades/View.php | 2 +- src/Illuminate/Support/ServiceProvider.php | 2 -- src/Illuminate/View/ViewServiceProvider.php | 1 - tests/Foundation/FoundationAliasLoaderTest.php | 2 +- tests/Mail/MailMandrillTransportTest.php | 2 +- tests/Queue/QueueListenerTest.php | 2 +- tests/Support/SupportMessageBagTest.php | 2 +- 53 files changed, 47 insertions(+), 55 deletions(-) diff --git a/src/Illuminate/Cache/CacheServiceProvider.php b/src/Illuminate/Cache/CacheServiceProvider.php index 8806cb344719..c08602768406 100755 --- a/src/Illuminate/Cache/CacheServiceProvider.php +++ b/src/Illuminate/Cache/CacheServiceProvider.php @@ -68,4 +68,4 @@ public function provides() ]; } -} +} diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php index e4f1453b897c..bfb8e0e2c805 100644 --- a/src/Illuminate/Console/Scheduling/Event.php +++ b/src/Illuminate/Console/Scheduling/Event.php @@ -625,7 +625,7 @@ public function sendOutputTo($location) * * @param array|dynamic $addresses * @return $this - * + * * @throws \LogicException */ public function emailOutputTo($addresses) diff --git a/src/Illuminate/Contracts/Debug/ExceptionHandler.php b/src/Illuminate/Contracts/Debug/ExceptionHandler.php index d2ece7b786ea..d85fff53fa7e 100644 --- a/src/Illuminate/Contracts/Debug/ExceptionHandler.php +++ b/src/Illuminate/Contracts/Debug/ExceptionHandler.php @@ -1,7 +1,6 @@ connection(), $method), $parameters); } -} +} diff --git a/src/Illuminate/Database/SeedServiceProvider.php b/src/Illuminate/Database/SeedServiceProvider.php index bf2c8144c6ea..3dd93c17728d 100755 --- a/src/Illuminate/Database/SeedServiceProvider.php +++ b/src/Illuminate/Database/SeedServiceProvider.php @@ -52,4 +52,4 @@ public function provides() return array('seeder', 'command.seed'); } -} +} diff --git a/src/Illuminate/Encryption/EncryptionServiceProvider.php b/src/Illuminate/Encryption/EncryptionServiceProvider.php index 5907eee3206a..9e9f0059a70a 100755 --- a/src/Illuminate/Encryption/EncryptionServiceProvider.php +++ b/src/Illuminate/Encryption/EncryptionServiceProvider.php @@ -24,4 +24,4 @@ public function register() }); } -} +} diff --git a/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php b/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php index 396dc7bdbffa..d249075e6cc1 100644 --- a/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php +++ b/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php @@ -2,7 +2,6 @@ use Illuminate\Log\Writer; use Monolog\Logger as Monolog; -use Monolog\Handler\SyslogHandler; use Illuminate\Contracts\Foundation\Application; class ConfigureLogging { diff --git a/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php b/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php index 6ef2bdb186dd..a50883c71dba 100644 --- a/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php +++ b/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php @@ -1,7 +1,6 @@ replaceIn( $this->getBootstrapPath(), $this->currentRoot.'\\Console', $this->argument('name').'\\Console' ); - + $this->replaceIn( $this->getBootstrapPath(), $this->currentRoot.'\\Exceptions', $this->argument('name').'\\Exceptions' ); diff --git a/src/Illuminate/Hashing/HashServiceProvider.php b/src/Illuminate/Hashing/HashServiceProvider.php index 696c5312601e..0ce1e83a2f61 100755 --- a/src/Illuminate/Hashing/HashServiceProvider.php +++ b/src/Illuminate/Hashing/HashServiceProvider.php @@ -31,4 +31,4 @@ public function provides() return array('hash'); } -} +} diff --git a/src/Illuminate/Pagination/PaginationServiceProvider.php b/src/Illuminate/Pagination/PaginationServiceProvider.php index d34d94fd6967..01a772195a65 100755 --- a/src/Illuminate/Pagination/PaginationServiceProvider.php +++ b/src/Illuminate/Pagination/PaginationServiceProvider.php @@ -22,4 +22,4 @@ public function register() }); } -} +} diff --git a/src/Illuminate/Queue/Console/ListenCommand.php b/src/Illuminate/Queue/Console/ListenCommand.php index f23f322208a4..f138b3c46b75 100755 --- a/src/Illuminate/Queue/Console/ListenCommand.php +++ b/src/Illuminate/Queue/Console/ListenCommand.php @@ -142,4 +142,4 @@ protected function getOptions() ); } -} +} diff --git a/src/Illuminate/Redis/RedisServiceProvider.php b/src/Illuminate/Redis/RedisServiceProvider.php index c32fe556fbbb..fdd653dd300d 100755 --- a/src/Illuminate/Redis/RedisServiceProvider.php +++ b/src/Illuminate/Redis/RedisServiceProvider.php @@ -34,4 +34,4 @@ public function provides() return array('redis'); } -} +} diff --git a/src/Illuminate/Routing/Matching/HostValidator.php b/src/Illuminate/Routing/Matching/HostValidator.php index 7324f1a4c4ab..be14f00280d7 100644 --- a/src/Illuminate/Routing/Matching/HostValidator.php +++ b/src/Illuminate/Routing/Matching/HostValidator.php @@ -19,4 +19,4 @@ public function matches(Route $route, Request $request) return preg_match($route->getCompiled()->getHostRegex(), $request->getHost()); } -} +} diff --git a/src/Illuminate/Routing/Matching/MethodValidator.php b/src/Illuminate/Routing/Matching/MethodValidator.php index 94d3278bc735..211bc3083164 100644 --- a/src/Illuminate/Routing/Matching/MethodValidator.php +++ b/src/Illuminate/Routing/Matching/MethodValidator.php @@ -17,4 +17,4 @@ public function matches(Route $route, Request $request) return in_array($request->getMethod(), $route->methods()); } -} +} diff --git a/src/Illuminate/Routing/Matching/SchemeValidator.php b/src/Illuminate/Routing/Matching/SchemeValidator.php index ff7d090bc746..009bb94604fd 100644 --- a/src/Illuminate/Routing/Matching/SchemeValidator.php +++ b/src/Illuminate/Routing/Matching/SchemeValidator.php @@ -26,4 +26,4 @@ public function matches(Route $route, Request $request) return true; } -} +} diff --git a/src/Illuminate/Routing/Matching/UriValidator.php b/src/Illuminate/Routing/Matching/UriValidator.php index d808644d53b7..b0b43022d1cd 100644 --- a/src/Illuminate/Routing/Matching/UriValidator.php +++ b/src/Illuminate/Routing/Matching/UriValidator.php @@ -19,4 +19,4 @@ public function matches(Route $route, Request $request) return preg_match($route->getCompiled()->getRegex(), rawurldecode($path)); } -} +} diff --git a/src/Illuminate/Routing/Matching/ValidatorInterface.php b/src/Illuminate/Routing/Matching/ValidatorInterface.php index d783a7d4e632..65e5638e7f6e 100644 --- a/src/Illuminate/Routing/Matching/ValidatorInterface.php +++ b/src/Illuminate/Routing/Matching/ValidatorInterface.php @@ -14,4 +14,4 @@ interface ValidatorInterface { */ public function matches(Route $route, Request $request); -} +} diff --git a/src/Illuminate/Session/SessionManager.php b/src/Illuminate/Session/SessionManager.php index fa504309ae0d..bd66ab3e32dd 100755 --- a/src/Illuminate/Session/SessionManager.php +++ b/src/Illuminate/Session/SessionManager.php @@ -196,4 +196,4 @@ public function setDefaultDriver($name) $this->app['config']['session.driver'] = $name; } -} +} diff --git a/src/Illuminate/Session/SessionServiceProvider.php b/src/Illuminate/Session/SessionServiceProvider.php index bba066091c1c..70fd15213dac 100755 --- a/src/Illuminate/Session/SessionServiceProvider.php +++ b/src/Illuminate/Session/SessionServiceProvider.php @@ -62,4 +62,4 @@ protected function registerSessionDriver() }); } -} +} diff --git a/src/Illuminate/Support/Facades/App.php b/src/Illuminate/Support/Facades/App.php index 2b30220a7939..56158095ff5c 100755 --- a/src/Illuminate/Support/Facades/App.php +++ b/src/Illuminate/Support/Facades/App.php @@ -12,4 +12,4 @@ class App extends Facade { */ protected static function getFacadeAccessor() { return 'app'; } -} +} diff --git a/src/Illuminate/Support/Facades/Artisan.php b/src/Illuminate/Support/Facades/Artisan.php index 4880bf000026..9242116605cc 100755 --- a/src/Illuminate/Support/Facades/Artisan.php +++ b/src/Illuminate/Support/Facades/Artisan.php @@ -12,4 +12,4 @@ class Artisan extends Facade { */ protected static function getFacadeAccessor() { return 'Illuminate\Contracts\Console\Kernel'; } -} +} diff --git a/src/Illuminate/Support/Facades/Auth.php b/src/Illuminate/Support/Facades/Auth.php index 98d14ca6f1c8..66fd582cc5b4 100755 --- a/src/Illuminate/Support/Facades/Auth.php +++ b/src/Illuminate/Support/Facades/Auth.php @@ -13,4 +13,4 @@ class Auth extends Facade { */ protected static function getFacadeAccessor() { return 'auth'; } -} +} diff --git a/src/Illuminate/Support/Facades/Cache.php b/src/Illuminate/Support/Facades/Cache.php index e2e9103a97bc..dbcca0645cf5 100755 --- a/src/Illuminate/Support/Facades/Cache.php +++ b/src/Illuminate/Support/Facades/Cache.php @@ -13,4 +13,4 @@ class Cache extends Facade { */ protected static function getFacadeAccessor() { return 'cache'; } -} +} diff --git a/src/Illuminate/Support/Facades/Config.php b/src/Illuminate/Support/Facades/Config.php index 00a73375b3db..b414875ede75 100755 --- a/src/Illuminate/Support/Facades/Config.php +++ b/src/Illuminate/Support/Facades/Config.php @@ -12,4 +12,4 @@ class Config extends Facade { */ protected static function getFacadeAccessor() { return 'config'; } -} +} diff --git a/src/Illuminate/Support/Facades/Cookie.php b/src/Illuminate/Support/Facades/Cookie.php index 60c7eac00d4d..c22c45f6eaf8 100755 --- a/src/Illuminate/Support/Facades/Cookie.php +++ b/src/Illuminate/Support/Facades/Cookie.php @@ -35,4 +35,4 @@ public static function get($key = null, $default = null) */ protected static function getFacadeAccessor() { return 'cookie'; } -} +} diff --git a/src/Illuminate/Support/Facades/Crypt.php b/src/Illuminate/Support/Facades/Crypt.php index 2437ab382331..d5992bbb8195 100755 --- a/src/Illuminate/Support/Facades/Crypt.php +++ b/src/Illuminate/Support/Facades/Crypt.php @@ -12,4 +12,4 @@ class Crypt extends Facade { */ protected static function getFacadeAccessor() { return 'encrypter'; } -} +} diff --git a/src/Illuminate/Support/Facades/DB.php b/src/Illuminate/Support/Facades/DB.php index 4e05736e4de4..c83e2fd98ac8 100755 --- a/src/Illuminate/Support/Facades/DB.php +++ b/src/Illuminate/Support/Facades/DB.php @@ -13,4 +13,4 @@ class DB extends Facade { */ protected static function getFacadeAccessor() { return 'db'; } -} +} diff --git a/src/Illuminate/Support/Facades/Event.php b/src/Illuminate/Support/Facades/Event.php index 158ff264d396..d6f6517c9e31 100755 --- a/src/Illuminate/Support/Facades/Event.php +++ b/src/Illuminate/Support/Facades/Event.php @@ -12,4 +12,4 @@ class Event extends Facade { */ protected static function getFacadeAccessor() { return 'events'; } -} +} diff --git a/src/Illuminate/Support/Facades/File.php b/src/Illuminate/Support/Facades/File.php index 273c07bb30d3..058203d29837 100755 --- a/src/Illuminate/Support/Facades/File.php +++ b/src/Illuminate/Support/Facades/File.php @@ -12,4 +12,4 @@ class File extends Facade { */ protected static function getFacadeAccessor() { return 'files'; } -} +} diff --git a/src/Illuminate/Support/Facades/Hash.php b/src/Illuminate/Support/Facades/Hash.php index 001303fcd2ff..5960198243fc 100755 --- a/src/Illuminate/Support/Facades/Hash.php +++ b/src/Illuminate/Support/Facades/Hash.php @@ -12,4 +12,4 @@ class Hash extends Facade { */ protected static function getFacadeAccessor() { return 'hash'; } -} +} diff --git a/src/Illuminate/Support/Facades/Input.php b/src/Illuminate/Support/Facades/Input.php index 50eacefbf4f2..0537f3bc3cf4 100755 --- a/src/Illuminate/Support/Facades/Input.php +++ b/src/Illuminate/Support/Facades/Input.php @@ -26,4 +26,4 @@ public static function get($key = null, $default = null) */ protected static function getFacadeAccessor() { return 'request'; } -} +} diff --git a/src/Illuminate/Support/Facades/Lang.php b/src/Illuminate/Support/Facades/Lang.php index d2878720e6b0..fe2b8b497a5e 100755 --- a/src/Illuminate/Support/Facades/Lang.php +++ b/src/Illuminate/Support/Facades/Lang.php @@ -12,4 +12,4 @@ class Lang extends Facade { */ protected static function getFacadeAccessor() { return 'translator'; } -} +} diff --git a/src/Illuminate/Support/Facades/Log.php b/src/Illuminate/Support/Facades/Log.php index 70c51d57ff61..3504a010a9d3 100755 --- a/src/Illuminate/Support/Facades/Log.php +++ b/src/Illuminate/Support/Facades/Log.php @@ -12,4 +12,4 @@ class Log extends Facade { */ protected static function getFacadeAccessor() { return 'log'; } -} +} diff --git a/src/Illuminate/Support/Facades/Mail.php b/src/Illuminate/Support/Facades/Mail.php index 7af6855e35ed..5881acf25e2e 100755 --- a/src/Illuminate/Support/Facades/Mail.php +++ b/src/Illuminate/Support/Facades/Mail.php @@ -12,4 +12,4 @@ class Mail extends Facade { */ protected static function getFacadeAccessor() { return 'mailer'; } -} +} diff --git a/src/Illuminate/Support/Facades/Paginator.php b/src/Illuminate/Support/Facades/Paginator.php index 2530c1b5e01c..5c099e080ae4 100755 --- a/src/Illuminate/Support/Facades/Paginator.php +++ b/src/Illuminate/Support/Facades/Paginator.php @@ -12,4 +12,4 @@ class Paginator extends Facade { */ protected static function getFacadeAccessor() { return 'paginator'; } -} +} diff --git a/src/Illuminate/Support/Facades/Redirect.php b/src/Illuminate/Support/Facades/Redirect.php index c823cdeeb6d3..164a37f4f2af 100755 --- a/src/Illuminate/Support/Facades/Redirect.php +++ b/src/Illuminate/Support/Facades/Redirect.php @@ -12,4 +12,4 @@ class Redirect extends Facade { */ protected static function getFacadeAccessor() { return 'redirect'; } -} +} diff --git a/src/Illuminate/Support/Facades/Redis.php b/src/Illuminate/Support/Facades/Redis.php index f34498735a4f..4cf73f2c617f 100755 --- a/src/Illuminate/Support/Facades/Redis.php +++ b/src/Illuminate/Support/Facades/Redis.php @@ -12,4 +12,4 @@ class Redis extends Facade { */ protected static function getFacadeAccessor() { return 'redis'; } -} +} diff --git a/src/Illuminate/Support/Facades/Request.php b/src/Illuminate/Support/Facades/Request.php index 7004e442332f..203e43a534e5 100755 --- a/src/Illuminate/Support/Facades/Request.php +++ b/src/Illuminate/Support/Facades/Request.php @@ -12,4 +12,4 @@ class Request extends Facade { */ protected static function getFacadeAccessor() { return 'request'; } -} +} diff --git a/src/Illuminate/Support/Facades/Route.php b/src/Illuminate/Support/Facades/Route.php index 66e994838fd2..3f1fa48a41b9 100755 --- a/src/Illuminate/Support/Facades/Route.php +++ b/src/Illuminate/Support/Facades/Route.php @@ -12,4 +12,4 @@ class Route extends Facade { */ protected static function getFacadeAccessor() { return 'router'; } -} +} diff --git a/src/Illuminate/Support/Facades/Schema.php b/src/Illuminate/Support/Facades/Schema.php index 8e749620de2f..7d185e7bfcbb 100755 --- a/src/Illuminate/Support/Facades/Schema.php +++ b/src/Illuminate/Support/Facades/Schema.php @@ -26,4 +26,4 @@ protected static function getFacadeAccessor() return static::$app['db']->connection()->getSchemaBuilder(); } -} +} diff --git a/src/Illuminate/Support/Facades/Session.php b/src/Illuminate/Support/Facades/Session.php index 567a26e051c0..fdc6c7f2a408 100755 --- a/src/Illuminate/Support/Facades/Session.php +++ b/src/Illuminate/Support/Facades/Session.php @@ -13,4 +13,4 @@ class Session extends Facade { */ protected static function getFacadeAccessor() { return 'session'; } -} +} diff --git a/src/Illuminate/Support/Facades/URL.php b/src/Illuminate/Support/Facades/URL.php index 755aca4be259..e9d7e1086bb5 100755 --- a/src/Illuminate/Support/Facades/URL.php +++ b/src/Illuminate/Support/Facades/URL.php @@ -12,4 +12,4 @@ class URL extends Facade { */ protected static function getFacadeAccessor() { return 'url'; } -} +} diff --git a/src/Illuminate/Support/Facades/Validator.php b/src/Illuminate/Support/Facades/Validator.php index af6a5d6ba683..e07013344ec8 100755 --- a/src/Illuminate/Support/Facades/Validator.php +++ b/src/Illuminate/Support/Facades/Validator.php @@ -12,4 +12,4 @@ class Validator extends Facade { */ protected static function getFacadeAccessor() { return 'validator'; } -} +} diff --git a/src/Illuminate/Support/Facades/View.php b/src/Illuminate/Support/Facades/View.php index 29816b2a6e6f..748915538ede 100755 --- a/src/Illuminate/Support/Facades/View.php +++ b/src/Illuminate/Support/Facades/View.php @@ -12,4 +12,4 @@ class View extends Facade { */ protected static function getFacadeAccessor() { return 'view'; } -} +} diff --git a/src/Illuminate/Support/ServiceProvider.php b/src/Illuminate/Support/ServiceProvider.php index 7fe977821f68..030c8cc0cd6f 100755 --- a/src/Illuminate/Support/ServiceProvider.php +++ b/src/Illuminate/Support/ServiceProvider.php @@ -1,7 +1,5 @@ assertEquals(array('foo' => 'bar'), $loader->getAliases()); $this->assertFalse($loader->isRegistered()); $loader->register(); - + $this->assertTrue($loader->isRegistered()); } diff --git a/tests/Mail/MailMandrillTransportTest.php b/tests/Mail/MailMandrillTransportTest.php index 03a217e5cf5f..b907e0fa35a6 100755 --- a/tests/Mail/MailMandrillTransportTest.php +++ b/tests/Mail/MailMandrillTransportTest.php @@ -42,4 +42,4 @@ public function setHttpClient($client) { $this->client = $client; } -} \ No newline at end of file +} diff --git a/tests/Queue/QueueListenerTest.php b/tests/Queue/QueueListenerTest.php index 56ca10633724..a5bdebcab391 100755 --- a/tests/Queue/QueueListenerTest.php +++ b/tests/Queue/QueueListenerTest.php @@ -44,4 +44,4 @@ public function testMakeProcessCorrectlyFormatsCommandLine() $this->assertEquals('"'.PHP_BINARY.'" artisan queue:work connection --queue="queue" --delay=1 --memory=2 --sleep=3 --tries=0', $process->getCommandLine()); } -} +} diff --git a/tests/Support/SupportMessageBagTest.php b/tests/Support/SupportMessageBagTest.php index 09c865fce160..aef79d8b69b9 100755 --- a/tests/Support/SupportMessageBagTest.php +++ b/tests/Support/SupportMessageBagTest.php @@ -151,4 +151,4 @@ public function testConstructor() $this->assertEquals(array('country' => array('Azerbaijan'), 'capital' => array('Baku')), $messageBag->getMessages()); } -} +}