diff --git a/.travis.yml b/.travis.yml index dfeea409e..20b6e700a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.4 - 5.5 - 5.6 - 7.0 diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index b980622d7..db989dae3 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -47,7 +47,7 @@ require __DIR__.'/../vendor/autoload.php'; | */ -$compiledPath = __DIR__.'/../storage/framework/compiled.php'; +$compiledPath = __DIR__.'/cache/compiled.php'; if (file_exists($compiledPath)) { require $compiledPath; diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/bootstrap/cache/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/config/app.php b/config/app.php index 1da5680c6..4f2959817 100644 --- a/config/app.php +++ b/config/app.php @@ -111,7 +111,7 @@ return [ | */ - 'providers' => array_merge(include(base_path().'/modules/system/providers.php'), [ + 'providers' => array_merge(include(base_path('modules/system/providers.php')), [ // 'Illuminate\Html\HtmlServiceProvider', // Example @@ -129,7 +129,7 @@ return [ | */ - 'aliases' => array_merge(include(base_path().'/modules/system/aliases.php'), [ + 'aliases' => array_merge(include(base_path('modules/system/aliases.php')), [ // 'Str' => 'Illuminate\Support\Str', // Example diff --git a/config/broadcasting.php b/config/broadcasting.php new file mode 100644 index 000000000..02cf625a5 --- /dev/null +++ b/config/broadcasting.php @@ -0,0 +1,52 @@ + 'pusher', + + /* + |-------------------------------------------------------------------------- + | Broadcast Connections + |-------------------------------------------------------------------------- + | + | Here you may define all of the broadcast connections that will be used + | to broadcast events to other systems or over websockets. Samples of + | each available type of connection are provided inside this array. + | + */ + + 'connections' => [ + + 'pusher' => [ + 'driver' => 'pusher', + 'key' => '', + 'secret' => '', + 'app_id' => '', + 'options' => [ + // + ], + ], + + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + ], + + 'log' => [ + 'driver' => 'log', + ], + + ], + +]; \ No newline at end of file diff --git a/config/cache.php b/config/cache.php index 425c74e4b..65939e071 100644 --- a/config/cache.php +++ b/config/cache.php @@ -44,7 +44,7 @@ return [ 'file' => [ 'driver' => 'file', - 'path' => storage_path().'/framework/cache', + 'path' => storage_path('framework/cache'), ], 'memcached' => [ diff --git a/config/cms.php b/config/cms.php index 88ee86081..49f922403 100644 --- a/config/cms.php +++ b/config/cms.php @@ -200,13 +200,13 @@ return [ 'uploads' => [ 'disk' => 'local', 'folder' => 'uploads', - 'path' => '/storage/app/uploads', + 'path' => storage_path('app/uploads'), ], 'media' => [ 'disk' => 'local', 'folder' => 'media', - 'path' => '/storage/app/media', + 'path' => storage_path('app/media'), ], ], diff --git a/config/database.php b/config/database.php index 13f816854..f76288396 100644 --- a/config/database.php +++ b/config/database.php @@ -48,7 +48,7 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => 'storage/database.sqlite', + 'database' => database_path('database.sqlite'), 'prefix' => '', ], diff --git a/config/filesystems.php b/config/filesystems.php index c636d36c3..a265cbb3e 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -45,7 +45,7 @@ return [ 'local' => [ 'driver' => 'local', - 'root' => storage_path().'/app', + 'root' => storage_path('app'), ], 's3' => [ diff --git a/config/session.php b/config/session.php index 739563bde..3ee92a981 100644 --- a/config/session.php +++ b/config/session.php @@ -57,7 +57,7 @@ return [ | */ - 'files' => storage_path().'/framework/sessions', + 'files' => storage_path('framework/sessions'), /* |-------------------------------------------------------------------------- diff --git a/config/testing/cms.php b/config/testing/cms.php index 36fe39edd..dfea912c7 100644 --- a/config/testing/cms.php +++ b/config/testing/cms.php @@ -96,7 +96,7 @@ return [ | */ - 'pluginsPathLocal' => base_path().'/tests/fixtures/plugins', + 'pluginsPathLocal' => base_path('tests/fixtures/plugins'), /* |-------------------------------------------------------------------------- @@ -107,6 +107,6 @@ return [ | */ - 'themesPathLocal' => base_path().'/tests/fixtures/themes', + 'themesPathLocal' => base_path('tests/fixtures/themes'), ]; diff --git a/config/view.php b/config/view.php index 215dfafc2..9948f06ea 100644 --- a/config/view.php +++ b/config/view.php @@ -28,6 +28,6 @@ return [ | */ - 'compiled' => realpath(storage_path().'/framework/views'), + 'compiled' => realpath(storage_path('framework/views')), ];