Merge pull request #49 from JuanDMeGon/master

Upgrading to Laravel 6
hey @JuanDMeGon  Thanks! this looks great!
Fixes #47

Author: joselfonseca

.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
 before_script:
@@ -14,4 +13,4 @@ script:
   - vendor/bin/phpunit --coverage-clover=coverage.clover
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

app/Http/Controllers/Api/Assets/UploadFileController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\Assets;
 
 use GuzzleHttp\Client;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Entities\Assets\Asset;
 use Dingo\Api\Routing\Helpers;
@@ -146,7 +147,7 @@ protected function storeInDatabase(array $attributes, $path)
      */
     protected function storeInFileSystem(array $attributes)
     {
-        $path = md5(str_random(16).date('U')).'.'.$this->validMimes[$attributes['mime']]['extension'];
+        $path = md5(Str::random(16).date('U')).'.'.$this->validMimes[$attributes['mime']]['extension'];
         Storage::put($path, $attributes['content']);
 
         return $path;

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ConfirmsPasswords;
+
+class ConfirmPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Confirm Password Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password confirmations and
+    | uses a simple trait to include the behavior. You're free to explore
+    | this trait and override any functions that require customization.
+    |
+    */
+
+    use ConfirmsPasswords;
+
+    /**
+     * Where to redirect users when the intended url fails.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -19,14 +19,4 @@ class ForgotPasswordController extends Controller
     */
 
     use SendsPasswordResetEmails;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -26,14 +26,4 @@ class ResetPasswordController extends Controller
      * @var string
      */
     protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
 }

app/Http/Kernel.php

@@ -52,6 +52,7 @@ class Kernel extends HttpKernel
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
         'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
@@ -70,6 +71,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

composer.json

@@ -13,23 +13,22 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
-        "dingo/api": "^2.3",
-        "fideloper/proxy": "~4.0",
-        "intervention/image": "^2.4",
-        "intervention/imagecache": "^2.3",
-        "laravel/framework": "5.8.*",
-        "laravel/passport": "^7.0",
-        "laravel/tinker": "~1.0",
-        "spatie/laravel-permission": "^2.37"
+        "php": "^7.2",
+        "dingo/api": "^2.4",
+        "fideloper/proxy": "^4.0",
+        "intervention/image": "^2.5",
+        "intervention/imagecache": "^2.4",
+        "laravel/framework": "^6.2",
+        "laravel/passport": "^7.5",
+        "laravel/tinker": "^1.0",
+        "spatie/laravel-permission": "^3.2"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.0",
+        "facade/ignition": "^1.4",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.0"
     },
     "config": {
         "optimize-autoloader": true,