Skip to content

CS #3399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from Jun 1, 2015
Merged

CS #3399

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/Console/Commands/Inspire.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Console\Commands;
<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring;
Expand Down
4 changes: 3 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Console;
<?php

namespace App\Console;

use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
Expand Down
4 changes: 3 additions & 1 deletion app/Events/Event.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Events;
<?php

namespace App\Events;

abstract class Event
{
Expand Down
6 changes: 4 additions & 2 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Exceptions;
<?php

namespace App\Exceptions;

use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
Expand All @@ -11,7 +13,7 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException'
'Symfony\Component\HttpKernel\Exception\HttpException',
];

/**
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Controllers\Auth;
<?php

namespace App\Http\Controllers\Auth;

use App\User;
use Validator;
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Controllers\Auth;
<?php

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Controllers;
<?php

namespace App\Http\Controllers;

use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http;
<?php

namespace App\Http;

use Illuminate\Foundation\Http\Kernel as HttpKernel;

Expand Down
4 changes: 3 additions & 1 deletion app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Middleware;
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Contracts\Auth\Guard;
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Middleware/RedirectIfAuthenticated.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Middleware;
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Contracts\Auth\Guard;
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Middleware/VerifyCsrfToken.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Middleware;
<?php

namespace App\Http\Middleware;

use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;

Expand Down
4 changes: 3 additions & 1 deletion app/Http/Requests/Request.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Requests;
<?php

namespace App\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;

Expand Down
6 changes: 3 additions & 3 deletions app/Jobs/Job.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php namespace App\Jobs;
<?php

namespace App\Jobs;

use Illuminate\Bus\Queueable;

abstract class Job
{

/*
|--------------------------------------------------------------------------
| Queueable Jobs
Expand All @@ -17,5 +18,4 @@ abstract class Job
*/

use Queueable;

}
4 changes: 3 additions & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Providers;
<?php

namespace App\Providers;

use Illuminate\Support\ServiceProvider;

Expand Down
4 changes: 3 additions & 1 deletion app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Providers;
<?php

namespace App\Providers;

use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
Expand Down
4 changes: 3 additions & 1 deletion app/Providers/RouteServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Providers;
<?php

namespace App\Providers;

use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
Expand Down
4 changes: 3 additions & 1 deletion app/User.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App;
<?php

namespace App;

use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model;
Expand Down
92 changes: 46 additions & 46 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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
}
6 changes: 3 additions & 3 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
'stores' => [

'apc' => [
'driver' => 'apc'
'driver' => 'apc',
],

'array' => [
'driver' => 'array'
'driver' => 'array',
],

'database' => [
Expand All @@ -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,
],
],
],
Expand Down
2 changes: 1 addition & 1 deletion config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
|
*/

'default' => env('DB_CONNECTION','mysql'),
'default' => env('DB_CONNECTION', 'mysql'),

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion config/filesystems.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
'container' => 'your-container',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => 'IAD',
'url_type' => 'publicURL'
'url_type' => 'publicURL',
],

],
Expand Down
2 changes: 1 addition & 1 deletion config/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

'paths' => [
realpath(base_path('resources/views'))
realpath(base_path('resources/views')),
],

/*
Expand Down
2 changes: 1 addition & 1 deletion database/seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function run()
Model::unguard();

// $this->call('UserTableSeeder');

Model::reguard();
}
}
1 change: 1 addition & 0 deletions public/index.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* Laravel - A PHP Framework For Web Artisans
*
Expand Down
10 changes: 5 additions & 5 deletions resources/lang/en/passwords.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
|
*/

"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!",
'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!',

];
Loading