Commit e0c102b7 authored by Nicolas Widart's avatar Nicolas Widart

Updating laravel

parent 79f71c4c
File mode changed from 100644 to 100755
<?php namespace App\Http\Controllers\Auth;
use Illuminate\Routing\Controller;
use Illuminate\Contracts\Auth\Guard;
use App\Http\Requests\Auth\LoginRequest;
use App\Http\Requests\Auth\RegisterRequest;
/**
* @Middleware("guest", except={"logout"})
*/
class AuthController extends Controller {
/**
* The Guard implementation.
*
* @var Guard
*/
protected $auth;
/**
* Create a new authentication controller instance.
*
* @param Guard $auth
* @return void
*/
public function __construct(Guard $auth)
{
$this->auth = $auth;
}
/**
* Show the application registration form.
*
* @Get("auth/register")
*
* @return Response
*/
public function showRegistrationForm()
{
return view('auth.register');
}
/**
* Handle a registration request for the application.
*
* @Post("auth/register")
*
* @param RegisterRequest $request
* @return Response
*/
public function register(RegisterRequest $request)
{
// Registration form is valid, create user...
$this->auth->login($user);
return redirect('/');
}
/**
* Show the application login form.
*
* @Get("auth/login")
*
* @return Response
*/
public function showLoginForm()
{
return view('auth.login');
}
/**
* Handle a login request to the application.
*
* @Post("auth/login")
*
* @param LoginRequest $request
* @return Response
*/
public function login(LoginRequest $request)
{
if ($this->auth->attempt($request->only('email', 'password')))
{
return redirect('/');
}
return redirect('/auth/login')->withErrors([
'email' => 'These credentials do not match our records.',
]);
}
/**
* Log the user out of the application.
*
* @Get("auth/logout")
*
* @return Response
*/
public function logout()
{
$this->auth->logout();
return redirect('/');
}
}
<?php namespace App\Http\Controllers\Auth;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Illuminate\Contracts\Auth\PasswordBroker;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* @Middleware("guest")
*/
class PasswordController extends Controller {
/**
* The password broker implementation.
*
* @var PasswordBroker
*/
protected $passwords;
/**
* Create a new password controller instance.
*
* @param PasswordBroker $passwords
* @return void
*/
public function __construct(PasswordBroker $passwords)
{
$this->passwords = $passwords;
}
/**
* Display the form to request a password reset link.
*
* @Get("password/email")
*
* @return Response
*/
public function showResetRequestForm()
{
return view('password.email');
}
/**
* Send a reset link to the given user.
*
* @Post("password/email")
*
* @param Request $request
* @return Response
*/
public function sendResetLink(Request $request)
{
switch ($response = $this->passwords->sendResetLink($request->only('email')))
{
case PasswordBroker::INVALID_USER:
return redirect()->back()->with('error', trans($response));
case PasswordBroker::RESET_LINK_SENT:
return redirect()->back()->with('status', trans($response));
}
}
/**
* Display the password reset view for the given token.
*
* @Get("password/reset")
*
* @param string $token
* @return Response
*/
public function showResetForm($token = null)
{
if (is_null($token))
{
throw new NotFoundHttpException;
}
return view('password.reset')->with('token', $token);
}
/**
* Reset the given user's password.
*
* @Post("password/reset")
*
* @param Request $request
* @return Response
*/
public function resetPassword(Request $request)
{
$credentials = $request->only(
'email', 'password', 'password_confirmation', 'token'
);
$response = $this->passwords->reset($credentials, function($user, $password)
{
$user->password = bcrypt($password);
$user->save();
});
switch ($response)
{
case PasswordBroker::INVALID_PASSWORD:
case PasswordBroker::INVALID_TOKEN:
case PasswordBroker::INVALID_USER:
return redirect()->back()->with('error', trans($response));
case PasswordBroker::PASSWORD_RESET:
return redirect()->to('/');
}
}
}
<?php namespace App\Http\Controllers;
class HomeController {
use Illuminate\Routing\Controller;
class HomeController extends Controller {
/*
|--------------------------------------------------------------------------
| Default Home Controller
| Home Controller
|--------------------------------------------------------------------------
|
| You may wish to use controllers instead of, or in addition to, Closure
| based routes. That's great! Here is an example controller method to
| get you started. To route to this controller, just add the route:
|
| $router->get('/', 'HomeController@index');
| Controller methods are called when a request enters the application
| with their assigned URI. The URI a method responds to may be set
| via simple annotations. Here is an example to get you started!
|
*/
/**
* @Get("/", as="home")
* @Get("/")
*/
public function index()
{
......
<?php namespace App\Http\Middleware;
use Closure;
use Illuminate\Routing\Route;
use Illuminate\Contracts\Auth\Authenticator;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Routing\Middleware;
use Illuminate\Contracts\Routing\ResponseFactory;
class AuthMiddleware implements Middleware {
/**
* The authenticator implementation.
* The Guard implementation.
*
* @var Authenticator
* @var Guard
*/
protected $auth;
......@@ -25,11 +24,11 @@ class AuthMiddleware implements Middleware {
/**
* Create a new filter instance.
*
* @param Authenticator $auth
* @param Guard $auth
* @param ResponseFactory $response
* @return void
*/
public function __construct(Authenticator $auth,
public function __construct(Guard $auth,
ResponseFactory $response)
{
$this->auth = $auth;
......
<?php namespace App\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Routing\Middleware;
use Illuminate\Contracts\Auth\Authenticator;
class BasicAuthMiddleware implements Middleware {
/**
* The authenticator implementation.
* The Guard implementation.
*
* @var Authenticator
* @var Guard
*/
protected $auth;
/**
* Create a new filter instance.
*
* @param Authenticator $auth
* @param Guard $auth
* @return void
*/
public function __construct(Authenticator $auth)
public function __construct(Guard $auth)
{
$this->auth = $auth;
}
......
......@@ -12,6 +12,8 @@ class CsrfMiddleware implements Middleware {
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*
* @throws TokenMismatchException
*/
public function handle($request, Closure $next)
{
......
<?php namespace App\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\RedirectResponse;
use Illuminate\Contracts\Auth\Authenticator;
use Illuminate\Contracts\Routing\Middleware;
class GuestMiddleware implements Middleware {
/**
* The authenticator implementation.
* The Guard implementation.
*
* @var Authenticator
* @var Guard
*/
protected $auth;
/**
* Create a new filter instance.
*
* @param Authenticator $auth
* @param Guard $auth
* @return void
*/
public function __construct(Authenticator $auth)
public function __construct(Guard $auth)
{
$this->auth = $auth;
}
......
......@@ -5,7 +5,7 @@ use Illuminate\Http\Response;
use Illuminate\Contracts\Routing\Middleware;
use Illuminate\Contracts\Foundation\Application;
class MaintenanceMiddleware {
class MaintenanceMiddleware implements Middleware {
/**
* The application implementation.
......
File mode changed from 100644 to 100755
<?php namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;
class LoginRequest extends FormRequest {
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required', 'password' => 'required',
];
}
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
}
<?php namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;
class RegisterRequest extends FormRequest {
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required|email|unique:users',
'password' => 'required|confirmed|min:8',
];
}
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
}
<?php
/*
|--------------------------------------------------------------------------
| 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 Closure to execute when that URI is requested.
|
*/
$router->get('/', 'HomeController@index');
......@@ -29,6 +29,8 @@ class AppServiceProvider extends ServiceProvider {
'Illuminate\Cookie\Middleware\Queue',
'Illuminate\Session\Middleware\Reader',
'Illuminate\Session\Middleware\Writer',
'Illuminate\View\Middleware\ErrorBinder',
'App\Http\Middleware\CsrfMiddleware',
];
/**
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -15,4 +15,13 @@ class EventServiceProvider extends ServiceProvider {
],
];
/**
* The classes to scan for event annotations.
*
* @var array
*/
protected $scan = [
//
];
}
File mode changed from 100644 to 100755
<?php namespace App\Providers;
use Illuminate\Routing\Router;
use Illuminate\Contracts\Routing\UrlGenerator;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
class RouteServiceProvider extends ServiceProvider {
/**
* The root namespace to assume when generating URLs to actions.
*
* @var string
*/
protected $rootUrlNamespace = 'App\Http\Controllers';
/**
* The controllers to scan for route annotations.
*
* @var array
*/
protected $scan = [
'App\Http\Controllers\HomeController',
'App\Http\Controllers\Auth\AuthController',
'App\Http\Controllers\Auth\PasswordController',
];
/**
* Called before routes are registered.
*
* Register any model bindings or pattern based filters.
*
* @param Router $router
* @param UrlGenerator $url
* @return void
*/
public function before(Router $router, UrlGenerator $url)
public function before(Router $router)
{
$url->setRootControllerNamespace('App\Http\Controllers');
//
}
/**
......@@ -25,18 +41,9 @@ class RouteServiceProvider extends ServiceProvider {
*
* @return void
*/
public function map()
public function map(Router $router)
{
// Once the application has booted, we will include the default routes
// file. This "namespace" helper will load the routes file within a
// route group which automatically sets the controller namespace.
$this->app->booted(function()
{
$this->namespaced('App\Http\Controllers', function(Router $router)
{
require app_path().'/Http/routes.php';
});
});
// require app_path('Http/routes.php');
}
}
......@@ -2,13 +2,13 @@
use Illuminate\Auth\UserTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Reminders\RemindableTrait;
use Illuminate\Contracts\Auth\User as UserContract;
use Illuminate\Contracts\Auth\Remindable as RemindableContract;
use Illuminate\Auth\Passwords\CanResetPasswordTrait;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class User extends Model implements UserContract, RemindableContract {
class User extends Model implements UserContract, CanResetPasswordContract {
use UserTrait, RemindableTrait;
use UserTrait, CanResetPasswordTrait;
/**
* The database table used by the model.
......
......@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "2579cd23c86449741fd4f52910e1a8b1",
"hash": "d8aab6e38e4ce71739afb3d52b32f3c4",
"packages": [
{
"name": "cartalyst/sentinel",
......@@ -485,21 +485,20 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "4.2.2",
"version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "9c4fbbf6457768f5036fbd88f1229f3fca812a5d"
"reference": "9e806208d9b418a58ec86c49078aa94385e64bbd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9c4fbbf6457768f5036fbd88f1229f3fca812a5d",
"reference": "9c4fbbf6457768f5036fbd88f1229f3fca812a5d",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9e806208d9b418a58ec86c49078aa94385e64bbd",
"reference": "9e806208d9b418a58ec86c49078aa94385e64bbd",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/streams": "~2.1",
"guzzlehttp/ringphp": "~1.0",
"php": ">=5.4.0"
},
"require-dev": {
......@@ -507,22 +506,16 @@
"phpunit/phpunit": "~4.0",
"psr/log": "~1.0"
},
"suggest": {
"ext-curl": "Guzzle will use specific adapters if cURL is present"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-ring": "5.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions.php"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
......@@ -546,7 +539,57 @@
"rest",
"web service"
],
"time": "2014-09-08 22:11:58"
"time": "2014-10-16 18:00:41"
},
{
"name": "guzzlehttp/ringphp",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/guzzle/RingPHP.git",
"reference": "bbf23555a557fc91fb5ef6edbd23a1f17188cd4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/bbf23555a557fc91fb5ef6edbd23a1f17188cd4b",
"reference": "bbf23555a557fc91fb5ef6edbd23a1f17188cd4b",
"shasum": ""
},
"require": {
"guzzlehttp/streams": "~3.0",
"php": ">=5.4.0",
"react/promise": "~2.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "~4.0"
},
"suggest": {
"ext-curl": "Guzzle will use specific adapters if cURL is present"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Ring\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"time": "2014-10-15 20:34:26"
},
{
"name": "guzzlehttp/streams",
......@@ -554,12 +597,12 @@
"source": {
"type": "git",
"url": "https://github.com/guzzle/streams.git",
"reference": "30d5c8e7646e004768054c4143a433c89bc9ece0"
"reference": "48be63a56ea8a98ec620eb59ef76bcab77feba55"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/streams/zipball/30d5c8e7646e004768054c4143a433c89bc9ece0",
"reference": "30d5c8e7646e004768054c4143a433c89bc9ece0",
"url": "https://api.github.com/repos/guzzle/streams/zipball/48be63a56ea8a98ec620eb59ef76bcab77feba55",
"reference": "48be63a56ea8a98ec620eb59ef76bcab77feba55",
"shasum": ""
},
"require": {
......@@ -571,16 +614,13 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Stream\\": "src/"
},
"files": [
"src/functions.php"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
......@@ -593,13 +633,13 @@
"homepage": "https://github.com/mtdowling"
}
],
"description": "Provides a simple abstraction over streams of data (Guzzle 4+)",
"description": "Provides a simple abstraction over streams of data",
"homepage": "http://guzzlephp.org/",
"keywords": [
"Guzzle",
"stream"
],
"time": "2014-09-15 01:45:40"
"time": "2014-10-12 19:45:36"
},
{
"name": "illuminate/html",
......@@ -607,12 +647,12 @@
"source": {
"type": "git",
"url": "https://github.com/illuminate/html.git",
"reference": "8b44c77a3b648af05fee2a8aed28d3058542dcc8"
"reference": "b04be9a84be0d6f7552b281ad6b9e2795218fe56"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/html/zipball/8b44c77a3b648af05fee2a8aed28d3058542dcc8",
"reference": "8b44c77a3b648af05fee2a8aed28d3058542dcc8",
"url": "https://api.github.com/repos/illuminate/html/zipball/b04be9a84be0d6f7552b281ad6b9e2795218fe56",
"reference": "b04be9a84be0d6f7552b281ad6b9e2795218fe56",
"shasum": ""
},
"require": {
......@@ -645,7 +685,7 @@
"email": "taylorotwell@gmail.com"
}
],
"time": "2014-10-01 19:15:37"
"time": "2014-10-16 14:38:30"
},
{
"name": "ircmaxell/password-compat",
......@@ -869,12 +909,12 @@
"source": {
"type": "git",
"url": "https://github.com/laravel/elixir.git",
"reference": "fdaa831b9fb2559c7fd146be0b0ff9a2cad80c01"
"reference": "e1a8b0580c0f66b595a228eb2e34585f570eb771"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/elixir/zipball/fdaa831b9fb2559c7fd146be0b0ff9a2cad80c01",
"reference": "fdaa831b9fb2559c7fd146be0b0ff9a2cad80c01",
"url": "https://api.github.com/repos/laravel/elixir/zipball/e1a8b0580c0f66b595a228eb2e34585f570eb771",
"reference": "e1a8b0580c0f66b595a228eb2e34585f570eb771",
"shasum": ""
},
"require": {
......@@ -905,7 +945,7 @@
"email": "taylorotwell@gmail.com"
}
],
"time": "2014-10-11 00:30:36"
"time": "2014-10-14 17:59:08"
},
{
"name": "laravel/framework",
......@@ -913,18 +953,20 @@
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "c091f3f39e3dae11c430e104767cc5bad3a32c57"
"reference": "ba916851321b9233cb56a0fb1deb41043b7df5fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/c091f3f39e3dae11c430e104767cc5bad3a32c57",
"reference": "c091f3f39e3dae11c430e104767cc5bad3a32c57",
"url": "https://api.github.com/repos/laravel/framework/zipball/ba916851321b9233cb56a0fb1deb41043b7df5fb",
"reference": "ba916851321b9233cb56a0fb1deb41043b7df5fb",
"shasum": ""
},
"require": {
"classpreloader/classpreloader": "~1.0.2",
"d11wtq/boris": "~1.0",
"doctrine/annotations": "~1.0",
"ext-mcrypt": "*",
"ext-openssl": "*",
"filp/whoops": "1.1.*",
"ircmaxell/password-compat": "~1.0",
"jeremeamia/superclosure": "~1.0.1",
......@@ -1023,7 +1065,7 @@
"framework",
"laravel"
],
"time": "2014-10-10 15:39:37"
"time": "2014-10-16 18:05:12"
},
{
"name": "league/flysystem",
......@@ -1031,12 +1073,12 @@
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "0bc9f7ef20ed7c01400a9ba4cc5b84c36f8aaeec"
"reference": "30d2bedf2ff4b20645e708d3113bd6e788267ce7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0bc9f7ef20ed7c01400a9ba4cc5b84c36f8aaeec",
"reference": "0bc9f7ef20ed7c01400a9ba4cc5b84c36f8aaeec",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/30d2bedf2ff4b20645e708d3113bd6e788267ce7",
"reference": "30d2bedf2ff4b20645e708d3113bd6e788267ce7",
"shasum": ""
},
"require": {
......@@ -1055,7 +1097,8 @@
"phpunit/phpunit": "~4.0",
"predis/predis": "~1.0",
"rackspace/php-opencloud": "~1.10.0",
"sabre/dav": "~2.0.2"
"sabre/dav": "~2.0.2",
"tedivm/stash": "~0.12.0"
},
"suggest": {
"aws/aws-sdk-php": "Allows you to use AWS S3 storage",
......@@ -1066,7 +1109,8 @@
"phpseclib/phpseclib": "Allows SFTP server storage",
"predis/predis": "Allows you to use Predis for caching",
"rackspace/php-opencloud": "Allows you to use Rackspace Cloud Files",
"sabre/dav": "Enables WebDav support"
"sabre/dav": "Enables WebDav support",
"tedivm/stash": "Allows you to use Stash as cache implementation"
},
"type": "library",
"extra": {
......@@ -1103,7 +1147,7 @@
"sftp",
"storage"
],
"time": "2014-10-04 07:01:23"
"time": "2014-10-11 16:17:17"
},
{
"name": "mcamara/laravel-localization",
......@@ -1577,6 +1621,50 @@
],
"time": "2014-01-18 15:33:09"
},
{
"name": "react/promise",
"version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "937b04f1b0ee8f6d180e75a0830aac778ca4bcd6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/937b04f1b0ee8f6d180e75a0830aac778ca4bcd6",
"reference": "937b04f1b0ee8f6d180e75a0830aac778ca4bcd6",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
}
},
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [
"src/functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jan Sorgalla",
"email": "jsorgalla@googlemail.com"
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"time": "2014-10-15 20:05:57"
},
{
"name": "stack/builder",
"version": "dev-master",
......@@ -2162,12 +2250,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
"reference": "26d82e307861f7d0612aa84a2a5fa07dbd0dd3bc"
"reference": "2014d64562ceae90018ca2457f7c6d8ed093aceb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/26d82e307861f7d0612aa84a2a5fa07dbd0dd3bc",
"reference": "26d82e307861f7d0612aa84a2a5fa07dbd0dd3bc",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2014d64562ceae90018ca2457f7c6d8ed093aceb",
"reference": "2014d64562ceae90018ca2457f7c6d8ed093aceb",
"shasum": ""
},
"require": {
......@@ -2228,7 +2316,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
"time": "2014-10-08 20:39:21"
"time": "2014-10-17 07:38:59"
},
{
"name": "symfony/process",
......@@ -2466,25 +2554,30 @@
},
{
"name": "vlucas/phpdotenv",
"version": "1.0.6",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "2821c024b4c14c7e6d1ff99e063ae9532620beb2"
"reference": "56c252d48dce336da97926591aed71805203815b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2821c024b4c14c7e6d1ff99e063ae9532620beb2",
"reference": "2821c024b4c14c7e6d1ff99e063ae9532620beb2",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/56c252d48dce336da97926591aed71805203815b",
"reference": "56c252d48dce336da97926591aed71805203815b",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-0": {
"Dotenv": "src/"
......@@ -2498,8 +2591,7 @@
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
"homepage": "http://www.vancelucas.com",
"role": "Developer"
"homepage": "http://www.vancelucas.com"
}
],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
......@@ -2509,7 +2601,7 @@
"env",
"environment"
],
"time": "2014-01-31 16:18:39"
"time": "2014-10-16 14:50:21"
}
],
"packages-dev": [
......@@ -2519,16 +2611,16 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "4bdc0421209a00e6f425f4c3554d1b0df3a7e897"
"reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/4bdc0421209a00e6f425f4c3554d1b0df3a7e897",
"reference": "4bdc0421209a00e6f425f4c3554d1b0df3a7e897",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
"reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
"shasum": ""
},
"require": {
"php": "~5.3"
"php": ">=5.3,<8.0-DEV"
},
"require-dev": {
"athletic/athletic": "~0.1.8",
......@@ -2565,7 +2657,7 @@
"constructor",
"instantiate"
],
"time": "2014-10-05 00:20:37"
"time": "2014-10-13 12:58:55"
},
{
"name": "phpunit/php-code-coverage",
......@@ -2817,12 +2909,12 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "f75e6b2e0764bcf4faa5082f4b60d5e7cf0959bb"
"reference": "cd4014775069d7d39d20f617037c2c0f9b4bc25b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f75e6b2e0764bcf4faa5082f4b60d5e7cf0959bb",
"reference": "f75e6b2e0764bcf4faa5082f4b60d5e7cf0959bb",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cd4014775069d7d39d20f617037c2c0f9b4bc25b",
"reference": "cd4014775069d7d39d20f617037c2c0f9b4bc25b",
"shasum": ""
},
"require": {
......@@ -2880,7 +2972,7 @@
"testing",
"xunit"
],
"time": "2014-10-07 09:30:07"
"time": "2014-10-17 09:28:50"
},
{
"name": "phpunit/phpunit-mock-objects",
......@@ -3306,8 +3398,8 @@
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"mcamara/laravel-localization": 20,
"laracasts/commander": 20,
"mcamara/laravel-localization": 20,
"dimsav/laravel-translatable": 20
},
"prefer-stable": false,
......
......@@ -105,15 +105,6 @@ return [
'App\Providers\LogServiceProvider',
'App\Providers\RouteServiceProvider',
'Illuminate\Html\HtmlServiceProvider',
'Pingpong\Modules\ModulesServiceProvider',
'Cartalyst\Sentinel\Laravel\SentinelServiceProvider',
'Laracasts\Commander\CommanderServiceProvider',
'Laracasts\Flash\FlashServiceProvider',
'Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider',
'Modules\Core\Providers\CoreServiceProvider',
/*
* Laravel Framework Service Providers...
*/
......@@ -121,6 +112,7 @@ return [
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
......@@ -132,7 +124,7 @@ return [
'Illuminate\Pagination\PaginationServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
'Illuminate\Auth\Reminders\ReminderServiceProvider',
'Illuminate\Auth\Passwords\PasswordResetServiceProvider',
'Illuminate\Session\SessionServiceProvider',
'Illuminate\Translation\TranslationServiceProvider',
'Illuminate\Validation\ValidationServiceProvider',
......@@ -195,15 +187,7 @@ return [
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
'Form' => 'Illuminate\Html\FormFacade',
/* Packages */
'Form' => 'Illuminate\Html\FormFacade',
'Module' => 'Pingpong\Modules\Facades\Module',
'Activation' => 'Cartalyst\Sentinel\Laravel\Facades\Activation',
'Reminder' => 'Cartalyst\Sentinel\Laravel\Facades\Reminder',
'Sentinel' => 'Cartalyst\Sentinel\Laravel\Facades\Sentinel',
'Flash' => 'Laracasts\Flash\Flash',
'LaravelLocalization' => 'Mcamara\LaravelLocalization\Facades\LaravelLocalization',
],
];
......@@ -45,22 +45,22 @@ return [
/*
|--------------------------------------------------------------------------
| Password Reminder Settings
| Password Reset Settings
|--------------------------------------------------------------------------
|
| Here you may set the settings for password reminders, including a view
| that should be used as your password reminder e-mail. You will also
| be able to set the name of the table that holds the reset tokens.
| Here you may set the options for resetting passwords including the view
| that is your password reset e-mail. You can also set the name of the
| table that maintains all of the reset tokens for your application.
|
| The "expire" time is the number of minutes that the reminder should be
| The expire time is the number of minutes that the reset token should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/
'reminder' => [
'email' => 'emails.auth.reminder',
'table' => 'password_reminders',
'password' => [
'email' => 'emails.auth.password',
'table' => 'password_resets',
'expire' => 60,
],
......
......@@ -28,17 +28,4 @@ return [
'compiled' => storage_path().'/framework/views',
/*
|--------------------------------------------------------------------------
| Pagination View
|--------------------------------------------------------------------------
|
| This view will be used to render the pagination link output, and can
| be easily customized here to show any view you like. A clean view
| compatible with Twitter's Bootstrap is given to you by default.
|
*/
'pagination' => 'pagination::slider-3',
];
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