Merge pull request #305 from dreamfactorysoftware/laravel-upgrade

Add Laravel 6 support

Author: Taras Viyatyk

.env-dist

@@ -9,6 +9,17 @@
 ## Application Settings
 ##------------------------------------------------------------------------------
 
+##You can configure the asset URL host by setting the ASSET_URL variable in your .env file. 
+##This can be useful if you host your assets on an external service like Amazon S3:
+#ASSET_URL=
+##This option determines where all the compiled Blade templates will be
+##stored for your application. By default, this is within the storage
+##directory. However, as usual, you are free to change this value.
+#VIEW_COMPILED_PATH=
+##Here you may specify the configuration options that should be used when
+##passwords are hashed using the Bcrypt algorithm. This will allow you
+##to control the amount of time it takes to hash the given password.
+#BCRYPT_ROUNDS=
 ## Application name used in email templates and other displays
 #APP_NAME=DreamFactory
 ## Encryption cipher options are AES-128-CBC or AES-256-CBC (default)
@@ -20,8 +31,8 @@ APP_ENV=local
 ## Use 'php artisan key:generate' to generate a new key. Key size must be 16, 24 or 32.
 APP_KEY=
 #APP_LOCALE=en
-## LOG setting. Where and/or how the log file is setup. Options are single (default), daily, syslog, errorlog
-#APP_LOG=single
+## Here you may configure the log channels for your application. Options are stack (default), slack, single, daily, syslog, errorlog
+#LOG_CHANNEL=stack
 ## LOG Level. This is hierarchical and goes in the following order.
 ## DEBUG -> INFO -> NOTICE -> WARNING -> ERROR -> CRITICAL -> ALERT -> EMERGENCY
 ## If you set log level to WARNING then all WARNING, ERROR, CRITICAL, ALERT, and EMERGENCY
@@ -75,8 +86,8 @@ APP_KEY=
 
 ## CACHE_DRIVER options: apc, array, database, file, memcached, redis
 #CACHE_DRIVER=file
-## Cache TTL in minutes
-#CACHE_DEFAULT_TTL=300
+## Cache TTL in seconds
+#CACHE_DEFAULT_TTL=18000
 ## Prefix added to all caching from this installation
 #CACHE_PREFIX=dreamfactory
 ## Database cache settings if CACHE_DRIVER=file
@@ -123,22 +134,22 @@ APP_KEY=
 ## Queuing Settings
 ##------------------------------------------------------------------------------
 
-## QUEUE_DRIVER options: sync (default), database, beanstalkd, sqs, redis, null
-#QUEUE_DRIVER=sync
+## QUEUE_CONNECTION options: sync (default), database, beanstalkd, sqs, redis, null
+#QUEUE_CONNECTION=sync
 ## Name of the queue to use
 #QUEUE_NAME=default
 ## Number of seconds after to retry a failed job
 #QUEUE_RETRY_AFTER=90
-## If QUEUE_DRIVER = database
+## If QUEUE_CONNECTION = database
 #QUEUE_TABLE=jobs
-## If QUEUE_DRIVER = sqs
-#SQS_KEY=
-#SQS_SECRET=
-#SQS_REGION=us-east-1
+## If QUEUE_CONNECTION = sqs
+#AWS_ACCESS_KEY_ID=
+#AWS_SECRET_ACCESS_KEY=
+#AWS_DEFAULT_REGION=us-east-1
 #SQS_PREFIX=https://sqs.us-east-1.amazonaws.com/your-account-id
-## If QUEUE_DRIVER = beanstalkd or redis
+## If QUEUE_CONNECTION = beanstalkd or redis
 #QUEUE_HOST=
-## If QUEUE_DRIVER = redis
+## If QUEUE_CONNECTION = redis
 #QUEUE_PORT=6379
 #QUEUE_DATABASE=3
 #QUEUE_PASSWORD=
@@ -180,8 +191,8 @@ APP_KEY=
 ## New user confirmation code length. Max/Default is 32. Minimum is 5.
 #DF_CONFIRM_CODE_LENGTH=32
 
-## Confirmation code expiration. Default is 1440 minutes (24 hours)
-#DF_CONFIRM_CODE_TTL=1440
+## Confirmation code expiration. Default is 86400 seconds (24 hours)
+#DF_CONFIRM_CODE_TTL=86400
 
 ## JSON Web Token session management, encryption secret, defaults to APP_KEY value
 #JWT_SECRET=

app/Http/Controllers/Auth/RegisterController.php

@@ -2,10 +2,11 @@
 
 namespace DreamFactory\Http\Controllers\Auth;
 
-use DreamFactory\User;
 use DreamFactory\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
+use DreamFactory\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
 {
@@ -65,7 +66,7 @@ protected function create(array $data)
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'password' => Hash::make($data['password']),
         ]);
     }
 }

app/Http/Controllers/Controller.php

@@ -2,10 +2,10 @@
 
 namespace DreamFactory\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {

app/Http/Controllers/SplashController.php

@@ -2,9 +2,10 @@
 
 namespace DreamFactory\Http\Controllers;
 
+use DreamFactory\Core\Enums\Verbs;
 use DreamFactory\Core\Models\User;
 use DreamFactory\Core\Utility\Session;
-use DreamFactory\Core\Enums\Verbs;
+use Illuminate\Support\Arr;
 use Response;
 
 class SplashController extends Controller
@@ -18,21 +19,21 @@ public function index()
     {
         $token = \Request::input('session_token');
         $param = '';
-        if (!empty($token)) {
-            $param = '?session_token=' . $token;
+        if (! empty($token)) {
+            $param = '?session_token='.$token;
         }
 
-        return redirect(config('df.landing_page', '/test_rest.html') . $param);
+        return redirect(config('df.landing_page', '/test_rest.html').$param);
     }
 
     public function createFirstUser()
     {
-        if (!User::adminExists()) {
+        if (! User::adminExists()) {
             $request = \Request::instance();
             $method = $request->method();
             $data = [
                 'username_placeholder' => 'Username (Optional, defaults to email address)',
-                'email_placeholder'    => 'Email Address (Required for login)'
+                'email_placeholder'    => 'Email Address (Required for login)',
             ];
             $loginAttribute = strtolower(config('df.login_attribute', 'email'));
             if ($loginAttribute === 'username') {
@@ -48,28 +49,28 @@ public function createFirstUser()
                     'first_name' => '',
                     'last_name'  => '',
                     'username'   => '',
-                    'errors'     => []
+                    'errors'     => [],
                 ], $data);
 
                 return view('firstUser', $data);
             } elseif (Verbs::POST === $method) {
                 $data = array_merge($request->all(), $data);
                 $user = User::createFirstAdmin($data);
 
-                if (!$user) {
+                if (! $user) {
                     return view('firstUser', $data);
                 }
 
                 $jwt = null;
                 if (true === $login = Session::setUserInfoWithJWT($user)) {
                     $sessionInfo = Session::getPublicInfo();
-                    $jwt = array_get($sessionInfo, 'session_token');
+                    $jwt = Arr::get($sessionInfo, 'session_token');
                 }
             }
         }
 
-        if (!empty($jwt)) {
-            return redirect()->to('/?session_token=' . $jwt);
+        if (! empty($jwt)) {
+            return redirect()->to('/?session_token='.$jwt);
         } else {
             return redirect()->to('/');
         }
@@ -88,12 +89,12 @@ public function setupDb()
 
             if (Verbs::GET === $method) {
                 return view('setup', [
-                    'version' => config('app.version')
+                    'version' => config('app.version'),
                 ]);
             } elseif (Verbs::POST === $method) {
                 try {
                     if (\Cache::pull('setup_db', false)) {
-                        if (!file_exists(base_path('.env'))) {
+                        if (! file_exists(base_path('.env'))) {
                             copy(base_path('.env-dist'), base_path('.env'));
                         }
 
@@ -113,7 +114,7 @@ public function setupDb()
                         if ($request->ajax()) {
                             return json_encode([
                                 'success' => false,
-                                'message' => 'Setup not required. System is already setup'
+                                'message' => 'Setup not required. System is already setup',
                             ]);
                         }
                     }
@@ -125,7 +126,7 @@ public function setupDb()
                             'errors.generic',
                             [
                                 'error'   => $e->getMessage(),
-                                'version' => config('app.version')
+                                'version' => config('app.version'),
                             ]
                         );
                     }
@@ -135,4 +136,4 @@ public function setupDb()
 
         return redirect()->to('/');
     }
-}
+}

app/Http/Kernel.php

@@ -15,7 +15,7 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
     ];
 
     /**
@@ -26,8 +26,8 @@ class Kernel extends HttpKernel
     protected $middlewareGroups = [
         'web' => [
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class
-        ]
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
     ];
 
     /**
@@ -38,6 +38,23 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class
+        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+    ];
+
+    /**
+     * The priority-sorted list of middleware.
+     *
+     * This forces non-global middleware to always be in the given order.
+     *
+     * @var array
+     */
+    protected $middlewarePriority = [
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \DreamFactory\Http\Middleware\Authenticate::class,
+        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        \Illuminate\Auth\Middleware\Authorize::class,
     ];
 }

app/Providers/AppServiceProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace DreamFactory\Providers;
 
 use Illuminate\Support\ServiceProvider;

app/Providers/AuthServiceProvider.php

@@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        'DreamFactory\Model' => 'DreamFactory\Policies\ModelPolicy',
     ];
 
     /**

app/Providers/EventServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace DreamFactory\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        'DreamFactory\Events\Event' => [
+            'DreamFactory\Listeners\EventListener',
         ],
     ];
 

app/Providers/RouteServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace DreamFactory\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {

app/User.php

@@ -2,8 +2,8 @@
 
 namespace DreamFactory;
 
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {

bootstrap/app.php

@@ -11,11 +11,6 @@
 |
 */
 
-use DreamFactory\Core\LogHandlers\StreamHandler;
-use DreamFactory\Core\LogHandlers\SyslogHandler;
-use DreamFactory\Core\LogHandlers\ErrorLogHandler;
-use DreamFactory\Core\LogHandlers\RotatingFileHandler;
-use Monolog\Formatter\LineFormatter;
 use Monolog\Logger;
 
 $app = new Illuminate\Foundation\Application(
@@ -48,30 +43,6 @@
     DreamFactory\Exceptions\Handler::class
 );
 
-$app->configureMonologUsing(function (Logger $monolog){
-    $logFile =
-        env('DF_MANAGED_LOG_PATH', storage_path('logs')) .
-        DIRECTORY_SEPARATOR .
-        env('DF_MANAGED_LOG_FILE', 'dreamfactory.log');
-
-    $mode = config('app.log');
-
-    if ($mode === 'syslog') {
-        $monolog->pushHandler(new SyslogHandler('dreamfactory'));
-    } else {
-        if ($mode === 'single') {
-            $handler = new StreamHandler($logFile);
-        } else if ($mode === 'errorlog') {
-            $handler = new ErrorLogHandler();
-        } else {
-            $handler = new RotatingFileHandler($logFile, 5);
-        }
-
-        $monolog->pushHandler($handler);
-        $handler->setFormatter(new LineFormatter(null, null, true, true));
-    }
-});
-
 /*
 |--------------------------------------------------------------------------
 | Return The Application