Laravel 5.2 upgrade

bestmomo · Dec 23, 2015 · 2f13704 · 2f13704
1 parent 03a9aee
commit 2f13704
Show file tree

Hide file tree

Showing 23 changed files with 189 additions and 133 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -1,8 +1,11 @@
 <?php namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Foundation\Validation\ValidationException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler {
 
@@ -12,7 +15,10 @@ class Handler extends ExceptionHandler {
 	 * @var array
 	 */
 	 protected $dontReport = [
-	 	'Symfony\Component\HttpKernel\Exception\HttpException'
+		AuthorizationException::class,
+		HttpException::class,
+		ModelNotFoundException::class,
+		ValidationException::class,
 	 ];
 
 	/**

diff --git a/app/Handlers/Events/.gitkeep b/app/Handlers/Events/.gitkeep
diff --git a/app/Http/Controllers/BlogController.php b/app/Http/Controllers/BlogController.php
@@ -58,7 +58,7 @@ public function __construct(
 	public function indexFront()
 	{
 		$posts = $this->blog_gestion->indexFront($this->nbrPages);
-		$links = $posts->setPath('')->render();
+		$links = $posts->render();
 
 		return view('front.blog.index', compact('posts', 'links'));
 	}
@@ -254,7 +254,7 @@ public function tag(Request $request)
 	{
 		$tag = $request->input('tag');
 		$posts = $this->blog_gestion->indexTag($this->nbrPages, $tag);
-		$links = $posts->setPath('')->appends(compact('tag'))->render();
+		$links = $posts->appends(compact('tag'))->render();
 		$info = trans('front/blog.info-tag') . '<strong>' . $this->blog_gestion->getTagById($tag) . '</strong>';
 
 		return view('front.blog.index', compact('posts', 'links', 'info'));
@@ -270,7 +270,7 @@ public function search(SearchRequest $request)
 	{
 		$search = $request->input('search');
 		$posts = $this->blog_gestion->search($this->nbrPages, $search);
-		$links = $posts->setPath('')->appends(compact('search'))->render();
+		$links = $posts->appends(compact('search'))->render();
 		$info = trans('front/blog.info-search') . '<strong>' . $search . '</strong>';
 
 		return view('front.blog.index', compact('posts', 'links', 'info'));

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
@@ -38,7 +38,7 @@ public function __construct(
 	public function index()
 	{
 		$comments = $this->comment_gestion->index(4);
-		$links = $comments->setPath('')->render();
+		$links = $comments->render();
 
 		return view('back.comments.index', compact('comments', 'links'));
 	}

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -62,7 +62,7 @@ public function indexSort($role)
 	{
 		$counts = $this->user_gestion->counts();
 		$users = $this->user_gestion->index(4, $role); 
-		$links = $users->setPath('')->render();
+		$links = $users->render();
 		$roles = $this->role_gestion->all();
 
 		return view('back.users.index', compact('users', 'links', 'counts', 'roles'));		
@@ -124,7 +124,7 @@ public function edit(User $user)
 	 */
 	public function update(
 		UserUpdateRequest $request,
-		$user)
+		User $user)
 	{
 		$this->user_gestion->update($request->all(), $user);
 
@@ -140,7 +140,7 @@ public function update(
 	 */
 	public function updateSeen(
 		Request $request, 
-		$user)
+		User $user)
 	{
 		$this->user_gestion->update($request->all(), $user);
 

diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -58,8 +58,20 @@
 
 Route::resource('user', 'UserController');
 
-// Auth
-Route::controllers([
-	'auth' => 'Auth\AuthController',
-	'password' => 'Auth\PasswordController',
-]);
+// Authentication routes...
+Route::get('auth/login', 'Auth\AuthController@getLogin');
+Route::post('auth/login', 'Auth\AuthController@postLogin');
+Route::get('auth/logout', 'Auth\AuthController@getLogout');
+Route::get('auth/confirm/{token}', 'Auth\AuthController@getConfirm');
+
+// Registration routes...
+Route::get('auth/register', 'Auth\AuthController@getRegister');
+Route::post('auth/register', 'Auth\AuthController@postRegister');
+
+// Password reset link request routes...
+Route::get('password/email', 'Auth\PasswordController@getEmail');
+Route::post('password/email', 'Auth\PasswordController@postEmail');
+
+// Password reset routes...
+Route::get('password/reset/{token}', 'Auth\PasswordController@getReset');
+Route::post('password/reset', 'Auth\PasswordController@postReset');
diff --git a/app/Jobs/ChangeLocale.php b/app/Jobs/ChangeLocale.php
@@ -3,9 +3,8 @@
 namespace App\Jobs;
 
 use App\Jobs\Job;
-use Illuminate\Contracts\Bus\SelfHandling;
 
-class ChangeLocale extends Job implements SelfHandling
+class ChangeLocale extends Job
 {
 	public $lang;
 

diff --git a/app/Jobs/SendMail.php b/app/Jobs/SendMail.php
@@ -5,10 +5,9 @@
 use App\Jobs\Job;
 use App\Models\User;
 use Request;
-use Illuminate\Contracts\Bus\SelfHandling;
 use Illuminate\Contracts\Mail\Mailer;
 
-class SendMail extends Job implements SelfHandling
+class SendMail extends Job
 {
 
     /**

diff --git a/app/Jobs/SetLocale.php b/app/Jobs/SetLocale.php
@@ -4,9 +4,8 @@
 
 use App\Jobs\Job;
 use Request;
-use Illuminate\Contracts\Bus\SelfHandling;
 
-class SetLocale extends Job implements SelfHandling
+class SetLocale extends Job
 {
     /**
      * Execute the command.

diff --git a/app/Handlers/Commands/.gitkeep → app/Listeners/.gitkeep b/app/Handlers/Commands/.gitkeep → app/Listeners/.gitkeep
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -11,8 +11,8 @@ class EventServiceProvider extends ServiceProvider {
 	 * @var array
 	 */
 	protected $listen = [
-		'auth.login' => ['App\Services\Statut@setLoginStatut'],
-		'auth.logout' => ['App\Services\Statut@setVisitorStatut'],
+		'Illuminate\Auth\Events\Login' => ['App\Services\Statut@setLoginStatut'],
+		'Illuminate\Auth\Events\Logout' => ['App\Services\Statut@setVisitorStatut'],
 		'user.access' => ['App\Services\Statut@setStatut']
 	];
 

diff --git a/app/Repositories/RoleRepository.php b/app/Repositories/RoleRepository.php
@@ -58,7 +58,7 @@ public function update($inputs)
 	 */
 	public function getAllSelect()
 	{
-		$select = $this->all()->lists('title', 'id');
+		$select = $this->all()->pluck('title', 'id');
 
 		return compact('select');
 	}

diff --git a/app/Services/Html/HtmlServiceProvider.php b/app/Services/Html/HtmlServiceProvider.php
@@ -9,12 +9,11 @@ class HtmlServiceProvider extends \Collective\Html\HtmlServiceProvider {
 	 */
 	protected function registerFormBuilder()
 	{
-		$this->app->bindShared('form', function($app)
-		{
-			$form = new FormBuilder($app['html'], $app['url'], $app['session.store']->getToken());
+        $this->app->singleton('form', function ($app) {
+            $form = new FormBuilder($app['html'], $app['url'], $app['view'], $app['session.store']->getToken());
 
-			return $form->setSessionStore($app['session.store']);
-		});
+            return $form->setSessionStore($app['session.store']);
+        });
 	}
 
 }
diff --git a/app/Services/Statut.php b/app/Services/Statut.php
@@ -5,12 +5,12 @@ class Statut  {
 	/**
 	 * Set the login user statut
 	 * 
-	 * @param  App\Models\User $user
+	 * @param  Illuminate\Auth\Events\Login $login
 	 * @return void
 	 */
-	public function setLoginStatut($user)
+	public function setLoginStatut($login)
 	{
-		session()->put('statut', $user->role->slug);
+		session()->put('statut', $login->user->role->slug);
 	}
 
 	/**

diff --git a/artisan b/artisan
@@ -28,11 +28,11 @@ $app = require_once __DIR__.'/bootstrap/app.php';
 |
 */
 
-$kernel = $app->make('Illuminate\Contracts\Console\Kernel');
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
 
 $status = $kernel->handle(
-	$input = new Symfony\Component\Console\Input\ArgvInput,
-	new Symfony\Component\Console\Output\ConsoleOutput
+    $input = new Symfony\Component\Console\Input\ArgvInput,
+    new Symfony\Component\Console\Output\ConsoleOutput
 );
 
 /*

diff --git a/bower.json b/bower.json
diff --git a/composer.json b/composer.json
@@ -6,15 +6,16 @@
     "type": "project",
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "5.1.*",
-        "laravelcollective/html": "5.1.*",
-        "bestmomo/filemanager": "1.1.*"
+        "laravel/framework": "5.2.*",
+        "laravelcollective/html": "5.2.*-dev",
+        "bestmomo/filemanager": "1.1.2"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~4.0",
-        "phpspec/phpspec": "~2.1"
+        "symfony/css-selector": "2.8.*|3.0.*",
+        "symfony/dom-crawler": "2.8.*|3.0.*"
     },
     "autoload": {
         "classmap": [
@@ -33,25 +34,25 @@
         ]
     },
     "scripts": {
+        "post-root-package-install": [
+            "php -r \"copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "php artisan key:generate"
+        ],
         "post-install-cmd": [
             "php artisan clear-compiled",
             "php artisan optimize"
         ],
+        "pre-update-cmd": [
+            "php artisan clear-compiled"
+        ],
         "post-update-cmd": [
-            "php artisan clear-compiled",
             "php artisan optimize"
-        ],
-        "post-root-package-install": [
-            "php -r \"copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "php artisan key:generate"
         ]
     },
     "config": {
         "preferred-install": "dist"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }
 
diff --git a/config/app.php b/config/app.php
@@ -2,6 +2,19 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services your application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'production'),
+
 	/*
 	|--------------------------------------------------------------------------
 	| Application Debug Mode
@@ -126,13 +139,11 @@
 		/*
 		 * Laravel Framework Service Providers...
 		 */
-        Illuminate\Foundation\Providers\ArtisanServiceProvider::class,
         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Routing\ControllerServiceProvider::class,
         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,