Commit 9b6d5f42 authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #3399 from GrahamForks/cs

CS
parents f871b7d0 bf3785d0
<?php namespace App\Console\Commands; <?php
namespace App\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring; use Illuminate\Foundation\Inspiring;
......
<?php namespace App\Console; <?php
namespace App\Console;
use Illuminate\Console\Scheduling\Schedule; use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel; use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
......
<?php namespace App\Events; <?php
namespace App\Events;
abstract class Event abstract class Event
{ {
......
<?php namespace App\Exceptions; <?php
namespace App\Exceptions;
use Exception; use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
...@@ -11,7 +13,7 @@ class Handler extends ExceptionHandler ...@@ -11,7 +13,7 @@ class Handler extends ExceptionHandler
* @var array * @var array
*/ */
protected $dontReport = [ protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException' 'Symfony\Component\HttpKernel\Exception\HttpException',
]; ];
/** /**
......
<?php namespace App\Http\Controllers\Auth; <?php
namespace App\Http\Controllers\Auth;
use App\User; use App\User;
use Validator; use Validator;
......
<?php namespace App\Http\Controllers\Auth; <?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
......
<?php namespace App\Http\Controllers; <?php
namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
......
<?php namespace App\Http; <?php
namespace App\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Kernel as HttpKernel;
......
<?php namespace App\Http\Middleware; <?php
namespace App\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
......
<?php namespace App\Http\Middleware; <?php
namespace App\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
......
<?php namespace App\Http\Middleware; <?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
......
<?php namespace App\Http\Requests; <?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
......
<?php namespace App\Jobs; <?php
namespace App\Jobs;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
abstract class Job abstract class Job
{ {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Queueable Jobs | Queueable Jobs
...@@ -17,5 +18,4 @@ abstract class Job ...@@ -17,5 +18,4 @@ abstract class Job
*/ */
use Queueable; use Queueable;
} }
<?php namespace App\Providers; <?php
namespace App\Providers;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
......
<?php namespace App\Providers; <?php
namespace App\Providers;
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
......
<?php namespace App\Providers; <?php
namespace App\Providers;
use Illuminate\Routing\Router; use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
......
<?php namespace App; <?php
namespace App;
use Illuminate\Auth\Authenticatable; use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
......
...@@ -29,11 +29,11 @@ return [ ...@@ -29,11 +29,11 @@ return [
'stores' => [ 'stores' => [
'apc' => [ 'apc' => [
'driver' => 'apc' 'driver' => 'apc',
], ],
'array' => [ 'array' => [
'driver' => 'array' 'driver' => 'array',
], ],
'database' => [ 'database' => [
...@@ -51,7 +51,7 @@ return [ ...@@ -51,7 +51,7 @@ return [
'driver' => 'memcached', 'driver' => 'memcached',
'servers' => [ 'servers' => [
[ [
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
], ],
], ],
], ],
......
...@@ -26,7 +26,7 @@ return [ ...@@ -26,7 +26,7 @@ return [
| |
*/ */
'default' => env('DB_CONNECTION','mysql'), 'default' => env('DB_CONNECTION', 'mysql'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
...@@ -77,7 +77,7 @@ return [ ...@@ -77,7 +77,7 @@ return [
'container' => 'your-container', 'container' => 'your-container',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => 'IAD', 'region' => 'IAD',
'url_type' => 'publicURL' 'url_type' => 'publicURL',
], ],
], ],
......
...@@ -14,7 +14,7 @@ return [ ...@@ -14,7 +14,7 @@ return [
*/ */
'paths' => [ 'paths' => [
realpath(base_path('resources/views')) realpath(base_path('resources/views')),
], ],
/* /*
......
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
......
...@@ -13,10 +13,10 @@ return [ ...@@ -13,10 +13,10 @@ return [
| |
*/ */
"password" => "Passwords must be at least six characters and match the confirmation.", 'password' => 'Passwords must be at least six characters and match the confirmation.',
"user" => "We can't find a user with that e-mail address.", 'user' => "We can't find a user with that e-mail address.",
"token" => "This password reset token is invalid.", 'token' => 'This password reset token is invalid.',
"sent" => "We have e-mailed your password reset link!", 'sent' => 'We have e-mailed your password reset link!',
"reset" => "Your password has been reset!", 'reset' => 'Your password has been reset!',
]; ];
...@@ -13,66 +13,66 @@ return [ ...@@ -13,66 +13,66 @@ return [
| |
*/ */
"accepted" => "The :attribute must be accepted.", 'accepted' => 'The :attribute must be accepted.',
"active_url" => "The :attribute is not a valid URL.", 'active_url' => 'The :attribute is not a valid URL.',
"after" => "The :attribute must be a date after :date.", 'after' => 'The :attribute must be a date after :date.',
"alpha" => "The :attribute may only contain letters.", 'alpha' => 'The :attribute may only contain letters.',
"alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
"alpha_num" => "The :attribute may only contain letters and numbers.", 'alpha_num' => 'The :attribute may only contain letters and numbers.',
"array" => "The :attribute must be an array.", 'array' => 'The :attribute must be an array.',
"before" => "The :attribute must be a date before :date.", 'before' => 'The :attribute must be a date before :date.',
"between" => [ 'between' => [
"numeric" => "The :attribute must be between :min and :max.", 'numeric' => 'The :attribute must be between :min and :max.',
"file" => "The :attribute must be between :min and :max kilobytes.", 'file' => 'The :attribute must be between :min and :max kilobytes.',
"string" => "The :attribute must be between :min and :max characters.", 'string' => 'The :attribute must be between :min and :max characters.',
"array" => "The :attribute must have between :min and :max items.", 'array' => 'The :attribute must have between :min and :max items.',
], ],
"boolean" => "The :attribute field must be true or false.", 'boolean' => 'The :attribute field must be true or false.',
"confirmed" => "The :attribute confirmation does not match.", 'confirmed' => 'The :attribute confirmation does not match.',
"date" => "The :attribute is not a valid date.", 'date' => 'The :attribute is not a valid date.',
"date_format" => "The :attribute does not match the format :format.", 'date_format' => 'The :attribute does not match the format :format.',
"different" => "The :attribute and :other must be different.", 'different' => 'The :attribute and :other must be different.',
"digits" => "The :attribute must be :digits digits.", 'digits' => 'The :attribute must be :digits digits.',
"digits_between" => "The :attribute must be between :min and :max digits.", 'digits_between' => 'The :attribute must be between :min and :max digits.',
"email" => "The :attribute must be a valid email address.", 'email' => 'The :attribute must be a valid email address.',
"filled" => "The :attribute field is required.", 'filled' => 'The :attribute field is required.',
"exists" => "The selected :attribute is invalid.", 'exists' => 'The selected :attribute is invalid.',
"image" => "The :attribute must be an image.", 'image' => 'The :attribute must be an image.',
"in" => "The selected :attribute is invalid.", 'in' => 'The selected :attribute is invalid.',
"integer" => "The :attribute must be an integer.", 'integer' => 'The :attribute must be an integer.',
"ip" => "The :attribute must be a valid IP address.", 'ip' => 'The :attribute must be a valid IP address.',
"max" => [ 'max' => [
"numeric" => "The :attribute may not be greater than :max.", 'numeric' => 'The :attribute may not be greater than :max.',
"file" => "The :attribute may not be greater than :max kilobytes.", 'file' => 'The :attribute may not be greater than :max kilobytes.',
"string" => "The :attribute may not be greater than :max characters.", 'string' => 'The :attribute may not be greater than :max characters.',
"array" => "The :attribute may not have more than :max items.", 'array' => 'The :attribute may not have more than :max items.',
], ],
"mimes" => "The :attribute must be a file of type: :values.", 'mimes' => 'The :attribute must be a file of type: :values.',
"min" => [ 'min' => [
"numeric" => "The :attribute must be at least :min.", 'numeric' => 'The :attribute must be at least :min.',
"file" => "The :attribute must be at least :min kilobytes.", 'file' => 'The :attribute must be at least :min kilobytes.',
"string" => "The :attribute must be at least :min characters.", 'string' => 'The :attribute must be at least :min characters.',
"array" => "The :attribute must have at least :min items.", 'array' => 'The :attribute must have at least :min items.',
], ],
"not_in" => "The selected :attribute is invalid.", 'not_in' => 'The selected :attribute is invalid.',
"numeric" => "The :attribute must be a number.", 'numeric' => 'The :attribute must be a number.',
"regex" => "The :attribute format is invalid.", 'regex' => 'The :attribute format is invalid.',
"required" => "The :attribute field is required.", 'required' => 'The :attribute field is required.',
"required_if" => "The :attribute field is required when :other is :value.", 'required_if' => 'The :attribute field is required when :other is :value.',
"required_with" => "The :attribute field is required when :values is present.", 'required_with' => 'The :attribute field is required when :values is present.',
"required_with_all" => "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' => 'The :attribute field is required when :values is not present.',
"required_without_all" => "The :attribute field is required when none of :values are present.", 'required_without_all' => 'The :attribute field is required when none of :values are present.',
"same" => "The :attribute and :other must match.", 'same' => 'The :attribute and :other must match.',
"size" => [ 'size' => [
"numeric" => "The :attribute must be :size.", 'numeric' => 'The :attribute must be :size.',
"file" => "The :attribute must be :size kilobytes.", 'file' => 'The :attribute must be :size kilobytes.',
"string" => "The :attribute must be :size characters.", 'string' => 'The :attribute must be :size characters.',
"array" => "The :attribute must contain :size items.", 'array' => 'The :attribute must contain :size items.',
], ],
"timezone" => "The :attribute must be a valid zone.", 'timezone' => 'The :attribute must be a valid zone.',
"unique" => "The :attribute has already been taken.", 'unique' => 'The :attribute has already been taken.',
"url" => "The :attribute format is invalid.", 'url' => 'The :attribute format is invalid.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
......
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