Skip to content

Commit

Permalink
Update for Laravel 5.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
janhenkgerritsen committed Feb 5, 2015
1 parent 3bd405b commit 186850a
Show file tree
Hide file tree
Showing 96 changed files with 3,650 additions and 154 deletions.
11 changes: 3 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
/vendor
/node_modules
/tests/_output
/storage/*.sqlite
.env
.DS_Store
Thumbs.db
composer.lock
composer.phar
tests/_output
storage/database.sqlite
storage/testing.sqlite
.idea
1 change: 0 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class Kernel extends ConsoleKernel {
* @var array
*/
protected $commands = [
'App\Console\Commands\GenerateRepository',
'App\Console\Commands\Inspire',
];

Expand Down
5 changes: 0 additions & 5 deletions app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@

class AuthController extends Controller {

/**
* URL to redirect to after registering a new user.
*/
protected $redirectTo = '/';

/*
|--------------------------------------------------------------------------
| Registration & Login Controller
Expand Down
16 changes: 13 additions & 3 deletions app/Http/routes.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?php

/** HomeController */
/*
|--------------------------------------------------------------------------
| Application Routes
|--------------------------------------------------------------------------
|
| Here is where you can register all of the routes for an application.
| It's a breeze. Simply tell Laravel the URIs it should respond to
| and give it the controller to call when that URI is requested.
|
*/

Route::get('/', 'HomeController@index');
Route::get('flash', 'HomeController@flash');
Route::get('back', 'HomeController@back');
Expand All @@ -12,6 +22,6 @@
Route::resource('api/posts', 'Api\PostsController');

Route::controllers([
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]);
2 changes: 1 addition & 1 deletion app/Providers/TestingServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ public function register()
}
}

}
}
1 change: 1 addition & 0 deletions app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
* @var array
*/
protected $hidden = ['password', 'remember_token'];

}
8 changes: 6 additions & 2 deletions artisan
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ $app = require_once __DIR__.'/bootstrap/app.php';
|
*/

$status = $app->make('Illuminate\Contracts\Console\Kernel')->handle(
new Symfony\Component\Console\Input\ArgvInput,
$kernel = $app->make('Illuminate\Contracts\Console\Kernel');

$status = $kernel->handle(
$input = new Symfony\Component\Console\Input\ArgvInput,
new Symfony\Component\Console\Output\ConsoleOutput
);

Expand All @@ -44,4 +46,6 @@ $status = $app->make('Illuminate\Contracts\Console\Kernel')->handle(
|
*/

$kernel->terminate($input, $status);

exit($status);
14 changes: 6 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
"license": "MIT",
"type": "project",
"require": {
"laravel/framework": "~5.0",
"illuminate/html": "~5.0",
"doctrine/dbal": "~2.5@dev"
"laravel/framework": "5.0.*",
"illuminate/html": "5.0.*"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"codeception/codeception": "~2.0",
"janhenkgerritsen/codeception-laravel5": "dev-master",
"phpspec/phpspec": "~2.1"
"phpspec/phpspec": "~2.1",
"codeception/codeception": "*",
"janhenkgerritsen/codeception-laravel5": "*"
},
"autoload": {
"classmap": [
Expand Down Expand Up @@ -44,6 +43,5 @@
},
"config": {
"preferred-install": "dist"
},
"minimum-stability": "dev"
}
}
Loading

0 comments on commit 186850a

Please sign in to comment.