From c77a3892774b63a8f05ed164f6f870b539b02d6c Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 1 Jun 2015 15:37:04 +0100 Subject: [PATCH 1/3] Tabs to spaces Signed-off-by: Graham Campbell --- composer.json | 92 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index eb69683da24..57eea9248f3 100644 --- a/composer.json +++ b/composer.json @@ -1,48 +1,48 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "type": "project", - "require": { - "laravel/framework": "5.1.*" - }, - "require-dev": { - "fzaninotto/faker": "~1.4", - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0", - "phpspec/phpspec": "~2.1" - }, - "autoload": { - "classmap": [ - "database" - ], - "psr-4": { - "App\\": "app/" - } - }, - "autoload-dev": { - "classmap": [ - "tests/TestCase.php" - ] - }, - "scripts": { - "post-install-cmd": [ - "php artisan clear-compiled", - "php artisan optimize" - ], - "post-update-cmd": [ - "php artisan clear-compiled", - "php artisan optimize" - ], - "post-create-project-cmd": [ - "php -r \"copy('.env.example', '.env');\"", - "php artisan key:generate" - ] - }, - "config": { - "preferred-install": "dist" - }, - "minimum-stability": "dev", - "prefer-stable": true + "name": "laravel/laravel", + "description": "The Laravel Framework.", + "keywords": ["framework", "laravel"], + "license": "MIT", + "type": "project", + "require": { + "laravel/framework": "5.1.*" + }, + "require-dev": { + "fzaninotto/faker": "~1.4", + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "~4.0", + "phpspec/phpspec": "~2.1" + }, + "autoload": { + "classmap": [ + "database" + ], + "psr-4": { + "App\\": "app/" + } + }, + "autoload-dev": { + "classmap": [ + "tests/TestCase.php" + ] + }, + "scripts": { + "post-install-cmd": [ + "php artisan clear-compiled", + "php artisan optimize" + ], + "post-update-cmd": [ + "php artisan clear-compiled", + "php artisan optimize" + ], + "post-create-project-cmd": [ + "php -r \"copy('.env.example', '.env');\"", + "php artisan key:generate" + ] + }, + "config": { + "preferred-install": "dist" + }, + "minimum-stability": "dev", + "prefer-stable": true } From 060938bc66f03b6e7b997e4229ed370b1ac49d40 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 1 Jun 2015 15:40:45 +0100 Subject: [PATCH 2/3] PSR-2 Signed-off-by: Graham Campbell --- app/Jobs/Job.php | 2 -- config/database.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php index 506b92c2d97..5cca53c5cb1 100644 --- a/app/Jobs/Job.php +++ b/app/Jobs/Job.php @@ -4,7 +4,6 @@ abstract class Job { - /* |-------------------------------------------------------------------------- | Queueable Jobs @@ -17,5 +16,4 @@ abstract class Job */ use Queueable; - } diff --git a/config/database.php b/config/database.php index 32325a28b4f..503da619e6a 100644 --- a/config/database.php +++ b/config/database.php @@ -26,7 +26,7 @@ | */ - 'default' => env('DB_CONNECTION','mysql'), + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- From bf3785d0bc3cd166119d8ed45c2f869bbc31021c Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 1 Jun 2015 15:43:37 +0100 Subject: [PATCH 3/3] Additional cs fixes Signed-off-by: Graham Campbell --- app/Console/Commands/Inspire.php | 4 +- app/Console/Kernel.php | 4 +- app/Events/Event.php | 4 +- app/Exceptions/Handler.php | 6 +- app/Http/Controllers/Auth/AuthController.php | 4 +- .../Controllers/Auth/PasswordController.php | 4 +- app/Http/Controllers/Controller.php | 4 +- app/Http/Kernel.php | 4 +- app/Http/Middleware/Authenticate.php | 4 +- .../Middleware/RedirectIfAuthenticated.php | 4 +- app/Http/Middleware/VerifyCsrfToken.php | 4 +- app/Http/Requests/Request.php | 4 +- app/Jobs/Job.php | 4 +- app/Providers/AppServiceProvider.php | 4 +- app/Providers/EventServiceProvider.php | 4 +- app/Providers/RouteServiceProvider.php | 4 +- app/User.php | 4 +- config/cache.php | 6 +- config/filesystems.php | 2 +- config/view.php | 2 +- database/seeds/DatabaseSeeder.php | 2 +- public/index.php | 1 + resources/lang/en/passwords.php | 10 +- resources/lang/en/validation.php | 112 +++++++++--------- server.php | 1 + 25 files changed, 121 insertions(+), 85 deletions(-) diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php index 2180bfb778d..db9ab85422f 100644 --- a/app/Console/Commands/Inspire.php +++ b/app/Console/Commands/Inspire.php @@ -1,4 +1,6 @@ - [ 'apc' => [ - 'driver' => 'apc' + 'driver' => 'apc', ], 'array' => [ - 'driver' => 'array' + 'driver' => 'array', ], 'database' => [ @@ -51,7 +51,7 @@ 'driver' => 'memcached', 'servers' => [ [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 + 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100, ], ], ], diff --git a/config/filesystems.php b/config/filesystems.php index cdb96acf168..3fffcf0a2fd 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -77,7 +77,7 @@ 'container' => 'your-container', 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', 'region' => 'IAD', - 'url_type' => 'publicURL' + 'url_type' => 'publicURL', ], ], diff --git a/config/view.php b/config/view.php index 9948f06eadd..e193ab61d91 100644 --- a/config/view.php +++ b/config/view.php @@ -14,7 +14,7 @@ */ 'paths' => [ - realpath(base_path('resources/views')) + realpath(base_path('resources/views')), ], /* diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index f3baf4b0fb7..fb9e60074f5 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -15,7 +15,7 @@ public function run() Model::unguard(); // $this->call('UserTableSeeder'); - + Model::reguard(); } } diff --git a/public/index.php b/public/index.php index 6778d8aa147..0dc49c127af 100644 --- a/public/index.php +++ b/public/index.php @@ -1,4 +1,5 @@ "Passwords must be at least six characters and match the confirmation.", - "user" => "We can't find a user with that e-mail address.", - "token" => "This password reset token is invalid.", - "sent" => "We have e-mailed your password reset link!", - "reset" => "Your password has been reset!", + 'password' => 'Passwords must be at least six characters and match the confirmation.', + 'user' => "We can't find a user with that e-mail address.", + 'token' => 'This password reset token is invalid.', + 'sent' => 'We have e-mailed your password reset link!', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index bc6e4088b14..c0d0d7cb752 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -13,66 +13,66 @@ | */ - "accepted" => "The :attribute must be accepted.", - "active_url" => "The :attribute is not a valid URL.", - "after" => "The :attribute must be a date after :date.", - "alpha" => "The :attribute may only contain letters.", - "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", - "alpha_num" => "The :attribute may only contain letters and numbers.", - "array" => "The :attribute must be an array.", - "before" => "The :attribute must be a date before :date.", - "between" => [ - "numeric" => "The :attribute must be between :min and :max.", - "file" => "The :attribute must be between :min and :max kilobytes.", - "string" => "The :attribute must be between :min and :max characters.", - "array" => "The :attribute must have between :min and :max items.", + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'between' => [ + 'numeric' => 'The :attribute must be between :min and :max.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', ], - "boolean" => "The :attribute field must be true or false.", - "confirmed" => "The :attribute confirmation does not match.", - "date" => "The :attribute is not a valid date.", - "date_format" => "The :attribute does not match the format :format.", - "different" => "The :attribute and :other must be different.", - "digits" => "The :attribute must be :digits digits.", - "digits_between" => "The :attribute must be between :min and :max digits.", - "email" => "The :attribute must be a valid email address.", - "filled" => "The :attribute field is required.", - "exists" => "The selected :attribute is invalid.", - "image" => "The :attribute must be an image.", - "in" => "The selected :attribute is invalid.", - "integer" => "The :attribute must be an integer.", - "ip" => "The :attribute must be a valid IP address.", - "max" => [ - "numeric" => "The :attribute may not be greater than :max.", - "file" => "The :attribute may not be greater than :max kilobytes.", - "string" => "The :attribute may not be greater than :max characters.", - "array" => "The :attribute may not have more than :max items.", + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'email' => 'The :attribute must be a valid email address.', + 'filled' => 'The :attribute field is required.', + 'exists' => 'The selected :attribute is invalid.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'max' => [ + 'numeric' => 'The :attribute may not be greater than :max.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', ], - "mimes" => "The :attribute must be a file of type: :values.", - "min" => [ - "numeric" => "The :attribute must be at least :min.", - "file" => "The :attribute must be at least :min kilobytes.", - "string" => "The :attribute must be at least :min characters.", - "array" => "The :attribute must have at least :min items.", + 'mimes' => 'The :attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => 'The :attribute must be at least :min.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', ], - "not_in" => "The selected :attribute is invalid.", - "numeric" => "The :attribute must be a number.", - "regex" => "The :attribute format is invalid.", - "required" => "The :attribute field is required.", - "required_if" => "The :attribute field is required when :other is :value.", - "required_with" => "The :attribute field is required when :values is present.", - "required_with_all" => "The :attribute field is required when :values is present.", - "required_without" => "The :attribute field is required when :values is not present.", - "required_without_all" => "The :attribute field is required when none of :values are present.", - "same" => "The :attribute and :other must match.", - "size" => [ - "numeric" => "The :attribute must be :size.", - "file" => "The :attribute must be :size kilobytes.", - "string" => "The :attribute must be :size characters.", - "array" => "The :attribute must contain :size items.", + 'not_in' => 'The selected :attribute is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'same' => 'The :attribute and :other must match.', + 'size' => [ + 'numeric' => 'The :attribute must be :size.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', ], - "timezone" => "The :attribute must be a valid zone.", - "unique" => "The :attribute has already been taken.", - "url" => "The :attribute format is invalid.", + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'url' => 'The :attribute format is invalid.', /* |-------------------------------------------------------------------------- diff --git a/server.php b/server.php index c1b914b09bb..fdbc49e27a4 100644 --- a/server.php +++ b/server.php @@ -1,4 +1,5 @@