diff --git a/bootstrap/app.php b/bootstrap/app.php
index 0bb6d3f62..a2c39e181 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,5 +1,15 @@
 <?php
 
+use Illuminate\Contracts\Console\Kernel as Kernel2;
+use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Contracts\Http\Kernel as Kernel4;
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Console\Kernel;
+use Illuminate\Foundation\Exceptions\Handler;
+use Illuminate\Foundation\Http\Kernel as Kernel3;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\RotatingFileHandler;
+
 /*
 |--------------------------------------------------------------------------
 | Create The Application
@@ -11,7 +21,7 @@
 |
 */
 
-$app = new Illuminate\Foundation\Application(
+$app = new Application(
     realpath(__DIR__ . '/../')
 );
 
@@ -27,28 +37,28 @@ $app = new Illuminate\Foundation\Application(
 */
 
 $app->singleton(
-    Illuminate\Contracts\Http\Kernel::class,
-    Illuminate\Foundation\Http\Kernel::class
+    Kernel4::class,
+    Kernel3::class
 );
 
 $app->singleton(
-    Illuminate\Contracts\Console\Kernel::class,
-    Illuminate\Foundation\Console\Kernel::class
+    Kernel2::class,
+    Kernel::class
 );
 
 $app->singleton(
-    Illuminate\Contracts\Debug\ExceptionHandler::class,
-    Illuminate\Foundation\Exceptions\Handler::class
+    ExceptionHandler::class,
+    Handler::class
 );
 
 $app->configureMonologUsing(function ($monolog) use ($app) {
     $monolog->pushHandler(
-        (new Monolog\Handler\RotatingFileHandler(
+        (new RotatingFileHandler(
         // Set the log path
             $app->storagePath() . '/logs/processmaker.log',
             // Set the number of daily files you want to keep
             $app->make('config')->get('app.log_max_files', 5)
-        ))->setFormatter(new Monolog\Formatter\LineFormatter(null, null, true, true))
+        ))->setFormatter(new LineFormatter(null, null, true, true))
     );
 });
 
diff --git a/config/app.php b/config/app.php
index 744aa911a..e036a5ab0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,5 +1,9 @@
 <?php
 
+use Illuminate\Cache\CacheServiceProvider;
+use Illuminate\Filesystem\FilesystemServiceProvider;
+use Illuminate\View\ViewServiceProvider;
+
 return [
     'name' => env('APP_NAME', 'ProcessMaker'),
     'env' => env('APP_ENV', 'production'),
@@ -8,9 +12,9 @@ return [
     'log_level' => env('APP_LOG_LEVEL', 'debug'),
 
     'providers' => [
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
+        FilesystemServiceProvider::class,
+        CacheServiceProvider::class,
+        ViewServiceProvider::class,
     ],
 
     'aliases' => [
diff --git a/config/filesystems.php b/config/filesystems.php
index 4544f60c4..1f4edca03 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -51,7 +51,7 @@ return [
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'url' => env('APP_URL') . '/storage',
             'visibility' => 'public',
         ],
 
diff --git a/processmaker b/processmaker
index 81a41099f..947685aa0 100755
--- a/processmaker
+++ b/processmaker
@@ -3,9 +3,9 @@
 use Illuminate\Foundation\Console\Kernel;
 
 // Because laravel has a __ helper function, it's important we include the class.g file to ensure our __ is used.
-require_once __DIR__.'/gulliver/system/class.g.php';
-require_once __DIR__.'/bootstrap/autoload.php';
-require_once __DIR__.'/bootstrap/app.php';
+require_once __DIR__ . '/gulliver/system/class.g.php';
+require_once __DIR__ . '/bootstrap/autoload.php';
+require_once __DIR__ . '/bootstrap/app.php';
 $app->make(Kernel::class)->bootstrap();
 
 $scriptDir = dirname(__FILE__).'/';
diff --git a/tests/Feature/CacheTest.php b/tests/Feature/CacheTest.php
index 24b1fff81..b8c23839a 100644
--- a/tests/Feature/CacheTest.php
+++ b/tests/Feature/CacheTest.php
@@ -16,4 +16,4 @@ class CacheTest extends TestCase
         Cache::put('foo', 'bar', 5);
         $this->assertEquals('bar', (Cache::get('foo')));
     }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 28a769477..1eb56dd35 100644
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -3913,7 +3913,7 @@ class workspaceTools
     {
         $paths = [
             PATH_DATA.'framework' => 0770,
-            PATH_DATA.'framework' . DIRECTORY_SEPARATOR.'cache' => 0770,
+            PATH_DATA.'framework' . DIRECTORY_SEPARATOR . 'cache' => 0770,
         ];
         foreach ($paths as $path => $permission) {
             if (!file_exists($path)) {